ChangeLogTag: Thu Jan 25 17:39:59 UTC 2007 Chad Elliott <elliott_c@ociweb.com>

1666 files changed, 18764 insertions, 38300 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 6044f9b93de..65846fee96c 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Thu Jan 25 17:39:59 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * *.{h,cpp,inl}:
+
+          Removed the ACE exception macros from all files.  There are a few
+          number of files that still use ACE_PRINT_EXCEPTION.  They will be
+          dealt with in my next commit.
+
 Thu Jan 25 13:40:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/IDL_Test/IDL_Test.mpc:
diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp
index afbf70a7041..71f2362ab05 100644
--- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp
+++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp
@@ -39,12 +39,11 @@ Concurrency_Service::Concurrency_Service (void)
 // Constructor taking command-line arguments.
 
 Concurrency_Service::Concurrency_Service (int argc,
-                                          ACE_TCHAR** argv
-                                          ACE_ENV_ARG_DECL)
+                                          ACE_TCHAR** argv)
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT("Concurrency_Service::Concurrency_Service (...)\n")));
-  this->init (argc, argv ACE_ENV_ARG_PARAMETER);
+  this->init (argc, argv);
 }
 
 int
@@ -88,8 +87,7 @@ Concurrency_Service::parse_args (int argc, ACE_TCHAR** argv)
 
 int
 Concurrency_Service::init (int argc,
-                           ACE_TCHAR **argv
-                           ACE_ENV_ARG_DECL)
+                           ACE_TCHAR **argv)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Concurrency_Service::init\n"));
@@ -99,8 +97,7 @@ Concurrency_Service::init (int argc,
 
   if (this->orb_manager_.init_child_poa (command_line.get_argc(),
                                          command_line.get_ASCII_argv(),
-                                         "child_poa"
-                                          ACE_ENV_ARG_PARAMETER) == -1)
+                                         "child_poa") == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT("%p\n"),
                        ACE_TEXT("init_child_poa")),
@@ -111,8 +108,7 @@ Concurrency_Service::init (int argc,
                        ACE_TEXT("Could not parse command line\n")),
                      -1);
   CORBA::String_var str =
-    this->orb_manager_.activate (this->my_concurrency_server_.GetLockSetFactory ()
-                                ACE_ENV_ARG_PARAMETER);
+    this->orb_manager_.activate (this->my_concurrency_server_.GetLockSetFactory ());
   ACE_DEBUG ((LM_DEBUG,
               "The IOR is: <%s>\n",
               ACE_TEXT_CHAR_TO_TCHAR(str.in ())));
@@ -171,15 +167,13 @@ Concurrency_Service::init_naming_service (void)
   concurrency_context_name[0].id = CORBA::string_dup ("CosConcurrency");
 
   this->concurrency_context_ =
-    this->naming_client_->bind_new_context (concurrency_context_name
-                                             ACE_ENV_ARG_PARAMETER);
+    this->naming_client_->bind_new_context (concurrency_context_name);
 
   CosNaming::Name lockset_name (1);
   lockset_name.length (1);
   lockset_name[0].id = CORBA::string_dup ("LockSetFactory");
   this->concurrency_context_->bind (lockset_name,
-                                   lockset_factory_.in ()
-                                   ACE_ENV_ARG_PARAMETER);
+                                   lockset_factory_.in ());
   return 0;
 }
 
@@ -215,10 +209,9 @@ ACE_TMAIN (int argc, ACE_TCHAR ** argv)
   ACE_DEBUG ((LM_DEBUG,
               "\n \t Concurrency Service:SERVER \n \n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      int r = concurrency_service.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      int r = concurrency_service.init (argc, argv);
 
       if (r == -1)
         return 1;
@@ -226,17 +219,16 @@ ACE_TMAIN (int argc, ACE_TCHAR ** argv)
       concurrency_service.run ();
     }
 
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      userex._tao_print_exception ("User Exception");
       return -1;
     }
 
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h
index a27742a0df0..e5f0c5e133b 100644
--- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h
+++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h
@@ -47,16 +47,14 @@ public:
 
   /// Constructor taking the command-line arguments.
   Concurrency_Service (int argc,
-                       ACE_TCHAR **argv
-                       ACE_ENV_ARG_DECL);
+                       ACE_TCHAR **argv);
 
   /// Destructor.
   ~Concurrency_Service (void);
 
   /// Initialize the Concurrency Service with the arguments.
   int init (int argc,
-            ACE_TCHAR **argv
-            ACE_ENV_ARG_DECL);
+            ACE_TCHAR **argv);
 
   /// Run the Concurrency_Service.
   int run (void);
diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
index d61f336f849..71f9d9740c5 100644
--- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
+++ b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
@@ -17,15 +17,14 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   TAO_CEC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Copy command line parameter.
       ACE_Argv_Type_Converter command_line(argc, argv);
 
       // Intialize the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (command_line.get_argc(), command_line.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (command_line.get_argc(), command_line.get_ASCII_argv(), 0);
 
       // Call TAO_CEC_Event_Loader::init (argc, argv) from here.
       TAO_CEC_Event_Loader event_service;
@@ -62,11 +61,10 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
       // Destroy the ORB
       orb->destroy();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, argv[0]);
+      ex._tao_print_exception (argv[0]);
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp
index 5c05c2eb776..e40e3a66417 100644
--- a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp
+++ b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp
@@ -18,17 +18,17 @@ ACE_RCSID (Dump_Schedule,
 int
 ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Copy command line parameter.
       ACE_Argv_Type_Converter command_line(argc, argv);
 
       // Initialize ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (command_line.get_argc(), command_line.get_ASCII_argv(), "internet" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (command_line.get_argc(), command_line.get_ASCII_argv(), "internet");
 
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil(naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -36,7 +36,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
       const char *name = "ScheduleService";
       if (command_line.get_argc() > 1)
@@ -55,8 +55,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
                                          ACE_SCOPE_THREAD),
          ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                          ACE_SCOPE_THREAD),
-         infos.out (), deps.out (), configs.out (), anomalies.out ()
-         ACE_ENV_ARG_PARAMETER);
+         infos.out (), deps.out (), configs.out (), anomalies.out ());
 
       ACE_Scheduler_Factory::dump_schedule (infos.in (),
                                             deps.in (),
@@ -64,11 +63,10 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
                                             anomalies.in (),
                                             "Scheduler_Runtime.cpp");
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Dump_Schedule");
+      ex._tao_print_exception ("Dump_Schedule");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.cpp b/TAO/orbsvcs/Event_Service/Event_Service.cpp
index 8d57044cc9e..dc0082c11ef 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.cpp
+++ b/TAO/orbsvcs/Event_Service/Event_Service.cpp
@@ -51,28 +51,27 @@ Event_Service::~Event_Service (void)
 int
 Event_Service::run (int argc, ACE_TCHAR* argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Make a copy of command line parameter.
       ACE_Argv_Type_Converter command(argc, argv);
 
       // Initialize ORB.
       this->orb_ =
-        CORBA::ORB_init (command.get_argc(), command.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (command.get_argc(), command.get_ASCII_argv(), "");
 
       if (this->parse_args (command.get_argc(), command.get_TCHAR_argv()) == -1)
         return 1;
 
       CORBA::Object_var root_poa_object =
-        this->orb_->resolve_initial_references("RootPOA"
-                                               ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references("RootPOA");
       if (CORBA::is_nil (root_poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize the root POA.\n"),
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (root_poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (root_poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -92,7 +91,7 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
       if (use_name_service)
         {
           naming_obj=
-            this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
+            this->orb_->resolve_initial_references ("NameService");
 
           if (CORBA::is_nil (naming_obj.in ()))
             ACE_ERROR_RETURN ((LM_ERROR,
@@ -100,7 +99,7 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
                               1);
 
           naming_context =
-            CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
+            CosNaming::NamingContext::_narrow (naming_obj.in ());
         }
 
       // This is the name we (potentially) register the Scheduling
@@ -123,18 +122,16 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
           // Register the servant with the Naming Context....
           if (!CORBA::is_nil (naming_context.in ()))
             {
-              naming_context->rebind (schedule_name, scheduler.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+              naming_context->rebind (schedule_name, scheduler.in ());
             }
         }
       else if (this->scheduler_type_ == ES_SCHED_GLOBAL)
         {
           // Get reference to a scheduler from naming service
           CORBA::Object_var tmp =
-            naming_context->resolve (schedule_name ACE_ENV_ARG_PARAMETER);
+            naming_context->resolve (schedule_name);
 
-          scheduler = RtecScheduler::Scheduler::_narrow (tmp.in ()
-                                                          ACE_ENV_ARG_PARAMETER);
+          scheduler = RtecScheduler::Scheduler::_narrow (tmp.in ());
 
           if (CORBA::is_nil (scheduler.in ()))
             ACE_ERROR_RETURN ((LM_ERROR,
@@ -181,12 +178,10 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
           if (persistent != 0)
             {
               policies[index++] =
-                root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                                        ACE_ENV_ARG_PARAMETER);
+                root_poa->create_id_assignment_policy (PortableServer::USER_ID);
 
               policies[index++] =
-                root_poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                                   ACE_ENV_ARG_PARAMETER);
+                root_poa->create_lifespan_policy (PortableServer::PERSISTENT);
             }
 
           if (this->use_bidir_giop_ == true)
@@ -195,8 +190,7 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
               pol <<= BiDirPolicy::BOTH;
               policies[index++] =
                 this->orb_->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
-                                           pol
-                                            ACE_ENV_ARG_PARAMETER);
+                                           pol);
             }
 
           policies.length (index);
@@ -205,8 +199,7 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
           PortableServer::POA_var child_poa =
             root_poa->create_POA (child_poa_name.c_str (),
                                   poa_manager.in (),
-                                  policies
-                                  ACE_ENV_ARG_PARAMETER);
+                                  policies);
 
           // Creation of persistentPOA is over. Destroy the Policy objects.
           for (CORBA::ULong i = 0;
@@ -225,20 +218,17 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
             PortableServer::string_to_ObjectId(object_id_.c_str());
 
           child_poa->activate_object_with_id(ec_object_id.in(),
-                                             this
-                                              ACE_ENV_ARG_PARAMETER);
+                                             this);
 
           CORBA::Object_var ec_obj =
-            child_poa->id_to_reference(ec_object_id.in()
-                                        ACE_ENV_ARG_PARAMETER);
+            child_poa->id_to_reference(ec_object_id.in());
 
           ec =
-            RtecEventChannelAdmin::EventChannel::_narrow(ec_obj.in()
-                                                         ACE_ENV_ARG_PARAMETER);
+            RtecEventChannelAdmin::EventChannel::_narrow(ec_obj.in());
         }
 
       CORBA::String_var str =
-         this->orb_->object_to_string (ec.in () ACE_ENV_ARG_PARAMETER);
+         this->orb_->object_to_string (ec.in ());
 
       if (ACE_OS::strcmp(this->ior_file_name_.c_str(), "") != 0)
         {
@@ -277,7 +267,7 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
           CosNaming::Name channel_name (1);
           channel_name.length (1);
           channel_name[0].id = CORBA::string_dup (this->service_name_.c_str());
-          naming_context->rebind (channel_name, ec.in () ACE_ENV_ARG_PARAMETER);
+          naming_context->rebind (channel_name, ec.in ());
         }
 
       ACE_DEBUG ((LM_DEBUG,
@@ -291,21 +281,20 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
           CosNaming::Name channel_name (1);
           channel_name.length (1);
           channel_name[0].id = CORBA::string_dup (this->service_name_.c_str());
-          naming_context->unbind (channel_name ACE_ENV_ARG_PARAMETER);
+          naming_context->unbind (channel_name);
         }
 
       if (!CORBA::is_nil (scheduler.in ()) &&
           !CORBA::is_nil (naming_context.in ()))
         {
-          naming_context->unbind (schedule_name ACE_ENV_ARG_PARAMETER);
+          naming_context->unbind (schedule_name);
         }
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "EC");
+      ex._tao_print_exception ("EC");
     }
-  ACE_ENDTRY;
 
 
   return 0;
@@ -419,24 +408,22 @@ Event_Service::destroy (void)
 }
 
 RtecEventChannelAdmin::Observer_Handle
-Event_Service::append_observer (RtecEventChannelAdmin::Observer_ptr observer
-                                ACE_ENV_ARG_DECL)
+Event_Service::append_observer (RtecEventChannelAdmin::Observer_ptr observer)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
           RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER))
 {
-  return this->ec_impl_->append_observer (observer ACE_ENV_ARG_PARAMETER);
+  return this->ec_impl_->append_observer (observer);
 }
 
 void
-Event_Service::remove_observer (RtecEventChannelAdmin::Observer_Handle handle
-                                ACE_ENV_ARG_DECL)
+Event_Service::remove_observer (RtecEventChannelAdmin::Observer_Handle handle)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
           RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER))
 {
-  this->ec_impl_->remove_observer (handle ACE_ENV_ARG_PARAMETER);
+  this->ec_impl_->remove_observer (handle);
 }
 
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.h b/TAO/orbsvcs/Event_Service/Event_Service.h
index 19b21434ce1..84c3f46542f 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.h
+++ b/TAO/orbsvcs/Event_Service/Event_Service.h
@@ -49,14 +49,12 @@ public:
   virtual void destroy (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
   virtual RtecEventChannelAdmin::Observer_Handle
-    append_observer (RtecEventChannelAdmin::Observer_ptr observer
-                     ACE_ENV_ARG_DECL)
+    append_observer (RtecEventChannelAdmin::Observer_ptr observer)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
           RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER));
-  virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle
-                                ACE_ENV_ARG_DECL)
+  virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
index 70e156b0232..6648a74bba9 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
@@ -40,7 +40,7 @@ FT_EventService::~FT_EventService()
 int
 FT_EventService::run(int argc, ACE_TCHAR* argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
   {
     // Make a copy of command line parameter.
     ACE_Argv_Type_Converter command(argc, argv);
@@ -48,21 +48,20 @@ FT_EventService::run(int argc, ACE_TCHAR* argv[])
     // Initialize ORB.
     orb_ = CORBA::ORB_init (command.get_argc(),
                             command.get_ASCII_argv(),
-                            "" ACE_ENV_ARG_PARAMETER);
+                            "");
 
     if (this->parse_args (command.get_argc(), command.get_TCHAR_argv()) == -1)
       return 1;
 
     CORBA::Object_var root_poa_object =
-      orb_->resolve_initial_references("RootPOA"
-      ACE_ENV_ARG_PARAMETER);
+      orb_->resolve_initial_references("RootPOA");
     if (CORBA::is_nil (root_poa_object.in ()))
       ACE_ERROR_RETURN ((LM_ERROR,
       " (%P|%t) Unable to initialize the root POA.\n"),
       1);
 
     PortableServer::POA_var root_poa =
-      PortableServer::POA::_narrow (root_poa_object.in () ACE_ENV_ARG_PARAMETER);
+      PortableServer::POA::_narrow (root_poa_object.in ());
 
     PortableServer::POAManager_var poa_manager =
       root_poa->the_POAManager ();
@@ -70,16 +69,16 @@ FT_EventService::run(int argc, ACE_TCHAR* argv[])
     poa_manager->activate ();
 
     CORBA::Object_var naming_obj =
-      orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
+      orb_->resolve_initial_references ("NameService");
     if (CORBA::is_nil (naming_obj.in ()))
       ACE_ERROR_RETURN ((LM_ERROR,
       " (%P|%t) Unable to initialize the Naming Service.\n"),
       1);
 
     CosNaming::NamingContext_var naming_context =
-      CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
+      CosNaming::NamingContext::_narrow (naming_obj.in ());
 
-    setup_scheduler(naming_context.in() ACE_ENV_ARG_PARAMETER);
+    setup_scheduler(naming_context.in());
 
 
     poa_manager->activate();
@@ -89,20 +88,18 @@ FT_EventService::run(int argc, ACE_TCHAR* argv[])
     TAO_FTEC_Event_Channel ec(orb_, root_poa);
 
     FtRtecEventChannelAdmin::EventChannel_var ec_ior =
-      ec.activate(membership_
-        ACE_ENV_ARG_PARAMETER);
+      ec.activate(membership_);
 
     if (report_factory(orb_.in(), ec_ior.in() )==-1)
       return -1;
 
     orb_->run();
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION, "A CORBA Exception occurred.");
+    ex._tao_print_exception ("A CORBA Exception occurred.");
     return -1;
   }
-  ACE_ENDTRY;
 
 
   ACE_Thread_Manager::instance()->wait();
@@ -194,8 +191,7 @@ FT_EventService::parse_args (int argc, ACE_TCHAR* argv [])
 }
 
 void
-FT_EventService::setup_scheduler(CosNaming::NamingContext_ptr naming_context
-                                 ACE_ENV_ARG_DECL)
+FT_EventService::setup_scheduler(CosNaming::NamingContext_ptr naming_context)
 {
     RtecScheduler::Scheduler_var scheduler;
     if (CORBA::is_nil(naming_context)) {
@@ -229,16 +225,14 @@ FT_EventService::setup_scheduler(CosNaming::NamingContext_ptr naming_context
                 scheduler = this->sched_impl_->_this ();
 
                 // Register the servant with the Naming Context....
-                naming_context->rebind (schedule_name, scheduler.in ()
-                    ACE_ENV_ARG_PARAMETER);
+                naming_context->rebind (schedule_name, scheduler.in ());
             }
             else
             {
                 CORBA::Object_var tmp =
-                    naming_context->resolve (schedule_name ACE_ENV_ARG_PARAMETER);
+                    naming_context->resolve (schedule_name);
 
-                scheduler = RtecScheduler::Scheduler::_narrow (tmp.in ()
-                    ACE_ENV_ARG_PARAMETER);
+                scheduler = RtecScheduler::Scheduler::_narrow (tmp.in ());
             }
         }
     }
@@ -248,7 +242,7 @@ int
 FT_EventService::report_factory(CORBA::ORB_ptr orb,
                    FtRtecEventChannelAdmin::EventChannel_ptr ec)
 {
-  ACE_TRY_NEW_ENV {
+  try{
     char* addr = ACE_OS::getenv("EventChannelFactoryAddr");
 
     if (addr != NULL) {
@@ -262,8 +256,7 @@ FT_EventService::report_factory(CORBA::ORB_ptr orb,
         ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Invalid Factory Address\n"), -1);
 
       ACE_DEBUG((LM_DEBUG,"Factory connected\n"));
-      CORBA::String_var my_ior_string = orb->object_to_string(ec
-        ACE_ENV_ARG_PARAMETER);
+      CORBA::String_var my_ior_string = orb->object_to_string(ec);
 
       int len = strlen(my_ior_string.in()) ;
 
@@ -273,10 +266,9 @@ FT_EventService::report_factory(CORBA::ORB_ptr orb,
       stream.close();
     }
   }
-  ACE_CATCHALL {
+  catch (...){
     return -1;
   }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h
index 9238edf51b0..c8c181e55cc 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h
+++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h
@@ -35,8 +35,7 @@ public:
 
 private:
   int parse_args (int argc, ACE_TCHAR* argv []);
-  void setup_scheduler(CosNaming::NamingContext_ptr naming_context
-                                        ACE_ENV_ARG_DECL);
+  void setup_scheduler(CosNaming::NamingContext_ptr naming_context);
   int report_factory(CORBA::ORB_ptr orb,
                    FtRtecEventChannelAdmin::EventChannel_ptr ec);
   virtual void become_primary();
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
index 5c50d85167c..45cfae40bcf 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
@@ -24,7 +24,6 @@ CORBA::Object_ptr EventChannelFactory_i::create_object (
   const char * type_id,
   const PortableGroup::Criteria & the_criteria,
   PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id
-  ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
   CORBA::SystemException
@@ -40,11 +39,11 @@ CORBA::Object_ptr EventChannelFactory_i::create_object (
   FILE* file = 0;
   char *id_str=0, *prog=0;
 
-  ACE_TRY {
+  try{
 
     file = fopen(conf_file, "r");
     if (file == 0)
-      ACE_TRY_THROW (PortableGroup::NoFactory());
+      throw PortableGroup::NoFactory();
 
     ACE_Read_Buffer read_buf(file);
 
@@ -56,20 +55,18 @@ CORBA::Object_ptr EventChannelFactory_i::create_object (
       }
     }
   }
-  ACE_CATCHALL {
+  catch (...){
     if (file) fclose(file);
     if (id_str) ACE_Allocator::instance()->free(id_str);
     if (prog) ACE_Allocator::instance()->free(prog);
-    ACE_RE_THROW;
+    throw;
   }
-  ACE_ENDTRY;
 
     ACE_THROW_RETURN(PortableGroup::ObjectNotCreated(), CORBA::Object::_nil());
 }
 
 void EventChannelFactory_i::delete_object (
   const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id
-  ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((
   CORBA::SystemException
@@ -184,17 +181,15 @@ CORBA::Object_ptr EventChannelFactory_i::create_process (
   if (strlen(ior)  ==0)
     return result;
 
-  ACE_TRY_NEW_ENV {
-    CORBA::Object_var result  = orb->string_to_object(ior
-      ACE_ENV_ARG_PARAMETER);
+  try{
+    CORBA::Object_var result  = orb->string_to_object(ior);
 
     if (objects.bind(id, result) ==0){
       return result._retn();
     }
   }
-  ACE_CATCHALL {
+  catch (...){
   }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h
index 656df7363bf..c4f2da131fe 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h
@@ -29,7 +29,6 @@ public:
     const char * type_id,
     const PortableGroup::Criteria & the_criteria,
     PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id
-    ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -42,7 +41,6 @@ public:
 
   virtual void delete_object (
     const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id
-    ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
     CORBA::SystemException
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp
index 5871bfaa159..f9e0cb37295 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp
@@ -55,21 +55,17 @@ int parse_args(int argc, char* argv[])
 int main(int argc, ACE_TCHAR* argv[])
 {
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY {
-    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, ""
-                                         ACE_ENV_ARG_PARAMETER);
+  try{
+    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "");
 
     if (parse_args(argc, argv) == -1)
       return -1;
 
     CORBA::Object_var obj =
-      orb->resolve_initial_references("RootPOA"
-      ACE_ENV_ARG_PARAMETER);
+      orb->resolve_initial_references("RootPOA");
 
     PortableServer::POA_var poa =
-      PortableServer::POA::_narrow(obj.in()
-                                   ACE_ENV_ARG_PARAMETER);
+      PortableServer::POA::_narrow(obj.in());
 
     PortableServer::POAManager_var mgr = poa->the_POAManager();
 
@@ -84,12 +80,10 @@ int main(int argc, ACE_TCHAR* argv[])
 
     if (id.length()) {
       CORBA::Object_var namng_contex_object =
-        orb->resolve_initial_references("NameService"
-        ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("NameService");
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow(namng_contex_object.in()
-        ACE_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow(namng_contex_object.in());
 
       // register to naming service
       CosNaming::Name name(1);
@@ -98,8 +92,7 @@ int main(int argc, ACE_TCHAR* argv[])
       if (kind.length())
         name[0].kind = CORBA::string_dup(kind.c_str());
 
-      naming_context->bind(name, event_channel_factory.in()
-        ACE_ENV_ARG_PARAMETER);
+      naming_context->bind(name, event_channel_factory.in());
 
       ACE_DEBUG((LM_DEBUG, "Register to naming service with %s", id.c_str()));
       if (kind.length())
@@ -109,8 +102,7 @@ int main(int argc, ACE_TCHAR* argv[])
 
     if (output.length()) {
       // get the IOR of factory
-      CORBA::String_var str = orb->object_to_string(event_channel_factory.in()
-        ACE_ENV_ARG_PARAMETER);
+      CORBA::String_var str = orb->object_to_string(event_channel_factory.in());
 
       if (ACE_OS::strcmp(output.c_str(), "") != 0)
       {
@@ -131,11 +123,10 @@ int main(int argc, ACE_TCHAR* argv[])
     orb->run();
 
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION, "A CORBA Exception occurred.");
+    ex._tao_print_exception ("A CORBA Exception occurred.");
   }
-  ACE_ENDTRY;
 
 
 
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp
index 326d5b0157e..8588d646113 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp
@@ -23,7 +23,7 @@ namespace {
 
 int parse_args(int argc, ACE_TCHAR** argv)
 {
-  ACE_TRY_NEW_ENV {
+  try{
     ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("i:n:o:"));
     int opt;
     CosNaming::Name name(1);
@@ -36,10 +36,8 @@ int parse_args(int argc, ACE_TCHAR** argv)
       {
       case 'i':
         {
-          CORBA::Object_var obj = orb->string_to_object(get_opt.opt_arg ()
-                                                        ACE_ENV_ARG_PARAMETER);
-          ftec = FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in()
-                                                                ACE_ENV_ARG_PARAMETER);
+          CORBA::Object_var obj = orb->string_to_object(get_opt.opt_arg ());
+          ftec = FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in());
         }
         break;
       case 'n':
@@ -55,37 +53,32 @@ int parse_args(int argc, ACE_TCHAR** argv)
       /// we should get the ftec from Naming Service
 
       CosNaming::NamingContext_var naming_context =
-        resolve_init<CosNaming::NamingContext>(orb.in(), "NameService"
-        ACE_ENV_ARG_PARAMETER);
+        resolve_init<CosNaming::NamingContext>(orb.in(), "NameService");
 
       ftec = resolve<FtRtecEventChannelAdmin::EventChannel>(naming_context.in(),
-        name
-        ACE_ENV_ARG_PARAMETER);
+        name);
 
       if (CORBA::is_nil(ftec.in()))
         ACE_ERROR_RETURN((LM_ERROR, "Cannot Find FT_EventService\n"), -1);
     }
   }
-  ACE_CATCHANY {
+  catch (const CORBA::Exception& ex){
     ACE_ERROR_RETURN((LM_ERROR, "Cannot Find FT_EventService\n"), -1);
   }
-  ACE_ENDTRY;
   return 0;
 }
 
 int main(int argc,  ACE_TCHAR** argv)
 {
-  ACE_TRY_NEW_ENV
+  try
   {
-    orb = CORBA::ORB_init (argc, argv, ""
-                           ACE_ENV_ARG_PARAMETER);
+    orb = CORBA::ORB_init (argc, argv, "");
 
     if (parse_args(argc, argv)==-1)
       return 1;
 
     PortableServer::POA_var
-      root_poa =  resolve_init<PortableServer::POA>(orb.in(), "RootPOA"
-      ACE_ENV_ARG_PARAMETER);
+      root_poa =  resolve_init<PortableServer::POA>(orb.in(), "RootPOA");
 
     // create POAManager
     PortableServer::POAManager_var
@@ -97,12 +90,11 @@ int main(int argc,  ACE_TCHAR** argv)
     TAO_FTRTEC::FTEC_Gateway gateway_servant(orb.in(), ftec.in());
 
     RtecEventChannelAdmin::EventChannel_var gateway =
-      gateway_servant.activate(root_poa.in() ACE_ENV_ARG_PARAMETER);
+      gateway_servant.activate(root_poa.in());
 
     if (ior_file_name.length())
     {
-      CORBA::String_var str = orb->object_to_string(gateway.in()
-        ACE_ENV_ARG_PARAMETER);
+      CORBA::String_var str = orb->object_to_string(gateway.in());
 
       FILE *output_file=
         ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(ior_file_name.c_str()),
@@ -118,9 +110,8 @@ int main(int argc,  ACE_TCHAR** argv)
 
     orb->run();
   }
-  ACE_CATCHANY {
+  catch (const CORBA::Exception& ex){
     return 1;
   }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
index 9d5cdd91e0a..c824b411c5e 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
@@ -58,8 +58,7 @@ TAO::FT_FaultConsumer::~FT_FaultConsumer ()
 int TAO::FT_FaultConsumer::init (
   PortableServer::POA_ptr poa,
   FT::FaultNotifier_ptr fault_notifier,
-  TAO::FT_FaultAnalyzer * fault_analyzer
-  ACE_ENV_ARG_DECL)
+  TAO::FT_FaultAnalyzer * fault_analyzer)
 {
 
   if (TAO_debug_level > 1)
@@ -91,18 +90,18 @@ int TAO::FT_FaultConsumer::init (
   //@@ For now, let's try just activating it in the POA.
 
   // Activate this consumer in the POA.
-  this->object_id_ = this->poa_->activate_object (this ACE_ENV_ARG_PARAMETER);
+  this->object_id_ = this->poa_->activate_object (this);
   CORBA::Object_var obj =
-    this->poa_->id_to_reference (this->object_id_.in() ACE_ENV_ARG_PARAMETER);
+    this->poa_->id_to_reference (this->object_id_.in());
 
   // Narrow it to CosNotifyComm::StructuredPushConsumer.
   this->consumer_ref_ = CosNotifyComm::StructuredPushConsumer::_narrow (
-    obj.in() ACE_ENV_ARG_PARAMETER);
+    obj.in());
 
   // Subscribe to the FaultNotifier.
   CosNotifyFilter::Filter_var filter = CosNotifyFilter::Filter::_nil ();
   this->consumer_id_ = fault_notifier_->connect_structured_fault_consumer (
-    this->consumer_ref_.in(), filter.in () ACE_ENV_ARG_PARAMETER);
+    this->consumer_ref_.in(), filter.in ());
 
   if (TAO_debug_level > 1)
   {
@@ -133,7 +132,7 @@ int TAO::FT_FaultConsumer::fini (void)
 
   // Disconnect from the FaultNotifier.
   // Swallow any exception.
-  ACE_TRY_NEW_ENV
+  try
   {
     if (!CORBA::is_nil (this->fault_notifier_.in()))
     {
@@ -148,7 +147,7 @@ int TAO::FT_FaultConsumer::fini (void)
       }
 
       this->fault_notifier_->disconnect_consumer (
-        this->consumer_id_ ACE_ENV_ARG_PARAMETER);
+        this->consumer_id_);
 
       if (TAO_debug_level > 1)
       {
@@ -161,18 +160,15 @@ int TAO::FT_FaultConsumer::fini (void)
 
       // Deactivate ourself from the POA.
       this->poa_->deactivate_object (
-        this->object_id_.in() ACE_ENV_ARG_PARAMETER);
+        this->object_id_.in());
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+    ex._tao_print_exception (
       ACE_TEXT (
-        "TAO::FT_FaultConsumer::fini: "
-        "Error disconnecting from notifier (ignored).\n")
-    );
+        "TAO::FT_FaultConsumer::fini: ""Error disconnecting from notifier (ignored).\n"));
   }
-  ACE_ENDTRY;
 
   if (TAO_debug_level > 1)
   {
@@ -218,7 +214,6 @@ size_t TAO::FT_FaultConsumer::notifications () const
 // we simply log the error and drop the event.
 void TAO::FT_FaultConsumer::push_structured_event (
   const CosNotification::StructuredEvent &event
-  ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException, CosEventComm::Disconnected))
 {
@@ -270,7 +265,6 @@ void TAO::FT_FaultConsumer::push_structured_event (
 void TAO::FT_FaultConsumer::offer_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyComm::InvalidEventType))
 {
@@ -282,7 +276,6 @@ void TAO::FT_FaultConsumer::offer_change (
 }
 
 void TAO::FT_FaultConsumer::disconnect_structured_push_consumer (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
index f92a5641fa8..04f8c3303e1 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
@@ -71,8 +71,7 @@ namespace TAO
     int init (
       PortableServer::POA_ptr poa,
       FT::FaultNotifier_ptr fault_notifier,
-      TAO::FT_FaultAnalyzer * fault_analyzer
-      ACE_ENV_ARG_DECL);
+      TAO::FT_FaultAnalyzer * fault_analyzer);
 
     /**
     * Clean house for process shut down.
@@ -106,19 +105,16 @@ namespace TAO
     // CORBA methods
     virtual void push_structured_event (
       const CosNotification::StructuredEvent &notification
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((CORBA::SystemException, CosEventComm::Disconnected));
 
    virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyComm::InvalidEventType));
 
    virtual void disconnect_structured_push_consumer (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp
index 0268c527fbb..33d947d344e 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp
@@ -45,8 +45,7 @@ TAO::FT_Property_Validator::~FT_Property_Validator (void)
 
 void
 TAO::FT_Property_Validator::validate_property (
-    const PortableGroup::Properties & props
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Properties & props)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::InvalidProperty,
                    PortableGroup::UnsupportedProperty))
@@ -67,8 +66,7 @@ TAO::FT_Property_Validator::validate_property (
                   && value != FT::ACTIVE
                   && value != FT::ACTIVE_WITH_VOTING
                   && value != FT::SEMI_ACTIVE))
-            ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                       property.val));
+            throw PortableGroup::InvalidProperty (property.nam, property.val);
         }
       else if (property.nam == this->membership_style_)
         {
@@ -76,8 +74,7 @@ TAO::FT_Property_Validator::validate_property (
           if (!(property.val >>= value)
               || (value != PortableGroup::MEMB_APP_CTRL
                   && value != PortableGroup::MEMB_INF_CTRL))
-            ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                       property.val));
+            throw PortableGroup::InvalidProperty (property.nam, property.val);
         }
       else if (property.nam == this->consistency_style_)
         {
@@ -85,8 +82,7 @@ TAO::FT_Property_Validator::validate_property (
           if (!(property.val >>= value)
               || (value != FT::CONS_APP_CTRL
                   && value != FT::CONS_INF_CTRL))
-            ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                       property.val));
+            throw PortableGroup::InvalidProperty (property.nam, property.val);
         }
       else if (property.nam == this->fault_monitoring_style_)
         {
@@ -95,8 +91,7 @@ TAO::FT_Property_Validator::validate_property (
               || (value != FT::PULL
                   && value != FT::PUSH
                   && value != FT::NOT_MONITORED))
-            ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                       property.val));
+            throw PortableGroup::InvalidProperty (property.nam, property.val);
         }
       else if (property.nam == this->fault_monitoring_granularity_)
         {
@@ -105,22 +100,21 @@ TAO::FT_Property_Validator::validate_property (
               || (value != FT::MEMB
                   && value != FT::LOC
                   && value != FT::LOC_AND_TYPE))
-            ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                       property.val));
+            throw PortableGroup::InvalidProperty (property.nam, property.val);
         }
       else if (property.nam == this->factories_)
         {
           const PortableGroup::FactoriesValue * factories;
           if (!(property.val >>= factories))
-            ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                       property.val));
+            throw PortableGroup::InvalidProperty (property.nam, property.val);
           else
             {
               const CORBA::ULong flen = factories->length ();
 
               if (flen == 0)
-                ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                           property.val));
+                throw PortableGroup::InvalidProperty (
+                  property.nam,
+                  property.val);
 
               for (CORBA::ULong j = 0; j < flen; ++j)
                 {
@@ -129,8 +123,9 @@ TAO::FT_Property_Validator::validate_property (
 
                   if (CORBA::is_nil (factory_info.the_factory.in ())
                       || factory_info.the_location.length () == 0)
-                    ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                               property.val));
+                    throw PortableGroup::InvalidProperty (
+                      property.nam,
+                      property.val);
                 }
             }
         }
@@ -139,8 +134,7 @@ TAO::FT_Property_Validator::validate_property (
 
 void
 TAO::FT_Property_Validator::validate_criteria (
-    const PortableGroup::Properties & props
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Properties & props)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::InvalidCriteria,
                    PortableGroup::CannotMeetCriteria))
@@ -239,7 +233,7 @@ TAO::FT_Property_Validator::validate_criteria (
       // deallocations should occur.
       invalid_criteria.length (p);
 
-      ACE_THROW (PortableGroup::InvalidCriteria (invalid_criteria));
+      throw PortableGroup::InvalidCriteria (invalid_criteria);
     }
 }
 
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h
index 954d7f29ded..77d0d76b6a0 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h
@@ -48,8 +48,7 @@ namespace TAO
     /// first invalid property is encountered.  The remaining properties
     /// will not be validated.
     virtual
-    void validate_property (const PortableGroup::Properties & props
-                            ACE_ENV_ARG_DECL)
+    void validate_property (const PortableGroup::Properties & props)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::InvalidProperty,
                       PortableGroup::UnsupportedProperty));
@@ -58,8 +57,7 @@ namespace TAO
     /// will be validated regardless of whether or not an invalid
     /// property was encountered.
     virtual
-    void validate_criteria (const PortableGroup::Properties & criteria
-                            ACE_ENV_ARG_DECL)
+    void validate_criteria (const PortableGroup::Properties & criteria)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::InvalidCriteria,
                       PortableGroup::CannotMeetCriteria));
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
index 3cd7243c0ac..2d5d6c1084f 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
@@ -139,7 +139,7 @@ const char * TAO::FT_ReplicationManager::identity () const
 }
 
 //public
-int TAO::FT_ReplicationManager::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+int TAO::FT_ReplicationManager::init (CORBA::ORB_ptr orb)
 {
   int result = 0;
 
@@ -156,13 +156,13 @@ int TAO::FT_ReplicationManager::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 
   // Get the RootPOA.
   CORBA::Object_var poa_obj = this->orb_->resolve_initial_references (
-    TAO_OBJID_ROOTPOA ACE_ENV_ARG_PARAMETER);
+    TAO_OBJID_ROOTPOA);
   this->poa_ = PortableServer::POA::_narrow (
-    poa_obj.in () ACE_ENV_ARG_PARAMETER);
+    poa_obj.in ());
 
 
   // initialize the FactoryRegistry
-  this->factory_registry_.init (this->orb_.in (), this->poa_.in () ACE_ENV_ARG_PARAMETER);
+  this->factory_registry_.init (this->orb_.in (), this->poa_.in ());
 
   PortableGroup::FactoryRegistry_var factory_registry = this->factory_registry_.reference ();
 
@@ -170,17 +170,16 @@ int TAO::FT_ReplicationManager::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
   this->group_factory_.init (
     this->orb_.in (),
     this->poa_.in (),
-    factory_registry.in ()
-    ACE_ENV_ARG_PARAMETER);
+    factory_registry.in ());
 
   // Activate ourself in the POA.
   PortableServer::ObjectId_var oid = this->poa_->activate_object (
-    this ACE_ENV_ARG_PARAMETER);
+    this);
 
   CORBA::Object_var this_obj = this->poa_->id_to_reference (
-    oid.in () ACE_ENV_ARG_PARAMETER);
+    oid.in ());
   this->replication_manager_ref_ = FT::ReplicationManager::_narrow (
-    this_obj.in () ACE_ENV_ARG_PARAMETER);
+    this_obj.in ());
 
   // If we were given an initial IOR string for a Fault Notifier on the
   // command line, convert it to an IOR, then register the fault
@@ -188,12 +187,12 @@ int TAO::FT_ReplicationManager::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
   if (this->fault_notifier_ior_string_ != 0)
   {
     CORBA::Object_var notifier_obj = this->orb_->string_to_object (
-      this->fault_notifier_ior_string_ ACE_ENV_ARG_PARAMETER);
+      this->fault_notifier_ior_string_);
     FT::FaultNotifier_var notifier = FT::FaultNotifier::_narrow (
-      notifier_obj.in () ACE_ENV_ARG_PARAMETER);
+      notifier_obj.in ());
     if (! CORBA::is_nil (notifier.in ()))
     {
-      this->register_fault_notifier_i (notifier.in () ACE_ENV_ARG_PARAMETER);
+      this->register_fault_notifier_i (notifier.in ());
     }
     else
     {
@@ -214,10 +213,10 @@ int TAO::FT_ReplicationManager::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
   // "ReplicationManager".
   CORBA::Object_var ior_table_obj =
     this->orb_->resolve_initial_references (
-      TAO_OBJID_IORTABLE ACE_ENV_ARG_PARAMETER);
+      TAO_OBJID_IORTABLE);
 
   IORTable::Table_var ior_table =
-    IORTable::Table::_narrow (ior_table_obj.in () ACE_ENV_ARG_PARAMETER);
+    IORTable::Table::_narrow (ior_table_obj.in ());
   if (CORBA::is_nil (ior_table.in ()))
   {
     ACE_ERROR_RETURN ( (LM_ERROR,
@@ -227,9 +226,8 @@ int TAO::FT_ReplicationManager::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
   else
   {
     CORBA::String_var rm_ior_str = this->orb_->object_to_string (
-      this->replication_manager_ref_.in () ACE_ENV_ARG_PARAMETER);
-    ior_table->bind ("ReplicationManager", rm_ior_str.in ()
-      ACE_ENV_ARG_PARAMETER);
+      this->replication_manager_ref_.in ());
+    ior_table->bind ("ReplicationManager", rm_ior_str.in ());
   }
 
   // Publish our IOR, either to a file or the Naming Service.
@@ -246,11 +244,11 @@ int TAO::FT_ReplicationManager::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
     this->identity_ += this->ns_name_;
 
     CORBA::Object_var naming_obj = this->orb_->resolve_initial_references (
-        TAO_OBJID_NAMESERVICE ACE_ENV_ARG_PARAMETER);
+        TAO_OBJID_NAMESERVICE);
 
     this->naming_context_ =
       CosNaming::NamingContext::_narrow (
-        naming_obj.in () ACE_ENV_ARG_PARAMETER);
+        naming_obj.in ());
 
     if (CORBA::is_nil (this->naming_context_.in ()))
     {
@@ -264,8 +262,7 @@ int TAO::FT_ReplicationManager::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 
     this->naming_context_->rebind (
       this->this_name_,
-      this->replication_manager_ref_.in ()
-      ACE_ENV_ARG_PARAMETER);
+      this->replication_manager_ref_.in ());
   }
 
   if (TAO_debug_level > 1)
@@ -290,30 +287,30 @@ int TAO::FT_ReplicationManager::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
   // Initialize default properties
   PortableGroup::Value value;
   value <<= TAO_PG_MEMBERSHIP_STYLE;
-  this->properties_support_.set_default_property (PortableGroup::PG_MEMBERSHIP_STYLE, value ACE_ENV_ARG_PARAMETER);
+  this->properties_support_.set_default_property (PortableGroup::PG_MEMBERSHIP_STYLE, value);
 
   value <<= TAO_PG_INITIAL_NUMBER_MEMBERS;
-  this->properties_support_.set_default_property (PortableGroup::PG_INITIAL_NUMBER_MEMBERS, value ACE_ENV_ARG_PARAMETER);
+  this->properties_support_.set_default_property (PortableGroup::PG_INITIAL_NUMBER_MEMBERS, value);
 
   value <<= TAO_PG_MINIMUM_NUMBER_MEMBERS;
-  this->properties_support_.set_default_property (PortableGroup::PG_MINIMUM_NUMBER_MEMBERS, value ACE_ENV_ARG_PARAMETER);
+  this->properties_support_.set_default_property (PortableGroup::PG_MINIMUM_NUMBER_MEMBERS, value);
 
   value <<= FT::SEMI_ACTIVE;
-  this->properties_support_.set_default_property (FT::FT_REPLICATION_STYLE, value ACE_ENV_ARG_PARAMETER);
+  this->properties_support_.set_default_property (FT::FT_REPLICATION_STYLE, value);
 
   value <<= FT::CONS_APP_CTRL;
-  this->properties_support_.set_default_property (  FT::FT_CONSISTENCY_STYLE, value ACE_ENV_ARG_PARAMETER);
+  this->properties_support_.set_default_property (  FT::FT_CONSISTENCY_STYLE, value);
 
   value <<= FT::PULL;
-  this->properties_support_.set_default_property (FT::FT_FAULT_MONITORING_STYLE, value ACE_ENV_ARG_PARAMETER);
+  this->properties_support_.set_default_property (FT::FT_FAULT_MONITORING_STYLE, value);
 
   value <<= FT::MEMB;
-  this->properties_support_.set_default_property (FT::FT_FAULT_MONITORING_GRANULARITY, value ACE_ENV_ARG_PARAMETER);
+  this->properties_support_.set_default_property (FT::FT_FAULT_MONITORING_GRANULARITY, value);
 
 #if 0
   FaultMonitoringIntervalAndTimeoutValue times;
   value <<= times;
-  this->properties_support_.set_default_property (FT::FT_FAULT_MONITORING_INTERVAL_AND_TIMEOUT, value ACE_ENV_ARG_PARAMETER);
+  this->properties_support_.set_default_property (FT::FT_FAULT_MONITORING_INTERVAL_AND_TIMEOUT, value);
 #endif
 
 #if 0
@@ -326,7 +323,7 @@ int TAO::FT_ReplicationManager::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 }
 
 //public
-int TAO::FT_ReplicationManager::idle (int & result ACE_ENV_ARG_DECL_NOT_USED)
+int TAO::FT_ReplicationManager::idle (int & result)
 {
   ACE_UNUSED_ARG (result);
   return this->quit_;
@@ -347,7 +344,7 @@ int TAO::FT_ReplicationManager::fini (void)
   }
   if (this->ns_name_ != 0)
   {
-    this->naming_context_->unbind (this->this_name_ ACE_ENV_ARG_PARAMETER);
+    this->naming_context_->unbind (this->this_name_);
     this->ns_name_ = 0;
   }
 
@@ -357,18 +354,16 @@ int TAO::FT_ReplicationManager::fini (void)
 //CORBA
 void
 TAO::FT_ReplicationManager::register_fault_notifier (
-  FT::FaultNotifier_ptr fault_notifier
-  ACE_ENV_ARG_DECL)
+  FT::FaultNotifier_ptr fault_notifier)
   ACE_THROW_SPEC ( (CORBA::SystemException))
 {
-  this->register_fault_notifier_i (fault_notifier ACE_ENV_ARG_PARAMETER);
+  this->register_fault_notifier_i (fault_notifier);
 }
 
 //private
 void
 TAO::FT_ReplicationManager::register_fault_notifier_i (
-  FT::FaultNotifier_ptr fault_notifier
-  ACE_ENV_ARG_DECL)
+  FT::FaultNotifier_ptr fault_notifier)
   ACE_THROW_SPEC ( (CORBA::SystemException))
 {
   if (CORBA::is_nil (fault_notifier))
@@ -378,11 +373,11 @@ TAO::FT_ReplicationManager::register_fault_notifier_i (
         "%T %n (%P|%t) - "
         "Bad Fault Notifier object reference provided.\n")
     ));
-    ACE_THROW (CORBA::BAD_PARAM (
+    throw CORBA::BAD_PARAM (
       CORBA::SystemException::_tao_minor_code (
         TAO::VMCID,
         EINVAL),
-      CORBA::COMPLETED_NO));
+      CORBA::COMPLETED_NO);
   }
 
   // Cache new Fault Notifier object reference.
@@ -391,7 +386,7 @@ TAO::FT_ReplicationManager::register_fault_notifier_i (
   // Re-initialize our consumer.
   // Swallow any exception.
   int result = 0;
-  ACE_TRY_NEW_ENV
+  try
   {
     //@@ should we check to see if a notifier is already registered, rather than
     // simply "unregistering"?
@@ -419,20 +414,16 @@ TAO::FT_ReplicationManager::register_fault_notifier_i (
       result = this->fault_consumer_.init (
         this->poa_.in (),
         this->fault_notifier_.in (),
-        analyzer
-        ACE_ENV_ARG_PARAMETER);
+        analyzer);
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+    ex._tao_print_exception (
       ACE_TEXT (
-        "TAO::FT_ReplicationManager::register_fault_notifier_i: "
-        "Error reinitializing FT_FaultConsumer.\n")
-    );
+        "TAO::FT_ReplicationManager::register_fault_notifier_i: ""Error reinitializing FT_FaultConsumer.\n"));
     result = -1;
   }
-  ACE_ENDTRY;
 
   if (result != 0)
   {
@@ -442,11 +433,11 @@ TAO::FT_ReplicationManager::register_fault_notifier_i (
         "Could not re-initialize FT_FaultConsumer.\n")
     ));
 
-    ACE_THROW (CORBA::INTERNAL (
+    throw CORBA::INTERNAL (
       CORBA::SystemException::_tao_minor_code (
         TAO::VMCID,
         EINVAL),
-      CORBA::COMPLETED_NO));
+      CORBA::COMPLETED_NO);
   }
 }
 
@@ -454,8 +445,7 @@ TAO::FT_ReplicationManager::register_fault_notifier_i (
 // Returns the reference of the Fault Notifier.
 //CORBA
 FT::FaultNotifier_ptr
-TAO::FT_ReplicationManager::get_fault_notifier (
-  ACE_ENV_SINGLE_ARG_DECL)
+TAO::FT_ReplicationManager::get_fault_notifier ()
   ACE_THROW_SPEC ( (CORBA::SystemException, FT::InterfaceNotFound))
 {
   if (CORBA::is_nil (this->fault_notifier_.in ()))
@@ -470,8 +460,7 @@ TAO::FT_ReplicationManager::get_fault_notifier (
 //CORBA
 ::PortableGroup::FactoryRegistry_ptr
 TAO::FT_ReplicationManager::get_factory_registry (
-  const PortableGroup::Criteria & selection_criteria
-  ACE_ENV_ARG_DECL_NOT_USED)
+  const PortableGroup::Criteria & selection_criteria)
   ACE_THROW_SPEC ( (CORBA::SystemException))
 {
   ACE_UNUSED_ARG (selection_criteria);
@@ -480,8 +469,7 @@ TAO::FT_ReplicationManager::get_factory_registry (
 
 // TAO-specific shutdown operation.
 //public
-void TAO::FT_ReplicationManager::shutdown (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+void TAO::FT_ReplicationManager::shutdown ()
   ACE_THROW_SPEC ( (CORBA::SystemException))
 {
   this->quit_ = 1;
@@ -490,8 +478,7 @@ void TAO::FT_ReplicationManager::shutdown (
 // Get the type_id associated with an object group.
 //CORBA
 char * TAO::FT_ReplicationManager::type_id (
-  PortableGroup::ObjectGroup_ptr object_group
-  ACE_ENV_ARG_DECL)
+  PortableGroup::ObjectGroup_ptr object_group)
 {
   char * result = 0;
   TAO::PG_Object_Group * group = 0;
@@ -512,89 +499,77 @@ char * TAO::FT_ReplicationManager::type_id (
 //CORBA
 void
 TAO::FT_ReplicationManager::set_default_properties (
-  const PortableGroup::Properties & props
-  ACE_ENV_ARG_DECL)
+  const PortableGroup::Properties & props)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::InvalidProperty,
                    PortableGroup::UnsupportedProperty))
 {
 
-  this->properties_support_.set_default_properties (props ACE_ENV_ARG_PARAMETER);
+  this->properties_support_.set_default_properties (props);
   //@@ validate properties?
 }
 
 //CORBA
 PortableGroup::Properties *
-TAO::FT_ReplicationManager::get_default_properties (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO::FT_ReplicationManager::get_default_properties ()
   ACE_THROW_SPEC ( (CORBA::SystemException))
 {
-  return this->properties_support_.get_default_properties (
-      ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->properties_support_.get_default_properties ();
 }
 
 //CORBA
 void
 TAO::FT_ReplicationManager::remove_default_properties (
-    const PortableGroup::Properties & props
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Properties & props)
   ACE_THROW_SPEC ( (CORBA::SystemException,
                    PortableGroup::InvalidProperty,
                    PortableGroup::UnsupportedProperty))
 {
-  this->properties_support_.remove_default_properties (props
-    ACE_ENV_ARG_PARAMETER);
+  this->properties_support_.remove_default_properties (props);
 }
 
 //CORBA
 void
 TAO::FT_ReplicationManager::set_type_properties (
     const char *type_id,
-    const PortableGroup::Properties & overrides
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Properties & overrides)
   ACE_THROW_SPEC ( (CORBA::SystemException,
                    PortableGroup::InvalidProperty,
                    PortableGroup::UnsupportedProperty))
 {
   this->properties_support_.set_type_properties (
     type_id,
-    overrides
-    ACE_ENV_ARG_PARAMETER);
+    overrides);
 }
 
 //CORBA
 PortableGroup::Properties *
 TAO::FT_ReplicationManager::get_type_properties (
-    const char *type_id
-    ACE_ENV_ARG_DECL)
+    const char *type_id)
   ACE_THROW_SPEC ( (CORBA::SystemException))
 {
-  return this->properties_support_.get_type_properties (type_id
-     ACE_ENV_ARG_PARAMETER);
+  return this->properties_support_.get_type_properties (type_id);
 }
 
 //CORBA
 void
 TAO::FT_ReplicationManager::remove_type_properties (
     const char *type_id,
-    const PortableGroup::Properties & props
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Properties & props)
   ACE_THROW_SPEC ( (CORBA::SystemException,
                    PortableGroup::InvalidProperty,
                    PortableGroup::UnsupportedProperty))
 {
   this->properties_support_.remove_type_properties (
     type_id,
-    props
-    ACE_ENV_ARG_PARAMETER);
+    props);
 }
 
 //CORBA
 void
 TAO::FT_ReplicationManager::set_properties_dynamically (
     PortableGroup::ObjectGroup_ptr object_group,
-    const PortableGroup::Properties & overrides
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Properties & overrides)
   ACE_THROW_SPEC ( (CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::InvalidProperty,
@@ -604,19 +579,18 @@ TAO::FT_ReplicationManager::set_properties_dynamically (
   TAO::PG_Object_Group * group = 0;
   if (this->group_factory_.find_group (object_group, group))
   {
-    group->set_properties_dynamically (overrides ACE_ENV_ARG_PARAMETER);
+    group->set_properties_dynamically (overrides);
   }
   else
   {
-    ACE_THROW (PortableGroup::ObjectGroupNotFound ());
+    throw PortableGroup::ObjectGroupNotFound ();
   }
 }
 
 //CORBA
 PortableGroup::Properties *
 TAO::FT_ReplicationManager::get_properties (
-    PortableGroup::ObjectGroup_ptr object_group
-    ACE_ENV_ARG_DECL)
+    PortableGroup::ObjectGroup_ptr object_group)
   ACE_THROW_SPEC ( (CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound))
 {
@@ -644,8 +618,7 @@ TAO::FT_ReplicationManager::get_properties (
 PortableGroup::ObjectGroup_ptr
 TAO::FT_ReplicationManager::set_primary_member (
   PortableGroup::ObjectGroup_ptr object_group,
-  const PortableGroup::Location & the_location
-  ACE_ENV_ARG_DECL)
+  const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ( (
     CORBA::SystemException
     , PortableGroup::ObjectGroupNotFound
@@ -663,7 +636,7 @@ TAO::FT_ReplicationManager::set_primary_member (
     PortableGroup::TagGroupTaggedComponent tag_component;
     TAO_FT_IOGR_Property prop (tag_component);
 
-    int sts = group->set_primary_member (&prop, the_location ACE_ENV_ARG_PARAMETER);
+    int sts = group->set_primary_member (&prop, the_location);
     if (sts)
     {
       result = group->reference ();
@@ -686,8 +659,7 @@ TAO::FT_ReplicationManager::create_member (
     PortableGroup::ObjectGroup_ptr object_group,
     const PortableGroup::Location & the_location,
     const char * type_id,
-    const PortableGroup::Criteria & the_criteria
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Criteria & the_criteria)
   ACE_THROW_SPEC ( (CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::MemberAlreadyPresent,
@@ -700,7 +672,7 @@ TAO::FT_ReplicationManager::create_member (
   TAO::PG_Object_Group * group = 0;
   if (this->group_factory_.find_group (object_group, group))
   {
-    group->create_member (the_location, type_id, the_criteria ACE_ENV_ARG_PARAMETER);
+    group->create_member (the_location, type_id, the_criteria);
     result = group->reference ();
   }
   else
@@ -722,8 +694,7 @@ PortableGroup::ObjectGroup_ptr
 TAO::FT_ReplicationManager::add_member (
     PortableGroup::ObjectGroup_ptr object_group,
     const PortableGroup::Location & the_location,
-    CORBA::Object_ptr member
-    ACE_ENV_ARG_DECL)
+    CORBA::Object_ptr member)
   ACE_THROW_SPEC ( (CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::MemberAlreadyPresent,
@@ -738,8 +709,7 @@ TAO::FT_ReplicationManager::add_member (
   {
     group->add_member (
       the_location,
-      member
-      ACE_ENV_ARG_PARAMETER);
+      member);
 
     result = group->reference ();
 
@@ -761,8 +731,7 @@ TAO::FT_ReplicationManager::add_member (
 PortableGroup::ObjectGroup_ptr
 TAO::FT_ReplicationManager::remove_member (
     PortableGroup::ObjectGroup_ptr object_group,
-    const PortableGroup::Location & the_location
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ( (CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::MemberNotFound))
@@ -773,7 +742,7 @@ TAO::FT_ReplicationManager::remove_member (
   TAO::PG_Object_Group * group = 0;
   if (this->group_factory_.find_group (object_group, group))
   {
-    group->remove_member (the_location ACE_ENV_ARG_PARAMETER);
+    group->remove_member (the_location);
 
     group->minimum_populate ();
       //@@ how about the case where the member was removed successfully,
@@ -792,8 +761,7 @@ TAO::FT_ReplicationManager::remove_member (
 //CORBA
 PortableGroup::Locations *
 TAO::FT_ReplicationManager::locations_of_members (
-    PortableGroup::ObjectGroup_ptr object_group
-    ACE_ENV_ARG_DECL)
+    PortableGroup::ObjectGroup_ptr object_group)
   ACE_THROW_SPEC ( (CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound))
 {
@@ -803,8 +771,7 @@ TAO::FT_ReplicationManager::locations_of_members (
   TAO::PG_Object_Group * group = 0;
   if (this->group_factory_.find_group (object_group, group))
   {
-    result = group->locations_of_members (
-      ACE_ENV_SINGLE_ARG_PARAMETER);
+    result = group->locations_of_members ();
   }
   else
   {
@@ -822,18 +789,16 @@ TAO::FT_ReplicationManager::locations_of_members (
 //CORBA
 PortableGroup::ObjectGroups *
 TAO::FT_ReplicationManager::groups_at_location (
-    const PortableGroup::Location & the_location
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ( (CORBA::SystemException))
 {
-  return this->group_factory_.groups_at_location (the_location ACE_ENV_ARG_PARAMETER);
+  return this->group_factory_.groups_at_location (the_location);
 }
 
 //CORBA
 PortableGroup::ObjectGroupId
 TAO::FT_ReplicationManager::get_object_group_id (
-    PortableGroup::ObjectGroup_ptr object_group
-    ACE_ENV_ARG_DECL)
+    PortableGroup::ObjectGroup_ptr object_group)
   ACE_THROW_SPEC ( (CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound))
 {
@@ -860,8 +825,7 @@ TAO::FT_ReplicationManager::get_object_group_id (
 //CORBA
 PortableGroup::ObjectGroup_ptr
 TAO::FT_ReplicationManager::get_object_group_ref (
-    PortableGroup::ObjectGroup_ptr object_group
-    ACE_ENV_ARG_DECL)
+    PortableGroup::ObjectGroup_ptr object_group)
   ACE_THROW_SPEC ( (CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound))
 {
@@ -889,8 +853,7 @@ TAO::FT_ReplicationManager::get_object_group_ref (
 //CORBA, TAO specific
 PortableGroup::ObjectGroup_ptr
 TAO::FT_ReplicationManager::get_object_group_ref_from_id (
-    PortableGroup::ObjectGroupId group_id
-    ACE_ENV_ARG_DECL)
+    PortableGroup::ObjectGroupId group_id)
   ACE_THROW_SPEC ( (
     CORBA::SystemException
     , PortableGroup::ObjectGroupNotFound
@@ -921,8 +884,7 @@ TAO::FT_ReplicationManager::get_object_group_ref_from_id (
 CORBA::Object_ptr
 TAO::FT_ReplicationManager::get_member_ref (
     PortableGroup::ObjectGroup_ptr object_group,
-    const PortableGroup::Location & the_location
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ( (CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::MemberNotFound))
@@ -933,7 +895,7 @@ TAO::FT_ReplicationManager::get_member_ref (
   TAO::PG_Object_Group * group = 0;
   if (this->group_factory_.find_group (object_group, group))
   {
-    result = group->get_member_reference (the_location ACE_ENV_ARG_PARAMETER);
+    result = group->get_member_reference (the_location);
   }
   else
   {
@@ -957,8 +919,7 @@ CORBA::Object_ptr
 TAO::FT_ReplicationManager::create_object (
   const char * type_id,
   const PortableGroup::Criteria & the_criteria,
-  PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id
-  ACE_ENV_ARG_DECL)
+  PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id)
   ACE_THROW_SPEC ( (CORBA::SystemException,
                    PortableGroup::NoFactory,
                    PortableGroup::ObjectNotCreated,
@@ -973,15 +934,13 @@ TAO::FT_ReplicationManager::create_object (
   // type of object group
   TAO::PG_Property_Set * typeid_properties
     = this->properties_support_.find_typeid_properties (
-      type_id
-      ACE_ENV_ARG_PARAMETER);
+      type_id);
 
   TAO::PG_Object_Group * group
     = this->group_factory_.create_group (
       type_id,
       the_criteria,
-      typeid_properties
-      ACE_ENV_ARG_PARAMETER);
+      typeid_properties);
 
   group->initial_populate ();
     //@@ on error we should remove the group from the Group_Factory
@@ -1008,8 +967,7 @@ TAO::FT_ReplicationManager::create_object (
 //CORBA
 void
 TAO::FT_ReplicationManager::delete_object (
-  const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id
-  ACE_ENV_ARG_DECL)
+  const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id)
   ACE_THROW_SPEC ( (CORBA::SystemException,
                    PortableGroup::ObjectNotFound))
 {
@@ -1018,12 +976,11 @@ TAO::FT_ReplicationManager::delete_object (
   if (factory_creation_id >>= group_id)
   {
     this->group_factory_.delete_group (
-      group_id
-      ACE_ENV_ARG_PARAMETER);
+      group_id);
   }
   else
   {
-    ACE_THROW (PortableGroup::ObjectNotFound ());
+    throw PortableGroup::ObjectNotFound ();
   }
 }
 
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
index 4b333eabc6a..753b8f9340c 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
@@ -111,7 +111,7 @@ namespace TAO
      * @param orb Our CORBA::ORB -- we keep var to it.
      * @return zero for success; nonzero is process return code for failure.
      */
-    int init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL);
+    int init (CORBA::ORB_ptr orb);
 
     /**
      * Prepare to exit.
@@ -125,7 +125,7 @@ namespace TAO
      * @param result is set to process return code if return value is non-zero.
      * @return zero to continue; nonzero to exit
      */
-    int idle (int & result ACE_ENV_ARG_DECL);
+    int idle (int & result);
 
 
     /**
@@ -139,8 +139,7 @@ namespace TAO
      * @param object_group The ObjectGroup.
      * @return String identifying the type id associated with the ObjectGroup.
      */
-    char * type_id (PortableGroup::ObjectGroup_ptr object_group
-        ACE_ENV_ARG_DECL);
+    char * type_id (PortableGroup::ObjectGroup_ptr object_group);
 
 
   //////////////////////
@@ -158,7 +157,6 @@ namespace TAO
     /// Registers the Fault Notifier with the Replication Manager.
     virtual void register_fault_notifier (
         FT::FaultNotifier_ptr fault_notifier
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -166,7 +164,6 @@ namespace TAO
 
     /// Returns the reference of the Fault Notifier.
     virtual FT::FaultNotifier_ptr get_fault_notifier (
-        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -176,7 +173,6 @@ namespace TAO
     /// TAO-specific find factory registry
     virtual ::PortableGroup::FactoryRegistry_ptr get_factory_registry (
         const PortableGroup::Criteria & selection_criteria
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -184,7 +180,6 @@ namespace TAO
 
     /// TAO-specific shutdown operation.
     virtual void shutdown (
-        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -201,21 +196,18 @@ namespace TAO
 
     /// Set the default properties to be used by all object groups.
     virtual void set_default_properties (
-        const PortableGroup::Properties & props
-        ACE_ENV_ARG_DECL)
+        const PortableGroup::Properties & props)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::InvalidProperty,
                       PortableGroup::UnsupportedProperty));
 
     /// Get the default properties used by all object groups.
-    virtual PortableGroup::Properties * get_default_properties (
-        ACE_ENV_SINGLE_ARG_DECL)
+    virtual PortableGroup::Properties * get_default_properties ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Remove default properties.
     virtual void remove_default_properties (
-        const PortableGroup::Properties & props
-        ACE_ENV_ARG_DECL)
+        const PortableGroup::Properties & props)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::InvalidProperty,
                       PortableGroup::UnsupportedProperty));
@@ -226,8 +218,7 @@ namespace TAO
      */
     virtual void set_type_properties (
         const char * type_id,
-        const PortableGroup::Properties & overrides
-        ACE_ENV_ARG_DECL)
+        const PortableGroup::Properties & overrides)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::InvalidProperty,
                       PortableGroup::UnsupportedProperty));
@@ -238,15 +229,13 @@ namespace TAO
      * addition to the default properties that were not overridden.
      */
     virtual PortableGroup::Properties * get_type_properties (
-        const char * type_id
-        ACE_ENV_ARG_DECL)
+        const char * type_id)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Remove the given properties associated with the Replica type ID.
     virtual void remove_type_properties (
         const char * type_id,
-        const PortableGroup::Properties & props
-        ACE_ENV_ARG_DECL)
+        const PortableGroup::Properties & props)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::InvalidProperty,
                       PortableGroup::UnsupportedProperty));
@@ -259,8 +248,7 @@ namespace TAO
      */
     virtual void set_properties_dynamically (
         PortableGroup::ObjectGroup_ptr object_group,
-        const PortableGroup::Properties & overrides
-        ACE_ENV_ARG_DECL)
+        const PortableGroup::Properties & overrides)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::ObjectGroupNotFound,
                       PortableGroup::InvalidProperty,
@@ -274,8 +262,7 @@ namespace TAO
      * that weren't overridden.
      */
     virtual PortableGroup::Properties * get_properties (
-        PortableGroup::ObjectGroup_ptr object_group
-        ACE_ENV_ARG_DECL)
+        PortableGroup::ObjectGroup_ptr object_group)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::ObjectGroupNotFound));
 
@@ -294,8 +281,7 @@ namespace TAO
         PortableGroup::ObjectGroup_ptr object_group,
         const PortableGroup::Location & the_location,
         const char * type_id,
-        const PortableGroup::Criteria & the_criteria
-        ACE_ENV_ARG_DECL)
+        const PortableGroup::Criteria & the_criteria)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::ObjectGroupNotFound,
                       PortableGroup::MemberAlreadyPresent,
@@ -308,8 +294,7 @@ namespace TAO
     virtual PortableGroup::ObjectGroup_ptr add_member (
         PortableGroup::ObjectGroup_ptr object_group,
         const PortableGroup::Location & the_location,
-        CORBA::Object_ptr member
-        ACE_ENV_ARG_DECL)
+        CORBA::Object_ptr member)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::ObjectGroupNotFound,
                       PortableGroup::MemberAlreadyPresent,
@@ -328,29 +313,25 @@ namespace TAO
      */
     virtual PortableGroup::ObjectGroup_ptr remove_member (
         PortableGroup::ObjectGroup_ptr object_group,
-        const PortableGroup::Location & the_location
-        ACE_ENV_ARG_DECL)
+        const PortableGroup::Location & the_location)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::ObjectGroupNotFound,
                       PortableGroup::MemberNotFound));
 
     /// Return the locations of the members in the given ObjectGroup.
     virtual PortableGroup::Locations * locations_of_members (
-        PortableGroup::ObjectGroup_ptr object_group
-        ACE_ENV_ARG_DECL)
+        PortableGroup::ObjectGroup_ptr object_group)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::ObjectGroupNotFound));
 
     /// Return the locations of the members in the given ObjectGroup.
     virtual PortableGroup::ObjectGroups * groups_at_location (
-        const PortableGroup::Location & the_location
-        ACE_ENV_ARG_DECL)
+        const PortableGroup::Location & the_location)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Return the ObjectGroupId for the given ObjectGroup.
     virtual PortableGroup::ObjectGroupId get_object_group_id (
-        PortableGroup::ObjectGroup_ptr object_group
-        ACE_ENV_ARG_DECL)
+        PortableGroup::ObjectGroup_ptr object_group)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::ObjectGroupNotFound));
 
@@ -360,8 +341,7 @@ namespace TAO
      * parameter.
      */
     virtual PortableGroup::ObjectGroup_ptr get_object_group_ref (
-        PortableGroup::ObjectGroup_ptr object_group
-        ACE_ENV_ARG_DECL)
+        PortableGroup::ObjectGroup_ptr object_group)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::ObjectGroupNotFound));
 
@@ -371,7 +351,6 @@ namespace TAO
      */
      virtual PortableGroup::ObjectGroup_ptr get_object_group_ref_from_id (
           PortableGroup::ObjectGroupId group_id
-          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -384,8 +363,7 @@ namespace TAO
      */
     virtual CORBA::Object_ptr get_member_ref (
         PortableGroup::ObjectGroup_ptr object_group,
-        const PortableGroup::Location & loc
-        ACE_ENV_ARG_DECL)
+        const PortableGroup::Location & loc)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::ObjectGroupNotFound,
                       PortableGroup::MemberNotFound));
@@ -394,7 +372,6 @@ namespace TAO
     virtual PortableGroup::ObjectGroup_ptr set_primary_member (
         PortableGroup::ObjectGroup_ptr object_group,
         const PortableGroup::Location & the_location
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -427,8 +404,7 @@ namespace TAO
         const char * type_id,
         const PortableGroup::Criteria & the_criteria,
         PortableGroup::GenericFactory::FactoryCreationId_out
-          factory_creation_id
-        ACE_ENV_ARG_DECL)
+          factory_creation_id)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::NoFactory,
                       PortableGroup::ObjectNotCreated,
@@ -444,8 +420,7 @@ namespace TAO
      */
     virtual void delete_object (
         const PortableGroup::GenericFactory::FactoryCreationId &
-          factory_creation_id
-        ACE_ENV_ARG_DECL)
+          factory_creation_id)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::ObjectNotFound));
 
@@ -462,7 +437,6 @@ namespace TAO
     /// Registers the Fault Notifier with the Replication Manager.
     void register_fault_notifier_i (
         FT::FaultNotifier_ptr fault_notifier
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
index 8a906ecd3c2..e84359052b1 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
@@ -391,7 +391,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member (
   int result = 0;
   object_is_primary = 0;
 
-  ACE_TRY_NEW_ENV
+  try
   {
     // Create an "empty" TAO_FT_IOGR_Property and use it to get the
     // tagged component.
@@ -399,7 +399,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member (
     FT::TagFTGroupTaggedComponent ft_group_tagged_component;
     CORBA::Boolean got_tagged_component =
       temp_ft_prop.get_tagged_component (
-          iogr, ft_group_tagged_component ACE_ENV_ARG_PARAMETER);
+          iogr, ft_group_tagged_component);
     if (got_tagged_component)
     {
       // Create a new TAO_FT_IOGR_Property with the tagged
@@ -408,12 +408,12 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member (
 
       // Check to see if a primary is set.
       CORBA::Boolean primary_is_set = ft_prop.is_primary_set (
-        iogr ACE_ENV_ARG_PARAMETER);
+        iogr);
       if (primary_is_set)
       {
         // Get the primary object.
         CORBA::Object_var primary_obj = ft_prop.get_primary (
-          iogr ACE_ENV_ARG_PARAMETER);
+          iogr);
         if (CORBA::is_nil (primary_obj.in()))
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -426,7 +426,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member (
         // Get the object reference of the failed member.
         CORBA::Object_var failed_obj =
           this->replication_manager_->get_member_ref (
-            iogr, location ACE_ENV_ARG_PARAMETER);
+            iogr, location);
         if (CORBA::is_nil (failed_obj.in()))
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -438,7 +438,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member (
 
         // Are the two object refs (primary and failed) equivalent?
         CORBA::Boolean equiv = primary_obj->_is_equivalent (
-          failed_obj.in() ACE_ENV_ARG_PARAMETER);
+          failed_obj.in());
         if (equiv)
         {
           object_is_primary = 1;
@@ -465,16 +465,13 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member (
       result = -1;
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (
-      ACE_ANY_EXCEPTION,
+    ex._tao_print_exception (
       ACE_TEXT (
-        "TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member: ")
-    );
+        "TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member: "));
     result = -1;
   }
-  ACE_ENDTRY;
 
   return result;
 }
@@ -487,13 +484,12 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure (
   PortableGroup::ObjectGroup_var the_object_group = PortableGroup::ObjectGroup::_nil();
   PortableGroup::Properties_var properties;
 
-  ACE_TRY_NEW_ENV
+  try
   {
     // Get the object group reference based on the ObjectGroupId.
     the_object_group =
       this->replication_manager_->get_object_group_ref_from_id (
-        fault_event_desc.object_group_id
-        ACE_ENV_ARG_PARAMETER);
+        fault_event_desc.object_group_id);
 
     // This should not happen, but let us be safe.
     if (CORBA::is_nil (the_object_group.in()))
@@ -504,24 +500,20 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure (
           "Could not get ObjectGroup reference from ObjectGroupId: <%Q>.\n"),
           fault_event_desc.object_group_id
       ));
-      ACE_TRY_THROW (PortableGroup::ObjectGroupNotFound ());
+      throw PortableGroup::ObjectGroupNotFound ();
     }
 
     // Get the properties associated with this ObjectGroup.
     properties = this->replication_manager_->get_properties (
-      the_object_group.in()
-      ACE_ENV_ARG_PARAMETER);
+      the_object_group.in());
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (
-      ACE_ANY_EXCEPTION,
+    ex._tao_print_exception (
       ACE_TEXT (
-        "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ")
-    );
+        "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: "));
     result = -1;
   }
-  ACE_ENDTRY;
 
   if (result == 0)
   {
@@ -779,24 +771,21 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::remove_failed_member (
   int result = 0;
   new_iogr = PortableGroup::ObjectGroup::_nil ();
 
-  ACE_TRY_NEW_ENV
+  try
   {
     // Remove the old primary member from the object group.
     PortableGroup::ObjectGroup_var temp_iogr =
       this->replication_manager_->remove_member (
         iogr,
-        fault_event_desc.location.in()
-        ACE_ENV_ARG_PARAMETER);
+        fault_event_desc.location.in());
     new_iogr = temp_iogr._retn ();
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (
-      ACE_ANY_EXCEPTION,
+    ex._tao_print_exception (
       "TAO::FT_ReplicationManagerFaultAnalyzer::remove_failed_member: ");
     result = -1;
   }
-  ACE_ENDTRY;
   return result;
 }
 
@@ -812,21 +801,19 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::set_new_primary (
   int result = 0;
   new_iogr = PortableGroup::ObjectGroup::_nil ();
 
-  ACE_TRY_NEW_ENV
+  try
   {
     // Get the locations of the remaining members of the object group.
     PortableGroup::Locations_var locations =
       this->replication_manager_->locations_of_members (
-        iogr
-        ACE_ENV_ARG_PARAMETER);
+        iogr);
 
     // Choose the first location as our new primary location.
     if (locations->length() >= 1)
     {
       new_iogr = this->replication_manager_->set_primary_member (
         iogr,
-        (*locations)[0]
-        ACE_ENV_ARG_PARAMETER);
+        (*locations)[0]);
     }
     else
     {
@@ -838,14 +825,12 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::set_new_primary (
         -1);
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (
-      ACE_ANY_EXCEPTION,
+    ex._tao_print_exception (
       "TAO::FT_ReplicationManagerFaultAnalyzer::set_new_primary: ");
     result = -1;
   }
-  ACE_ENDTRY;
 
   return result;
 }
@@ -863,14 +848,13 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::add_members (
   int result = 0;
   new_iogr = PortableGroup::ObjectGroup::_nil ();
 
-  ACE_TRY_NEW_ENV
+  try
   {
     // Get current number of members in object group
     // (same as number of locations).
     PortableGroup::Locations_var locations =
       this->replication_manager_->locations_of_members (
-        iogr
-        ACE_ENV_ARG_PARAMETER);
+        iogr);
     CORBA::ULong num_members = locations->length();
 
     // If it is less than the MinimumNumberMembers property, add
@@ -884,7 +868,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::add_members (
       PortableGroup::Criteria fake_criteria;
       PortableGroup::FactoryRegistry_var factory_registry =
         this->replication_manager_->get_factory_registry (
-          fake_criteria ACE_ENV_ARG_PARAMETER);
+          fake_criteria);
 
 
       // @@ DLW SAYS: we need to find out the role played by this object
@@ -893,7 +877,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::add_members (
       CORBA::String_var type_id;
       PortableGroup::FactoryInfos_var factories_by_type =
           factory_registry->list_factories_by_role (
-          fault_event_desc.type_id.in(), type_id ACE_ENV_ARG_PARAMETER);
+          fault_event_desc.type_id.in(), type_id);
 
       //
       // Build a set of locations of factories for this type that we
@@ -931,8 +915,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::add_members (
           iogr,
           good_location.in(),
           fault_event_desc.type_id.in(),
-          fake_criteria
-          ACE_ENV_ARG_PARAMETER);
+          fake_criteria);
 
         // Stop adding members when we reach the value of the
         // MinimumNumberMembers property.
@@ -942,14 +925,12 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::add_members (
 
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (
-      ACE_ANY_EXCEPTION,
+    ex._tao_print_exception (
       "TAO::FT_ReplicationManagerFaultAnalyzer::add_members: ");
     result = -1;
   }
-  ACE_ENDTRY;
 
   return result;
 }
@@ -969,23 +950,23 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::location_failure (
   //   location.
   // - Handle each one of them as a single replica failure.
 
-  ACE_TRY_NEW_ENV
+  try
   {
     // Get the factory registry from the Replication Manager.
     PortableGroup::Criteria fake_criteria;
     PortableGroup::FactoryRegistry_var factory_registry =
       this->replication_manager_->get_factory_registry (
-        fake_criteria ACE_ENV_ARG_PARAMETER);
+        fake_criteria);
 
     // Unregister all factories at the failed location.
     factory_registry->unregister_factory_by_location (
-      fault_event_desc.location.in() ACE_ENV_ARG_PARAMETER);
+      fault_event_desc.location.in());
 
     // Determine all the object groups that had members at that
     // location.
     PortableGroup::ObjectGroups_var object_groups_at_location =
       this->replication_manager_->groups_at_location (
-      fault_event_desc.location.in() ACE_ENV_ARG_PARAMETER);
+      fault_event_desc.location.in());
 
     // Handle each one of them as a single replica failure.
     for (CORBA::ULong i=0;
@@ -995,25 +976,23 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::location_failure (
       // Get the object group id.
       fault_event_desc.object_group_id =
         this->replication_manager_->get_object_group_id (
-          object_groups_at_location[i] ACE_ENV_ARG_PARAMETER);
+          object_groups_at_location[i]);
 
       // Get type id of this object group.
       fault_event_desc.type_id =
         this->replication_manager_->type_id (
-          object_groups_at_location[i] ACE_ENV_ARG_PARAMETER);
+          object_groups_at_location[i]);
 
       // Handle it as a single replica failure.
       result = this->single_replica_failure (fault_event_desc);
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (
-      ACE_ANY_EXCEPTION,
+    ex._tao_print_exception (
       "TAO::FT_ReplicationManagerFaultAnalyzer::location_failure: ");
     result = -1;
   }
-  ACE_ENDTRY;
 
   return result;
 }
@@ -1033,27 +1012,26 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::type_failure (
   //   location of that type.
   // - Handle each one of them as a single replica failure.
 
-  ACE_TRY_NEW_ENV
+  try
   {
     // Get the factory registry from the Replication Manager.
     PortableGroup::Criteria fake_criteria;
     PortableGroup::FactoryRegistry_var factory_registry =
       this->replication_manager_->get_factory_registry (
-        fake_criteria ACE_ENV_ARG_PARAMETER);
+        fake_criteria);
 
     // Unregister the factory at the failed location associated with
     // the role.
     //@@ Using type_id as the role for now.
     factory_registry->unregister_factory (
       fault_event_desc.type_id.in(),
-      fault_event_desc.location.in()
-      ACE_ENV_ARG_PARAMETER);
+      fault_event_desc.location.in());
 
     // Get all the object groups that had members at that
     // location.
     PortableGroup::ObjectGroups_var object_groups_at_location =
       this->replication_manager_->groups_at_location (
-      fault_event_desc.location.in() ACE_ENV_ARG_PARAMETER);
+      fault_event_desc.location.in());
 
     // For each one, if it was of the same type as the failed type,
     // handle it as a single replica failure.
@@ -1064,12 +1042,12 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::type_failure (
       // Get the object group id.
       fault_event_desc.object_group_id =
         this->replication_manager_->get_object_group_id (
-          object_groups_at_location[i] ACE_ENV_ARG_PARAMETER);
+          object_groups_at_location[i]);
 
       // Get type id of this object group.
       PortableGroup::TypeId_var type_id =
         this->replication_manager_->type_id (
-          object_groups_at_location[i] ACE_ENV_ARG_PARAMETER);
+          object_groups_at_location[i]);
 
       // If the type id is the same as the failed type id...
       if (ACE_OS::strcmp (type_id.in(), fault_event_desc.type_id.in()) == 0)
@@ -1079,14 +1057,12 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::type_failure (
       }
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (
-      ACE_ANY_EXCEPTION,
+    ex._tao_print_exception (
       "TAO::FT_ReplicationManagerFaultAnalyzer::type_failure: ");
     result = -1;
   }
-  ACE_ENDTRY;
 
   return result;
 }
diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
index e6e7f35f24b..df556a7c958 100644
--- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
+++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
@@ -83,7 +83,6 @@ TAO::FT_FaultDetectorFactory_i::~FT_FaultDetectorFactory_i ()
     // before this object disappears
     shutdown_i ();
   }
-  ACE_DECLARE_NEW_ENV;
   fini ();
   this->threadManager_.close ();
 }
@@ -187,7 +186,7 @@ const char * TAO::FT_FaultDetectorFactory_i::identity () const
   return this->identity_.c_str();
 }
 
-int TAO::FT_FaultDetectorFactory_i::idle (int & result ACE_ENV_ARG_DECL_NOT_USED)
+int TAO::FT_FaultDetectorFactory_i::idle (int & result)
 {
   ACE_UNUSED_ARG (result);
   int quit = this->quit_requested_;
@@ -207,15 +206,14 @@ int TAO::FT_FaultDetectorFactory_i::idle (int & result ACE_ENV_ARG_DECL_NOT_USED
 }
 
 
-int TAO::FT_FaultDetectorFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+int TAO::FT_FaultDetectorFactory_i::init (CORBA::ORB_ptr orb)
 {
   int result = 0;
   this->orb_ = CORBA::ORB::_duplicate (orb);
 
   // Use the ROOT POA for now
   CORBA::Object_var poa_object =
-    this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA
-                                            ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA);
 
   if (CORBA::is_nil (poa_object.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -224,8 +222,7 @@ int TAO::FT_FaultDetectorFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 
   // Get the POA object.
   this->poa_ =
-    PortableServer::POA::_narrow (poa_object.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (poa_object.in ());
 
 
   if (CORBA::is_nil(this->poa_.in ()))
@@ -242,16 +239,14 @@ int TAO::FT_FaultDetectorFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 
   // Register with the POA.
 
-  this->objectId_ = this->poa_->activate_object (this ACE_ENV_ARG_PARAMETER);
+  this->objectId_ = this->poa_->activate_object (this);
 
   // find my IOR
 
   CORBA::Object_var this_obj =
-    this->poa_->id_to_reference (objectId_.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+    this->poa_->id_to_reference (objectId_.in ());
 
-  this->ior_ = this->orb_->object_to_string (this_obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+  this->ior_ = this->orb_->object_to_string (this_obj.in ());
 
   this->identity_ = "FaultDetectorFactory";
 
@@ -259,10 +254,10 @@ int TAO::FT_FaultDetectorFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
   // Register with ReplicationManager
   if (this->rm_register_)
   {
-    ACE_TRY_NEW_ENV
+    try
     {
-      CORBA::Object_var rm_obj = orb->resolve_initial_references("ReplicationManager" ACE_ENV_ARG_PARAMETER);
-      this->replication_manager_ = ::FT::ReplicationManager::_narrow(rm_obj.in() ACE_ENV_ARG_PARAMETER);
+      CORBA::Object_var rm_obj = orb->resolve_initial_references("ReplicationManager");
+      this->replication_manager_ = ::FT::ReplicationManager::_narrow(rm_obj.in());
       if (!CORBA::is_nil (replication_manager_.in ()))
       {
         // capture the default notifier
@@ -270,7 +265,7 @@ int TAO::FT_FaultDetectorFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 
         // register with ReplicationManager::RegistrationFactory
         PortableGroup::Criteria criteria(0);
-        this->factory_registry_ = this->replication_manager_->get_factory_registry (criteria ACE_ENV_ARG_PARAMETER);
+        this->factory_registry_ = this->replication_manager_->get_factory_registry (criteria);
 
         if (! CORBA::is_nil(factory_registry_.in ()))
         {
@@ -288,8 +283,7 @@ int TAO::FT_FaultDetectorFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
           this->factory_registry_->register_factory(
             FT::FAULT_DETECTOR_ROLE_NAME,
             FT::FAULT_DETECTOR_ROLE_NAME,
-            info
-            ACE_ENV_ARG_PARAMETER);
+            info);
 
           ACE_DEBUG ((LM_DEBUG,
             "FaultDetector Registration complete.\n"
@@ -306,12 +300,11 @@ int TAO::FT_FaultDetectorFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
         ACE_ERROR ((LM_ERROR,"FaultNotifier: Can't resolve ReplicationManager, It will not be registered.\n" ));
       }
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-        "ReplicaFactory: Exception resolving ReplicationManager.  Factory will not be registered.\n" );
+      ex._tao_print_exception (
+        "ReplicaFactory: Exception resolving ReplicationManager.  Factory will not be registered.\n");
     }
-    ACE_ENDTRY;
   }
   else
   {
@@ -333,7 +326,7 @@ int TAO::FT_FaultDetectorFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
     this->identity_ += this->ns_name_;
 
     CORBA::Object_var naming_obj =
-      this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
+      this->orb_->resolve_initial_references ("NameService");
 
     if (CORBA::is_nil(naming_obj.in ())){
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -342,13 +335,13 @@ int TAO::FT_FaultDetectorFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
     }
 
     this->naming_context_ =
-      ::CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
+      ::CosNaming::NamingContext::_narrow (naming_obj.in ());
 
     this->this_name_.length (1);
     this->this_name_[0].id = CORBA::string_dup (this->ns_name_);
 
     this->naming_context_->rebind (this->this_name_, this_obj.in()  //CORBA::Object::_duplicate(this_obj)
-                            ACE_ENV_ARG_PARAMETER);
+                            );
   }
 
   return result;
@@ -363,8 +356,7 @@ int TAO::FT_FaultDetectorFactory_i::fini (void)
   }
   if (this->ns_name_ != 0)
   {
-    this->naming_context_->unbind (this_name_
-                            ACE_ENV_ARG_PARAMETER);
+    this->naming_context_->unbind (this_name_);
     this->ns_name_ = 0;
   }
 
@@ -372,8 +364,7 @@ int TAO::FT_FaultDetectorFactory_i::fini (void)
   {
     this->factory_registry_->unregister_factory(
       FT::FAULT_DETECTOR_ROLE_NAME,
-      this->location_
-      ACE_ENV_ARG_PARAMETER);
+      this->location_);
     this->registered_ = 0;
   }
   return 0;
@@ -441,7 +432,6 @@ void TAO::FT_FaultDetectorFactory_i::remove_detector(CORBA::ULong id, TAO::Fault
 
 void TAO::FT_FaultDetectorFactory_i::change_properties (
     const PortableGroup::Properties & property_set
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -475,7 +465,7 @@ void TAO::FT_FaultDetectorFactory_i::change_properties (
     ::PortableGroup::InvalidProperty ex;
     ex.nam.length(1);
     ex.nam[0].id = CORBA::string_dup(FT::FT_FAULT_MONITORING_INTERVAL);
-    ACE_THROW (::PortableGroup::InvalidProperty (ex));
+    throw ::PortableGroup::InvalidProperty (ex);
   }
   METHOD_RETURN(TAO::FT_FaultDetectorFactory_i::change_properties);
 }
@@ -496,7 +486,6 @@ CORBA::Object_ptr TAO::FT_FaultDetectorFactory_i::create_object (
     const char * type_id,
     const PortableGroup::Criteria & the_criteria,
     PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -657,7 +646,6 @@ CORBA::Object_ptr TAO::FT_FaultDetectorFactory_i::create_object (
 
 void TAO::FT_FaultDetectorFactory_i::delete_object (
     const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -678,12 +666,12 @@ void TAO::FT_FaultDetectorFactory_i::delete_object (
     }
     else
     {
-      ACE_THROW(::PortableGroup::ObjectNotFound());
+      throw ::PortableGroup::ObjectNotFound();
     }
   }
   else
   {
-    ACE_THROW(::PortableGroup::ObjectNotFound());
+    throw ::PortableGroup::ObjectNotFound();
   }
   METHOD_RETURN(TAO::FT_FaultDetectorFactory_i::delete_object);
 }
diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
index 590a603bac1..f6e9fa59a07 100644
--- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
+++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
@@ -117,7 +117,7 @@ namespace TAO
      * @param orb our ORB -- we keep var to it.
      * @return zero for success; nonzero is process return code for failure.
      */
-    int init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL);
+    int init (CORBA::ORB_ptr orb);
 
     /**
      * Prepare to exit.
@@ -131,7 +131,7 @@ namespace TAO
      * @param result is set to process return code if return value is non-zero.
      * @return zero to continue; nonzero to exit
      */
-    int idle(int & result ACE_ENV_ARG_DECL);
+    int idle(int & result);
 
 
     /**
@@ -156,7 +156,6 @@ namespace TAO
     // CORBA interface FaultDetectorFactory methods
     virtual void change_properties (
         const PortableGroup::Properties & property_set
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -174,7 +173,6 @@ namespace TAO
       const char * type_id,
       const PortableGroup::Criteria & the_criteria,
       PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -187,7 +185,6 @@ namespace TAO
 
     virtual void delete_object (
       const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
diff --git a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp
index 0d86fea6734..c60005ed755 100644
--- a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp
+++ b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp
@@ -87,7 +87,7 @@ void TAO::Fault_Detector_i::run()
 {
   while ( ! this->quit_requested_ )
   {
-    ACE_TRY_NEW_ENV
+    try
     {
       if (this->monitorable_->is_alive())
       {
@@ -105,7 +105,7 @@ void TAO::Fault_Detector_i::run()
         this->quit_requested_ = 1;
       }
     }
-    ACE_CATCHANY  // todo refine this
+    catch (const CORBA::Exception& ex)// todo refine this
     {
       ACE_ERROR ((LM_ERROR,
         "FaultDetector FAULT: exception.\n"
@@ -113,7 +113,6 @@ void TAO::Fault_Detector_i::run()
       notify();
       this->quit_requested_ = 1;
     }
-    ACE_ENDTRY;
   }
   // warning:  The following call will delete
   // this object.  Be careful not to reference
@@ -156,7 +155,7 @@ void TAO::Fault_Detector_i::notify()
         vEvent->filterable_data[3].value <<= this->group_id_;
       }
     }
-    ACE_TRY_NEW_ENV
+    try
     {
       if (TAO_debug_level > 5)
       {
@@ -164,8 +163,7 @@ void TAO::Fault_Detector_i::notify()
         "call Fault Detector push Structured Event.\n"
         ));
       }
-      this->notifier_->push_structured_fault(vEvent.in()
-        ACE_ENV_ARG_PARAMETER);
+      this->notifier_->push_structured_fault(vEvent.in());
       if (TAO_debug_level > 5)
       {
 
@@ -174,12 +172,10 @@ void TAO::Fault_Detector_i::notify()
         ));
       }
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-        "Fault Detector cannot send notification.");
+      ex._tao_print_exception ("Fault Detector cannot send notification.");
     }
-    ACE_ENDTRY;
   }
   else
   {
diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp
index c04ce2cf8ef..ca006e1430a 100644
--- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp
+++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp
@@ -82,18 +82,17 @@ TAO::FT_FaultNotifier_i::FT_FaultNotifier_i ()
 // Implementation skeleton destructor
 TAO::FT_FaultNotifier_i::~FT_FaultNotifier_i ()
 {
-  ACE_TRY_NEW_ENV
+  try
   {
     fini ();
   }
-  ACE_CATCHALL
+  catch (...)
   {
   }
-  ACE_ENDTRY;
 }
 
 
-int TAO::FT_FaultNotifier_i::idle(int &result ACE_ENV_ARG_DECL_NOT_USED)
+int TAO::FT_FaultNotifier_i::idle(int &result)
 {
   static unsigned long linger = 0;
   ACE_UNUSED_ARG(result);
@@ -220,21 +219,20 @@ int TAO::FT_FaultNotifier_i::fini (void)
   }
   if (this->ns_name_ != 0 && this->naming_context_.in() != 0)
   {
-    this->naming_context_->unbind (this_name_
-                            ACE_ENV_ARG_PARAMETER);
+    this->naming_context_->unbind (this_name_);
     this->ns_name_ = 0;
   }
 
   if (this->registered_)
   {
-    ACE_TRY
+    try
     {
       this->replication_manager_->register_fault_notifier(::FT::FaultNotifier::_nil ());
       ACE_DEBUG ((LM_DEBUG,
         "FaultNotifier unregistered from ReplicationManager.\n"
         ));
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG ((LM_DEBUG,
         "FaultNotifier Can't unregister from ReplicationManager.\n"
@@ -242,22 +240,20 @@ int TAO::FT_FaultNotifier_i::fini (void)
       // complain, but otherwise ignore this error
       // RM may be down.
     }
-    ACE_ENDTRY;
 
     this->registered_ = 0;
   }
   return 0;
 }
 
-int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL )
+int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb )
 {
   int result = 0;
   this->orb_ = CORBA::ORB::_duplicate (orb);
 
   // Use the ROOT POA for now
   CORBA::Object_var poa_object =
-    this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA
-                                            ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA);
 
   if (CORBA::is_nil (poa_object.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -266,8 +262,7 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL )
 
   // Get the POA object.
   this->poa_ =
-    PortableServer::POA::_narrow (poa_object.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (poa_object.in ());
 
 
   if (CORBA::is_nil(this->poa_.in ()))
@@ -284,30 +279,26 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL )
 
   // Register with the POA.
 
-  this->object_id_ = this->poa_->activate_object (this ACE_ENV_ARG_PARAMETER);
+  this->object_id_ = this->poa_->activate_object (this);
 
   // find my IOR
 
   CORBA::Object_var this_obj =
-    this->poa_->id_to_reference (object_id_.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+    this->poa_->id_to_reference (object_id_.in ());
 
-  this->ior_ = this->orb_->object_to_string (this_obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+  this->ior_ = this->orb_->object_to_string (this_obj.in ());
 
 
   ////////////////////////////////////////////////
   // Register with coresident Notification Channel
   CosNotifyChannelAdmin::EventChannelFactory_var notify_factory =
-    TAO_Notify_EventChannelFactory_i::create (poa_.in ()
-    ACE_ENV_ARG_PARAMETER);
+    TAO_Notify_EventChannelFactory_i::create (poa_.in ());
   CosNotification::QoSProperties initial_qos;
   CosNotification::AdminProperties initial_admin;
   this->notify_channel_ =
     notify_factory->create_channel (initial_qos,
     initial_admin,
-    channel_id_
-    ACE_ENV_ARG_PARAMETER);
+    channel_id_);
 
   this->filter_factory_ = this->notify_channel_->default_filter_factory ();
 
@@ -323,12 +314,10 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL )
   ::CosNotifyChannelAdmin::ProxyConsumer_var consumer
     = this->supplier_admin_->obtain_notification_push_consumer (
       ::CosNotifyChannelAdmin::STRUCTURED_EVENT,
-      proxyId
-      ACE_ENV_ARG_PARAMETER);
+      proxyId);
 
   structured_proxy_push_consumer_
-    = ::CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow(consumer.in ()
-      ACE_ENV_ARG_PARAMETER);
+    = ::CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow(consumer.in ());
   if (CORBA::is_nil (this->structured_proxy_push_consumer_.in ()))
   {
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -340,20 +329,17 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL )
   CosNotifyComm::StructuredPushSupplier_var stubPushSupplier =
     CosNotifyComm::StructuredPushSupplier::_nil();
 
-  this->structured_proxy_push_consumer_->connect_structured_push_supplier (stubPushSupplier.in()
-     ACE_ENV_ARG_PARAMETER);
+  this->structured_proxy_push_consumer_->connect_structured_push_supplier (stubPushSupplier.in());
 
   ////////////////////
   // Sequence producer
   consumer
     = this->supplier_admin_->obtain_notification_push_consumer (
       ::CosNotifyChannelAdmin::SEQUENCE_EVENT,
-      proxyId
-      ACE_ENV_ARG_PARAMETER);
+      proxyId);
 
   this->sequence_proxy_push_consumer_
-    = ::CosNotifyChannelAdmin::SequenceProxyPushConsumer::_narrow(consumer.in ()
-      ACE_ENV_ARG_PARAMETER);
+    = ::CosNotifyChannelAdmin::SequenceProxyPushConsumer::_narrow(consumer.in ());
   if (CORBA::is_nil (this->sequence_proxy_push_consumer_.in ()))
   {
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -365,8 +351,7 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL )
   CosNotifyComm::SequencePushSupplier_var stubSeqPushSupplier =
     CosNotifyComm::SequencePushSupplier::_nil();
 
-  this->sequence_proxy_push_consumer_->connect_sequence_push_supplier (stubSeqPushSupplier.in()
-    ACE_ENV_ARG_PARAMETER);
+  this->sequence_proxy_push_consumer_->connect_sequence_push_supplier (stubSeqPushSupplier.in());
   ///////////////////////////
   // Consumer registration
 
@@ -385,10 +370,10 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL )
   // Register with ReplicationManager
   if (this->rm_register_)
   {
-    ACE_TRY_NEW_ENV
+    try
     {
-      CORBA::Object_var rm_obj = orb->resolve_initial_references("ReplicationManager" ACE_ENV_ARG_PARAMETER);
-      this->replication_manager_ = ::FT::ReplicationManager::_narrow(rm_obj.in() ACE_ENV_ARG_PARAMETER);
+      CORBA::Object_var rm_obj = orb->resolve_initial_references("ReplicationManager");
+      this->replication_manager_ = ::FT::ReplicationManager::_narrow(rm_obj.in());
       if (!CORBA::is_nil (replication_manager_.in ()))
       {
         // @@: should we check to see if there's already one registered?
@@ -413,12 +398,11 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL )
         ACE_ERROR ((LM_ERROR,"FaultNotifier: Can't resolve ReplicationManager, It will not be registered.\n" ));
       }
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-        "FaultNotifier: Exception resolving ReplicationManager.  Notifier will not be registered.\n" );
+      ex._tao_print_exception (
+        "FaultNotifier: Exception resolving ReplicationManager.  Notifier will not be registered.\n");
     }
-    ACE_ENDTRY;
   }
   else
   {
@@ -448,7 +432,7 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL )
       this->identity_ += this->ns_name_;
 
       CORBA::Object_var naming_obj =
-        this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil(naming_obj.in ())){
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -457,7 +441,7 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL )
       }
 
       this->naming_context_ =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
       if (CORBA::is_nil(this->naming_context_.in ()))
       {
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -468,7 +452,7 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL )
       this->this_name_[0].id = CORBA::string_dup (this->ns_name_);
 
       this->naming_context_->rebind (this->this_name_, this_obj.in()  //CORBA::Object::_duplicate(this_obj)
-                              ACE_ENV_ARG_PARAMETER);
+                              );
     }
   }
 
@@ -480,35 +464,30 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL )
 
 void TAO::FT_FaultNotifier_i::push_structured_fault (
     const CosNotification::StructuredEvent & event
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   METHOD_ENTRY(TAO::FT_FaultNotifier_i::push_structured_fault);
 
-  this->structured_proxy_push_consumer_->push_structured_event (event
-    ACE_ENV_ARG_PARAMETER);
+  this->structured_proxy_push_consumer_->push_structured_event (event);
 
   METHOD_RETURN(TAO::FT_FaultNotifier_i::push_structured_fault);
 }
 
 void TAO::FT_FaultNotifier_i::push_sequence_fault (
     const CosNotification::EventBatch & events
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   METHOD_ENTRY(TAO::FT_FaultNotifier_i::push_sequence_fault);
 
-  this->sequence_proxy_push_consumer_->push_structured_events (events
-    ACE_ENV_ARG_PARAMETER);
+  this->sequence_proxy_push_consumer_->push_structured_events (events);
 
   METHOD_RETURN(TAO::FT_FaultNotifier_i::push_sequence_fault);
 }
 
 ::CosNotifyFilter::Filter_ptr TAO::FT_FaultNotifier_i::create_subscription_filter (
     const char * constraint_grammar
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyFilter::InvalidGrammar))
 {
@@ -523,7 +502,6 @@ void TAO::FT_FaultNotifier_i::push_sequence_fault (
 FT::FaultNotifier::ConsumerId TAO::FT_FaultNotifier_i::connect_structured_fault_consumer (
     CosNotifyComm::StructuredPushConsumer_ptr push_consumer,
     CosNotifyFilter::Filter_ptr filter
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -557,14 +535,12 @@ FT::FaultNotifier::ConsumerId TAO::FT_FaultNotifier_i::connect_structured_fault_
   info.proxyVar_
       = this->consumer_admin_->obtain_notification_push_supplier (
       ::CosNotifyChannelAdmin::STRUCTURED_EVENT,
-      info.proxyId_
-      ACE_ENV_ARG_PARAMETER);
+      info.proxyId_);
 
   this->consumer_connects_ += 1;
 
   ::CosNotifyChannelAdmin::StructuredProxyPushSupplier_var proxySupplier
-    = ::CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow(info.proxyVar_.in ()
-        ACE_ENV_ARG_PARAMETER);
+    = ::CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow(info.proxyVar_.in ());
 
   if ( CORBA::is_nil (proxySupplier.in ()))
   {
@@ -576,8 +552,7 @@ FT::FaultNotifier::ConsumerId TAO::FT_FaultNotifier_i::connect_structured_fault_
   }
   else
   {
-    proxySupplier->connect_structured_push_consumer ( push_consumer
-      ACE_ENV_ARG_PARAMETER);
+    proxySupplier->connect_structured_push_consumer ( push_consumer);
 
     if (! CORBA::is_nil (filter))
     {
@@ -591,7 +566,6 @@ FT::FaultNotifier::ConsumerId TAO::FT_FaultNotifier_i::connect_structured_fault_
 FT::FaultNotifier::ConsumerId TAO::FT_FaultNotifier_i::connect_sequence_fault_consumer (
     CosNotifyComm::SequencePushConsumer_ptr push_consumer,
     CosNotifyFilter::Filter_ptr filter
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -624,14 +598,12 @@ FT::FaultNotifier::ConsumerId TAO::FT_FaultNotifier_i::connect_sequence_fault_co
   info.proxyVar_
     = this->consumer_admin_->obtain_notification_push_supplier (
       ::CosNotifyChannelAdmin::SEQUENCE_EVENT,
-      info.proxyId_
-      ACE_ENV_ARG_PARAMETER);
+      info.proxyId_);
 
   this->consumer_connects_ += 1;
 
   ::CosNotifyChannelAdmin::SequenceProxyPushSupplier_var proxySupplier
-    = ::CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow(info.proxyVar_.in ()
-      ACE_ENV_ARG_PARAMETER);
+    = ::CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow(info.proxyVar_.in ());
   if ( CORBA::is_nil (proxySupplier.in ()))
   {
     // this is a shoould-not-occur situation.  The consumer admin returned
@@ -642,8 +614,7 @@ FT::FaultNotifier::ConsumerId TAO::FT_FaultNotifier_i::connect_sequence_fault_co
   }
   else
   {
-    proxySupplier->connect_sequence_push_consumer ( push_consumer
-      ACE_ENV_ARG_PARAMETER);
+    proxySupplier->connect_sequence_push_consumer ( push_consumer);
 
     if (! CORBA::is_nil (filter))
     {
@@ -655,7 +626,6 @@ FT::FaultNotifier::ConsumerId TAO::FT_FaultNotifier_i::connect_sequence_fault_co
 
 void TAO::FT_FaultNotifier_i::disconnect_consumer (
     FT::FaultNotifier::ConsumerId connection
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException, CosEventComm::Disconnected))
 {
@@ -667,13 +637,12 @@ void TAO::FT_FaultNotifier_i::disconnect_consumer (
     ProxyInfo & info = this->proxy_infos_[index];
     if (CORBA::is_nil(info.proxyVar_.in ()) )
     {
-      ACE_THROW(CosEventComm::Disconnected());
+      throw CosEventComm::Disconnected();
     }
     else
     {
       ::CosNotifyChannelAdmin::StructuredProxyPushSupplier_var proxySupplier
-        = ::CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow(info.proxyVar_.in ()
-            ACE_ENV_ARG_PARAMETER);
+        = ::CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow(info.proxyVar_.in ());
       if (! CORBA::is_nil (proxySupplier.in ()))
       {
         proxySupplier->disconnect_structured_push_supplier ();
@@ -682,8 +651,7 @@ void TAO::FT_FaultNotifier_i::disconnect_consumer (
       else
       {
         ::CosNotifyChannelAdmin::SequenceProxyPushSupplier_var proxySupplier
-          = ::CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow(info.proxyVar_.in ()
-              ACE_ENV_ARG_PARAMETER);
+          = ::CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow(info.proxyVar_.in ());
         if (! CORBA::is_nil (proxySupplier.in ()))
         {
           proxySupplier->disconnect_sequence_push_supplier ();
@@ -694,14 +662,14 @@ void TAO::FT_FaultNotifier_i::disconnect_consumer (
           ACE_ERROR((LM_ERROR,
             "%T %n (%P|%t) Unexpected proxy supplier type\n"
             ));
-          ACE_THROW(CosEventComm::Disconnected());
+          throw CosEventComm::Disconnected();
         }
       }
     }
   }
   else
   {
-    ACE_THROW(CosEventComm::Disconnected());
+    throw CosEventComm::Disconnected();
   }
 
   this->consumer_disconnects_ += 1;
@@ -715,8 +683,7 @@ void TAO::FT_FaultNotifier_i::disconnect_consumer (
         static_cast<unsigned int> (this->consumer_connects_),
         static_cast<unsigned int> (this->consumer_disconnects_)
         ));
-      this->poa_->deactivate_object (this->object_id_.in ()
-                   ACE_ENV_ARG_PARAMETER);
+      this->poa_->deactivate_object (this->object_id_.in ());
       this->quitting_ = 1;
     }
   }
diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
index fa0ed80c588..f182cb50000 100644
--- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
+++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
@@ -67,7 +67,7 @@ namespace TAO
      * @param orbManager our ORB -- we keep var to it.
      * @return zero for success; nonzero is process return code for failure.
      */
-    int init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL);
+    int init (CORBA::ORB_ptr orb);
 
     /**
      * Prepare to exit
@@ -86,7 +86,7 @@ namespace TAO
      * @param result [out] status code to return from process
      * @returns 0 to continue; nonzero to quit
      */
-    int idle(int &result ACE_ENV_ARG_DECL);
+    int idle(int &result);
 
     //////////////////
     // CORBA interface
@@ -94,39 +94,33 @@ namespace TAO
 
     virtual void push_structured_fault (
         const CosNotification::StructuredEvent & event
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual void push_sequence_fault (
       const CosNotification::EventBatch & events
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual ::CosNotifyFilter::Filter_ptr create_subscription_filter (
       const char * constraint_grammar
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyFilter::InvalidGrammar));
 
     virtual FT::FaultNotifier::ConsumerId connect_structured_fault_consumer (
       CosNotifyComm::StructuredPushConsumer_ptr push_consumer,
       CosNotifyFilter::Filter_ptr filter
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual FT::FaultNotifier::ConsumerId connect_sequence_fault_consumer (
       CosNotifyComm::SequencePushConsumer_ptr push_consumer,
       CosNotifyFilter::Filter_ptr filter
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual void disconnect_consumer (
       FT::FaultNotifier::ConsumerId connection
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException, CosEventComm::Disconnected));
 
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Server.cpp b/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
index 0349058c60e..905212046e3 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
@@ -13,10 +13,9 @@ main (int argc, char *argv[])
 {
   IFR_Service server;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      int status = server.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      int status = server.init (argc, argv);
 
       if (status != 0)
         {
@@ -34,16 +33,15 @@ main (int argc, char *argv[])
             }
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unknown Exception");
+      ex._tao_print_exception ("Unknown Exception");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
index e80a6be95c0..95fdd4a1291 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
@@ -25,16 +25,14 @@ IFR_Service::~IFR_Service (void)
 
 int
 IFR_Service::init (int argc,
-                   char *argv[]
-                   ACE_ENV_ARG_DECL)
+                   char *argv[])
 {
   int result;
-  ACE_TRY
+  try
     {
       this->orb_ = CORBA::ORB_init (argc,
                                     argv,
-                                    0
-                                    ACE_ENV_ARG_PARAMETER);
+                                    0);
 
       result = this->my_ifr_server_.init_with_orb (argc,
                                                    argv,
@@ -45,21 +43,19 @@ IFR_Service::init (int argc,
         }
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "IFR_Service::init");
+      ex._tao_print_exception ("IFR_Service::init");
 
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 int
 IFR_Service::run (void)
 {
-  this->orb_->run (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->run (0);
 
   return 0;
 }
@@ -67,17 +63,15 @@ IFR_Service::run (void)
 int
 IFR_Service::fini (void)
 {
-  ACE_TRY
+  try
     {
       this->my_ifr_server_.fini ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "IFR_Service::fini");
-      ACE_RE_THROW;
+      ex._tao_print_exception ("IFR_Service::fini");
+      throw;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.h b/TAO/orbsvcs/IFR_Service/IFR_Service.h
index 1ce904f9248..034d00696d8 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.h
@@ -42,8 +42,7 @@ public:
 
   /// Initialize the IFR service.
   int init (int argc,
-            char *argv[]
-            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+            char *argv[]);
 
   /// Shut down the IFR Service.
   int fini (void);
diff --git a/TAO/orbsvcs/IFR_Service/be_init.cpp b/TAO/orbsvcs/IFR_Service/be_init.cpp
index 55bba536d6f..6a57d0af586 100644
--- a/TAO/orbsvcs/IFR_Service/be_init.cpp
+++ b/TAO/orbsvcs/IFR_Service/be_init.cpp
@@ -69,22 +69,18 @@ BE_save_orb_args (int &argc, char *argv[])
 int
 BE_ifr_orb_init (int &ac, char *av[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       be_global->orb (CORBA::ORB_init (ac,
                                        av,
-                                       0
-                                       ACE_ENV_ARG_PARAMETER));
+                                       0));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("BE_ifr_orb_init"));
+      ex._tao_print_exception (ACE_TEXT ("BE_ifr_orb_init"));
 
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/IFR_Service/be_produce.cpp b/TAO/orbsvcs/IFR_Service/be_produce.cpp
index 3b917f4af3b..d9a779052d3 100644
--- a/TAO/orbsvcs/IFR_Service/be_produce.cpp
+++ b/TAO/orbsvcs/IFR_Service/be_produce.cpp
@@ -105,8 +105,7 @@ BE_create_holding_scope (void)
 
   // If we are multi-threaded, it may already be created.
   CORBA::Contained_var result =
-    be_global->repository ()->lookup_id (be_global->holding_scope_name ()
-                                         ACE_ENV_ARG_PARAMETER);
+    be_global->repository ()->lookup_id (be_global->holding_scope_name ());
 
   // Will live until the repository goes away for good.
   if (CORBA::is_nil (result.in ()))
@@ -116,13 +115,11 @@ BE_create_holding_scope (void)
                                       be_global->holding_scope_name (),
                                       be_global->holding_scope_name (),
                                       "1.0"
-                                      ACE_ENV_ARG_PARAMETER
                                     );
     }
   else
     {
-      scope = CORBA::ModuleDef::_narrow (result.in ()
-                                         ACE_ENV_ARG_PARAMETER);
+      scope = CORBA::ModuleDef::_narrow (result.in ());
     }
 
   be_global->holding_scope (scope);
@@ -132,8 +129,7 @@ int
 BE_ifr_repo_init (void)
 {
   CORBA::Object_var object =
-    be_global->orb ()->resolve_initial_references ("InterfaceRepository"
-                                                    ACE_ENV_ARG_PARAMETER);
+    be_global->orb ()->resolve_initial_references ("InterfaceRepository");
 
   if (CORBA::is_nil (object.in ()))
     {
@@ -146,8 +142,7 @@ BE_ifr_repo_init (void)
     }
 
   CORBA::Repository_var repo =
-    CORBA::Repository::_narrow (object.in ()
-                                ACE_ENV_ARG_PARAMETER);
+    CORBA::Repository::_narrow (object.in ());
 
   if (CORBA::is_nil (repo.in ()))
     {
@@ -168,8 +163,7 @@ BE_ifr_repo_init (void)
 TAO_IFR_BE_Export void
 BE_produce (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       int status = BE_ifr_repo_init ();
 
@@ -230,13 +224,11 @@ BE_produce (void)
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("BE_produce"));
+      ex._tao_print_exception (ACE_TEXT ("BE_produce"));
 
     }
-  ACE_ENDTRY;
 
   // Clean up.
   BE_cleanup ();
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
index bade3a94ef5..30f289b4a0f 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
@@ -116,22 +116,19 @@ ifr_adding_visitor::visit_scope (UTL_Scope *node)
 int
 ifr_adding_visitor::visit_predefined_type (AST_PredefinedType *node)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       this->ir_current_ =
       be_global->repository ()->get_primitive (
                                     this->predefined_type_to_pkind (node)
-                                    ACE_ENV_ARG_PARAMETER
                                   );
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("visit_predefined_type"));
+      ex._tao_print_exception (ACE_TEXT ("visit_predefined_type"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -146,14 +143,12 @@ ifr_adding_visitor::visit_module (AST_Module *node)
 
   CORBA::Container_var new_def;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // If this module been opened before, it will already be in
       // the repository.
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
+        be_global->repository ()->lookup_id (node->repoID ());
 
       if (CORBA::is_nil (prev_def.in ()))
         {
@@ -167,7 +162,6 @@ ifr_adding_visitor::visit_module (AST_Module *node)
                                        node->repoID (),
                                        node->local_name ()->get_string (),
                                        node->version ()
-                                       ACE_ENV_ARG_PARAMETER
                                      );
             }
           else
@@ -197,8 +191,7 @@ ifr_adding_visitor::visit_module (AST_Module *node)
               this->in_reopened_ = 1;
 
               new_def =
-                CORBA::ComponentIR::Container::_narrow (prev_def.in ()
-                                                        ACE_ENV_ARG_PARAMETER);
+                CORBA::ComponentIR::Container::_narrow (prev_def.in ());
             }
         }
 
@@ -239,14 +232,12 @@ ifr_adding_visitor::visit_module (AST_Module *node)
           );
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("visit_module"));
+      ex._tao_print_exception (ACE_TEXT ("visit_module"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -259,19 +250,16 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
       return 0;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Is this interface already in the respository?
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
+        be_global->repository ()->lookup_id (node->repoID ());
 
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
         {
-          int status = this->create_interface_def (node
-                                                   ACE_ENV_ARG_PARAMETER);
+          int status = this->create_interface_def (node);
 
           return status;
         }
@@ -312,13 +300,11 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
                   if (kind == CORBA::dk_Interface)
                     {
                       CORBA::InterfaceDef_var iface =
-                        CORBA::InterfaceDef::_narrow (prev_def.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
+                        CORBA::InterfaceDef::_narrow (prev_def.in ());
 
                       CORBA::ContainedSeq_var contents =
                         iface->contents (CORBA::dk_all,
-                                         1
-                                         ACE_ENV_ARG_PARAMETER);
+                                         1);
 
                       CORBA::ULong length = contents->length ();
 
@@ -331,8 +317,7 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
                     {
                       prev_def->destroy ();
 
-                      int status = this->create_interface_def (node
-                                                               ACE_ENV_ARG_PARAMETER);
+                      int status = this->create_interface_def (node);
 
                       return status;
                     }
@@ -350,8 +335,7 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
               for (CORBA::ULong i = 0; i < n_parents; ++i)
                 {
                   result =
-                    be_global->repository ()->lookup_id (parents[i]->repoID ()
-                                                         ACE_ENV_ARG_PARAMETER);
+                    be_global->repository ()->lookup_id (parents[i]->repoID ());
 
                   // If one of our interface's parents is not in the repository,
                   // that means that it has not yet been seen (even as a
@@ -361,16 +345,13 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
                   if (CORBA::is_nil (result.in ()))
                     {
                       this->ir_current_ =
-                        CORBA::IDLType::_narrow (prev_def.in ()
-                                                ACE_ENV_ARG_PARAMETER);
-                      ACE_TRY_CHECK
+                        CORBA::IDLType::_narrow (prev_def.in ());
 
                       return 0;
                     }
 
                   bases[i] =
-                    CORBA::InterfaceDef::_narrow (result.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
+                    CORBA::InterfaceDef::_narrow (result.in ());
 
                   if (CORBA::is_nil (bases[i]))
                     {
@@ -386,12 +367,9 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
                 }
 
               CORBA::InterfaceDef_var extant_def =
-                CORBA::InterfaceDef::_narrow (prev_def. in ()
-                                              ACE_ENV_ARG_PARAMETER);
+                CORBA::InterfaceDef::_narrow (prev_def. in ());
 
-              extant_def->base_interfaces (bases
-                                           ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK
+              extant_def->base_interfaces (bases);
 
               node->ifr_added (1);
 
@@ -454,19 +432,16 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
               // defined/not added - takes the other branch.
               // defined/added - we're ok.
               this->ir_current_ =
-                CORBA::IDLType::_narrow (prev_def.in ()
-                                         ACE_ENV_ARG_PARAMETER);
+                CORBA::IDLType::_narrow (prev_def.in ());
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("visit_interface"));
+      ex._tao_print_exception (ACE_TEXT ("visit_interface"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -481,13 +456,11 @@ ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node)
 
   AST_Interface *i = node->full_definition ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Is this interface already in the respository?
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (i->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
+        be_global->repository ()->lookup_id (i->repoID ());
 
       if (CORBA::is_nil (prev_def.in ()))
         {
@@ -512,7 +485,6 @@ ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node)
                                        i->local_name ()->get_string (),
                                        i->version (),
                                        bases
-                                       ACE_ENV_ARG_PARAMETER
                                      );
                 }
               else
@@ -523,7 +495,6 @@ ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node)
                                        i->local_name ()->get_string (),
                                        i->version (),
                                        bases
-                                       ACE_ENV_ARG_PARAMETER
                                      );
                 }
 
@@ -545,14 +516,12 @@ ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node)
         }
 
    }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("visit_interface_fwd"));
+      ex._tao_print_exception (ACE_TEXT ("visit_interface_fwd"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -565,11 +534,9 @@ ifr_adding_visitor::visit_valuebox (AST_ValueBox *node)
       return 0;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->element_type (node->boxed_type ()
-                          ACE_ENV_ARG_PARAMETER);
+      this->element_type (node->boxed_type ());
 
       CORBA::Container_ptr current_scope =
         CORBA::Container::_nil ();
@@ -582,7 +549,6 @@ ifr_adding_visitor::visit_valuebox (AST_ValueBox *node)
                 node->local_name ()->get_string (),
                 node->version (),
                 this->ir_current_.in ()
-                ACE_ENV_ARG_PARAMETER
               );
         }
       else
@@ -598,14 +564,12 @@ ifr_adding_visitor::visit_valuebox (AST_ValueBox *node)
 
       node->ifr_added (1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("visit_valuebox"));
+      ex._tao_print_exception (ACE_TEXT ("visit_valuebox"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -618,19 +582,16 @@ ifr_adding_visitor::visit_valuetype (AST_ValueType *node)
       return 0;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Is this interface already in the respository?
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
+        be_global->repository ()->lookup_id (node->repoID ());
 
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
         {
-          int status = this->create_value_def (node
-                                               ACE_ENV_ARG_PARAMETER);
+          int status = this->create_value_def (node);
 
           return status;
         }
@@ -671,13 +632,11 @@ ifr_adding_visitor::visit_valuetype (AST_ValueType *node)
                   if (kind == CORBA::dk_Value)
                     {
                       CORBA::ValueDef_var value =
-                        CORBA::ValueDef::_narrow (prev_def.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
+                        CORBA::ValueDef::_narrow (prev_def.in ());
 
                       CORBA::ContainedSeq_var contents =
                         value->contents (CORBA::dk_all,
-                                         1
-                                         ACE_ENV_ARG_PARAMETER);
+                                         1);
 
                       CORBA::ULong length = contents->length ();
 
@@ -691,8 +650,7 @@ ifr_adding_visitor::visit_valuetype (AST_ValueType *node)
                       prev_def->destroy ();
 
                       int status =
-                        this->create_value_def (node
-                                                ACE_ENV_ARG_PARAMETER);
+                        this->create_value_def (node);
 
                       return status;
                     }
@@ -701,59 +659,47 @@ ifr_adding_visitor::visit_valuetype (AST_ValueType *node)
               // Our previous definition is a valuetype, so narrow it here,
               // then populate it.
               CORBA::ExtValueDef_var extant_def =
-                CORBA::ExtValueDef::_narrow (prev_def. in ()
-                                             ACE_ENV_ARG_PARAMETER);
+                CORBA::ExtValueDef::_narrow (prev_def. in ());
 
               // Concrete base value.
 
               CORBA::ValueDef_var base_vt;
               this->fill_base_value (base_vt.out (),
-                                     node
-                                     ACE_ENV_ARG_PARAMETER);
+                                     node);
 
-              extant_def->base_value (base_vt.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+              extant_def->base_value (base_vt.in ());
 
               // Abstract base values.
 
               CORBA::ValueDefSeq abstract_base_values;
               this->fill_abstract_base_values (abstract_base_values,
-                                               node
-                                               ACE_ENV_ARG_PARAMETER);
+                                               node);
 
-              extant_def->abstract_base_values (abstract_base_values
-                                                ACE_ENV_ARG_PARAMETER);
+              extant_def->abstract_base_values (abstract_base_values);
 
               // Supported interfaces.
 
               CORBA::InterfaceDefSeq supported;
               this->fill_supported_interfaces (supported,
-                                               node
-                                               ACE_ENV_ARG_PARAMETER);
+                                               node);
 
-              extant_def->supported_interfaces (supported
-                                                ACE_ENV_ARG_PARAMETER);
+              extant_def->supported_interfaces (supported);
 
               // Intializers.
 
               CORBA::ExtInitializerSeq initializers;
               this->fill_initializers (initializers,
-                                       node
-                                       ACE_ENV_ARG_PARAMETER);
+                                       node);
 
-              extant_def->ext_initializers (initializers
-                                            ACE_ENV_ARG_PARAMETER);
+              extant_def->ext_initializers (initializers);
 
               // Truncatable, abstract, custom.
 
-              extant_def->is_abstract (static_cast<CORBA::Boolean> (node->is_abstract ())
-                                       ACE_ENV_ARG_PARAMETER);
+              extant_def->is_abstract (static_cast<CORBA::Boolean> (node->is_abstract ()));
 
-              extant_def->is_truncatable (static_cast<CORBA::Boolean> (node->truncatable ())
-                                          ACE_ENV_ARG_PARAMETER);
+              extant_def->is_truncatable (static_cast<CORBA::Boolean> (node->truncatable ()));
 
-              extant_def->is_custom (static_cast<CORBA::Boolean> (node->custom ())
-                                     ACE_ENV_ARG_PARAMETER);
+              extant_def->is_custom (static_cast<CORBA::Boolean> (node->custom ()));
 
               node->ifr_added (1);
 
@@ -817,19 +763,16 @@ ifr_adding_visitor::visit_valuetype (AST_ValueType *node)
               // defined/not added - takes the other branch.
               // defined/added - we're ok.
               this->ir_current_ =
-                CORBA::IDLType::_narrow (prev_def.in ()
-                                         ACE_ENV_ARG_PARAMETER);
+                CORBA::IDLType::_narrow (prev_def.in ());
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("visit_valuetype"));
+      ex._tao_print_exception (ACE_TEXT ("visit_valuetype"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -844,13 +787,11 @@ ifr_adding_visitor::visit_valuetype_fwd (AST_ValueTypeFwd *node)
 
   AST_Interface *v = node->full_definition ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Is this interface already in the respository?
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (v->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
+        be_global->repository ()->lookup_id (v->repoID ());
 
       if (CORBA::is_nil (prev_def.in ()))
         {
@@ -886,7 +827,6 @@ ifr_adding_visitor::visit_valuetype_fwd (AST_ValueTypeFwd *node)
                                    abstract_bases,
                                    supported,
                                    initializers
-                                   ACE_ENV_ARG_PARAMETER
                                  );
             }
           else
@@ -905,14 +845,12 @@ ifr_adding_visitor::visit_valuetype_fwd (AST_ValueTypeFwd *node)
           v->ifr_fwd_added (1);
         }
    }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("visit_valuetype_fwd"));
+      ex._tao_print_exception (ACE_TEXT ("visit_valuetype_fwd"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -925,19 +863,16 @@ ifr_adding_visitor::visit_component (AST_Component *node)
       return 0;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Is this interface already in the respository?
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
+        be_global->repository ()->lookup_id (node->repoID ());
 
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
         {
-          int status = this->create_component_def (node
-                                                   ACE_ENV_ARG_PARAMETER);
+          int status = this->create_component_def (node);
 
           return status;
         }
@@ -980,13 +915,11 @@ ifr_adding_visitor::visit_component (AST_Component *node)
                       CORBA::ComponentIR::ComponentDef_var value =
                         CORBA::ComponentIR::ComponentDef::_narrow (
                             prev_def.in ()
-                            ACE_ENV_ARG_PARAMETER
                           );
 
                       CORBA::ContainedSeq_var contents =
                         value->contents (CORBA::dk_all,
-                                         1
-                                         ACE_ENV_ARG_PARAMETER);
+                                         1);
 
                       CORBA::ULong length = contents->length ();
 
@@ -1000,8 +933,7 @@ ifr_adding_visitor::visit_component (AST_Component *node)
                       prev_def->destroy ();
 
                       int status =
-                        this->create_component_def (node
-                                                    ACE_ENV_ARG_PARAMETER);
+                        this->create_component_def (node);
 
                       return status;
                     }
@@ -1012,44 +944,34 @@ ifr_adding_visitor::visit_component (AST_Component *node)
               CORBA::ComponentIR::ComponentDef_var extant_def =
                 CORBA::ComponentIR::ComponentDef::_narrow (
                                                       prev_def.in ()
-                                                      ACE_ENV_ARG_PARAMETER
                                                     );
 
               CORBA::InterfaceDefSeq supported_interfaces;
               this->fill_supported_interfaces (supported_interfaces,
-                                               node
-                                               ACE_ENV_ARG_PARAMETER);
+                                               node);
 
-              extant_def->supported_interfaces (supported_interfaces
-                                                ACE_ENV_ARG_PARAMETER);
+              extant_def->supported_interfaces (supported_interfaces);
 
               CORBA::ComponentIR::ComponentDef_var base_component;
               this->fill_base_component (base_component.out (),
-                                         node
-                                         ACE_ENV_ARG_PARAMETER);
+                                         node);
 
-              extant_def->base_component (base_component.in ()
-                                          ACE_ENV_ARG_PARAMETER);
+              extant_def->base_component (base_component.in ());
 
               this->visit_all_provides (node,
-                                        extant_def.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+                                        extant_def.in ());
 
               this->visit_all_uses (node,
-                                    extant_def.in ()
-                                    ACE_ENV_ARG_PARAMETER);
+                                    extant_def.in ());
 
               this->visit_all_emits (node,
-                                     extant_def.in ()
-                                     ACE_ENV_ARG_PARAMETER);
+                                     extant_def.in ());
 
               this->visit_all_publishes (node,
-                                         extant_def.in ()
-                                         ACE_ENV_ARG_PARAMETER);
+                                         extant_def.in ());
 
               this->visit_all_consumes (node,
-                                        extant_def.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+                                        extant_def.in ());
 
               node->ifr_added (1);
 
@@ -1113,19 +1035,16 @@ ifr_adding_visitor::visit_component (AST_Component *node)
               // defined/not added - takes the other branch.
               // defined/added - we're ok.
               this->ir_current_ =
-                CORBA::IDLType::_narrow (prev_def.in ()
-                                         ACE_ENV_ARG_PARAMETER);
+                CORBA::IDLType::_narrow (prev_def.in ());
             }
         }
    }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("visit_component"));
+      ex._tao_print_exception (ACE_TEXT ("visit_component"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -1141,13 +1060,11 @@ ifr_adding_visitor::visit_component_fwd (AST_ComponentFwd *node)
   AST_Component *c =
     AST_Component::narrow_from_decl (node->full_definition ());
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Is this interface already in the respository?
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (c->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
+        be_global->repository ()->lookup_id (c->repoID ());
 
       if (CORBA::is_nil (prev_def.in ()))
         {
@@ -1159,7 +1076,6 @@ ifr_adding_visitor::visit_component_fwd (AST_ComponentFwd *node)
               CORBA::ComponentIR::Container_var ccm_scope =
                 CORBA::ComponentIR::Container::_narrow (
                                                    current_scope
-                                                   ACE_ENV_ARG_PARAMETER
                                                  );
 
               // If our full definition is found in this IDL file, we go
@@ -1175,12 +1091,10 @@ ifr_adding_visitor::visit_component_fwd (AST_ComponentFwd *node)
               if (node->is_defined ())
                 {
                   this->fill_supported_interfaces (supported_interfaces,
-                                                   c
-                                                   ACE_ENV_ARG_PARAMETER);
+                                                   c);
 
                   this->fill_base_component (base_component.out (),
-                                             c
-                                             ACE_ENV_ARG_PARAMETER);
+                                             c);
                 }
 
               this->ir_current_ =
@@ -1190,7 +1104,6 @@ ifr_adding_visitor::visit_component_fwd (AST_ComponentFwd *node)
                                c->version (),
                                base_component.in (),
                                supported_interfaces
-                               ACE_ENV_ARG_PARAMETER
                              );
 
               // Might as well go ahead and complete the repository
@@ -1200,28 +1113,22 @@ ifr_adding_visitor::visit_component_fwd (AST_ComponentFwd *node)
                   CORBA::ComponentIR::ComponentDef_var new_def =
                     CORBA::ComponentIR::ComponentDef::_narrow (
                         this->ir_current_.in ()
-                        ACE_ENV_ARG_PARAMETER
                       );
 
                   this->visit_all_provides (c,
-                                            new_def.in ()
-                                            ACE_ENV_ARG_PARAMETER);
+                                            new_def.in ());
 
                   this->visit_all_uses (c,
-                                        new_def.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+                                        new_def.in ());
 
                   this->visit_all_emits (c,
-                                         new_def.in ()
-                                         ACE_ENV_ARG_PARAMETER);
+                                         new_def.in ());
 
                   this->visit_all_publishes (c,
-                                             new_def.in ()
-                                             ACE_ENV_ARG_PARAMETER);
+                                             new_def.in ());
 
                   this->visit_all_consumes (c,
-                                            new_def.in ()
-                                            ACE_ENV_ARG_PARAMETER);
+                                            new_def.in ());
                 }
             }
           else
@@ -1240,14 +1147,12 @@ ifr_adding_visitor::visit_component_fwd (AST_ComponentFwd *node)
           c->ifr_fwd_added (1);
         }
    }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("visit_component_fwd"));
+      ex._tao_print_exception (ACE_TEXT ("visit_component_fwd"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -1260,19 +1165,16 @@ ifr_adding_visitor::visit_eventtype (AST_EventType *node)
       return 0;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Is this interface already in the respository?
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
+        be_global->repository ()->lookup_id (node->repoID ());
 
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
         {
-          int status = this->create_event_def (node
-                                               ACE_ENV_ARG_PARAMETER);
+          int status = this->create_event_def (node);
 
           return status;
         }
@@ -1315,13 +1217,11 @@ ifr_adding_visitor::visit_eventtype (AST_EventType *node)
                       CORBA::ComponentIR::EventDef_var event =
                         CORBA::ComponentIR::EventDef::_narrow (
                             prev_def.in ()
-                            ACE_ENV_ARG_PARAMETER
                           );
 
                       CORBA::ContainedSeq_var contents =
                         event->contents (CORBA::dk_all,
-                                         1
-                                         ACE_ENV_ARG_PARAMETER);
+                                         1);
 
                       CORBA::ULong length = contents->length ();
 
@@ -1335,8 +1235,7 @@ ifr_adding_visitor::visit_eventtype (AST_EventType *node)
                       prev_def->destroy ();
 
                       int status =
-                        this->create_event_def (node
-                                                ACE_ENV_ARG_PARAMETER);
+                        this->create_event_def (node);
 
                       return status;
                     }
@@ -1345,59 +1244,47 @@ ifr_adding_visitor::visit_eventtype (AST_EventType *node)
               // Our previous definition is a valuetype, so narrow it here,
               // then populate it.
               CORBA::ComponentIR::EventDef_var extant_def =
-                CORBA::ComponentIR::EventDef::_narrow (prev_def. in ()
-                                                       ACE_ENV_ARG_PARAMETER);
+                CORBA::ComponentIR::EventDef::_narrow (prev_def. in ());
 
               // Concrete base value.
 
               CORBA::ValueDef_var base_vt;
               this->fill_base_value (base_vt.out (),
-                                     node
-                                     ACE_ENV_ARG_PARAMETER);
+                                     node);
 
-              extant_def->base_value (base_vt.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+              extant_def->base_value (base_vt.in ());
 
               // Abstract base values.
 
               CORBA::ValueDefSeq abstract_base_values;
               this->fill_abstract_base_values (abstract_base_values,
-                                               node
-                                               ACE_ENV_ARG_PARAMETER);
+                                               node);
 
-              extant_def->abstract_base_values (abstract_base_values
-                                                ACE_ENV_ARG_PARAMETER);
+              extant_def->abstract_base_values (abstract_base_values);
 
               // Supported interfaces.
 
               CORBA::InterfaceDefSeq supported;
               this->fill_supported_interfaces (supported,
-                                               node
-                                               ACE_ENV_ARG_PARAMETER);
+                                               node);
 
-              extant_def->supported_interfaces (supported
-                                                ACE_ENV_ARG_PARAMETER);
+              extant_def->supported_interfaces (supported);
 
               // Intializers.
 
               CORBA::ExtInitializerSeq initializers;
               this->fill_initializers (initializers,
-                                       node
-                                       ACE_ENV_ARG_PARAMETER);
+                                       node);
 
-              extant_def->ext_initializers (initializers
-                                            ACE_ENV_ARG_PARAMETER);
+              extant_def->ext_initializers (initializers);
 
               // Truncatable, abstract, custom.
 
-              extant_def->is_abstract (static_cast<CORBA::Boolean> (node->is_abstract ())
-                                       ACE_ENV_ARG_PARAMETER);
+              extant_def->is_abstract (static_cast<CORBA::Boolean> (node->is_abstract ()));
 
-              extant_def->is_truncatable (static_cast<CORBA::Boolean> (node->truncatable ())
-                                          ACE_ENV_ARG_PARAMETER);
+              extant_def->is_truncatable (static_cast<CORBA::Boolean> (node->truncatable ()));
 
-              extant_def->is_custom (static_cast<CORBA::Boolean> (node->custom ())
-                                     ACE_ENV_ARG_PARAMETER);
+              extant_def->is_custom (static_cast<CORBA::Boolean> (node->custom ()));
 
               node->ifr_added (1);
 
@@ -1461,19 +1348,16 @@ ifr_adding_visitor::visit_eventtype (AST_EventType *node)
               // defined/not added - takes the other branch.
               // defined/added - we're ok.
               this->ir_current_ =
-                CORBA::IDLType::_narrow (prev_def.in ()
-                                         ACE_ENV_ARG_PARAMETER);
+                CORBA::IDLType::_narrow (prev_def.in ());
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("visit_eventtype"));
+      ex._tao_print_exception (ACE_TEXT ("visit_eventtype"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -1488,13 +1372,11 @@ ifr_adding_visitor::visit_eventtype_fwd (AST_EventTypeFwd *node)
 
   AST_Interface *v = node->full_definition ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Is this interface already in the respository?
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (v->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
+        be_global->repository ()->lookup_id (v->repoID ());
 
       if (CORBA::is_nil (prev_def.in ()))
         {
@@ -1518,7 +1400,6 @@ ifr_adding_visitor::visit_eventtype_fwd (AST_EventTypeFwd *node)
               CORBA::ComponentIR::Container_var ccm_scope =
                 CORBA::ComponentIR::Container::_narrow (
                                                    current_scope
-                                                   ACE_ENV_ARG_PARAMETER
                                                  );
 
               CORBA::Boolean abstract =
@@ -1536,7 +1417,6 @@ ifr_adding_visitor::visit_eventtype_fwd (AST_EventTypeFwd *node)
                                abstract_bases,
                                supported,
                                initializers
-                               ACE_ENV_ARG_PARAMETER
                              );
             }
           else
@@ -1555,14 +1435,12 @@ ifr_adding_visitor::visit_eventtype_fwd (AST_EventTypeFwd *node)
           v->ifr_fwd_added (1);
         }
    }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("visit_eventtype_fwd"));
+      ex._tao_print_exception (ACE_TEXT ("visit_eventtype_fwd"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -1575,19 +1453,16 @@ ifr_adding_visitor::visit_home (AST_Home *node)
       return 0;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Is this interface already in the respository?
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
+        be_global->repository ()->lookup_id (node->repoID ());
 
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
         {
-          int status = this->create_home_def (node
-                                              ACE_ENV_ARG_PARAMETER);
+          int status = this->create_home_def (node);
 
           return status;
         }
@@ -1630,13 +1505,11 @@ ifr_adding_visitor::visit_home (AST_Home *node)
                       CORBA::ComponentIR::HomeDef_var value =
                         CORBA::ComponentIR::HomeDef::_narrow (
                             prev_def.in ()
-                            ACE_ENV_ARG_PARAMETER
                           );
 
                       CORBA::ContainedSeq_var contents =
                         value->contents (CORBA::dk_all,
-                                         1
-                                         ACE_ENV_ARG_PARAMETER);
+                                         1);
 
                       CORBA::ULong length = contents->length ();
 
@@ -1650,8 +1523,7 @@ ifr_adding_visitor::visit_home (AST_Home *node)
                       prev_def->destroy ();
 
                       int status =
-                        this->create_home_def (node
-                                               ACE_ENV_ARG_PARAMETER);
+                        this->create_home_def (node);
 
                       return status;
                     }
@@ -1669,19 +1541,16 @@ ifr_adding_visitor::visit_home (AST_Home *node)
               // defined/not added - takes the other branch.
               // defined/added - we're ok.
               this->ir_current_ =
-                CORBA::IDLType::_narrow (prev_def.in ()
-                                         ACE_ENV_ARG_PARAMETER);
+                CORBA::IDLType::_narrow (prev_def.in ());
             }
         }
    }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("visit_home"));
+      ex._tao_print_exception (ACE_TEXT ("visit_home"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -1700,12 +1569,10 @@ ifr_adding_visitor::visit_structure (AST_Structure *node)
       return 0;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
+        be_global->repository ()->lookup_id (node->repoID ());
 
       if (CORBA::is_nil (prev_def.in ()))
         {
@@ -1737,18 +1604,17 @@ ifr_adding_visitor::visit_structure (AST_Structure *node)
             }
 
           this->ir_current_ =
-            CORBA::IDLType::_narrow (prev_def.in ()
-                                    ACE_ENV_ARG_PARAMETER);
+            CORBA::IDLType::_narrow (prev_def.in ());
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("ifr_adding_visitor::visit_structure"));
+      ex._tao_print_exception (
+        ACE_TEXT (
+          "ifr_adding_visitor::visit_structure"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -1778,13 +1644,11 @@ ifr_adding_visitor::visit_enum (AST_Enum *node)
       return 0;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Is this enum already in the respository?
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
+        be_global->repository ()->lookup_id (node->repoID ());
 
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
@@ -1819,7 +1683,6 @@ ifr_adding_visitor::visit_enum (AST_Enum *node)
                     node->local_name ()->get_string (),
                     node->version (),
                     members
-                    ACE_ENV_ARG_PARAMETER
                   );
             }
           else
@@ -1854,18 +1717,15 @@ ifr_adding_visitor::visit_enum (AST_Enum *node)
           // There is already an entry in the repository, so just update
           // the current IR object holder.
           this->ir_current_ =
-            CORBA::EnumDef::_narrow (prev_def.in ()
-                                    ACE_ENV_ARG_PARAMETER);
+            CORBA::EnumDef::_narrow (prev_def.in ());
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("ifr_adding_visitor::visit_enum"));
+      ex._tao_print_exception (ACE_TEXT ("ifr_adding_visitor::visit_enum"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -1921,27 +1781,23 @@ ifr_adding_visitor::visit_field (AST_Field *node)
 int
 ifr_adding_visitor::visit_attribute (AST_Attribute *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       AST_Type *type = node->field_type ();
 
       // Updates ir_current_.
-      this->get_referenced_type (type
-                                 ACE_ENV_ARG_PARAMETER);
+      this->get_referenced_type (type);
 
       CORBA::AttributeMode mode =
         node->readonly () ? CORBA::ATTR_READONLY : CORBA::ATTR_NORMAL;
 
       CORBA::ExceptionDefSeq get_exceptions;
       this->fill_get_exceptions (get_exceptions,
-                                 node
-                                 ACE_ENV_ARG_PARAMETER);
+                                 node);
 
       CORBA::ExceptionDefSeq set_exceptions;
       this->fill_set_exceptions (set_exceptions,
-                                 node
-                                 ACE_ENV_ARG_PARAMETER);
+                                 node);
 
       CORBA::Container_ptr current_scope =
         CORBA::Container::_nil ();
@@ -1954,8 +1810,7 @@ ifr_adding_visitor::visit_attribute (AST_Attribute *node)
           if (kind == CORBA::dk_Value || kind == CORBA::dk_Event)
             {
               CORBA::ExtValueDef_var value =
-                CORBA::ExtValueDef::_narrow (current_scope
-                                             ACE_ENV_ARG_PARAMETER);
+                CORBA::ExtValueDef::_narrow (current_scope);
 
               CORBA::ExtAttributeDef_var new_def =
                 value->create_ext_attribute (
@@ -1966,7 +1821,6 @@ ifr_adding_visitor::visit_attribute (AST_Attribute *node)
                     mode,
                     get_exceptions,
                     set_exceptions
-                    ACE_ENV_ARG_PARAMETER
                   );
             }
           else
@@ -1974,8 +1828,7 @@ ifr_adding_visitor::visit_attribute (AST_Attribute *node)
               // We are an interface, a local interface, an abstract
               // interface or a component. This narrow covers them all.
               CORBA::InterfaceAttrExtension_var iface =
-                CORBA::InterfaceAttrExtension::_narrow (current_scope
-                                                        ACE_ENV_ARG_PARAMETER);
+                CORBA::InterfaceAttrExtension::_narrow (current_scope);
 
               CORBA::ExtAttributeDef_var new_def =
                 iface->create_ext_attribute (
@@ -1986,7 +1839,6 @@ ifr_adding_visitor::visit_attribute (AST_Attribute *node)
                     mode,
                     get_exceptions,
                     set_exceptions
-                    ACE_ENV_ARG_PARAMETER
                   );
             }
         }
@@ -2001,14 +1853,12 @@ ifr_adding_visitor::visit_attribute (AST_Attribute *node)
           );
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("visit_attribute"));
+      ex._tao_print_exception (ACE_TEXT ("visit_attribute"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -2021,12 +1871,10 @@ ifr_adding_visitor::visit_union (AST_Union *node)
       return 0;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
+        be_global->repository ()->lookup_id (node->repoID ());
 
       if (CORBA::is_nil (prev_def.in ()))
         {
@@ -2060,18 +1908,15 @@ ifr_adding_visitor::visit_union (AST_Union *node)
             }
 
           this->ir_current_ =
-            CORBA::UnionDef::_narrow (prev_def.in ()
-                                     ACE_ENV_ARG_PARAMETER);
+            CORBA::UnionDef::_narrow (prev_def.in ());
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("ifr_adding_visitor::visit_union"));
+      ex._tao_print_exception (ACE_TEXT ("ifr_adding_visitor::visit_union"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -2086,12 +1931,10 @@ ifr_adding_visitor::visit_constant (AST_Constant *node)
 
   const char *id = node->repoID ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (id
-                                             ACE_ENV_ARG_PARAMETER);
+        be_global->repository ()->lookup_id (id);
 
       // Nothing prevents this constant's repo id from already being
       // in the repository as another type, if it came from another
@@ -2127,18 +1970,15 @@ ifr_adding_visitor::visit_constant (AST_Constant *node)
           // This constant's type is a typedef - look up the typedef to
           // pass to create_constant().
           CORBA::Contained_var contained =
-            be_global->repository ()->lookup_id (td->repoID ()
-                                                 ACE_ENV_ARG_PARAMETER);
+            be_global->repository ()->lookup_id (td->repoID ());
 
-          this->ir_current_ = CORBA::IDLType::_narrow (contained.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
+          this->ir_current_ = CORBA::IDLType::_narrow (contained.in ());
         }
       else
         {
           CORBA::PrimitiveKind pkind = this->expr_type_to_pkind (ev->et);
           this->ir_current_ =
-            be_global->repository ()->get_primitive (pkind
-                                                     ACE_ENV_ARG_PARAMETER);
+            be_global->repository ()->get_primitive (pkind);
         }
 
       CORBA::Any any;
@@ -2157,7 +1997,6 @@ ifr_adding_visitor::visit_constant (AST_Constant *node)
                 node->version (),
                 this->ir_current_.in (),
                 any
-                ACE_ENV_ARG_PARAMETER
               );
         }
       else
@@ -2171,14 +2010,12 @@ ifr_adding_visitor::visit_constant (AST_Constant *node)
           );
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("visit_constant"));
+      ex._tao_print_exception (ACE_TEXT ("visit_constant"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -2186,11 +2023,9 @@ ifr_adding_visitor::visit_constant (AST_Constant *node)
 int
 ifr_adding_visitor::visit_array (AST_Array *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->element_type (node->base_type ()
-                          ACE_ENV_ARG_PARAMETER);
+      this->element_type (node->base_type ());
 
       AST_Expression **dims = node->dims ();
 
@@ -2200,18 +2035,15 @@ ifr_adding_visitor::visit_array (AST_Array *node)
             be_global->repository ()->create_array (
                 dims[i - 1]->ev ()->u.ulval,
                 this->ir_current_.in ()
-                ACE_ENV_ARG_PARAMETER
               );
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("visit_array"));
+      ex._tao_print_exception (ACE_TEXT ("visit_array"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -2219,27 +2051,22 @@ ifr_adding_visitor::visit_array (AST_Array *node)
 int
 ifr_adding_visitor::visit_sequence (AST_Sequence *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->element_type (node->base_type ()
-                          ACE_ENV_ARG_PARAMETER);
+      this->element_type (node->base_type ());
 
       this->ir_current_ =
         be_global->repository ()->create_sequence (
                                       node->max_size ()->ev ()->u.ulval,
                                       this->ir_current_.in ()
-                                      ACE_ENV_ARG_PARAMETER
                                     );
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("visit_sequence"));
+      ex._tao_print_exception (ACE_TEXT ("visit_sequence"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -2253,31 +2080,26 @@ ifr_adding_visitor::visit_string (AST_String *node)
 
   CORBA::ULong bound = static_cast<CORBA::ULong> (ev->u.ulval);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       if (node->node_type () == AST_Decl::NT_string)
         {
           this->ir_current_ =
-            be_global->repository ()->create_string (bound
-                                                     ACE_ENV_ARG_PARAMETER);
+            be_global->repository ()->create_string (bound);
         }
       else
         {
           this->ir_current_ =
-            be_global->repository ()->create_wstring (bound
-                                                      ACE_ENV_ARG_PARAMETER);
+            be_global->repository ()->create_wstring (bound);
         }
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("visit_string"));
+      ex._tao_print_exception (ACE_TEXT ("visit_string"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -2290,11 +2112,9 @@ ifr_adding_visitor::visit_typedef (AST_Typedef *node)
       return 0;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->element_type (node->base_type ()
-                          ACE_ENV_ARG_PARAMETER);
+      this->element_type (node->base_type ());
 
       CORBA::Container_ptr current_scope =
         CORBA::Container::_nil ();
@@ -2307,7 +2127,6 @@ ifr_adding_visitor::visit_typedef (AST_Typedef *node)
                 node->local_name ()->get_string (),
                 node->version (),
                 this->ir_current_.in ()
-                ACE_ENV_ARG_PARAMETER
               );
         }
       else
@@ -2323,14 +2142,12 @@ ifr_adding_visitor::visit_typedef (AST_Typedef *node)
 
       node->ifr_added (1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("visit_typedef"));
+      ex._tao_print_exception (ACE_TEXT ("visit_typedef"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -2385,12 +2202,10 @@ ifr_adding_visitor::visit_native (AST_Native *node)
       return 0;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
+        be_global->repository ()->lookup_id (node->repoID ());
 
       if (CORBA::is_nil (prev_def.in ()))
         {
@@ -2404,7 +2219,6 @@ ifr_adding_visitor::visit_native (AST_Native *node)
                     node->repoID (),
                     node->local_name ()->get_string (),
                     node->version ()
-                    ACE_ENV_ARG_PARAMETER
                   );
             }
           else
@@ -2438,18 +2252,15 @@ ifr_adding_visitor::visit_native (AST_Native *node)
             }
 
           this->ir_current_ =
-            CORBA::NativeDef::_narrow (prev_def.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+            CORBA::NativeDef::_narrow (prev_def.in ());
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("visit_native"));
+      ex._tao_print_exception (ACE_TEXT ("visit_native"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -2630,8 +2441,7 @@ ifr_adding_visitor::load_any (AST_Expression::AST_ExprValue *ev,
 }
 
 void
-ifr_adding_visitor::element_type (AST_Type *base_type
-                                  ACE_ENV_ARG_DECL)
+ifr_adding_visitor::element_type (AST_Type *base_type)
 {
   if (base_type->anonymous ())
     {
@@ -2647,8 +2457,7 @@ ifr_adding_visitor::element_type (AST_Type *base_type
   else
     {
       CORBA::Contained_var contained =
-        be_global->repository ()->lookup_id (base_type->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
+        be_global->repository ()->lookup_id (base_type->repoID ());
 
       if (CORBA::is_nil (contained.in ()))
         {
@@ -2659,14 +2468,12 @@ ifr_adding_visitor::element_type (AST_Type *base_type
             ));
         }
 
-      this->ir_current_ = CORBA::IDLType::_narrow (contained.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
+      this->ir_current_ = CORBA::IDLType::_narrow (contained.in ());
     }
 }
 
 int
-ifr_adding_visitor::create_interface_def (AST_Interface *node
-                                          ACE_ENV_ARG_DECL)
+ifr_adding_visitor::create_interface_def (AST_Interface *node)
 {
   CORBA::ULong n_parents = static_cast<CORBA::ULong> (node->n_inherits ());
   AST_Interface **parents = node->inherits ();
@@ -2682,15 +2489,13 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node
       for (CORBA::ULong i = 0; i < n_parents; ++i)
         {
           result =
-            be_global->repository ()->lookup_id (parents[i]->repoID ()
-                                                 ACE_ENV_ARG_PARAMETER);
+            be_global->repository ()->lookup_id (parents[i]->repoID ());
 
           // If we got to visit_interface() from a forward declared interface,
           // this node may not yet be in the repository.
           if (CORBA::is_nil (result.in ()))
             {
-              int status = this->create_interface_def (parents[i]
-                                                       ACE_ENV_ARG_PARAMETER);
+              int status = this->create_interface_def (parents[i]);
 
               if (status != 0)
                 {
@@ -2705,14 +2510,12 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node
                 }
 
               bases[i] =
-                CORBA::AbstractInterfaceDef::_narrow (this->ir_current_.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
+                CORBA::AbstractInterfaceDef::_narrow (this->ir_current_.in ());
             }
           else
             {
               abs_bases[i] =
-                CORBA::AbstractInterfaceDef::_narrow (result.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
+                CORBA::AbstractInterfaceDef::_narrow (result.in ());
             }
 
           if (CORBA::is_nil (abs_bases[i]))
@@ -2736,15 +2539,13 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node
       for (CORBA::ULong i = 0; i < n_parents; ++i)
         {
           result =
-            be_global->repository ()->lookup_id (parents[i]->repoID ()
-                                                 ACE_ENV_ARG_PARAMETER);
+            be_global->repository ()->lookup_id (parents[i]->repoID ());
 
           // If we got to visit_interface() from a forward declared interface,
           // this node may not yet be in the repository.
           if (CORBA::is_nil (result.in ()))
             {
-              int status = this->create_interface_def (parents[i]
-                                                       ACE_ENV_ARG_PARAMETER);
+              int status = this->create_interface_def (parents[i]);
 
               if (status != 0)
                 {
@@ -2758,13 +2559,11 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node
                   );
                 }
 
-              bases[i] = CORBA::InterfaceDef::_narrow (this->ir_current_.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
+              bases[i] = CORBA::InterfaceDef::_narrow (this->ir_current_.in ());
             }
           else
             {
-              bases[i] = CORBA::InterfaceDef::_narrow (result.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
+              bases[i] = CORBA::InterfaceDef::_narrow (result.in ());
             }
 
           if (CORBA::is_nil (bases[i]))
@@ -2796,7 +2595,6 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node
                                node->local_name ()->get_string (),
                                node->version (),
                                bases
-                               ACE_ENV_ARG_PARAMETER
                              );
         }
       else if (node->is_abstract ())
@@ -2807,7 +2605,6 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node
                                node->local_name ()->get_string (),
                                node->version (),
                                abs_bases
-                               ACE_ENV_ARG_PARAMETER
                              );
         }
       else
@@ -2818,7 +2615,6 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node
                                node->local_name ()->get_string (),
                                node->version (),
                                bases
-                               ACE_ENV_ARG_PARAMETER
                              );
         }
 
@@ -2827,8 +2623,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node
 
       // Push the new IR object onto the scope stack.
       CORBA::Container_var new_scope =
-        CORBA::Container::_narrow (new_def.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+        CORBA::Container::_narrow (new_def.in ());
 
       if (be_global->ifr_scopes ().push (new_scope.in ()) != 0)
         {
@@ -2895,8 +2690,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node
 }
 
 int
-ifr_adding_visitor::create_value_def (AST_ValueType *node
-                                      ACE_ENV_ARG_DECL)
+ifr_adding_visitor::create_value_def (AST_ValueType *node)
 {
   CORBA::Container_ptr current_scope =
     CORBA::Container::_nil ();
@@ -2905,23 +2699,19 @@ ifr_adding_visitor::create_value_def (AST_ValueType *node
     {
       CORBA::ValueDef_var base_value;
       this->fill_base_value (base_value.out (),
-                             node
-                             ACE_ENV_ARG_PARAMETER);
+                             node);
 
       CORBA::ValueDefSeq abstract_base_values;
       this->fill_abstract_base_values (abstract_base_values,
-                                       node
-                                       ACE_ENV_ARG_PARAMETER);
+                                       node);
 
       CORBA::InterfaceDefSeq supported_interfaces;
       this->fill_supported_interfaces (supported_interfaces,
-                                       node
-                                       ACE_ENV_ARG_PARAMETER);
+                                       node);
 
       CORBA::ExtInitializerSeq initializers;
       this->fill_initializers (initializers,
-                               node
-                               ACE_ENV_ARG_PARAMETER);
+                               node);
 
       CORBA::ExtValueDef_var new_def =
         current_scope->create_ext_value (
@@ -2935,15 +2725,13 @@ ifr_adding_visitor::create_value_def (AST_ValueType *node
                            abstract_base_values,
                            supported_interfaces,
                            initializers
-                           ACE_ENV_ARG_PARAMETER
                          );
 
       node->ifr_added (1);
 
       // Push the new IR object onto the scope stack.
       CORBA::Container_var new_scope =
-        CORBA::Container::_narrow (new_def.in ()
-                                   ACE_ENV_ARG_PARAMETER);
+        CORBA::Container::_narrow (new_def.in ());
 
       if (be_global->ifr_scopes ().push (new_scope.in ()) != 0)
         {
@@ -3010,8 +2798,7 @@ ifr_adding_visitor::create_value_def (AST_ValueType *node
 }
 
 int
-ifr_adding_visitor::create_component_def (AST_Component *node
-                                          ACE_ENV_ARG_DECL)
+ifr_adding_visitor::create_component_def (AST_Component *node)
 {
   CORBA::Container_ptr current_scope =
     CORBA::Container::_nil ();
@@ -3020,25 +2807,21 @@ ifr_adding_visitor::create_component_def (AST_Component *node
     {
       CORBA::ComponentIR::ComponentDef_var base_component;
       this->fill_base_component (base_component.out (),
-                                 node
-                                 ACE_ENV_ARG_PARAMETER);
+                                 node);
 
       CORBA::InterfaceDefSeq supported_interfaces;
       this->fill_supported_interfaces (supported_interfaces,
-                                       node
-                                       ACE_ENV_ARG_PARAMETER);
+                                       node);
 
       CORBA::ComponentIR::Container_var ccm_scope =
-        CORBA::ComponentIR::Container::_narrow (current_scope
-                                                ACE_ENV_ARG_PARAMETER);
+        CORBA::ComponentIR::Container::_narrow (current_scope);
 
       CORBA::ComponentIR::ComponentDef_var new_def =
         ccm_scope->create_component (node->repoID (),
                                      node->local_name ()->get_string (),
                                      node->version (),
                                      base_component.in (),
-                                     supported_interfaces
-                                     ACE_ENV_ARG_PARAMETER);
+                                     supported_interfaces);
 
       node->ifr_added (1);
 
@@ -3068,24 +2851,19 @@ ifr_adding_visitor::create_component_def (AST_Component *node
         }
 
       this->visit_all_provides (node,
-                                new_def.in ()
-                                ACE_ENV_ARG_PARAMETER);
+                                new_def.in ());
 
       this->visit_all_uses (node,
-                            new_def.in ()
-                            ACE_ENV_ARG_PARAMETER);
+                            new_def.in ());
 
       this->visit_all_emits (node,
-                             new_def.in ()
-                             ACE_ENV_ARG_PARAMETER);
+                             new_def.in ());
 
       this->visit_all_publishes (node,
-                                 new_def.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+                                 new_def.in ());
 
       this->visit_all_consumes (node,
-                                new_def.in ()
-                                ACE_ENV_ARG_PARAMETER);
+                                new_def.in ());
 
       // This spot in the AST doesn't necessarily have to be the
       // interface definition - it could be any reference to it.
@@ -3127,8 +2905,7 @@ ifr_adding_visitor::create_component_def (AST_Component *node
 }
 
 int
-ifr_adding_visitor::create_home_def (AST_Home *node
-                                     ACE_ENV_ARG_DECL)
+ifr_adding_visitor::create_home_def (AST_Home *node)
 {
   CORBA::Container_ptr current_scope =
     CORBA::Container::_nil ();
@@ -3137,27 +2914,22 @@ ifr_adding_visitor::create_home_def (AST_Home *node
     {
       CORBA::ComponentIR::HomeDef_var base_home;
       this->fill_base_home (base_home.out (),
-                            node
-                            ACE_ENV_ARG_PARAMETER);
+                            node);
 
       CORBA::ComponentIR::ComponentDef_var managed_component;
       this->fill_managed_component (managed_component.out (),
-                                    node
-                                    ACE_ENV_ARG_PARAMETER);
+                                    node);
 
       CORBA::InterfaceDefSeq supported_interfaces;
       this->fill_supported_interfaces (supported_interfaces,
-                                       node
-                                       ACE_ENV_ARG_PARAMETER);
+                                       node);
 
       CORBA::ValueDef_var primary_key;
       this->fill_primary_key (primary_key.out (),
-                              node
-                              ACE_ENV_ARG_PARAMETER);
+                              node);
 
       CORBA::ComponentIR::Container_var ccm_scope =
-        CORBA::ComponentIR::Container::_narrow (current_scope
-                                                ACE_ENV_ARG_PARAMETER);
+        CORBA::ComponentIR::Container::_narrow (current_scope);
 
       CORBA::ComponentIR::HomeDef_var new_def =
         ccm_scope->create_home (node->repoID (),
@@ -3166,15 +2938,13 @@ ifr_adding_visitor::create_home_def (AST_Home *node
                                 base_home.in (),
                                 managed_component.in (),
                                 supported_interfaces,
-                                primary_key.in ()
-                                ACE_ENV_ARG_PARAMETER);
+                                primary_key.in ());
 
       node->ifr_added (1);
 
       // Push the new IR object onto the scope stack.
       CORBA::Container_var new_scope =
-        CORBA::Container::_narrow (new_def.in ()
-                                   ACE_ENV_ARG_PARAMETER);
+        CORBA::Container::_narrow (new_def.in ());
 
       if (be_global->ifr_scopes ().push (new_scope.in ()) != 0)
         {
@@ -3204,12 +2974,10 @@ ifr_adding_visitor::create_home_def (AST_Home *node
       // Get the contents of these lists into the repository.
 
       this->visit_all_factories (node,
-                                 new_def.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+                                 new_def.in ());
 
       this->visit_all_finders (node,
-                               new_def.in ()
-                               ACE_ENV_ARG_PARAMETER);
+                               new_def.in ());
 
       // This spot in the AST doesn't necessarily have to be the
       // interface definition - it could be any reference to it.
@@ -3251,8 +3019,7 @@ ifr_adding_visitor::create_home_def (AST_Home *node
 }
 
 int
-ifr_adding_visitor::create_event_def (AST_EventType *node
-                                      ACE_ENV_ARG_DECL)
+ifr_adding_visitor::create_event_def (AST_EventType *node)
 {
   CORBA::Container_ptr current_scope =
     CORBA::Container::_nil ();
@@ -3261,27 +3028,22 @@ ifr_adding_visitor::create_event_def (AST_EventType *node
     {
       CORBA::ValueDef_var base_value;
       this->fill_base_value (base_value.out (),
-                             node
-                             ACE_ENV_ARG_PARAMETER);
+                             node);
 
       CORBA::ValueDefSeq abstract_base_values;
       this->fill_abstract_base_values (abstract_base_values,
-                                       node
-                                       ACE_ENV_ARG_PARAMETER);
+                                       node);
 
       CORBA::InterfaceDefSeq supported_interfaces;
       this->fill_supported_interfaces (supported_interfaces,
-                                       node
-                                       ACE_ENV_ARG_PARAMETER);
+                                       node);
 
       CORBA::ExtInitializerSeq initializers;
       this->fill_initializers (initializers,
-                               node
-                               ACE_ENV_ARG_PARAMETER);
+                               node);
 
       CORBA::ComponentIR::Container_var ccm_scope =
-        CORBA::ComponentIR::Container::_narrow (current_scope
-                                                ACE_ENV_ARG_PARAMETER);
+        CORBA::ComponentIR::Container::_narrow (current_scope);
 
       CORBA::ExtValueDef_var new_def =
         ccm_scope->create_event (
@@ -3295,15 +3057,13 @@ ifr_adding_visitor::create_event_def (AST_EventType *node
                        abstract_base_values,
                        supported_interfaces,
                        initializers
-                       ACE_ENV_ARG_PARAMETER
                      );
 
       node->ifr_added (1);
 
       // Push the new IR object onto the scope stack.
       CORBA::Container_var new_scope =
-        CORBA::Container::_narrow (new_def.in ()
-                                   ACE_ENV_ARG_PARAMETER);
+        CORBA::Container::_narrow (new_def.in ());
 
       if (be_global->ifr_scopes ().push (new_scope.in ()) != 0)
         {
@@ -3372,7 +3132,7 @@ ifr_adding_visitor::create_event_def (AST_EventType *node
 int
 ifr_adding_visitor::create_value_member (AST_Field *node)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       AST_Type *bt = node->field_type ();
       AST_Decl::NodeType nt = bt->node_type ();
@@ -3402,12 +3162,10 @@ ifr_adding_visitor::create_value_member (AST_Field *node)
         {
           // If the IDL is legal, this will succeed.
           CORBA::Contained_var holder =
-                be_global->repository ()->lookup_id (bt->repoID ()
-                                                     ACE_ENV_ARG_PARAMETER);
+                be_global->repository ()->lookup_id (bt->repoID ());
 
           this->ir_current_ =
-            CORBA::IDLType::_narrow (holder.in ()
-                                     ACE_ENV_ARG_PARAMETER);
+            CORBA::IDLType::_narrow (holder.in ());
         }
 
       CORBA::Visibility vis = CORBA::PUBLIC_MEMBER;
@@ -3444,32 +3202,27 @@ ifr_adding_visitor::create_value_member (AST_Field *node)
         }
 
       CORBA::ValueDef_var vt =
-        CORBA::ValueDef::_narrow (current_scope
-                                  ACE_ENV_ARG_PARAMETER);
+        CORBA::ValueDef::_narrow (current_scope);
 
       CORBA::ValueMemberDef_var vm =
         vt->create_value_member (node->repoID (),
                                  node->local_name ()->get_string (),
                                  node->version (),
                                  this->ir_current_.in (),
-                                 vis
-                                 ACE_ENV_ARG_PARAMETER);
+                                 vis);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("create_value_member"));
+      ex._tao_print_exception (ACE_TEXT ("create_value_member"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
 
 void
-ifr_adding_visitor::get_referenced_type (AST_Type *node
-                                         ACE_ENV_ARG_DECL)
+ifr_adding_visitor::get_referenced_type (AST_Type *node)
 {
   switch (node->node_type ())
   {
@@ -3497,12 +3250,10 @@ ifr_adding_visitor::get_referenced_type (AST_Type *node
     default:
       {
         CORBA::Contained_var prev_def =
-          be_global->repository ()->lookup_id (node->repoID ()
-                                               ACE_ENV_ARG_PARAMETER);
+          be_global->repository ()->lookup_id (node->repoID ());
 
         this->ir_current_ =
-          CORBA::IDLType::_narrow (prev_def.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+          CORBA::IDLType::_narrow (prev_def.in ());
         break;
       }
   }
@@ -3510,8 +3261,7 @@ ifr_adding_visitor::get_referenced_type (AST_Type *node
 
 void
 ifr_adding_visitor::fill_base_value (CORBA::ValueDef_ptr &result,
-                                     AST_ValueType *node
-                                     ACE_ENV_ARG_DECL)
+                                     AST_ValueType *node)
 {
   result = CORBA::ValueDef::_nil ();
   AST_ValueType *base_value = node->inherits_concrete ();
@@ -3524,14 +3274,12 @@ ifr_adding_visitor::fill_base_value (CORBA::ValueDef_ptr &result,
   CORBA::Contained_var holder =
     be_global->repository ()->lookup_id (
                                   base_value->repoID ()
-                                  ACE_ENV_ARG_PARAMETER
                                 );
 
   if (!CORBA::is_nil (holder.in ()))
     {
       result =
-        CORBA::ValueDef::_narrow (holder.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+        CORBA::ValueDef::_narrow (holder.in ());
     }
 }
 
@@ -3539,7 +3287,6 @@ void
 ifr_adding_visitor::fill_base_component (
     CORBA::ComponentIR::ComponentDef_ptr &result,
     AST_Component *node
-    ACE_ENV_ARG_DECL
   )
 {
   result = CORBA::ComponentIR::ComponentDef::_nil ();
@@ -3553,21 +3300,18 @@ ifr_adding_visitor::fill_base_component (
   CORBA::Contained_var holder =
     be_global->repository ()->lookup_id (
                                   base_component->repoID ()
-                                  ACE_ENV_ARG_PARAMETER
                                 );
 
   if (!CORBA::is_nil (holder.in ()))
     {
       result =
-        CORBA::ComponentIR::ComponentDef::_narrow (holder.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
+        CORBA::ComponentIR::ComponentDef::_narrow (holder.in ());
     }
 }
 
 void
 ifr_adding_visitor::fill_base_home (CORBA::ComponentIR::HomeDef_ptr &result,
-                                    AST_Home *node
-                                    ACE_ENV_ARG_DECL)
+                                    AST_Home *node)
 {
   result = CORBA::ComponentIR::HomeDef::_nil ();
   AST_Home *base_home = node->base_home ();
@@ -3580,14 +3324,12 @@ ifr_adding_visitor::fill_base_home (CORBA::ComponentIR::HomeDef_ptr &result,
   CORBA::Contained_var holder =
     be_global->repository ()->lookup_id (
                                   base_home->repoID ()
-                                  ACE_ENV_ARG_PARAMETER
                                 );
 
   if (!CORBA::is_nil (holder.in ()))
     {
       result =
-        CORBA::ComponentIR::HomeDef::_narrow (holder.in ()
-                                              ACE_ENV_ARG_PARAMETER);
+        CORBA::ComponentIR::HomeDef::_narrow (holder.in ());
     }
   else
     {
@@ -3595,8 +3337,7 @@ ifr_adding_visitor::fill_base_home (CORBA::ComponentIR::HomeDef_ptr &result,
       /// the repository and go again.
       (void) base_home->ast_accept (this);
       this->fill_base_home (result,
-                            node
-                            ACE_ENV_ARG_PARAMETER);
+                            node);
     }
 }
 
@@ -3604,7 +3345,6 @@ void
 ifr_adding_visitor::fill_managed_component (
     CORBA::ComponentIR::ComponentDef_ptr &result,
     AST_Home *node
-    ACE_ENV_ARG_DECL
   )
 {
   result = CORBA::ComponentIR::ComponentDef::_nil ();
@@ -3616,14 +3356,12 @@ ifr_adding_visitor::fill_managed_component (
     }
 
   CORBA::Contained_var holder =
-    be_global->repository ()->lookup_id (managed_component->repoID ()
-                                         ACE_ENV_ARG_PARAMETER);
+    be_global->repository ()->lookup_id (managed_component->repoID ());
 
   if (!CORBA::is_nil (holder.in ()))
     {
       result =
-        CORBA::ComponentIR::ComponentDef::_narrow (holder.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
+        CORBA::ComponentIR::ComponentDef::_narrow (holder.in ());
     }
   else
     {
@@ -3631,15 +3369,13 @@ ifr_adding_visitor::fill_managed_component (
       /// the repository and go again.
       (void) managed_component->ast_accept (this);
       this->fill_managed_component (result,
-                                    node
-                                    ACE_ENV_ARG_PARAMETER);
+                                    node);
     }
 }
 
 void
 ifr_adding_visitor::fill_primary_key (CORBA::ValueDef_ptr &result,
-                                      AST_Home *node
-                                      ACE_ENV_ARG_DECL)
+                                      AST_Home *node)
 {
   result = CORBA::ValueDef::_nil ();
   AST_ValueType *primary_key = node->primary_key ();
@@ -3650,14 +3386,12 @@ ifr_adding_visitor::fill_primary_key (CORBA::ValueDef_ptr &result,
     }
 
   CORBA::Contained_var holder =
-    be_global->repository ()->lookup_id (primary_key->repoID ()
-                                         ACE_ENV_ARG_PARAMETER);
+    be_global->repository ()->lookup_id (primary_key->repoID ());
 
   if (!CORBA::is_nil (holder.in ()))
     {
       result =
-        CORBA::ValueDef::_narrow (holder.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+        CORBA::ValueDef::_narrow (holder.in ());
     }
   else
     {
@@ -3665,15 +3399,13 @@ ifr_adding_visitor::fill_primary_key (CORBA::ValueDef_ptr &result,
       /// the repository and go again.
       (void) primary_key->ast_accept (this);
       this->fill_primary_key (result,
-                              node
-                              ACE_ENV_ARG_PARAMETER);
+                              node);
     }
 }
 
 void
 ifr_adding_visitor::fill_abstract_base_values (CORBA::ValueDefSeq &result,
-                                               AST_ValueType *node
-                                               ACE_ENV_ARG_DECL)
+                                               AST_ValueType *node)
 {
   CORBA::Long s_length = node->n_inherits ();
   result.length (0);
@@ -3699,28 +3431,24 @@ ifr_adding_visitor::fill_abstract_base_values (CORBA::ValueDefSeq &result,
           (void) list[i]->ast_accept (this);
 
           result[first_abs ? i : i - 1] =
-            CORBA::ValueDef::_narrow (this->ir_current_.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+            CORBA::ValueDef::_narrow (this->ir_current_.in ());
         }
     }
 }
 
 void
 ifr_adding_visitor::fill_inherited_interfaces (CORBA::InterfaceDefSeq &result,
-                                               AST_Interface *node
-                                               ACE_ENV_ARG_DECL)
+                                               AST_Interface *node)
 {
   result.length (0);
   this->fill_interfaces (result,
                          node->inherits (),
-                         node->n_inherits ()
-                         ACE_ENV_ARG_PARAMETER);
+                         node->n_inherits ());
 }
 
 void
 ifr_adding_visitor::fill_supported_interfaces (CORBA::InterfaceDefSeq &result,
-                                               AST_Interface *node
-                                               ACE_ENV_ARG_DECL)
+                                               AST_Interface *node)
 {
   result.length (0);
   CORBA::Long s_length = 0;
@@ -3756,15 +3484,13 @@ ifr_adding_visitor::fill_supported_interfaces (CORBA::InterfaceDefSeq &result,
 
   this->fill_interfaces (result,
                          list,
-                         s_length
-                         ACE_ENV_ARG_PARAMETER);
+                         s_length);
 }
 
 void
 ifr_adding_visitor::fill_interfaces (CORBA::InterfaceDefSeq &result,
                                      AST_Interface **list,
-                                     CORBA::Long length
-                                     ACE_ENV_ARG_DECL)
+                                     CORBA::Long length)
 {
   // Not sure if this could be negative in some default case or
   // not. If it's 0, we should make the call anyway to clear
@@ -3780,16 +3506,14 @@ ifr_adding_visitor::fill_interfaces (CORBA::InterfaceDefSeq &result,
           (void) list[i]->ast_accept (this);
 
           result[i] =
-            CORBA::InterfaceDef::_narrow (this->ir_current_.in ()
-                                          ACE_ENV_ARG_PARAMETER);
+            CORBA::InterfaceDef::_narrow (this->ir_current_.in ());
         }
     }
 }
 
 void
 ifr_adding_visitor::fill_initializers (CORBA::ExtInitializerSeq &result,
-                                       AST_ValueType *node
-                                       ACE_ENV_ARG_DECL_NOT_USED)
+                                       AST_ValueType *node)
 {
   result.length (0);
   AST_Decl *item = 0;
@@ -3881,28 +3605,23 @@ ifr_adding_visitor::fill_initializers (CORBA::ExtInitializerSeq &result,
 
 void
 ifr_adding_visitor::fill_get_exceptions (CORBA::ExceptionDefSeq &result,
-                                         AST_Attribute *node
-                                         ACE_ENV_ARG_DECL)
+                                         AST_Attribute *node)
 {
   this->fill_exceptions (result,
-                         node->get_get_exceptions ()
-                         ACE_ENV_ARG_PARAMETER);
+                         node->get_get_exceptions ());
 }
 
 void
 ifr_adding_visitor::fill_set_exceptions (CORBA::ExceptionDefSeq &result,
-                                         AST_Attribute *node
-                                         ACE_ENV_ARG_DECL)
+                                         AST_Attribute *node)
 {
   this->fill_exceptions (result,
-                         node->get_set_exceptions ()
-                         ACE_ENV_ARG_PARAMETER);
+                         node->get_set_exceptions ());
 }
 
 void
 ifr_adding_visitor::fill_exceptions (CORBA::ExceptionDefSeq &result,
-                                     AST_Decl *node
-                                     ACE_ENV_ARG_DECL)
+                                     AST_Decl *node)
 {
   switch (node->node_type ())
     {
@@ -3910,16 +3629,14 @@ ifr_adding_visitor::fill_exceptions (CORBA::ExceptionDefSeq &result,
         {
           AST_Operation *op = AST_Operation::narrow_from_decl (node);
           this->fill_exceptions (result,
-                                 op->exceptions ()
-                                 ACE_ENV_ARG_PARAMETER);
+                                 op->exceptions ());
           return;
         }
       case AST_Decl::NT_factory:
         {
           AST_Factory *f = AST_Factory::narrow_from_decl (node);
           this->fill_exceptions (result,
-                                 f->exceptions ()
-                                 ACE_ENV_ARG_PARAMETER);
+                                 f->exceptions ());
           return;
         }
       default:
@@ -3930,8 +3647,7 @@ ifr_adding_visitor::fill_exceptions (CORBA::ExceptionDefSeq &result,
 
 void
 ifr_adding_visitor::fill_exceptions (CORBA::ExceptionDefSeq &result,
-                                     UTL_ExceptList *list
-                                     ACE_ENV_ARG_DECL)
+                                     UTL_ExceptList *list)
 {
   if (list == 0)
     {
@@ -3955,19 +3671,16 @@ ifr_adding_visitor::fill_exceptions (CORBA::ExceptionDefSeq &result,
       // inherit from IDLType.
       (void) d->ast_accept (this);
 
-      holder = be_global->repository ()->lookup_id (d->repoID ()
-                                                    ACE_ENV_ARG_PARAMETER);
+      holder = be_global->repository ()->lookup_id (d->repoID ());
 
       result[index] =
-        CORBA::ExceptionDef::_narrow (holder.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        CORBA::ExceptionDef::_narrow (holder.in ());
     }
 }
 
 void
 ifr_adding_visitor::fill_params (CORBA::ParDescriptionSeq &result,
-                                 AST_Operation *node
-                                 ACE_ENV_ARG_DECL)
+                                 AST_Operation *node)
 {
   AST_Argument *arg = 0;
   CORBA::ULong n_args = static_cast<CORBA::ULong> (node->argument_count ());
@@ -3997,8 +3710,7 @@ ifr_adding_visitor::fill_params (CORBA::ParDescriptionSeq &result,
 
 void
 ifr_adding_visitor::visit_all_provides (AST_Component *node,
-                                        CORBA::ComponentIR::ComponentDef_ptr c
-                                        ACE_ENV_ARG_DECL)
+                                        CORBA::ComponentIR::ComponentDef_ptr c)
 {
   AST_Component::port_description *tmp = 0;
   CORBA::Contained_var contained;
@@ -4013,11 +3725,9 @@ ifr_adding_visitor::visit_all_provides (AST_Component *node,
        i.advance ())
     {
       i.next (tmp);
-      contained = be_global->repository ()->lookup_id (tmp->impl->repoID ()
-                                                       ACE_ENV_ARG_PARAMETER);
+      contained = be_global->repository ()->lookup_id (tmp->impl->repoID ());
 
-      interface_type = CORBA::InterfaceDef::_narrow (contained.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+      interface_type = CORBA::InterfaceDef::_narrow (contained.in ());
 
       ACE_CString str (node->repoID ());
       local_name = tmp->id->get_string ();
@@ -4025,15 +3735,13 @@ ifr_adding_visitor::visit_all_provides (AST_Component *node,
       new_def = c->create_provides (str.fast_rep (),
                                     local_name,
                                     tmp->impl->version (),
-                                    interface_type.in ()
-                                    ACE_ENV_ARG_PARAMETER);
+                                    interface_type.in ());
     }
 }
 
 void
 ifr_adding_visitor::visit_all_uses (AST_Component *node,
-                                    CORBA::ComponentIR::ComponentDef_ptr c
-                                    ACE_ENV_ARG_DECL)
+                                    CORBA::ComponentIR::ComponentDef_ptr c)
 {
   AST_Component::port_description *tmp = 0;
   CORBA::Contained_var contained;
@@ -4048,11 +3756,9 @@ ifr_adding_visitor::visit_all_uses (AST_Component *node,
        i.advance ())
     {
       i.next (tmp);
-      contained = be_global->repository ()->lookup_id (tmp->impl->repoID ()
-                                                       ACE_ENV_ARG_PARAMETER);
+      contained = be_global->repository ()->lookup_id (tmp->impl->repoID ());
 
-      interface_type = CORBA::InterfaceDef::_narrow (contained.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+      interface_type = CORBA::InterfaceDef::_narrow (contained.in ());
 
       ACE_CString str (node->repoID ());
       local_name = tmp->id->get_string ();
@@ -4061,15 +3767,13 @@ ifr_adding_visitor::visit_all_uses (AST_Component *node,
                                 local_name,
                                 tmp->impl->version (),
                                 interface_type.in (),
-                                static_cast<CORBA::Boolean> (tmp->is_multiple)
-                                ACE_ENV_ARG_PARAMETER);
+                                static_cast<CORBA::Boolean> (tmp->is_multiple));
     }
 }
 
 void
 ifr_adding_visitor::visit_all_emits (AST_Component *node,
-                                     CORBA::ComponentIR::ComponentDef_ptr c
-                                     ACE_ENV_ARG_DECL)
+                                     CORBA::ComponentIR::ComponentDef_ptr c)
 {
   AST_Component::port_description *tmp = 0;
   CORBA::Contained_var contained;
@@ -4084,12 +3788,10 @@ ifr_adding_visitor::visit_all_emits (AST_Component *node,
        i.advance ())
     {
       i.next (tmp);
-      contained = be_global->repository ()->lookup_id (tmp->impl->repoID ()
-                                                       ACE_ENV_ARG_PARAMETER);
+      contained = be_global->repository ()->lookup_id (tmp->impl->repoID ());
 
       event_type =
-        CORBA::ComponentIR::EventDef::_narrow (contained.in ()
-                                               ACE_ENV_ARG_PARAMETER);
+        CORBA::ComponentIR::EventDef::_narrow (contained.in ());
 
       ACE_CString str (node->repoID ());
       local_name = tmp->id->get_string ();
@@ -4097,15 +3799,13 @@ ifr_adding_visitor::visit_all_emits (AST_Component *node,
       new_def = c->create_emits (str.fast_rep (),
                                  local_name,
                                  tmp->impl->version (),
-                                 event_type.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+                                 event_type.in ());
     }
 }
 
 void
 ifr_adding_visitor::visit_all_publishes (AST_Component *node,
-                                         CORBA::ComponentIR::ComponentDef_ptr c
-                                         ACE_ENV_ARG_DECL)
+                                         CORBA::ComponentIR::ComponentDef_ptr c)
 {
   AST_Component::port_description *tmp = 0;
   CORBA::Contained_var contained;
@@ -4120,12 +3820,10 @@ ifr_adding_visitor::visit_all_publishes (AST_Component *node,
        i.advance ())
     {
       i.next (tmp);
-      contained = be_global->repository ()->lookup_id (tmp->impl->repoID ()
-                                                       ACE_ENV_ARG_PARAMETER);
+      contained = be_global->repository ()->lookup_id (tmp->impl->repoID ());
 
       event_type =
-        CORBA::ComponentIR::EventDef::_narrow (contained.in ()
-                                               ACE_ENV_ARG_PARAMETER);
+        CORBA::ComponentIR::EventDef::_narrow (contained.in ());
 
       ACE_CString str (node->repoID ());
       local_name = tmp->id->get_string ();
@@ -4133,15 +3831,13 @@ ifr_adding_visitor::visit_all_publishes (AST_Component *node,
       new_def = c->create_publishes (str.fast_rep (),
                                      local_name,
                                      tmp->impl->version (),
-                                     event_type.in ()
-                                     ACE_ENV_ARG_PARAMETER);
+                                     event_type.in ());
     }
 }
 
 void
 ifr_adding_visitor::visit_all_consumes (AST_Component *node,
-                                        CORBA::ComponentIR::ComponentDef_ptr c
-                                        ACE_ENV_ARG_DECL)
+                                        CORBA::ComponentIR::ComponentDef_ptr c)
 {
   AST_Component::port_description *tmp = 0;
   CORBA::Contained_var contained;
@@ -4156,12 +3852,10 @@ ifr_adding_visitor::visit_all_consumes (AST_Component *node,
        i.advance ())
     {
       i.next (tmp);
-      contained = be_global->repository ()->lookup_id (tmp->impl->repoID ()
-                                                       ACE_ENV_ARG_PARAMETER);
+      contained = be_global->repository ()->lookup_id (tmp->impl->repoID ());
 
       event_type =
-        CORBA::ComponentIR::EventDef::_narrow (contained.in ()
-                                               ACE_ENV_ARG_PARAMETER);
+        CORBA::ComponentIR::EventDef::_narrow (contained.in ());
 
       ACE_CString str (node->repoID ());
       local_name = tmp->id->get_string ();
@@ -4169,15 +3863,13 @@ ifr_adding_visitor::visit_all_consumes (AST_Component *node,
       new_def = c->create_consumes (str.fast_rep (),
                                     local_name,
                                     tmp->impl->version (),
-                                    event_type.in ()
-                                    ACE_ENV_ARG_PARAMETER);
+                                    event_type.in ());
     }
 }
 
 void
 ifr_adding_visitor::visit_all_factories (AST_Home *node,
-                                         CORBA::ComponentIR::HomeDef_ptr h
-                                         ACE_ENV_ARG_DECL)
+                                         CORBA::ComponentIR::HomeDef_ptr h)
 {
   AST_Operation **tmp = 0;
   CORBA::Contained_var contained;
@@ -4190,27 +3882,23 @@ ifr_adding_visitor::visit_all_factories (AST_Home *node,
       i.next (tmp);
       CORBA::ParDescriptionSeq params;
       this->fill_params (params,
-                         *tmp
-                         ACE_ENV_ARG_PARAMETER);
+                         *tmp);
 
       CORBA::ExceptionDefSeq exceptions;
       this->fill_exceptions (exceptions,
-                             *tmp
-                             ACE_ENV_ARG_PARAMETER);
+                             *tmp);
 
       new_def = h->create_factory ((*tmp)->repoID (),
                                    (*tmp)->local_name ()->get_string (),
                                    (*tmp)->version (),
                                    params,
-                                   exceptions
-                                   ACE_ENV_ARG_PARAMETER);
+                                   exceptions);
     }
 }
 
 void
 ifr_adding_visitor::visit_all_finders (AST_Home *node,
-                                       CORBA::ComponentIR::HomeDef_ptr h
-                                       ACE_ENV_ARG_DECL)
+                                       CORBA::ComponentIR::HomeDef_ptr h)
 {
   AST_Operation **tmp = 0;
   CORBA::Contained_var contained;
@@ -4223,20 +3911,17 @@ ifr_adding_visitor::visit_all_finders (AST_Home *node,
       i.next (tmp);
       CORBA::ParDescriptionSeq params;
       this->fill_params (params,
-                         *tmp
-                         ACE_ENV_ARG_PARAMETER);
+                         *tmp);
 
       CORBA::ExceptionDefSeq exceptions;
       this->fill_exceptions (exceptions,
-                             *tmp
-                             ACE_ENV_ARG_PARAMETER);
+                             *tmp);
 
       new_def = h->create_finder ((*tmp)->repoID (),
                                   (*tmp)->local_name ()->get_string (),
                                   (*tmp)->version (),
                                   params,
-                                  exceptions
-                                  ACE_ENV_ARG_PARAMETER);
+                                  exceptions);
     }
 }
 
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h
index 839373308e1..73c7257ced6 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h
@@ -140,127 +140,98 @@ protected:
                  CORBA::Any &any);
   // Determine the primitive type and insert into the Any.
 
-  void element_type (AST_Type *base_type
-                     ACE_ENV_ARG_DECL);
+  void element_type (AST_Type *base_type);
   // Creates or looks up the element type of an array or sequence,
   // and stores the result in ir_current_.
 
-  int create_interface_def (AST_Interface *node
-                            ACE_ENV_ARG_DECL);
+  int create_interface_def (AST_Interface *node);
   // Code encapsulated out of visit_interface().
 
-  int create_value_def (AST_ValueType *node
-                        ACE_ENV_ARG_DECL);
+  int create_value_def (AST_ValueType *node);
   // Code encapsulated out of visit_valuetype().
 
-  int create_component_def (AST_Component *node
-                            ACE_ENV_ARG_DECL);
+  int create_component_def (AST_Component *node);
   // Code encapsulated out of visit_component().
 
-  int create_home_def (AST_Home *node
-                       ACE_ENV_ARG_DECL);
+  int create_home_def (AST_Home *node);
   // Code encapsulated out of visit_home().
 
-  int create_event_def (AST_EventType *node
-                        ACE_ENV_ARG_DECL);
+  int create_event_def (AST_EventType *node);
   // Code encapsulated out of visit_eventtype().
 
   int create_value_member (AST_Field *node);
   // Conditional call from visit_field().
 
-  void get_referenced_type (AST_Type *node
-                            ACE_ENV_ARG_DECL);
+  void get_referenced_type (AST_Type *node);
   // Utility method to update ir_current_ for struct members, union
   // members, operation parameters and operation return types.
 
   void fill_base_value (CORBA::ValueDef_ptr &result,
-                        AST_ValueType *node
-                        ACE_ENV_ARG_DECL);
+                        AST_ValueType *node);
 
   void fill_base_component (CORBA::ComponentIR::ComponentDef_ptr &result,
-                            AST_Component *node
-                            ACE_ENV_ARG_DECL);
+                            AST_Component *node);
 
   void fill_base_home (CORBA::ComponentIR::HomeDef_ptr &result,
-                       AST_Home *node
-                       ACE_ENV_ARG_DECL);
+                       AST_Home *node);
 
   void fill_managed_component (CORBA::ComponentIR::ComponentDef_ptr &result,
-                               AST_Home *node
-                               ACE_ENV_ARG_DECL);
+                               AST_Home *node);
 
   void fill_primary_key (CORBA::ValueDef_ptr &result,
-                         AST_Home *node
-                         ACE_ENV_ARG_DECL);
+                         AST_Home *node);
 
   void fill_abstract_base_values (CORBA::ValueDefSeq &result,
-                                  AST_ValueType *node
-                                  ACE_ENV_ARG_DECL);
+                                  AST_ValueType *node);
 
   void fill_inherited_interfaces (CORBA::InterfaceDefSeq &result,
-                                  AST_Interface *node
-                                  ACE_ENV_ARG_DECL);
+                                  AST_Interface *node);
 
   void fill_supported_interfaces (CORBA::InterfaceDefSeq &result,
-                                  AST_Interface *node
-                                  ACE_ENV_ARG_DECL);
+                                  AST_Interface *node);
 
   void fill_interfaces (CORBA::InterfaceDefSeq &result,
                         AST_Interface **list,
-                        CORBA::Long length
-                        ACE_ENV_ARG_DECL);
+                        CORBA::Long length);
 
   void fill_initializers (CORBA::ExtInitializerSeq &result,
-                          AST_ValueType *node
-                          ACE_ENV_ARG_DECL);
+                          AST_ValueType *node);
 
   void fill_get_exceptions (CORBA::ExceptionDefSeq &result,
-                            AST_Attribute *node
-                            ACE_ENV_ARG_DECL);
+                            AST_Attribute *node);
 
   void fill_set_exceptions (CORBA::ExceptionDefSeq &result,
-                            AST_Attribute *node
-                            ACE_ENV_ARG_DECL);
+                            AST_Attribute *node);
 
   void fill_exceptions (CORBA::ExceptionDefSeq &result,
-                        AST_Decl *node
-                        ACE_ENV_ARG_DECL);
+                        AST_Decl *node);
 
   void fill_exceptions (CORBA::ExceptionDefSeq &result,
-                        UTL_ExceptList *list
-                        ACE_ENV_ARG_DECL);
+                        UTL_ExceptList *list);
 
   void fill_params (CORBA::ParDescriptionSeq &result,
-                    AST_Operation *node
-                    ACE_ENV_ARG_DECL);
+                    AST_Operation *node);
 
   void visit_all_provides (AST_Component *node,
-                           CORBA::ComponentIR::ComponentDef_ptr c
-                           ACE_ENV_ARG_DECL);
+                           CORBA::ComponentIR::ComponentDef_ptr c);
 
   void visit_all_uses (AST_Component *node,
-                       CORBA::ComponentIR::ComponentDef_ptr c
-                       ACE_ENV_ARG_DECL);
+                       CORBA::ComponentIR::ComponentDef_ptr c);
 
   void visit_all_emits (AST_Component *node,
-                        CORBA::ComponentIR::ComponentDef_ptr c
-                        ACE_ENV_ARG_DECL);
+                        CORBA::ComponentIR::ComponentDef_ptr c);
 
   void visit_all_publishes (AST_Component *node,
-                            CORBA::ComponentIR::ComponentDef_ptr c
-                            ACE_ENV_ARG_DECL);
+                            CORBA::ComponentIR::ComponentDef_ptr c);
 
   void visit_all_consumes (AST_Component *node,
-                           CORBA::ComponentIR::ComponentDef_ptr c
-                           ACE_ENV_ARG_DECL);
+                           CORBA::ComponentIR::ComponentDef_ptr c);
 
   void visit_all_factories (AST_Home *node,
-                            CORBA::ComponentIR::HomeDef_ptr h
-                            ACE_ENV_ARG_DECL);
+                            CORBA::ComponentIR::HomeDef_ptr h);
 
   void visit_all_finders (AST_Home *node,
-                          CORBA::ComponentIR::HomeDef_ptr h
-                          ACE_ENV_ARG_DECL);
+                          CORBA::ComponentIR::HomeDef_ptr h);
 
   void expand_id (ACE_CString &str,
                   const char *local_name);
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
index ed37fb00f4f..2e3ae1ea413 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
@@ -48,8 +48,7 @@ ifr_adding_visitor_exception::visit_scope (UTL_Scope *node)
 
   AST_Field **f = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Visit each field.
       for (CORBA::ULong i = 0; i < nfields; ++i)
@@ -89,7 +88,7 @@ ifr_adding_visitor_exception::visit_scope (UTL_Scope *node)
           else
             {
               // Updates ir_current_.
-              this->get_referenced_type (ft ACE_ENV_ARG_PARAMETER);
+              this->get_referenced_type (ft);
             }
 
           this->members_[i].name =
@@ -104,16 +103,14 @@ ifr_adding_visitor_exception::visit_scope (UTL_Scope *node)
             CORBA::IDLType::_duplicate (this->ir_current_.in ());
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (
-          ACE_ANY_EXCEPTION,
-          ACE_TEXT ("ifr_adding_visitor_structure::visit_scope")
-        );
+      ex._tao_print_exception (
+        ACE_TEXT (
+          "ifr_adding_visitor_structure::visit_scope"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -121,13 +118,11 @@ ifr_adding_visitor_exception::visit_scope (UTL_Scope *node)
 int
 ifr_adding_visitor_exception::visit_structure (AST_Structure *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Is this union already in the respository?
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
+        be_global->repository ()->lookup_id (node->repoID ());
 
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
@@ -144,8 +139,7 @@ ifr_adding_visitor_exception::visit_structure (AST_Structure *node)
                 CORBA::IDLType::_duplicate (visitor.ir_current ());
 
               CORBA::Contained_ptr tmp =
-                CORBA::Contained::_narrow (visitor.ir_current ()
-                                           ACE_ENV_ARG_PARAMETER);
+                CORBA::Contained::_narrow (visitor.ir_current ());
 
               // Since the enclosing ExceptionDef hasn't been created
               // yet, we don't have a scope, so this nested StructDef
@@ -171,20 +165,17 @@ ifr_adding_visitor_exception::visit_structure (AST_Structure *node)
             }
 
           this->ir_current_ =
-            CORBA::IDLType::_narrow (prev_def.in ()
-                                    ACE_ENV_ARG_PARAMETER);
+            CORBA::IDLType::_narrow (prev_def.in ());
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (
-          ACE_ANY_EXCEPTION,
-          ACE_TEXT ("ifr_adding_visitor_exception::visit_structure")
-        );
+      ex._tao_print_exception (
+        ACE_TEXT (
+          "ifr_adding_visitor_exception::visit_structure"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -192,12 +183,10 @@ ifr_adding_visitor_exception::visit_structure (AST_Structure *node)
 int
 ifr_adding_visitor_exception::visit_exception (AST_Exception *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
+        be_global->repository ()->lookup_id (node->repoID ());
 
       if (!CORBA::is_nil (prev_def.in ()))
         {
@@ -259,8 +248,7 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node)
         current_scope->create_exception (node->repoID (),
                                          node->local_name ()->get_string (),
                                          node->version (),
-                                         this->members_
-                                         ACE_ENV_ARG_PARAMETER);
+                                         this->members_);
 
 
       size_t size = this->move_queue_.size ();
@@ -270,8 +258,7 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node)
           CORBA::Contained_var traveller;
 
           CORBA::Container_var new_container =
-            CORBA::Container::_narrow (new_def.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+            CORBA::Container::_narrow (new_def.in ());
 
           for (size_t i = 0; i < size; ++i)
             {
@@ -285,23 +272,20 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node)
 
               traveller->move (new_container.in (),
                                name.in (),
-                               version.in ()
-                               ACE_ENV_ARG_PARAMETER);
+                               version.in ());
             }
         }
 
       node->ifr_added (1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (
-          ACE_ANY_EXCEPTION,
-          ACE_TEXT ("ifr_adding_visitor_exception::visit_exception")
-        );
+      ex._tao_print_exception (
+        ACE_TEXT (
+          "ifr_adding_visitor_exception::visit_exception"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -309,13 +293,11 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node)
 int
 ifr_adding_visitor_exception::visit_enum (AST_Enum *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Is this enum already in the respository?
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
+        be_global->repository ()->lookup_id (node->repoID ());
 
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
@@ -344,12 +326,10 @@ ifr_adding_visitor_exception::visit_enum (AST_Enum *node)
                                           node->local_name ()->get_string (),
                                           node->version (),
                                           members
-                                          ACE_ENV_ARG_PARAMETER
                                         );
 
           CORBA::Contained_ptr tmp =
-            CORBA::Contained::_narrow (this->ir_current_.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+            CORBA::Contained::_narrow (this->ir_current_.in ());
 
           this->move_queue_.enqueue_tail (tmp);
 
@@ -370,20 +350,17 @@ ifr_adding_visitor_exception::visit_enum (AST_Enum *node)
             }
 
           this->ir_current_ =
-            CORBA::IDLType::_narrow (prev_def.in ()
-                                    ACE_ENV_ARG_PARAMETER);
+            CORBA::IDLType::_narrow (prev_def.in ());
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (
-          ACE_ANY_EXCEPTION,
-          ACE_TEXT ("ifr_adding_visitor_exception::visit_enum")
-        );
+      ex._tao_print_exception (
+        ACE_TEXT (
+          "ifr_adding_visitor_exception::visit_enum"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -391,13 +368,11 @@ ifr_adding_visitor_exception::visit_enum (AST_Enum *node)
 int
 ifr_adding_visitor_exception::visit_union (AST_Union *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Is this union already in the respository?
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
+        be_global->repository ()->lookup_id (node->repoID ());
 
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
@@ -414,8 +389,7 @@ ifr_adding_visitor_exception::visit_union (AST_Union *node)
                 CORBA::IDLType::_duplicate (visitor.ir_current ());
 
               CORBA::Contained_ptr tmp =
-                CORBA::Contained::_narrow (visitor.ir_current ()
-                                          ACE_ENV_ARG_PARAMETER);
+                CORBA::Contained::_narrow (visitor.ir_current ());
 
               // Since the enclosing ExceptionDef hasn't been created
               // yet, we don't have a scope, so this nested UnionDef
@@ -441,20 +415,17 @@ ifr_adding_visitor_exception::visit_union (AST_Union *node)
             }
 
           this->ir_current_ =
-            CORBA::IDLType::_narrow (prev_def.in ()
-                                    ACE_ENV_ARG_PARAMETER);
+            CORBA::IDLType::_narrow (prev_def.in ());
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (
-          ACE_ANY_EXCEPTION,
-          ACE_TEXT ("ifr_adding_visitor_exception::visit_union")
-        );
+      ex._tao_print_exception (
+        ACE_TEXT (
+          "ifr_adding_visitor_exception::visit_union"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp
index 230e824a20d..65ea38e73fa 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp
@@ -30,8 +30,7 @@ ifr_adding_visitor_operation::~ifr_adding_visitor_operation (void)
 int
 ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // If this operation is already in the repository (for example, if
       // we are processing the IDL file a second time inadvertently), we
@@ -39,8 +38,7 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
       // compiler front end would have told us.
 
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
+        be_global->repository ()->lookup_id (node->repoID ());
 
       if (!CORBA::is_nil (prev_def.in ()))
         {
@@ -95,12 +93,10 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
           ex = ex_iter.item ();
 
           prev_def =
-            be_global->repository ()->lookup_id (ex->repoID ()
-                                                 ACE_ENV_ARG_PARAMETER);
+            be_global->repository ()->lookup_id (ex->repoID ());
 
           exceptions[i] =
-            CORBA::ExceptionDef::_narrow (prev_def.in ()
-                                          ACE_ENV_ARG_PARAMETER);
+            CORBA::ExceptionDef::_narrow (prev_def.in ());
         }
 
       // Build the context list.
@@ -137,8 +133,7 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
       AST_Type *return_type = node->return_type ();
 
       // Updates ir_current_.
-      this->get_referenced_type (return_type
-                                 ACE_ENV_ARG_PARAMETER);
+      this->get_referenced_type (return_type);
 
       // Is the operation oneway?
       CORBA::OperationMode mode = node->flags () == AST_Operation::OP_oneway
@@ -158,8 +153,7 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
           if (nt == AST_Decl::NT_interface)
             {
               CORBA::InterfaceDef_var iface =
-                CORBA::InterfaceDef::_narrow (current_scope
-                                              ACE_ENV_ARG_PARAMETER);
+                CORBA::InterfaceDef::_narrow (current_scope);
 
               CORBA::OperationDef_var new_def =
                 iface->create_operation (node->repoID (),
@@ -169,14 +163,12 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
                                          mode,
                                          this->params_,
                                          exceptions,
-                                         contexts
-                                         ACE_ENV_ARG_PARAMETER);
+                                         contexts);
             }
           else
             {
               CORBA::ValueDef_var vtype =
-                CORBA::ValueDef::_narrow (current_scope
-                                          ACE_ENV_ARG_PARAMETER);
+                CORBA::ValueDef::_narrow (current_scope);
 
               CORBA::OperationDef_var new_def =
                 vtype->create_operation (node->repoID (),
@@ -186,8 +178,7 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
                                          mode,
                                          this->params_,
                                          exceptions,
-                                         contexts
-                                         ACE_ENV_ARG_PARAMETER);
+                                         contexts);
             }
         }
       else
@@ -202,16 +193,14 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
           );
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (
-          ACE_ANY_EXCEPTION,
-          ACE_TEXT ("ifr_adding_visitor_operation::visit_operation")
-        );
+      ex._tao_print_exception (
+        ACE_TEXT (
+          "ifr_adding_visitor_operation::visit_operation"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -225,12 +214,10 @@ ifr_adding_visitor_operation::visit_argument (AST_Argument *node)
 
   AST_Type *arg_type = node->field_type ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Updates ir_current_.
-      this->get_referenced_type (arg_type
-                                 ACE_ENV_ARG_PARAMETER);
+      this->get_referenced_type (arg_type);
 
       this->params_[this->index_].type_def =
         CORBA::IDLType::_duplicate (this->ir_current_.in ());
@@ -256,16 +243,14 @@ ifr_adding_visitor_operation::visit_argument (AST_Argument *node)
 
       ++this->index_;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (
-          ACE_ANY_EXCEPTION,
-          ACE_TEXT ("ifr_adding_visitor_operation::visit_argument")
-        );
+      ex._tao_print_exception (
+        ACE_TEXT (
+          "ifr_adding_visitor_operation::visit_argument"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
index 5ef5ddac8e8..bfc8b72d17c 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
@@ -43,8 +43,7 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node)
   this->members_.length (nfields);
   AST_Field **f = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Visit each field.
       for (CORBA::ULong i = 0; i < nfields; ++i)
@@ -91,8 +90,7 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node)
                     CORBA::IDLType::_duplicate (visitor.ir_current ());
 
                   CORBA::Contained_ptr tmp =
-                    CORBA::Contained::_narrow (visitor.ir_current ()
-                                               ACE_ENV_ARG_PARAMETER);
+                    CORBA::Contained::_narrow (visitor.ir_current ());
 
                   this->move_queue_.enqueue_tail (tmp);
                 }
@@ -114,8 +112,7 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node)
           else
             {
               // Updates ir_current_.
-              this->get_referenced_type (ft
-                                         ACE_ENV_ARG_PARAMETER);
+              this->get_referenced_type (ft);
             }
 
           this->members_[i].name =
@@ -130,16 +127,14 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node)
             CORBA::IDLType::_duplicate (this->ir_current_.in ());
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (
-          ACE_ANY_EXCEPTION,
-          ACE_TEXT ("ifr_adding_visitor_structure::visit_scope")
-        );
+      ex._tao_print_exception (
+        ACE_TEXT (
+          "ifr_adding_visitor_structure::visit_scope"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -147,12 +142,10 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node)
 int
 ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
+        be_global->repository ()->lookup_id (node->repoID ());
 
       if (CORBA::is_nil (prev_def.in ()))
         {
@@ -184,7 +177,6 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
                 node->local_name ()->get_string (),
                 node->version (),
                 dummyMembers
-                ACE_ENV_ARG_PARAMETER
               );
 
           // Then recurse into the real structure members (which corrupts ir_current_)
@@ -212,8 +204,7 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
               CORBA::Contained_var traveller;
 
               CORBA::Container_var new_container =
-                CORBA::Container::_narrow (this->ir_current_.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+                CORBA::Container::_narrow (this->ir_current_.in ());
 
               for (size_t i = 0; i < size; ++i)
                 {
@@ -227,8 +218,7 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
 
                   traveller->move (new_container.in (),
                                    name.in (),
-                                   version.in ()
-                                   ACE_ENV_ARG_PARAMETER);
+                                   version.in ());
                 }
             }
 
@@ -249,20 +239,17 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
             }
 
           this->ir_current_ =
-            CORBA::IDLType::_narrow (prev_def.in ()
-                                    ACE_ENV_ARG_PARAMETER);
+            CORBA::IDLType::_narrow (prev_def.in ());
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (
-          ACE_ANY_EXCEPTION,
-          ACE_TEXT ("ifr_adding_visitor_structure::visit_structure")
-        );
+      ex._tao_print_exception (
+        ACE_TEXT (
+          "ifr_adding_visitor_structure::visit_structure"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -270,13 +257,11 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
 int
 ifr_adding_visitor_structure::visit_enum (AST_Enum *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Is this enum already in the respository?
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
+        be_global->repository ()->lookup_id (node->repoID ());
 
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
@@ -305,12 +290,10 @@ ifr_adding_visitor_structure::visit_enum (AST_Enum *node)
                                           node->local_name ()->get_string (),
                                           node->version (),
                                           members
-                                          ACE_ENV_ARG_PARAMETER
                                         );
 
           CORBA::Contained_ptr tmp =
-            CORBA::Contained::_narrow (this->ir_current_.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+            CORBA::Contained::_narrow (this->ir_current_.in ());
 
           // Since the enclosing StructDef hasn't been created
           // yet, we don't have a scope, so this nested EnumDef
@@ -335,20 +318,17 @@ ifr_adding_visitor_structure::visit_enum (AST_Enum *node)
             }
 
           this->ir_current_ =
-            CORBA::IDLType::_narrow (prev_def.in ()
-                                    ACE_ENV_ARG_PARAMETER);
+            CORBA::IDLType::_narrow (prev_def.in ());
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (
-          ACE_ANY_EXCEPTION,
-          ACE_TEXT ("ifr_adding_visitor_structure::visit_enum")
-        );
+      ex._tao_print_exception (
+        ACE_TEXT (
+          "ifr_adding_visitor_structure::visit_enum"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -356,13 +336,11 @@ ifr_adding_visitor_structure::visit_enum (AST_Enum *node)
 int
 ifr_adding_visitor_structure::visit_union (AST_Union *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Is this union already in the respository?
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
+        be_global->repository ()->lookup_id (node->repoID ());
 
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
@@ -379,8 +357,7 @@ ifr_adding_visitor_structure::visit_union (AST_Union *node)
                 CORBA::IDLType::_duplicate (visitor.ir_current ());
 
               CORBA::Contained_ptr tmp =
-                CORBA::Contained::_narrow (visitor.ir_current ()
-                                          ACE_ENV_ARG_PARAMETER);
+                CORBA::Contained::_narrow (visitor.ir_current ());
 
               // Since the enclosing StructDef hasn't been created
               // yet, we don't have a scope, so this nested UnionDef
@@ -406,20 +383,17 @@ ifr_adding_visitor_structure::visit_union (AST_Union *node)
             }
 
           this->ir_current_ =
-            CORBA::IDLType::_narrow (prev_def.in ()
-                                    ACE_ENV_ARG_PARAMETER);
+            CORBA::IDLType::_narrow (prev_def.in ());
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (
-          ACE_ANY_EXCEPTION,
-          ACE_TEXT ("ifr_adding_visitor_structure::visit_union")
-        );
+      ex._tao_print_exception (
+        ACE_TEXT (
+          "ifr_adding_visitor_structure::visit_union"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
index 4e12912c084..b8ad1e4dfd3 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
@@ -53,8 +53,7 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node)
   // Index into members_.
   CORBA::ULong index = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Visit each field.
       for (CORBA::ULong i = 0; i < nfields; ++i)
@@ -103,8 +102,7 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node)
                     CORBA::IDLType::_duplicate (visitor.ir_current ());
 
                   CORBA::Contained_ptr tmp =
-                    CORBA::Contained::_narrow (visitor.ir_current ()
-                                              ACE_ENV_ARG_PARAMETER);
+                    CORBA::Contained::_narrow (visitor.ir_current ());
 
                   this->move_queue_.enqueue_tail (tmp);
                 }
@@ -126,8 +124,7 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node)
           else
             {
               // Updates ir_current_.
-              this->get_referenced_type (ft
-                                         ACE_ENV_ARG_PARAMETER);
+              this->get_referenced_type (ft);
             }
 
           // Get the case label(s).
@@ -198,16 +195,14 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node)
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (
-          ACE_ANY_EXCEPTION,
-          ACE_TEXT ("ifr_adding_visitor_union::visit_scope")
-        );
+      ex._tao_print_exception (
+        ACE_TEXT (
+          "ifr_adding_visitor_union::visit_scope"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -215,13 +210,11 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node)
 int
 ifr_adding_visitor_union::visit_structure (AST_Structure *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Is this struct already in the respository?
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
+        be_global->repository ()->lookup_id (node->repoID ());
 
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
@@ -238,8 +231,7 @@ ifr_adding_visitor_union::visit_structure (AST_Structure *node)
                 CORBA::IDLType::_duplicate (visitor.ir_current ());
 
               CORBA::Contained_ptr tmp =
-                CORBA::Contained::_narrow (visitor.ir_current ()
-                                          ACE_ENV_ARG_PARAMETER);
+                CORBA::Contained::_narrow (visitor.ir_current ());
 
               // Since the enclosing UnionDef hasn't been created
               // yet, we don't have a scope, so this nested StructDef
@@ -265,20 +257,17 @@ ifr_adding_visitor_union::visit_structure (AST_Structure *node)
             }
 
           this->ir_current_ =
-            CORBA::IDLType::_narrow (prev_def.in ()
-                                    ACE_ENV_ARG_PARAMETER);
+            CORBA::IDLType::_narrow (prev_def.in ());
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (
-          ACE_ANY_EXCEPTION,
-          ACE_TEXT ("ifr_adding_visitor_union::visit_structure")
-        );
+      ex._tao_print_exception (
+        ACE_TEXT (
+          "ifr_adding_visitor_union::visit_structure"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -286,13 +275,11 @@ ifr_adding_visitor_union::visit_structure (AST_Structure *node)
 int
 ifr_adding_visitor_union::visit_enum (AST_Enum *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Is this enum already in the respository?
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
+        be_global->repository ()->lookup_id (node->repoID ());
 
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
@@ -319,12 +306,10 @@ ifr_adding_visitor_union::visit_enum (AST_Enum *node)
                                           node->local_name ()->get_string (),
                                           node->version (),
                                           members
-                                          ACE_ENV_ARG_PARAMETER
                                         );
 
           CORBA::Contained_ptr tmp =
-            CORBA::Contained::_narrow (this->ir_current_.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+            CORBA::Contained::_narrow (this->ir_current_.in ());
 
           // Since the enclosing UnionDef hasn't been created
           // yet, we don't have a scope, so this nested EnumDef
@@ -349,20 +334,17 @@ ifr_adding_visitor_union::visit_enum (AST_Enum *node)
             }
 
           this->ir_current_ =
-            CORBA::IDLType::_narrow (prev_def.in ()
-                                    ACE_ENV_ARG_PARAMETER);
+            CORBA::IDLType::_narrow (prev_def.in ());
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (
-          ACE_ANY_EXCEPTION,
-          ACE_TEXT ("ifr_adding_visitor_union::visit_enum")
-        );
+      ex._tao_print_exception (
+        ACE_TEXT (
+          "ifr_adding_visitor_union::visit_enum"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -370,12 +352,10 @@ ifr_adding_visitor_union::visit_enum (AST_Enum *node)
 int
 ifr_adding_visitor_union::visit_union (AST_Union *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
+        be_global->repository ()->lookup_id (node->repoID ());
 
       if (CORBA::is_nil (prev_def.in ()))
         {
@@ -388,8 +368,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
           if (disc_type->node_type () == AST_Decl::NT_enum)
             {
               CORBA::Contained_var disc_def =
-                be_global->repository ()->lookup_id (disc_type->repoID ()
-                                                     ACE_ENV_ARG_PARAMETER);
+                be_global->repository ()->lookup_id (disc_type->repoID ());
 
               if (CORBA::is_nil (disc_def.in ()))
                 {
@@ -404,8 +383,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
                 }
 
               CORBA::IDLType_var idl_def =
-                CORBA::IDLType::_narrow (disc_def.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+                CORBA::IDLType::_narrow (disc_def.in ());
 
               this->disc_tc_ = idl_def->type ();
             }
@@ -442,7 +420,6 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
                     node->version (),
                     this->ir_current_.in (),
                     this->members_
-                    ACE_ENV_ARG_PARAMETER
                   );
             }
           else
@@ -469,7 +446,6 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
                                    node->version (),
                                    this->ir_current_.in (),
                                    this->members_
-                                   ACE_ENV_ARG_PARAMETER
                                 );
             }
 
@@ -481,8 +457,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
               CORBA::Contained_var traveller;
 
               CORBA::Container_var new_container =
-                CORBA::Container::_narrow (this->ir_current_.in ()
-                                          ACE_ENV_ARG_PARAMETER);
+                CORBA::Container::_narrow (this->ir_current_.in ());
 
               for (size_t i = 0; i < size; ++i)
                 {
@@ -495,8 +470,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
 
                   traveller->move (new_container.in (),
                                    name.in (),
-                                   version.in ()
-                                   ACE_ENV_ARG_PARAMETER);
+                                   version.in ());
                 }
             }
 
@@ -517,20 +491,17 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
             }
 
           this->ir_current_ =
-            CORBA::IDLType::_narrow (prev_def.in ()
-                                    ACE_ENV_ARG_PARAMETER);
+            CORBA::IDLType::_narrow (prev_def.in ());
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (
-          ACE_ANY_EXCEPTION,
-          ACE_TEXT ("ifr_adding_visitor_union::visit_union")
-        );
+      ex._tao_print_exception (
+        ACE_TEXT (
+          "ifr_adding_visitor_union::visit_union"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp
index 82f0e05f653..0a6d92ee0c8 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp
@@ -29,8 +29,7 @@ ifr_removing_visitor::visit_scope (UTL_Scope *node)
 
       AST_Decl *d = 0;
 
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
+      try
         {
           // Continue until each element is visited.
           while (!si.is_done ())
@@ -56,8 +55,7 @@ ifr_removing_visitor::visit_scope (UTL_Scope *node)
                 }
 
               CORBA::Contained_var top_level =
-                be_global->repository ()->lookup_id (d->repoID ()
-                                                     ACE_ENV_ARG_PARAMETER);
+                be_global->repository ()->lookup_id (d->repoID ());
 
               if (!CORBA::is_nil (top_level.in ()))
                 {
@@ -70,16 +68,14 @@ ifr_removing_visitor::visit_scope (UTL_Scope *node)
               si.next ();
             }
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (
-              ACE_ANY_EXCEPTION,
-              ACE_TEXT ("ifr_removing_visitor::visit_scope")
-            );
+          ex._tao_print_exception (
+            ACE_TEXT (
+              "ifr_removing_visitor::visit_scope"));
 
           return -1;
         }
-      ACE_ENDTRY;
     }
 
   return 0;
@@ -88,12 +84,10 @@ ifr_removing_visitor::visit_scope (UTL_Scope *node)
 int
 ifr_removing_visitor::visit_root (AST_Root *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::Container_var new_scope =
-        CORBA::Container::_narrow (be_global->repository ()
-                                  ACE_ENV_ARG_PARAMETER);
+        CORBA::Container::_narrow (be_global->repository ());
 
       if (be_global->ifr_scopes ().push (new_scope.in ()) != 0)
         {
@@ -130,14 +124,12 @@ ifr_removing_visitor::visit_root (AST_Root *node)
           );
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("visit_root"));
+      ex._tao_print_exception (ACE_TEXT ("visit_root"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/IFR_Service/ifr_visitor_macro.h b/TAO/orbsvcs/IFR_Service/ifr_visitor_macro.h
index 0eae91fc49e..46e38822075 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_visitor_macro.h
+++ b/TAO/orbsvcs/IFR_Service/ifr_visitor_macro.h
@@ -18,7 +18,6 @@
                                 TAO_GUARD_FAILURE, \
                                 0), \
                               CORBA::COMPLETED_NO)); \
-  ACE_TRY_CHECK
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp
index 9ee39ab3220..829fe560dd5 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp
@@ -31,16 +31,16 @@ ImR_Activator_Loader::ImR_Activator_Loader (void)
 // is currently written with the assumption that it's running
 // in its own orb.
 int
-ImR_Activator_Loader::init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL)
+ImR_Activator_Loader::init (int argc, ACE_TCHAR *argv[])
 {
-  ACE_TRY
+  try
     {
       int err = this->opts_.init (argc, argv);
       if (err != 0)
         return -1;
 
       // Creates it's own internal orb, which we must run later
-      err = this->service_.init (this->opts_ ACE_ENV_ARG_PARAMETER);
+      err = this->service_.init (this->opts_);
       if (err != 0)
         return -1;
 
@@ -49,11 +49,10 @@ ImR_Activator_Loader::init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL)
       this->runner_.reset (new ImR_Activator_ORB_Runner (*this));
       this->runner_->activate ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -61,8 +60,7 @@ int
 ImR_Activator_Loader::fini (void)
 {
   ACE_ASSERT (this->runner_.get() != 0);
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       int ret = this->service_.fini ();
 
@@ -70,18 +68,16 @@ ImR_Activator_Loader::fini (void)
       this->runner_.reset (0);
       return ret;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       return -1;
     }
-  ACE_ENDTRY;
 }
 
 CORBA::Object_ptr
 ImR_Activator_Loader::create_object (CORBA::ORB_ptr,
                                   int,
-                                  ACE_TCHAR **
-                                  ACE_ENV_ARG_DECL)
+                                  ACE_TCHAR **)
    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN(CORBA::NO_IMPLEMENT (), CORBA::Object::_nil ());
@@ -90,17 +86,15 @@ ImR_Activator_Loader::create_object (CORBA::ORB_ptr,
 int
 ImR_Activator_Loader::run (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       return this->service_.run ();
     }
-  ACE_CATCHALL
+  catch (...)
     {
       ACE_ERROR ((LM_ERROR, "Exception in ImR_Locator_ORB_Runner()\n"));
       return -1;
     }
-  ACE_ENDTRY;
 }
 
 ACE_FACTORY_DEFINE (Activator, ImR_Activator_Loader)
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h
index 2871c38e56b..c41f2c947b3 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h
@@ -23,14 +23,13 @@ class Activator_Export ImR_Activator_Loader : public TAO_Object_Loader
 public:
   ImR_Activator_Loader(void);
 
-  virtual int init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL);
+  virtual int init (int argc, ACE_TCHAR *argv[]);
 
   virtual int fini (void);
 
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
-                                           ACE_TCHAR *argv[]
-                                           ACE_ENV_ARG_DECL)
+                                           ACE_TCHAR *argv[])
      ACE_THROW_SPEC ((CORBA::SystemException));
 
  // Unlike other service objects, we have our own orb.
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp
index 227f94010de..81cf67856de 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp
@@ -68,10 +68,9 @@ Activator_NT_Service::svc (void)
       return -1;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      int status = server.init (opts ACE_ENV_ARG_PARAMETER);
+      int status = server.init (opts);
 
       if (status == -1)
         {
@@ -91,19 +90,18 @@ Activator_NT_Service::svc (void)
         if (status != -1)
             return 0;
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, IMR_ACTIVATOR_DISPLAY_NAME);
+      sysex._tao_print_exception (IMR_ACTIVATOR_DISPLAY_NAME);
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, IMR_ACTIVATOR_DISPLAY_NAME);
+      userex._tao_print_exception (IMR_ACTIVATOR_DISPLAY_NAME);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, IMR_ACTIVATOR_DISPLAY_NAME);
+      ex._tao_print_exception (IMR_ACTIVATOR_DISPLAY_NAME);
     }
-  ACE_ENDTRY;
 
   report_status (SERVICE_STOPPED);
   return -1;
diff --git a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp
index 5f3ed1d6bd5..021fecad545 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp
@@ -26,8 +26,7 @@ ImR_Adapter::init (PortableServer::ServantLocator_ptr servant)
 
 CORBA::Boolean
 ImR_Adapter::unknown_adapter (PortableServer::POA_ptr parent,
-                                        const char *name
-                                        ACE_ENV_ARG_DECL)
+                                        const char *name)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_ASSERT (! CORBA::is_nil(parent));
@@ -37,17 +36,17 @@ ImR_Adapter::unknown_adapter (PortableServer::POA_ptr parent,
 
   const char *exception_message = "Null Message";
 
-  ACE_TRY
+  try
     {
       // Servant Retention Policy
       exception_message = "While PortableServer::POA::create_servant_retention_policy";
       policies[0] =
-        parent->create_servant_retention_policy (PortableServer::NON_RETAIN ACE_ENV_ARG_PARAMETER);
+        parent->create_servant_retention_policy (PortableServer::NON_RETAIN);
 
       // Request Processing Policy
       exception_message = "While PortableServer::POA::create_request_processing_policy";
       policies[1] =
-        parent->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER ACE_ENV_ARG_PARAMETER);
+        parent->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER);
 
       PortableServer::POAManager_var poa_manager =
         parent->the_POAManager ();
@@ -56,8 +55,7 @@ ImR_Adapter::unknown_adapter (PortableServer::POA_ptr parent,
       PortableServer::POA_var child =
         parent->create_POA (name,
                             poa_manager.in (),
-                            policies
-                            ACE_ENV_ARG_PARAMETER);
+                            policies);
 
       exception_message = "While unknown_adapter::policy->destroy";
       for (CORBA::ULong i = 0; i < policies.length (); ++i)
@@ -67,20 +65,19 @@ ImR_Adapter::unknown_adapter (PortableServer::POA_ptr parent,
         }
 
       exception_message = "While child->the_activator";
-      child->the_activator (this ACE_ENV_ARG_PARAMETER);
+      child->the_activator (this);
 
       exception_message = "While unknown_adapter, set_servant_manager";
-      child->set_servant_manager (this->servant_locator_ ACE_ENV_ARG_PARAMETER);
+      child->set_servant_manager (this->servant_locator_);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_ERROR ((LM_ERROR,
                   "IMR_Adapter_Activator::unknown_adapter - %s\n",
                   exception_message));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "System Exception");
+      ex._tao_print_exception ("System Exception");
       return 0;
     }
-  ACE_ENDTRY;
 
   // Finally, now everything is fine
   return 1;
diff --git a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h
index d62d8f3cfcf..eda7d41a054 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h
@@ -46,7 +46,6 @@ public:
   virtual CORBA::Boolean unknown_adapter (
     PortableServer::POA_ptr parent,
     const char *name
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS
   )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.cpp b/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.cpp
index 455c225afb1..d1d4686e993 100644
--- a/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.cpp
@@ -24,7 +24,7 @@ void AsyncStartupWaiter_i::debug (bool dbg)
 }
 
 void AsyncStartupWaiter_i::wait_for_startup (AMH_AsyncStartupWaiterResponseHandler_ptr rh,
-   const char* name ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException))
+   const char* name) ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PendingListPtr plst;
   pending_.find(name, plst);
@@ -64,17 +64,16 @@ AsyncStartupWaiter_i::send_response (ImplementationRepository::AMH_AsyncStartupW
   si->partial_ior = partial_ior;
   si->ior = ior;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      rh.wait_for_startup (si.in () ACE_ENV_ARG_PARAMETER);
+      rh.wait_for_startup (si.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       if (debug_)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "AsyncStartupWaiter_i::send_response ()");
+        ex._tao_print_exception (
+          "AsyncStartupWaiter_i::send_response ()");
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -117,19 +116,18 @@ AsyncStartupWaiter_i::unblock_all (const char* name) {
 
   for (size_t i = 0; i < tmp.size(); ++i)
   {
-    ACE_DECLARE_NEW_CORBA_ENV;
-    ACE_TRY
+    try
       {
         ImplementationRepository::AMH_AsyncStartupWaiterResponseHandler_var& rh = tmp[i];
 
-        rh->wait_for_startup (si.in () ACE_ENV_ARG_PARAMETER);
+        rh->wait_for_startup (si.in ());
       }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
       {
         if (debug_)
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "AsyncStartupWaiter_i::unblock_all ()");
+          ex._tao_print_exception (
+            "AsyncStartupWaiter_i::unblock_all ()");
       }
-    ACE_ENDTRY;
   }
 }
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.h b/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.h
index b4b527e1d40..33c824f5165 100644
--- a/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.h
@@ -48,7 +48,7 @@ public:
 
   void wait_for_startup (
    ImplementationRepository::AMH_AsyncStartupWaiterResponseHandler_ptr rh,
-   const char* name ACE_ENV_ARG_DECL)
+   const char* name)
    ACE_THROW_SPEC ((CORBA::SystemException));
 
   void unblock_one(const char* name, const char* partial_ior, const char* ior, bool queue);
diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
index 655383ff743..f07894ae8b3 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
@@ -33,23 +33,22 @@ ImR_Forwarder::ImR_Forwarder (ImR_Locator_i& imr_impl)
 }
 
 void
-ImR_Forwarder::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+ImR_Forwarder::init (CORBA::ORB_ptr orb)
 {
   ACE_ASSERT (! CORBA::is_nil(orb));
   this->orb_ = orb;
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var tmp =
-        orb->resolve_initial_references ("POACurrent" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("POACurrent");
 
       this->poa_current_var_ =
-        PortableServer::Current::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::Current::_narrow (tmp.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG ((LM_DEBUG, "ImR_Forwarder::init() Exception ignored.\n"));
     }
-  ACE_ENDTRY;
   ACE_ASSERT (!CORBA::is_nil (this->poa_current_var_.in ()));
 }
 
@@ -65,14 +64,13 @@ PortableServer::Servant
 ImR_Forwarder::preinvoke (const PortableServer::ObjectId &,
                           PortableServer::POA_ptr poa,
                           const char *,
-                          PortableServer::ServantLocator::Cookie &
-                          ACE_ENV_ARG_DECL)
+                          PortableServer::ServantLocator::Cookie &)
     ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest))
 {
   ACE_ASSERT (! CORBA::is_nil(poa));
   CORBA::Object_var forward_obj;
 
-  ACE_TRY
+  try
     {
       CORBA::String_var server_name = poa->the_name();
 
@@ -82,7 +80,7 @@ ImR_Forwarder::preinvoke (const PortableServer::ObjectId &,
       // The activator stores a partial ior with each server. We can
       // just tack on the current ObjectKey to get a valid ior for
       // the desired server.
-      CORBA::String_var pior = locator_.activate_server_by_name (server_name.in (), false ACE_ENV_ARG_PARAMETER);
+      CORBA::String_var pior = locator_.activate_server_by_name (server_name.in (), false);
 
       ACE_CString ior = pior.in ();
 
@@ -91,9 +89,11 @@ ImR_Forwarder::preinvoke (const PortableServer::ObjectId &,
       if (ior.find ("corbaloc:") != 0 || ior[ior.length () - 1] != '/')
         {
           ACE_ERROR ((LM_ERROR, "ImR_Forwarder::preinvoke () Invalid corbaloc ior.\n\t<%s>\n", ior.c_str()));
-          ACE_TRY_THROW (CORBA::OBJECT_NOT_EXIST (
-            CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
-            CORBA::COMPLETED_NO));
+          throw CORBA::OBJECT_NOT_EXIST (
+            CORBA::SystemException::_tao_minor_code (
+              TAO_IMPLREPO_MINOR_CODE,
+              0),
+            CORBA::COMPLETED_NO);
         }
 
       CORBA::String_var key_str;
@@ -111,28 +111,33 @@ ImR_Forwarder::preinvoke (const PortableServer::ObjectId &,
         ACE_DEBUG ((LM_DEBUG, "ImR: Forwarding invocation on <%s> to <%s>\n", server_name.in(), ior.c_str()));
 
       forward_obj =
-        this->orb_->string_to_object (ior.c_str () ACE_ENV_ARG_PARAMETER);
+        this->orb_->string_to_object (ior.c_str ());
     }
-  ACE_CATCH (ImplementationRepository::CannotActivate, ex)
+  catch (const ImplementationRepository::CannotActivate& ex)
     {
-      ACE_TRY_THROW (CORBA::TRANSIENT (
-        CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
-        CORBA::COMPLETED_NO));
+      throw CORBA::TRANSIENT (
+        CORBA::SystemException::_tao_minor_code (
+          TAO_IMPLREPO_MINOR_CODE,
+          0),
+        CORBA::COMPLETED_NO);
     }
-  ACE_CATCH (ImplementationRepository::NotFound, ex)
+  catch (const ImplementationRepository::NotFound& ex)
     {
-      ACE_TRY_THROW (CORBA::TRANSIENT (
-        CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
-        CORBA::COMPLETED_NO));
+      throw CORBA::TRANSIENT (
+        CORBA::SystemException::_tao_minor_code (
+          TAO_IMPLREPO_MINOR_CODE,
+          0),
+        CORBA::COMPLETED_NO);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Forwarder");
-      ACE_TRY_THROW (CORBA::TRANSIENT (
-        CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
-        CORBA::COMPLETED_NO));
+      ex._tao_print_exception ("Forwarder");
+      throw CORBA::TRANSIENT (
+        CORBA::SystemException::_tao_minor_code (
+          TAO_IMPLREPO_MINOR_CODE,
+          0),
+        CORBA::COMPLETED_NO);
     }
-  ACE_ENDTRY;
 
   if (!CORBA::is_nil (forward_obj.in ()))
     ACE_THROW_RETURN (PortableServer::ForwardRequest (forward_obj.in ()), 0);
@@ -149,7 +154,6 @@ ImR_Forwarder::postinvoke (const PortableServer::ObjectId &,
                            const char *,
                            PortableServer::ServantLocator::Cookie,
                            PortableServer::Servant
-                           ACE_ENV_ARG_DECL_NOT_USED
                            ) ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.h b/TAO/orbsvcs/ImplRepo_Service/Forwarder.h
index 31bf107b602..91b009f194e 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.h
@@ -49,7 +49,6 @@ public:
     PortableServer::POA_ptr poa,
     const char * operation,
     PortableServer::ServantLocator::Cookie &cookie
-    ACE_ENV_ARG_DECL
   ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest));
 
   virtual void postinvoke (
@@ -58,10 +57,9 @@ public:
     const char * operation,
     PortableServer::ServantLocator::Cookie the_cookie,
     PortableServer::Servant the_servant
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS
     ) ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void init(CORBA::ORB_ptr orb ACE_ENV_ARG_DECL);
+  void init(CORBA::ORB_ptr orb);
 
 private:
   /// Where we find out where to forward to.
diff --git a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp
index e44399dc3dd..390d7b21b23 100644
--- a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp
@@ -20,11 +20,11 @@ INS_Locator::INS_Locator (ImR_Locator_i& loc)
 }
 
 char *
-INS_Locator::locate (const char* object_key ACE_ENV_ARG_DECL)
+INS_Locator::locate (const char* object_key)
 ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound))
 {
   ACE_ASSERT (object_key != 0);
-  ACE_TRY
+  try
     {
       ACE_CString key (object_key);
       ssize_t poaidx = key.find ('/');
@@ -37,7 +37,7 @@ ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound))
         ACE_DEBUG ((LM_DEBUG, "ImR: Activating server <%s>.\n", key.c_str ()));
 
       CORBA::String_var located =
-        this->imr_locator_.activate_server_by_object (key.c_str () ACE_ENV_ARG_PARAMETER);
+        this->imr_locator_.activate_server_by_object (key.c_str ());
 
       ACE_CString tmp = located.in ();
       tmp += object_key;
@@ -47,17 +47,20 @@ ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound))
 
       return CORBA::string_dup (tmp.c_str ());
     }
-  ACE_CATCH (ImplementationRepository::CannotActivate, ex)
+  catch (const ImplementationRepository::CannotActivate& ex)
     {
-      ACE_TRY_THROW (CORBA::TRANSIENT (
-        CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
-        CORBA::COMPLETED_NO));
+      throw CORBA::TRANSIENT (
+        CORBA::SystemException::_tao_minor_code (
+          TAO_IMPLREPO_MINOR_CODE,
+          0),
+        CORBA::COMPLETED_NO);
     }
-  ACE_CATCH (ImplementationRepository::NotFound, ex)
+  catch (const ImplementationRepository::NotFound& ex)
     {
-      ACE_TRY_THROW (CORBA::TRANSIENT (
-        CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
-        CORBA::COMPLETED_NO));
+      throw CORBA::TRANSIENT (
+        CORBA::SystemException::_tao_minor_code (
+          TAO_IMPLREPO_MINOR_CODE,
+          0),
+        CORBA::COMPLETED_NO);
     }
-  ACE_ENDTRY;
 }
diff --git a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h
index 88fca61b5ba..82a69c31a7b 100644
--- a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h
+++ b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h
@@ -42,7 +42,7 @@ public:
   INS_Locator (ImR_Locator_i& loc);
 
   /// Locate the appropriate IOR.
-  char* locate (const char *object_key ACE_ENV_ARG_DECL)
+  char* locate (const char *object_key)
     ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound));
 
 private:
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
index e25aa35ad96..09effd0c661 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
@@ -25,16 +25,14 @@ ImR_Activator_Shutdown::ImR_Activator_Shutdown (ImR_Activator_i &act)
 void
 ImR_Activator_Shutdown::operator() (int /*which_signal*/)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
-    this->act_.shutdown (true ACE_ENV_ARG_PARAMETER);
+    this->act_.shutdown (true);
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR Activator: ");
+    ex._tao_print_exception ("ImR Activator: ");
   }
-  ACE_ENDTRY;
 }
 
 int
@@ -45,10 +43,9 @@ run_standalone (Activator_Options& opts)
   ImR_Activator_Shutdown killer (server);
   Service_Shutdown kill_contractor (killer);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      int status = server.init (opts ACE_ENV_ARG_PARAMETER);
+      int status = server.init (opts);
 
       if (status == -1)
         {
@@ -67,19 +64,18 @@ run_standalone (Activator_Options& opts)
         }
       return 0;
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      userex._tao_print_exception ("User Exception");
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unknown Exception");
+      ex._tao_print_exception ("Unknown Exception");
     }
-  ACE_ENDTRY;
 
   return 1;
 }
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
index 83508e9afe3..47ba784ff79 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
@@ -28,13 +28,13 @@ ImR_Activator_i::ImR_Activator_i (void)
 }
 
 static PortableServer::POA_ptr
-createPersistentPOA (PortableServer::POA_ptr root_poa, const char* poa_name ACE_ENV_ARG_DECL)
+createPersistentPOA (PortableServer::POA_ptr root_poa, const char* poa_name)
 {
   PortableServer::LifespanPolicy_var life =
-    root_poa->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER);
+    root_poa->create_lifespan_policy (PortableServer::PERSISTENT);
 
   PortableServer::IdAssignmentPolicy_var assign =
-    root_poa->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER);
+    root_poa->create_id_assignment_policy (PortableServer::USER_ID);
 
   CORBA::PolicyList pols;
   pols.length (2);
@@ -43,7 +43,7 @@ createPersistentPOA (PortableServer::POA_ptr root_poa, const char* poa_name ACE_
 
   PortableServer::POAManager_var mgr = root_poa->the_POAManager ();
   PortableServer::POA_var poa =
-    root_poa->create_POA(poa_name, mgr.in (), pols ACE_ENV_ARG_PARAMETER);
+    root_poa->create_POA(poa_name, mgr.in (), pols);
 
   life->destroy ();
   assign->destroy ();
@@ -58,24 +58,24 @@ createPersistentPOA (PortableServer::POA_ptr root_poa, const char* poa_name ACE_
 void
 ImR_Activator_i::register_with_imr (ImplementationRepository::Activator_ptr activator)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       if (this->debug_ > 1)
         ACE_DEBUG( (LM_DEBUG, "ImR Activator: Contacting ImplRepoService...\n"));
 
       // First, resolve the ImR, without this we can go no further
       CORBA::Object_var obj =
-        orb_->resolve_initial_references ("ImplRepoService" ACE_ENV_ARG_PARAMETER);
+        orb_->resolve_initial_references ("ImplRepoService");
 
       this->process_mgr_.open (ACE_Process_Manager::DEFAULT_SIZE,
         this->orb_->orb_core ()->reactor ());
 
-      locator_ = ImplementationRepository::Locator::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+      locator_ = ImplementationRepository::Locator::_narrow (obj.in ());
 
       if (!CORBA::is_nil (locator_.in ()))
         {
           this->registration_token_ =
-            locator_->register_activator (name_.c_str (), activator ACE_ENV_ARG_PARAMETER);
+            locator_->register_activator (name_.c_str (), activator);
 
           if (debug_ > 0)
             ACE_DEBUG((LM_DEBUG, "ImR Activator: Registered with ImR.\n"));
@@ -83,19 +83,19 @@ ImR_Activator_i::register_with_imr (ImplementationRepository::Activator_ptr acti
           return;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       if (debug_ > 1)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR Activator: Can't register with ImR.");
+        ex._tao_print_exception (
+          "ImR Activator: Can't register with ImR.");
     }
-  ACE_ENDTRY;
 
   if (debug_ > 0)
     ACE_DEBUG ((LM_DEBUG, "ImR Activator: Not registered with ImR.\n"));
 }
 
 int
-ImR_Activator_i::init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opts ACE_ENV_ARG_DECL)
+ImR_Activator_i::init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opts)
 {
   ACE_ASSERT(! CORBA::is_nil (orb));
   orb_ = CORBA::ORB::_duplicate (orb);
@@ -106,29 +106,29 @@ ImR_Activator_i::init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opt
       name_ = opts.name();
     }
 
-  ACE_TRY
+  try
     {
-      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA");
       ACE_ASSERT (! CORBA::is_nil (obj.in ()));
-      this->root_poa_ = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+      this->root_poa_ = PortableServer::POA::_narrow (obj.in ());
       ACE_ASSERT (! CORBA::is_nil(this->root_poa_.in ()));
 
       // The activator must use a persistent POA so that it can be started before the
       // locator in some scenarios, such as when the locator persists its database, and
       // wants to reconnect to running activators to auto_start some servers.
       this->imr_poa_ = createPersistentPOA (this->root_poa_.in (),
-        "ImR_Activator" ACE_ENV_ARG_PARAMETER);
+        "ImR_Activator");
       ACE_ASSERT (! CORBA::is_nil(this->imr_poa_.in ()));
 
       // Activate ourself
       PortableServer::ObjectId_var id = PortableServer::string_to_ObjectId ("ImR_Activator");
-      this->imr_poa_->activate_object_with_id (id.in (), this ACE_ENV_ARG_PARAMETER);
-      obj = this->imr_poa_->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER);
+      this->imr_poa_->activate_object_with_id (id.in (), this);
+      obj = this->imr_poa_->id_to_reference (id.in ());
       ImplementationRepository::Activator_var activator =
-        ImplementationRepository::Activator::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+        ImplementationRepository::Activator::_narrow (obj.in ());
       ACE_ASSERT(! CORBA::is_nil (activator.in ()));
 
-      CORBA::String_var ior = this->orb_->object_to_string (activator.in () ACE_ENV_ARG_PARAMETER);
+      CORBA::String_var ior = this->orb_->object_to_string (activator.in ());
 
       if (this->debug_ > 0)
         ACE_DEBUG((LM_DEBUG, "ImR Activator: Starting %s\n", name_.c_str ()));
@@ -171,17 +171,17 @@ ImR_Activator_i::init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opt
           ACE_OS::fclose (fp);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR_Activator_i::init_with_orb");
-      ACE_RE_THROW;
+      ex._tao_print_exception (
+        "ImR_Activator_i::init_with_orb");
+      throw;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 int
-ImR_Activator_i::init (Activator_Options& opts ACE_ENV_ARG_DECL)
+ImR_Activator_i::init (Activator_Options& opts)
 {
   ACE_CString cmdline = opts.cmdline();
   // Must use IOR style objrefs, because URLs sometimes get mangled when passed
@@ -191,9 +191,9 @@ ImR_Activator_i::init (Activator_Options& opts ACE_ENV_ARG_DECL)
   int argc = av.argc ();
 
   CORBA::ORB_var orb =
-    CORBA::ORB_init (argc, av.argv (), "TAO_ImR_Activator" ACE_ENV_ARG_PARAMETER);
+    CORBA::ORB_init (argc, av.argv (), "TAO_ImR_Activator");
 
-  int ret = this->init_with_orb(orb.in (), opts ACE_ENV_ARG_PARAMETER);
+  int ret = this->init_with_orb(orb.in (), opts);
 
   return ret;
 }
@@ -201,54 +201,49 @@ ImR_Activator_i::init (Activator_Options& opts ACE_ENV_ARG_DECL)
 int
 ImR_Activator_i::fini (void)
 {
-  ACE_TRY_EX (try_block_1)
+  try
     {
       if (debug_ > 1)
         ACE_DEBUG ((LM_DEBUG, "ImR Activator: Shutting down...\n"));
 
       this->process_mgr_.close ();
 
-      this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (try_block_1);
+      this->root_poa_->destroy (1, 1);
 
       if (! CORBA::is_nil (this->locator_.in ()) && this->registration_token_ != 0)
         {
           this->locator_->unregister_activator (name_.c_str(),
-            this->registration_token_ ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (try_block_1);
+            this->registration_token_);
         }
     }
-  ACE_CATCH(CORBA::COMM_FAILURE, ex)
+  catch (const CORBA::COMM_FAILURE& ex)
     {
       if (debug_ > 1)
         ACE_DEBUG ((LM_DEBUG, "ImR Activator: Unable to unregister from ImR.\n"));
     }
-  ACE_CATCH(CORBA::TRANSIENT, ex)
+  catch (const CORBA::TRANSIENT& ex)
     {
       if (debug_ > 1)
         ACE_DEBUG ((LM_DEBUG, "ImR Activator: Unable to unregister from ImR.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR Activator: fini");
-    ACE_RE_THROW_EX (try_block_1);
+    ex._tao_print_exception ("ImR Activator: fini");
+    throw;
   }
-  ACE_ENDTRY;
 
-  ACE_TRY_EX (try_block_2)
+  try
     {
       this->orb_->destroy ();
-      ACE_TRY_CHECK_EX (try_block_2);
 
       if (debug_ > 0)
         ACE_DEBUG ((LM_DEBUG, "ImR Activator: Shut down successfully.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR Activator: fini 2");
-      ACE_RE_THROW_EX (try_block_2);
+      ex._tao_print_exception ("ImR Activator: fini 2");
+      throw;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -263,20 +258,20 @@ void
 ImR_Activator_i::shutdown (void)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  shutdown (false ACE_ENV_ARG_PARAMETER);
+  shutdown (false);
 }
 
 void
-ImR_Activator_i::shutdown (bool wait_for_completion ACE_ENV_ARG_DECL)
+ImR_Activator_i::shutdown (bool wait_for_completion)
 {
-  this->orb_->shutdown (wait_for_completion ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (wait_for_completion);
 }
 
 void
 ImR_Activator_i::start_server(const char* name,
                               const char* cmdline,
                               const char* dir,
-                              const ImplementationRepository::EnvironmentList & env ACE_ENV_ARG_DECL)
+                              const ImplementationRepository::EnvironmentList & env)
                               ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::CannotActivate))
 {
   if (debug_ > 1)
@@ -311,7 +306,9 @@ ImR_Activator_i::start_server(const char* name,
       ACE_ERROR ((LM_ERROR,
         "ImR Activator: Cannot start server <%s> using <%s>\n", name, cmdline));
 
-      ACE_THROW(ImplementationRepository::CannotActivate(CORBA::string_dup ("Process Creation Failed")));
+      throw ImplementationRepository::CannotActivate(
+        CORBA::string_dup (
+          "Process Creation Failed"));
       return;
     }
   else
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h
index 2b57f15a802..ad84089c25e 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h
@@ -67,14 +67,14 @@ public:
    const char* name,
    const char* cmdline,
    const char* dir,
-   const ImplementationRepository::EnvironmentList & env ACE_ENV_ARG_DECL)
+   const ImplementationRepository::EnvironmentList & env)
    ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::CannotActivate));
 
   void shutdown(void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Initialize the Server state - parsing arguments and waiting.
-  int init (Activator_Options& opts ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  int init (Activator_Options& opts);
 
   /// Cleans up any state created by init*.
   int fini (void);
@@ -83,11 +83,11 @@ public:
   int run (void);
 
   /// Shutdown the orb.
-  void shutdown (bool wait_for_completion ACE_ENV_ARG_DECL);
+  void shutdown (bool wait_for_completion);
 
 private:
 
-  int init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opts ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  int init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opts);
 
   void register_with_imr(ImplementationRepository::Activator_ptr activator);
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
index 80fd3a450d9..c11ec1201d9 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
@@ -23,16 +23,14 @@ ImR_Locator_Shutdown::ImR_Locator_Shutdown (ImR_Locator_i &imr)
 void
 ImR_Locator_Shutdown::operator () (int /*which_signal*/)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->imr_.shutdown (true ACE_ENV_ARG_PARAMETER);
+      this->imr_.shutdown (true);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR: ");
+      ex._tao_print_exception ("ImR: ");
     }
-  ACE_ENDTRY;
 }
 
 int
@@ -43,10 +41,9 @@ run_standalone (Options& opts)
   ImR_Locator_Shutdown killer (server);
   Service_Shutdown kill_contractor(killer);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      int status = server.init (opts ACE_ENV_ARG_PARAMETER);
+      int status = server.init (opts);
       if (status == -1)
         {
           return 1;
@@ -64,19 +61,18 @@ run_standalone (Options& opts)
         }
       return 0;
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      userex._tao_print_exception ("User Exception");
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unknown Exception");
+      ex._tao_print_exception ("Unknown Exception");
     }
-  ACE_ENDTRY;
 
   return 1;
 }
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
index 5f255e982e9..6514799a146 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
@@ -30,13 +30,13 @@ static const ACE_Time_Value DEFAULT_SERVER_TIMEOUT (0, 10 * 1000); // 10ms
 static const ACE_Time_Value DEFAULT_SHUTDOWN_TIMEOUT (0, 5000 * 1000);
 
 static PortableServer::POA_ptr
-createPersistentPOA (PortableServer::POA_ptr root_poa, const char* poa_name ACE_ENV_ARG_DECL) {
+createPersistentPOA (PortableServer::POA_ptr root_poa, const char* poa_name) {
 
   PortableServer::LifespanPolicy_var life =
-    root_poa->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER);
+    root_poa->create_lifespan_policy (PortableServer::PERSISTENT);
 
   PortableServer::IdAssignmentPolicy_var assign =
-    root_poa->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER);
+    root_poa->create_id_assignment_policy (PortableServer::USER_ID);
 
   CORBA::PolicyList pols;
   pols.length (2);
@@ -45,7 +45,7 @@ createPersistentPOA (PortableServer::POA_ptr root_poa, const char* poa_name ACE_
 
   PortableServer::POAManager_var mgr = root_poa->the_POAManager ();
   PortableServer::POA_var poa =
-    root_poa->create_POA (poa_name, mgr.in (), pols ACE_ENV_ARG_PARAMETER);
+    root_poa->create_POA (poa_name, mgr.in (), pols);
 
   life->destroy ();
   assign->destroy ();
@@ -78,7 +78,7 @@ ImR_Locator_i::~ImR_Locator_i (void)
 }
 
 int
-ImR_Locator_i::init_with_orb (CORBA::ORB_ptr orb, Options& opts ACE_ENV_ARG_DECL)
+ImR_Locator_i::init_with_orb (CORBA::ORB_ptr orb, Options& opts)
 {
   orb_ = CORBA::ORB::_duplicate (orb);
   debug_ = opts.debug ();
@@ -87,45 +87,45 @@ ImR_Locator_i::init_with_orb (CORBA::ORB_ptr orb, Options& opts ACE_ENV_ARG_DECL
   ping_interval_ = opts.ping_interval ();
 
   CORBA::Object_var obj =
-    this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-  this->root_poa_ = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references ("RootPOA");
+  this->root_poa_ = PortableServer::POA::_narrow (obj.in ());
   ACE_ASSERT (! CORBA::is_nil (this->root_poa_.in ()));
 
-  this->forwarder_.init (orb ACE_ENV_ARG_PARAMETER);
+  this->forwarder_.init (orb);
   this->adapter_.init (& this->forwarder_);
 
   // Register the Adapter_Activator reference to be the RootPOA's
   // Adapter Activator.
-  root_poa_->the_activator (&this->adapter_ ACE_ENV_ARG_PARAMETER);
+  root_poa_->the_activator (&this->adapter_);
 
   // Use a persistent POA so that any IOR
   this->imr_poa_ = createPersistentPOA (this->root_poa_.in (),
-                                        "ImplRepo_Service" ACE_ENV_ARG_PARAMETER);
+                                        "ImplRepo_Service");
   ACE_ASSERT (! CORBA::is_nil (this->imr_poa_.in ()));
 
   waiter_svt_.debug (debug_ > 1);
   PortableServer::ObjectId_var id = PortableServer::string_to_ObjectId ("ImR_AsyncStartupWaiter");
-  this->imr_poa_->activate_object_with_id (id.in (), &waiter_svt_ ACE_ENV_ARG_PARAMETER);
-  obj = this->imr_poa_->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER);
+  this->imr_poa_->activate_object_with_id (id.in (), &waiter_svt_);
+  obj = this->imr_poa_->id_to_reference (id.in ());
   if (startup_timeout_ > ACE_Time_Value::zero)
     {
       obj = set_timeout_policy (obj.in (), startup_timeout_);
     }
-  waiter_ = ImplementationRepository::AsyncStartupWaiter::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+  waiter_ = ImplementationRepository::AsyncStartupWaiter::_narrow (obj.in ());
 
   id = PortableServer::string_to_ObjectId ("ImplRepo_Service");
-  this->imr_poa_->activate_object_with_id (id.in (), this ACE_ENV_ARG_PARAMETER);
+  this->imr_poa_->activate_object_with_id (id.in (), this);
 
-  obj = this->imr_poa_->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER);
-  CORBA::String_var ior = this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
+  obj = this->imr_poa_->id_to_reference (id.in ());
+  CORBA::String_var ior = this->orb_->object_to_string (obj.in ());
 
   // Register the ImR for use with INS
-  obj = orb->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
-  IORTable::Table_var ior_table = IORTable::Table::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+  obj = orb->resolve_initial_references ("IORTable");
+  IORTable::Table_var ior_table = IORTable::Table::_narrow (obj.in ());
   ACE_ASSERT (! CORBA::is_nil (ior_table.in ()));
-  ior_table->bind ("ImplRepoService", ior.in () ACE_ENV_ARG_PARAMETER);
-  ior_table->bind ("ImR", ior.in () ACE_ENV_ARG_PARAMETER);
-  ior_table->set_locator (this->ins_locator_.in () ACE_ENV_ARG_PARAMETER);
+  ior_table->bind ("ImplRepoService", ior.in ());
+  ior_table->bind ("ImR", ior.in ());
+  ior_table->set_locator (this->ins_locator_.in ());
 
   // Set up multicast support (if enabled)
   if (opts.multicast ())
@@ -170,7 +170,7 @@ ImR_Locator_i::init_with_orb (CORBA::ORB_ptr orb, Options& opts ACE_ENV_ARG_DECL
 }
 
 int
-ImR_Locator_i::init (Options& opts ACE_ENV_ARG_DECL)
+ImR_Locator_i::init (Options& opts)
 {
   ACE_CString cmdline = opts.cmdline ();
   cmdline += " -orbcollocation no -orbuseimr 0";
@@ -178,8 +178,8 @@ ImR_Locator_i::init (Options& opts ACE_ENV_ARG_DECL)
   int argc = av.argc ();
   char** argv = av.argv ();
 
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "TAO_ImR_Locator" ACE_ENV_ARG_PARAMETER);
-  int err = this->init_with_orb (orb.in (), opts ACE_ENV_ARG_PARAMETER);
+  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "TAO_ImR_Locator");
+  int err = this->init_with_orb (orb.in (), opts);
   return err;
 }
 
@@ -216,7 +216,7 @@ ImR_Locator_i::run (void)
 }
 
 void
-ImR_Locator_i::shutdown (CORBA::Boolean activators, CORBA::Boolean servers ACE_ENV_ARG_DECL)
+ImR_Locator_i::shutdown (CORBA::Boolean activators, CORBA::Boolean servers)
                         ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (servers != 0 && this->repository_.servers ().current_size () > 0)
@@ -242,20 +242,20 @@ ImR_Locator_i::shutdown (CORBA::Boolean activators, CORBA::Boolean servers ACE_E
 
       for (size_t i = 0; i < acts.size (); ++i)
         {
-          ACE_TRY
+          try
             {
               acts[i]->shutdown ();
               acts[i] = ImplementationRepository::Activator::_nil ();
             }
-          ACE_CATCHANY
+          catch (const CORBA::Exception& ex)
             {
               ++shutdown_errs;
               if (debug_ > 1)
                 {
-                  ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR: shutdown activator");
+                  ex._tao_print_exception (
+                    "ImR: shutdown activator");
                 }
             }
-          ACE_ENDTRY;
         }
       if (debug_ > 0 && shutdown_errs > 0)
         {
@@ -264,38 +264,37 @@ ImR_Locator_i::shutdown (CORBA::Boolean activators, CORBA::Boolean servers ACE_E
     }
   // Technically, we should wait for all the activators to unregister, but
   // ,for now at least, it doesn't seem worth it.
-  shutdown (false ACE_ENV_ARG_PARAMETER);
+  shutdown (false);
 }
 
 void
-ImR_Locator_i::shutdown (bool wait_for_completion ACE_ENV_ARG_DECL)
+ImR_Locator_i::shutdown (bool wait_for_completion)
 {
-  this->orb_->shutdown (wait_for_completion ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (wait_for_completion);
 }
 
 int
 ImR_Locator_i::fini (void)
 {
-  ACE_TRY
+  try
     {
       if (debug_ > 1)
         ACE_DEBUG ((LM_DEBUG, "ImR: Shutting down...\n"));
 
       teardown_multicast ();
 
-      this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      this->root_poa_->destroy (1, 1);
 
       this->orb_->destroy ();
 
       if (debug_ > 0)
         ACE_DEBUG ((LM_DEBUG, "ImR: Shut down successfully.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR_Locator_i::fini");
-      ACE_RE_THROW;
+      ex._tao_print_exception ("ImR_Locator_i::fini");
+      throw;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -368,8 +367,7 @@ ImR_Locator_i::setup_multicast (ACE_Reactor* reactor, const char* ior)
 
 CORBA::Long
 ImR_Locator_i::register_activator (const char* aname,
-                                   ImplementationRepository::Activator_ptr activator
-                                   ACE_ENV_ARG_DECL)
+                                   ImplementationRepository::Activator_ptr activator)
                                    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_ASSERT (aname != 0);
@@ -380,7 +378,7 @@ ImR_Locator_i::register_activator (const char* aname,
   this->unregister_activator_i (aname);
 
   CORBA::String_var ior =
-    this->orb_->object_to_string (activator ACE_ENV_ARG_PARAMETER);
+    this->orb_->object_to_string (activator);
 
   CORBA::Long token = ACE_OS::gettimeofday ().msec ();
 
@@ -396,8 +394,7 @@ ImR_Locator_i::register_activator (const char* aname,
 
 void
 ImR_Locator_i::unregister_activator (const char* aname,
-                                     CORBA::Long token
-                                     ACE_ENV_ARG_DECL)
+                                     CORBA::Long token)
                                      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_ASSERT (aname != 0);
@@ -432,7 +429,7 @@ ImR_Locator_i::unregister_activator_i (const char* aname)
 }
 
 void
-ImR_Locator_i::notify_child_death (const char* name ACE_ENV_ARG_DECL_NOT_USED)
+ImR_Locator_i::notify_child_death (const char* name)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_ASSERT (name != 0);
@@ -459,7 +456,7 @@ ACE_THROW_SPEC ((CORBA::SystemException))
 }
 
 void
-ImR_Locator_i::activate_server (const char* server ACE_ENV_ARG_DECL)
+ImR_Locator_i::activate_server (const char* server)
 ACE_THROW_SPEC ((CORBA::SystemException,
                 ImplementationRepository::NotFound,
                 ImplementationRepository::CannotActivate))
@@ -469,11 +466,11 @@ ACE_THROW_SPEC ((CORBA::SystemException,
 
   // This is the version called by tao_imr to activate the server, manually
   // starting it if necessary.
-  activate_server_by_name (server, true ACE_ENV_ARG_PARAMETER);
+  activate_server_by_name (server, true);
 }
 
 char*
-ImR_Locator_i::activate_server_by_name (const char* name, bool manual_start ACE_ENV_ARG_DECL)
+ImR_Locator_i::activate_server_by_name (const char* name, bool manual_start)
 ACE_THROW_SPEC ((CORBA::SystemException,
                 ImplementationRepository::NotFound,
                 ImplementationRepository::CannotActivate))
@@ -489,11 +486,11 @@ ACE_THROW_SPEC ((CORBA::SystemException,
       ACE_THROW_RETURN (ImplementationRepository::NotFound (), 0);
     }
 
-  return activate_server_i (*info, manual_start ACE_ENV_ARG_PARAMETER);
+  return activate_server_i (*info, manual_start);
 }
 
 char*
-ImR_Locator_i::activate_server_by_object (const char* object_name ACE_ENV_ARG_DECL)
+ImR_Locator_i::activate_server_by_object (const char* object_name)
 ACE_THROW_SPEC ((CORBA::SystemException,
                 ImplementationRepository::NotFound,
                 ImplementationRepository::CannotActivate))
@@ -507,18 +504,18 @@ ACE_THROW_SPEC ((CORBA::SystemException,
   if (pos != ACE_CString::npos)
     server_name = server_name.substr (pos + 1);
 
-  return activate_server_by_name (server_name.c_str (), false ACE_ENV_ARG_PARAMETER);
+  return activate_server_by_name (server_name.c_str (), false);
 }
 
 char*
-ImR_Locator_i::activate_server_i (Server_Info& info, bool manual_start ACE_ENV_ARG_DECL)
+ImR_Locator_i::activate_server_i (Server_Info& info, bool manual_start)
 ACE_THROW_SPEC ((CORBA::SystemException,
                 ImplementationRepository::NotFound,
                 ImplementationRepository::CannotActivate))
 {
   if (info.activation_mode == ImplementationRepository::PER_CLIENT)
     {
-      return activate_perclient_server_i (info, manual_start ACE_ENV_ARG_PARAMETER);
+      return activate_perclient_server_i (info, manual_start);
     }
 
   while (true)
@@ -555,13 +552,12 @@ ACE_THROW_SPEC ((CORBA::SystemException,
 
       // Note: We already updated info with StartupInfo in server_is_running ()
       ImplementationRepository::StartupInfo_var si =
-        start_server (info, manual_start, info.waiting_clients
-                      ACE_ENV_ARG_PARAMETER);
+        start_server (info, manual_start, info.waiting_clients);
     }
 }
 
 char*
-ImR_Locator_i::activate_perclient_server_i (Server_Info info, bool manual_start ACE_ENV_ARG_DECL)
+ImR_Locator_i::activate_perclient_server_i (Server_Info info, bool manual_start)
 ACE_THROW_SPEC ((CORBA::SystemException,
                 ImplementationRepository::NotFound,
                 ImplementationRepository::CannotActivate))
@@ -570,8 +566,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
   do
     {
       ImplementationRepository::StartupInfo* psi =
-        start_server (info, manual_start, shared_info->waiting_clients
-                      ACE_ENV_ARG_PARAMETER);
+        start_server (info, manual_start, shared_info->waiting_clients);
 
       if (psi != 0)
         {
@@ -604,7 +599,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
 
 ImplementationRepository::StartupInfo*
 ImR_Locator_i::start_server (Server_Info& info, bool manual_start,
-                             int& waiting_clients ACE_ENV_ARG_DECL)
+                             int& waiting_clients)
 ACE_THROW_SPEC ((CORBA::SystemException,
                 ImplementationRepository::NotFound,
                 ImplementationRepository::CannotActivate))
@@ -636,7 +631,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
                         (CORBA::string_dup ("No activator registered for server.")), 0);
     }
 
-  ACE_TRY
+  try
     {
       ++waiting_clients;
 
@@ -655,8 +650,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
                                           info.name.c_str (),
                                           info.cmdline.c_str (),
                                           info.dir.c_str (),
-                                          info.env_vars
-                                          ACE_ENV_ARG_PARAMETER);
+                                          info.env_vars);
         }
 
       if (info.partial_ior.length () == 0)
@@ -667,7 +661,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
             }
 
           ImplementationRepository::StartupInfo_var si =
-            waiter_->wait_for_startup (info.name.c_str () ACE_ENV_ARG_PARAMETER);
+            waiter_->wait_for_startup (info.name.c_str ());
 
           --waiting_clients;
           info.starting = false;
@@ -684,7 +678,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
           info.starting = false;
         }
     }
-  ACE_CATCH (CORBA::TIMEOUT, ex)
+  catch (const CORBA::TIMEOUT& ex)
     {
       --waiting_clients;
       info.starting = false;
@@ -698,7 +692,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
           info.reset ();
         }
     }
-  ACE_CATCH (ImplementationRepository::CannotActivate, ex)
+  catch (const ImplementationRepository::CannotActivate& ex)
     {
       --waiting_clients;
       info.starting = false;
@@ -706,18 +700,17 @@ ACE_THROW_SPEC ((CORBA::SystemException,
       if (debug_ > 0)
         ACE_DEBUG ((LM_DEBUG, "ImR: Activator cannot start <%s>.\n", info.name.c_str ()));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       --waiting_clients;
       info.starting = false;
       if (debug_ > 0)
         ACE_DEBUG ((LM_DEBUG, "ImR: Unexpected exception while starting <%s>.\n", info.name.c_str ()));
       if (debug_ > 1)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "");
+        ex._tao_print_exception ("");
       ainfo->reset ();
       info.reset ();
     }
-  ACE_ENDTRY;
   return 0; // This is not a corba call, so a zero should be ok
 }
 
@@ -726,7 +719,7 @@ ImR_Locator_i::set_timeout_policy (CORBA::Object_ptr obj, const ACE_Time_Value&
 {
   CORBA::Object_var ret (CORBA::Object::_duplicate (obj));
 
-  ACE_TRY_NEW_ENV
+  try
     {
       TimeBase::TimeT timeout;
       ORBSVCS_Time::Time_Value_to_TimeT (timeout, to);
@@ -735,9 +728,9 @@ ImR_Locator_i::set_timeout_policy (CORBA::Object_ptr obj, const ACE_Time_Value&
 
       CORBA::PolicyList policies (1);
       policies.length (1);
-      policies[0] = orb_->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, tmp ACE_ENV_ARG_PARAMETER);
+      policies[0] = orb_->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, tmp);
 
-      ret = obj->_set_policy_overrides (policies, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER);
+      ret = obj->_set_policy_overrides (policies, CORBA::ADD_OVERRIDE);
 
       policies[0]->destroy ();
 
@@ -750,19 +743,18 @@ ImR_Locator_i::set_timeout_policy (CORBA::Object_ptr obj, const ACE_Time_Value&
           ret = CORBA::Object::_duplicate (obj);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR_Locator_i::set_timeout_policy ()");
+      ex._tao_print_exception (
+        "ImR_Locator_i::set_timeout_policy ()");
     }
-  ACE_ENDTRY;
 
   return ret._retn ();
 }
 
 void
 ImR_Locator_i::add_or_update_server (const char* server,
-                                const ImplementationRepository::StartupOptions &options
-                                ACE_ENV_ARG_DECL)
+                                const ImplementationRepository::StartupOptions &options)
                                 ACE_THROW_SPEC ((CORBA::SystemException,
                                   ImplementationRepository::NotFound))
 {
@@ -771,9 +763,11 @@ ImR_Locator_i::add_or_update_server (const char* server,
   if (this->read_only_)
     {
       ACE_DEBUG ((LM_DEBUG, "ImR: Cannot add/update server <%s> due to locked database.\n", server));
-      ACE_THROW (CORBA::NO_PERMISSION (
-                                       CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
-                                       CORBA::COMPLETED_NO));
+      throw CORBA::NO_PERMISSION (
+        CORBA::SystemException::_tao_minor_code (
+          TAO_IMPLREPO_MINOR_CODE,
+          0),
+        CORBA::COMPLETED_NO);
     }
 
   if (debug_ > 0)
@@ -846,7 +840,7 @@ ImR_Locator_i::add_or_update_server (const char* server,
 }
 
 void
-ImR_Locator_i::remove_server (const char* name ACE_ENV_ARG_DECL)
+ImR_Locator_i::remove_server (const char* name)
 ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
 {
   ACE_ASSERT (name != 0);
@@ -854,9 +848,11 @@ ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
     {
       ACE_ERROR ((LM_ERROR,
                   "ImR: Can't remove server <%s> due to locked database.\n", name));
-      ACE_THROW (CORBA::NO_PERMISSION (
-                                       CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
-                                       CORBA::COMPLETED_NO));
+      throw CORBA::NO_PERMISSION (
+        CORBA::SystemException::_tao_minor_code (
+          TAO_IMPLREPO_MINOR_CODE,
+          0),
+        CORBA::COMPLETED_NO);
     }
 
   // Note : This will be safe, because any Server_Info_Ptr objects will still
@@ -876,7 +872,7 @@ ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
             {
               bool etherealize = true;
               bool wait = false;
-              poa->destroy (etherealize, wait ACE_ENV_ARG_PARAMETER);
+              poa->destroy (etherealize, wait);
             }
           if (this->debug_ > 0)
             ACE_DEBUG ((LM_DEBUG, "ImR: Removed Server <%s>.\n", name));
@@ -886,27 +882,26 @@ ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
     {
       ACE_ERROR ((LM_ERROR,
                   "ImR: Can't remove unknown server <%s>.\n", name));
-      ACE_THROW (ImplementationRepository::NotFound ());
+      throw ImplementationRepository::NotFound ();
     }
 }
 
 PortableServer::POA_ptr
 ImR_Locator_i::findPOA (const char* name)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       bool activate_it = false;
-      return root_poa_->find_POA (name, activate_it ACE_ENV_ARG_PARAMETER);
+      return root_poa_->find_POA (name, activate_it);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {// Ignore
     }
-  ACE_ENDTRY;
   return PortableServer::POA::_nil ();
 }
 
 void
-ImR_Locator_i::shutdown_server (const char* server ACE_ENV_ARG_DECL)
+ImR_Locator_i::shutdown_server (const char* server)
 ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
 {
   ACE_ASSERT (server != 0);
@@ -919,7 +914,7 @@ ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
     {
       ACE_ERROR ((LM_ERROR,
                   "ImR: shutdown_server () Cannot find info for server <%s>\n", server));
-      ACE_THROW (ImplementationRepository::NotFound ());
+      throw ImplementationRepository::NotFound ();
     }
 
   connect_server (*info);
@@ -928,17 +923,17 @@ ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
     {
       ACE_ERROR ((LM_ERROR,
                   "ImR: shutdown_server () Cannot connect to server <%s>\n", server));
-      ACE_THROW (ImplementationRepository::NotFound ());
+      throw ImplementationRepository::NotFound ();
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var obj = set_timeout_policy (info->server.in (), DEFAULT_SHUTDOWN_TIMEOUT);
       ImplementationRepository::ServerObject_var server =
-        ImplementationRepository::ServerObject::_unchecked_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+        ImplementationRepository::ServerObject::_unchecked_narrow (obj.in ());
       server->shutdown ();
     }
-  ACE_CATCH (CORBA::TIMEOUT, ex)
+  catch (const CORBA::TIMEOUT& ex)
     {
       info->reset ();
       int err = this->repository_.update_server (*info);
@@ -950,16 +945,15 @@ ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
         {
           ACE_DEBUG ((LM_DEBUG, "ImR: Timeout while waiting for <%s> shutdown.\n", server));
         }
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       if (this->debug_ > 1)
         {
           ACE_DEBUG ((LM_DEBUG, "ImR: Exception ignored while shutting down <%s>\n", server));
         }
     }
-  ACE_ENDTRY;
 
   // Note : In most cases this has already been done in the server_is_shutting_down ()
   // operation, but it doesn't hurt to update it again.
@@ -973,8 +967,7 @@ ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
 void
 ImR_Locator_i::server_is_running (const char* name,
                                   const char* partial_ior,
-                                  ImplementationRepository::ServerObject_ptr server
-                                  ACE_ENV_ARG_DECL)
+                                  ImplementationRepository::ServerObject_ptr server)
                                   ACE_THROW_SPEC ((CORBA::SystemException,
                                   ImplementationRepository::NotFound))
 {
@@ -985,7 +978,7 @@ ImR_Locator_i::server_is_running (const char* name,
   if (this->debug_ > 0)
     ACE_DEBUG ((LM_DEBUG, "ImR: Server %s is running at %s.\n", name, partial_ior));
 
-  CORBA::String_var ior = orb_->object_to_string (server ACE_ENV_ARG_PARAMETER);
+  CORBA::String_var ior = orb_->object_to_string (server);
 
   if (this->debug_ > 1)
     ACE_DEBUG ((LM_DEBUG, "ImR: Server %s callback at %s.\n", name, ior.in ()));
@@ -1039,7 +1032,7 @@ ImR_Locator_i::server_is_running (const char* name,
 }
 
 void
-ImR_Locator_i::server_is_shutting_down (const char* server ACE_ENV_ARG_DECL_NOT_USED)
+ImR_Locator_i::server_is_shutting_down (const char* server)
 ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
 {
   ACE_ASSERT (server != 0);
@@ -1066,8 +1059,7 @@ ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
 
 void
 ImR_Locator_i::find (const char* server,
-                     ImplementationRepository::ServerInformation_out imr_info
-                     ACE_ENV_ARG_DECL)
+                     ImplementationRepository::ServerInformation_out imr_info)
                      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_ASSERT (server != 0);
@@ -1092,7 +1084,6 @@ void
 ImR_Locator_i::list (CORBA::ULong how_many,
                      ImplementationRepository::ServerInformationList_out server_list,
                      ImplementationRepository::ServerInformationIterator_out server_iterator
-                     ACE_ENV_ARG_DECL
                      ) ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->debug_ > 1)
@@ -1144,19 +1135,18 @@ ImR_Locator_i::list (CORBA::ULong how_many,
 
       PortableServer::ServantBase_var tmp (imr_iter);
 
-      ACE_TRY
+      try
         {
           PortableServer::ObjectId_var id =
-            this->imr_poa_->activate_object (imr_iter ACE_ENV_ARG_PARAMETER);
-          CORBA::Object_var obj = this->imr_poa_->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER);
+            this->imr_poa_->activate_object (imr_iter);
+          CORBA::Object_var obj = this->imr_poa_->id_to_reference (id.in ());
           server_iterator = ImplementationRepository::
-            ServerInformationIterator::_unchecked_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+            ServerInformationIterator::_unchecked_narrow (obj.in ());
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_RE_THROW;
+          throw;
         }
-      ACE_ENDTRY;
     }
 }
 
@@ -1177,11 +1167,10 @@ ImR_Locator_i::connect_activator (Activator_Info& info)
   if (! CORBA::is_nil (info.activator.in ()) || info.ior.length () == 0)
     return;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var obj =
-        this->orb_->string_to_object (info.ior.c_str ()
-                                      ACE_ENV_ARG_PARAMETER);
+        this->orb_->string_to_object (info.ior.c_str ());
 
       if (CORBA::is_nil (obj.in ()))
         {
@@ -1195,7 +1184,7 @@ ImR_Locator_i::connect_activator (Activator_Info& info)
         }
 
       info.activator =
-        ImplementationRepository::Activator::_unchecked_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+        ImplementationRepository::Activator::_unchecked_narrow (obj.in ());
 
       if (CORBA::is_nil (info.activator.in ()))
         {
@@ -1206,11 +1195,10 @@ ImR_Locator_i::connect_activator (Activator_Info& info)
       if (debug_ > 1)
         ACE_DEBUG ((LM_DEBUG, "ImR: Connected to activator <%s>\n", info.name.c_str ()));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       info.reset ();
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -1230,26 +1218,25 @@ ImR_Locator_i::auto_start_servers (void)
       Server_Info_Ptr info = server_entry->int_id_;
       ACE_ASSERT (! info.null ());
 
-      ACE_TRY
+      try
         {
           if (info->activation_mode == ImplementationRepository::AUTO_START
               && info->cmdline.length () > 0)
             {
-              this->activate_server_i (*info, true ACE_ENV_ARG_PARAMETER);
+              this->activate_server_i (*info, true);
             }
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           if (this->debug_ > 1)
             {
               ACE_DEBUG ((LM_DEBUG,
                           "ImR: AUTO_START Could not activate <%s>\n",
                           server_entry->ext_id_.c_str ()));
-              ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "AUTO_START");
+              ex._tao_print_exception ("AUTO_START");
             }
           // Ignore exceptions
         }
-      ACE_ENDTRY;
     }
 }
 
@@ -1267,9 +1254,9 @@ ImR_Locator_i::connect_server (Server_Info& info)
       return; // can't connect
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      CORBA::Object_var obj = orb_->string_to_object (info.ior.c_str () ACE_ENV_ARG_PARAMETER);
+      CORBA::Object_var obj = orb_->string_to_object (info.ior.c_str ());
 
       if (CORBA::is_nil (obj.in ()))
         {
@@ -1280,7 +1267,7 @@ ImR_Locator_i::connect_server (Server_Info& info)
       obj = set_timeout_policy (obj.in (), DEFAULT_SERVER_TIMEOUT);
 
       info.server =
-        ImplementationRepository::ServerObject::_unchecked_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+        ImplementationRepository::ServerObject::_unchecked_narrow (obj.in ());
 
       if (CORBA::is_nil (info.server.in ()))
         {
@@ -1291,11 +1278,10 @@ ImR_Locator_i::connect_server (Server_Info& info)
       if (debug_ > 1)
         ACE_DEBUG ((LM_DEBUG, "ImR: Connected to server <%s>\n", info.name.c_str ()));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       info.reset ();
     }
-  ACE_ENDTRY;
 }
 
 bool
@@ -1348,7 +1334,6 @@ int
 ImR_Locator_i::is_alive_i (Server_Info& info)
 {
   // This is used by the ACE_TRY below when exceptions are turned off.
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   if (info.ior.length () == 0 || info.partial_ior.length () == 0)
     {
@@ -1406,7 +1391,7 @@ ImR_Locator_i::is_alive_i (Server_Info& info)
       return 0;
     }
 
-  ACE_TRY
+  try
     {
       // Make a copy, in case the info is updated during the ping.
       ImplementationRepository::ServerObject_var server = info.server;
@@ -1421,7 +1406,7 @@ ImR_Locator_i::is_alive_i (Server_Info& info)
         }
       info.last_ping = ACE_OS::gettimeofday ();
     }
-  ACE_CATCH (CORBA::TRANSIENT, ex)
+  catch (const CORBA::TRANSIENT& ex)
     {
       const CORBA::ULong BITS_5_THRU_12_MASK = 0x00000f80;
       switch (ex.minor () & BITS_5_THRU_12_MASK)
@@ -1460,7 +1445,7 @@ ImR_Locator_i::is_alive_i (Server_Info& info)
         return 0;
         }
     }
-  ACE_CATCH (CORBA::TIMEOUT, ex)
+  catch (const CORBA::TIMEOUT& ex)
     {
       if (debug_ > 1)
         {
@@ -1472,17 +1457,16 @@ ImR_Locator_i::is_alive_i (Server_Info& info)
       // about the timeout. In any case, we're only guaranteeing that the
       // server is alive, not that it's responsive.
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       if (debug_ > 1)
         {
           ACE_DEBUG ((LM_DEBUG, "ImR: <%s> Unexpected Ping exception. alive=false\n", info.name.c_str ()));
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "\n");
+          ex._tao_print_exception ("\n");
         }
       info.last_ping = ACE_Time_Value::zero;
       return false;
     }
-  ACE_ENDTRY;
   return 1;
 }
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
index 2a19b6deb69..ac1a543ba22 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
@@ -42,10 +42,10 @@ public:
   ~ImR_Locator_i (void);
 
   /// Initialize the service, creating its own orb, poa, etc.
-  int init (Options& opts ACE_ENV_ARG_DECL);
+  int init (Options& opts);
 
   /// Same as above, but use the given orb
-  int init_with_orb (CORBA::ORB_ptr orb, Options& opts ACE_ENV_ARG_DECL);
+  int init_with_orb (CORBA::ORB_ptr orb, Options& opts);
 
   /// Cleans up any state created by init*.
   int fini (void);
@@ -54,7 +54,7 @@ public:
   int run (void);
 
   /// Shutdown the orb.
-  void shutdown (bool wait_for_completion ACE_ENV_ARG_DECL);
+  void shutdown (bool wait_for_completion);
 
   int debug() const;
   // Note : See the IDL for descriptions of the operations.
@@ -62,76 +62,72 @@ public:
   // Activator->Locator
 
   virtual CORBA::Long register_activator (const char* name,
-    ImplementationRepository::Activator_ptr admin
-    ACE_ENV_ARG_DECL)
+    ImplementationRepository::Activator_ptr admin)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual void unregister_activator (const char* name,
-    CORBA::Long token ACE_ENV_ARG_DECL)
+    CORBA::Long token)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void notify_child_death (const char* name ACE_ENV_ARG_DECL)
+  virtual void notify_child_death (const char* name)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // tao_imr->Locator
 
-  virtual void activate_server (const char * name
-    ACE_ENV_ARG_DECL)
+  virtual void activate_server (const char * name)
     ACE_THROW_SPEC ((CORBA::SystemException,
     ImplementationRepository::NotFound,
     ImplementationRepository::CannotActivate));
   virtual void add_or_update_server (const char * name,
-    const ImplementationRepository::StartupOptions &options ACE_ENV_ARG_DECL)
+    const ImplementationRepository::StartupOptions &options)
     ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound));
-  virtual void remove_server (const char * name ACE_ENV_ARG_DECL)
+  virtual void remove_server (const char * name)
     ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound));
-  virtual void shutdown_server (const char * name ACE_ENV_ARG_DECL)
+  virtual void shutdown_server (const char * name)
     ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound));
   virtual void find (const char * name,
-    ImplementationRepository::ServerInformation_out info ACE_ENV_ARG_DECL)
+    ImplementationRepository::ServerInformation_out info)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual void list (
     CORBA::ULong how_many,
     ImplementationRepository::ServerInformationList_out server_list,
-    ImplementationRepository::ServerInformationIterator_out server_iterator ACE_ENV_ARG_DECL)
+    ImplementationRepository::ServerInformationIterator_out server_iterator)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void shutdown(CORBA::Boolean activators, CORBA::Boolean servers ACE_ENV_ARG_DECL)
+  virtual void shutdown(CORBA::Boolean activators, CORBA::Boolean servers)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Server->Locator
 
   virtual void server_is_running (const char* name,
     const char* partial_ior,
-    ImplementationRepository::ServerObject_ptr server_object
-    ACE_ENV_ARG_DECL)
+    ImplementationRepository::ServerObject_ptr server_object)
     ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound));
-  virtual void server_is_shutting_down (const char * name ACE_ENV_ARG_DECL)
+  virtual void server_is_shutting_down (const char * name)
     ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound));
 
   // Used by the INS_Locator to start a sever given an object name
-  char* activate_server_by_object (const char* object_name ACE_ENV_ARG_DECL)
+  char* activate_server_by_object (const char* object_name)
     ACE_THROW_SPEC ((CORBA::SystemException,
     ImplementationRepository::NotFound,
     ImplementationRepository::CannotActivate));
 
-  char* activate_server_by_name (const char * name, bool manual_start ACE_ENV_ARG_DECL)
+  char* activate_server_by_name (const char * name, bool manual_start)
     ACE_THROW_SPEC ((CORBA::SystemException,
     ImplementationRepository::NotFound,
     ImplementationRepository::CannotActivate));
 
 private:
 
-  char* activate_server_i (Server_Info& info, bool manual_start ACE_ENV_ARG_DECL)
+  char* activate_server_i (Server_Info& info, bool manual_start)
     ACE_THROW_SPEC ((CORBA::SystemException,
     ImplementationRepository::NotFound,
     ImplementationRepository::CannotActivate));
 
-  char* activate_perclient_server_i (Server_Info info, bool manual_start ACE_ENV_ARG_DECL)
+  char* activate_perclient_server_i (Server_Info info, bool manual_start)
     ACE_THROW_SPEC ((CORBA::SystemException,
     ImplementationRepository::NotFound,
     ImplementationRepository::CannotActivate));
 
   ImplementationRepository::StartupInfo*
-    start_server(Server_Info& info, bool manual_start, int& waiting_clients
-                 ACE_ENV_ARG_DECL)
+    start_server(Server_Info& info, bool manual_start, int& waiting_clients)
     ACE_THROW_SPEC ((CORBA::SystemException,
     ImplementationRepository::NotFound,
     ImplementationRepository::CannotActivate));
diff --git a/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp b/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp
index d2446c1ff0d..b30cb4ab1f3 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp
@@ -22,8 +22,7 @@ ImR_Iterator::ImR_Iterator (CORBA::ULong n, Locator_Repository& repo, PortableSe
 
 CORBA::Boolean
 ImR_Iterator::next_n (CORBA::ULong how_many,
-                      ImplementationRepository::ServerInformationList_out server_list
-                      ACE_ENV_ARG_DECL)
+                      ImplementationRepository::ServerInformationList_out server_list)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_NEW_THROW_EX (server_list,
@@ -84,6 +83,6 @@ void
 ImR_Iterator::destroy (void)
    ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  PortableServer::ObjectId_var oid = poa_->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  poa_->deactivate_object (oid.in() ACE_ENV_ARG_PARAMETER);
+  PortableServer::ObjectId_var oid = poa_->servant_to_id (this);
+  poa_->deactivate_object (oid.in());
 }
diff --git a/TAO/orbsvcs/ImplRepo_Service/Iterator.h b/TAO/orbsvcs/ImplRepo_Service/Iterator.h
index 86fbd81c2e6..eced1e66db8 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Iterator.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Iterator.h
@@ -39,7 +39,6 @@ public:
   virtual CORBA::Boolean next_n (
       CORBA::ULong how_many,
       ImplementationRepository::ServerInformationList_out server_list
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp
index b0fe04b178d..6c8c93e2bda 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp
@@ -28,14 +28,13 @@ ImR_Locator_Loader::ImR_Locator_Loader()
 int
 ImR_Locator_Loader::init (int argc, ACE_TCHAR *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       int err = this->opts_.init (argc, argv);
       if (err != 0)
         return -1;
 
-      err = this->service_.init (this->opts_ ACE_ENV_ARG_PARAMETER);
+      err = this->service_.init (this->opts_);
       if (err != 0)
         return -1;
 
@@ -44,11 +43,10 @@ ImR_Locator_Loader::init (int argc, ACE_TCHAR *argv[])
       this->runner_.reset(new ImR_Locator_ORB_Runner (*this));
       this->runner_->activate ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -56,8 +54,7 @@ int
 ImR_Locator_Loader::fini (void)
 {
   ACE_ASSERT(this->runner_.get () != 0);
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       int ret = this->service_.fini ();
 
@@ -65,18 +62,16 @@ ImR_Locator_Loader::fini (void)
       this->runner_.reset (0);
       return ret;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
     }
-  ACE_ENDTRY;
   return -1;
 }
 
 CORBA::Object_ptr
 ImR_Locator_Loader::create_object (CORBA::ORB_ptr,
                                   int,
-                                  ACE_TCHAR**
-                                  ACE_ENV_ARG_DECL)
+                                  ACE_TCHAR**)
    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT(), CORBA::Object::_nil ());
@@ -85,17 +80,15 @@ ImR_Locator_Loader::create_object (CORBA::ORB_ptr,
 int
 ImR_Locator_Loader::run(void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       return this->service_.run ();
     }
-  ACE_CATCHALL
+  catch (...)
     {
       ACE_ERROR((LM_ERROR, "Exception in ImR_Locator_ORB_Runner ()\n"));
       return -1;
     }
-  ACE_ENDTRY;
 }
 
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h
index ca90c61c6fb..06f7ed93b4b 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h
@@ -28,8 +28,7 @@ public:
 
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
-                                           ACE_TCHAR *argv[]
-                                           ACE_ENV_ARG_DECL)
+                                           ACE_TCHAR *argv[])
      ACE_THROW_SPEC ((CORBA::SystemException));
 
  // Unlike other service objects, we have our own orb.
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp
index 297bbe009b7..59a9f6434c9 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp
@@ -68,10 +68,9 @@ Locator_NT_Service::svc (void)
       return -1;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      int status = server.init (opts ACE_ENV_ARG_PARAMETER);
+      int status = server.init (opts);
 
       if (status == -1)
         {
@@ -91,19 +90,18 @@ Locator_NT_Service::svc (void)
         if (status != -1)
             return 0;
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, IMR_LOCATOR_DISPLAY_NAME);
+      sysex._tao_print_exception (IMR_LOCATOR_DISPLAY_NAME);
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, IMR_LOCATOR_DISPLAY_NAME);
+      userex._tao_print_exception (IMR_LOCATOR_DISPLAY_NAME);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, IMR_LOCATOR_DISPLAY_NAME);
+      ex._tao_print_exception (IMR_LOCATOR_DISPLAY_NAME);
     }
-  ACE_ENDTRY;
 
   report_status (SERVICE_STOPPED);
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
index ea31bdfa0ab..988f9d1d4b6 100644
--- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
@@ -43,11 +43,10 @@ TAO_IMR_i::init (int argc, char **argv)
 
   const char *exception_message = "Null Message";
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Retrieve the ORB.
-      this->orb_ = CORBA::ORB_init (this->argc_, this->argv_, "tao_imr_i" ACE_ENV_ARG_PARAMETER);
+      this->orb_ = CORBA::ORB_init (this->argc_, this->argv_, "tao_imr_i");
 
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
@@ -55,7 +54,7 @@ TAO_IMR_i::init (int argc, char **argv)
 
       // Get the ImplRepo object
       CORBA::Object_var obj =
-        orb_->resolve_initial_references ("ImplRepoService" ACE_ENV_ARG_PARAMETER);
+        orb_->resolve_initial_references ("ImplRepoService");
 
       if (CORBA::is_nil (obj.in ()))
         {
@@ -66,7 +65,7 @@ TAO_IMR_i::init (int argc, char **argv)
       exception_message = "While narrowing ImR";
 
       this->imr_ =
-        ImplementationRepository::Administration::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+        ImplementationRepository::Administration::_narrow (obj.in ());
 
       if (CORBA::is_nil (imr_.in ()))
         {
@@ -76,13 +75,12 @@ TAO_IMR_i::init (int argc, char **argv)
 
       this->op_->set_imr (this->imr_.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_ERROR ((LM_ERROR, "TAO_IMR_i::init - %s\n", exception_message));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception");
+      ex._tao_print_exception ("Exception");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -695,36 +693,34 @@ int
 TAO_IMR_Op_Activate::run (void)
 {
   ACE_ASSERT(! CORBA::is_nil(imr_));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->imr_->activate_server (this->server_name_.c_str () ACE_ENV_ARG_PARAMETER);
+      this->imr_->activate_server (this->server_name_.c_str ());
       ACE_DEBUG ((LM_DEBUG,
         "Successfully Activated server <%s>\n",
         this->server_name_.c_str ()));
     }
-  ACE_CATCH (ImplementationRepository::CannotActivate, ex)
+  catch (const ImplementationRepository::CannotActivate& ex)
     {
       ACE_ERROR ((LM_ERROR, "Cannot activate server <%s>, reason: <%s>\n",
         this->server_name_.c_str (),
         ex.reason.in ()));
       return TAO_IMR_Op::CANNOT_ACTIVATE;
     }
-  ACE_CATCH (ImplementationRepository::NotFound, ex)
+  catch (const ImplementationRepository::NotFound& ex)
     {
       ACE_ERROR ((LM_ERROR, "Could not find server <%s>.\n", this->server_name_.c_str ()));
       return TAO_IMR_Op::NOT_FOUND;
     }
-  ACE_CATCH (PortableServer::ForwardRequest, ex)
+  catch (const PortableServer::ForwardRequest& ex)
     {
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Activating Server");
+      ex._tao_print_exception ("Activating Server");
       return TAO_IMR_Op::UNKNOWN;
     }
-  ACE_ENDTRY;
 
   return TAO_IMR_Op::NORMAL;
 }
@@ -737,38 +733,35 @@ TAO_IMR_Op_Autostart::run (void)
   ImplementationRepository::ServerInformationList_var server_list;
   ImplementationRepository::ServerInformationIterator_var server_iter;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       this->imr_->list (0,
         server_list,
-        server_iter
-        ACE_ENV_ARG_PARAMETER);
+        server_iter);
 
       ACE_ASSERT(CORBA::is_nil (server_iter.in ()));
 
       CORBA::ULong len = server_list->length ();
       for (CORBA::ULong i = 0; i < len; ++i)
         {
-          ACE_TRY_EX (inside)
+          try
             {
-              this->imr_->activate_server (server_list[i].server.in () ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK_EX (inside);
+              this->imr_->activate_server (server_list[i].server.in ());
             }
-          ACE_CATCHANY
+          catch (const CORBA::Exception& ex)
             {
-              ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, server_list[i].server.in ());
+              ex._tao_print_exception (
+                server_list[i].server.in (
+                  ));
               // Ignore exception
             }
-          ACE_ENDTRY;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "autostart");
+      ex._tao_print_exception ("autostart");
       return TAO_IMR_Op::UNKNOWN;
     }
-  ACE_ENDTRY;
 
   return TAO_IMR_Op::NORMAL;
 }
@@ -780,7 +773,7 @@ TAO_IMR_Op_IOR::run (void)
 
   // Create a corbaloc string
   // Todo : Most of this logic duplicates that in the POA.cpp
-  ACE_TRY_NEW_ENV
+  try
     {
       if (CORBA::is_nil (this->imr_)
         || !this->imr_->_stubobj ()
@@ -843,12 +836,11 @@ TAO_IMR_Op_IOR::run (void)
         ACE_OS::fclose (file);
       }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "IOR");
+      ex._tao_print_exception ("IOR");
       return TAO_IMR_Op::UNKNOWN;
     }
-  ACE_ENDTRY;
 
   return TAO_IMR_Op::NORMAL;
 }
@@ -861,8 +853,7 @@ TAO_IMR_Op_List::run (void)
   ImplementationRepository::ServerInformationList_var server_list;
   ImplementationRepository::ServerInformationIterator_var server_iter;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // If there is a server name, list only that server.  Otherwise, look
       // at all of them.
@@ -870,8 +861,7 @@ TAO_IMR_Op_List::run (void)
         {
           this->imr_->list (0,
             server_list.out(),
-            server_iter.out()
-            ACE_ENV_ARG_PARAMETER);
+            server_iter.out());
 
           if (server_list->length() == 0)
           {
@@ -888,24 +878,23 @@ TAO_IMR_Op_List::run (void)
         {
           ImplementationRepository::ServerInformation_var si;
 
-          this->imr_->find (this->server_name_.c_str (), si ACE_ENV_ARG_PARAMETER);
+          this->imr_->find (this->server_name_.c_str (), si);
 
           this->verbose_server_information_ = 1;
 
           this->display_server_information (si.in ());
         }
     }
-  ACE_CATCH (ImplementationRepository::NotFound, ex)
+  catch (const ImplementationRepository::NotFound& ex)
     {
       ACE_ERROR ((LM_ERROR, "Could not find server <%s>.\n", this->server_name_.c_str ()));
       return TAO_IMR_Op::NOT_FOUND;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "List");
+      ex._tao_print_exception ("List");
       return TAO_IMR_Op::UNKNOWN;
     }
-  ACE_ENDTRY;
 
   return TAO_IMR_Op::NORMAL;
 }
@@ -915,31 +904,29 @@ TAO_IMR_Op_Remove::run (void)
 {
   ACE_ASSERT (! CORBA::is_nil(imr_));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->imr_->remove_server (this->server_name_.c_str () ACE_ENV_ARG_PARAMETER);
+      this->imr_->remove_server (this->server_name_.c_str ());
 
       ACE_DEBUG ((LM_DEBUG, "Successfully removed server <%s>\n",
         this->server_name_.c_str ()));
     }
-  ACE_CATCH (ImplementationRepository::NotFound, ex)
+  catch (const ImplementationRepository::NotFound& ex)
     {
       ACE_ERROR ((LM_ERROR, "Could not find server <%s>.\n",
         this->server_name_.c_str ()));
       return TAO_IMR_Op::NOT_FOUND;
     }
-  ACE_CATCH (CORBA::NO_PERMISSION, ex)
+  catch (const CORBA::NO_PERMISSION& ex)
     {
       ACE_ERROR ((LM_ERROR, "No Permission: ImplRepo is in Locked mode\n"));
       return TAO_IMR_Op::NO_PERMISSION;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Removing Server");
+      ex._tao_print_exception ("Removing Server");
       return TAO_IMR_Op::UNKNOWN;
     }
-  ACE_ENDTRY;
 
   return TAO_IMR_Op::NORMAL;
 }
@@ -949,30 +936,28 @@ TAO_IMR_Op_Shutdown::run (void)
 {
   ACE_ASSERT (! CORBA::is_nil(imr_));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->imr_->shutdown_server (this->server_name_.c_str () ACE_ENV_ARG_PARAMETER);
+      this->imr_->shutdown_server (this->server_name_.c_str ());
 
       ACE_DEBUG ((LM_DEBUG, "Successfully shut down server <%s>\n",
         this->server_name_.c_str ()));
     }
-  ACE_CATCH (ImplementationRepository::NotFound, ex)
+  catch (const ImplementationRepository::NotFound& ex)
     {
       ACE_ERROR ((LM_ERROR, "Server <%s> already shut down.\n", this->server_name_.c_str ()));
       return TAO_IMR_Op::NOT_FOUND;
     }
-  ACE_CATCH(CORBA::TIMEOUT, ex)
+  catch (const CORBA::TIMEOUT& ex)
     {
       ACE_DEBUG ((LM_DEBUG, "Timeout waiting for <%s> to shutdown.\n",
         this->server_name_.c_str ()));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Shutting Down Server");
+      ex._tao_print_exception ("Shutting Down Server");
       return TAO_IMR_Op::UNKNOWN;
     }
-  ACE_ENDTRY;
 
   return TAO_IMR_Op::NORMAL;
 }
@@ -982,24 +967,22 @@ TAO_IMR_Op_ShutdownRepo::run (void)
 {
   ACE_ASSERT(! CORBA::is_nil(imr_));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       bool servers = false; // not implemented yet, if ever
-      this->imr_->shutdown (activators_, servers ACE_ENV_ARG_PARAMETER);
+      this->imr_->shutdown (activators_, servers);
 
       ACE_DEBUG ((LM_DEBUG, "ImR shutdown initiated.\n"));
     }
-  ACE_CATCH(CORBA::TIMEOUT, ex)
+  catch (const CORBA::TIMEOUT& ex)
     {
       ACE_DEBUG ((LM_DEBUG, "Timeout waiting for ImR shutdown.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Shutting Down ImR");
+      ex._tao_print_exception ("Shutting Down ImR");
       return TAO_IMR_Op::UNKNOWN;
     }
-  ACE_ENDTRY;
 
   return TAO_IMR_Op::NORMAL;
 }
@@ -1013,11 +996,10 @@ TAO_IMR_Op_Register::run (void)
   ImplementationRepository::StartupOptions  local;
   ImplementationRepository::StartupOptions* options = NULL;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       this->imr_->find(this->server_name_.c_str (),
-        server_information.out() ACE_ENV_ARG_PARAMETER);
+        server_information.out());
 
       if (server_name_ == server_information->server.in())
         {
@@ -1066,21 +1048,20 @@ TAO_IMR_Op_Register::run (void)
             this->server_name_.c_str (), options->activator.in ()));
         }
 
-      this->imr_->add_or_update_server (this->server_name_.c_str (), *options ACE_ENV_ARG_PARAMETER);
+      this->imr_->add_or_update_server (this->server_name_.c_str (), *options);
 
       ACE_DEBUG((LM_DEBUG, "Successfully registered <%s>.\n", this->server_name_.c_str ()));
     }
-  ACE_CATCH (CORBA::NO_PERMISSION, ex)
+  catch (const CORBA::NO_PERMISSION& ex)
     {
       ACE_ERROR ((LM_ERROR, "No Permission: ImplRepo is in Locked mode\n"));
       return TAO_IMR_Op::NO_PERMISSION;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Updating server");
+      ex._tao_print_exception ("Updating server");
       return TAO_IMR_Op::UNKNOWN;
     }
-  ACE_ENDTRY;
 
   return TAO_IMR_Op::NORMAL;
 }
diff --git a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp
index 9e7b2a0c4b1..311a4876080 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp
@@ -38,7 +38,7 @@ Factory_Trader::Factory_Trader (int debug_level)
     support_Attributes_ptr_(0),
     debug_level_ (debug_level)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       int argc = 0;
       // create the trader
@@ -55,12 +55,11 @@ Factory_Trader::Factory_Trader (int debug_level)
       // Add the "Factory" type to the repository
       this->add_type ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "LifeCycle Server: (Factory_Trader::Factory_Trader) Failed adding a new type.\n");
+      ex._tao_print_exception (
+        "LifeCycle Server: (Factory_Trader::Factory_Trader) Failed adding a new type.\n");
     }
-  ACE_ENDTRY;
   // @@ ACE_CHECK?  No way to pass back any exceptions.
 }
 
@@ -73,7 +72,7 @@ Factory_Trader::~Factory_Trader ()
 void
 Factory_Trader::add_type ()
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // define the new type
       CosTradingRepos::ServiceTypeRepository::PropStruct propStruct_name;
@@ -103,15 +102,12 @@ Factory_Trader::add_type ()
       this->repository_.add_type (CORBA::string_dup("GenericFactory"),
                                   GENERIC_FACTORY_INTERFACE_REPOSITORY_ID,
                                   propStructSeq,
-                                  superTypeSeq
-                                  ACE_ENV_ARG_PARAMETER);
+                                  superTypeSeq);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "LifeCycle Server: (Factory_Trader::init).\n");
+      ex._tao_print_exception ("LifeCycle Server: (Factory_Trader::init).\n");
     }
-  ACE_ENDTRY;
   // @@ ACE_CHECK
 }
 
@@ -122,7 +118,7 @@ Factory_Trader::_cxx_export (const char * name,
                              const char * description,
                              const CORBA::Object_ptr object_ptr)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       if (CORBA::is_nil(object_ptr))
         {
@@ -147,17 +143,14 @@ Factory_Trader::_cxx_export (const char * name,
       // invoke the export method on the Register interface of the Trading Service
       register_ptr->_cxx_export (CORBA::Object::_duplicate (object_ptr),
                                  CORBA::string_dup("GenericFactory"),
-                                 propertySeq
-                                 ACE_ENV_ARG_PARAMETER);
+                                 propertySeq);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "LifeCycle Server (Factory_Trader::export): "
-                           "Failed to export factory.\n");
+      ex._tao_print_exception (
+        "LifeCycle Server (Factory_Trader::export): ""Failed to export factory.\n");
     }
-  ACE_ENDTRY;
   // @@ ACE_CHECK*
 }
 
@@ -165,7 +158,7 @@ Factory_Trader::_cxx_export (const char * name,
 CORBA::Object_ptr
 Factory_Trader::query (const char* constraint)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CosTrading::Lookup::SpecifiedProps specifiedProps;
       specifiedProps._d(CosTrading::Lookup::all);
@@ -192,7 +185,7 @@ Factory_Trader::query (const char* constraint)
                          CosTrading::OfferSeq_out(offerSeq_ptr),               // results
                          CosTrading::OfferIterator_out(offerIterator_ptr),     // more results
                          CosTrading::PolicyNameSeq_out(policyNameSeq_ptr)      // Policies
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 
       // Initialize
       CORBA::Object_ptr object_ptr = 0;
@@ -220,11 +213,11 @@ Factory_Trader::query (const char* constraint)
         }
       return object_ptr;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Factory_Trader::query: Failed.\n");
+      ex._tao_print_exception (
+        "Factory_Trader::query: Failed.\n");
     }
-  ACE_ENDTRY;
   // @@ ACE_CHECK_RETURN (?)
   return 0;
 }
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp
index e45842d842d..3466db31bb4 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp
@@ -29,25 +29,23 @@ Life_Cycle_Service_Server::Life_Cycle_Service_Server (void)
 
 Life_Cycle_Service_Server::~Life_Cycle_Service_Server (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Unbind the Factory Finder.
       CosNaming::Name generic_Factory_Name (2);
       generic_Factory_Name.length (2);
       generic_Factory_Name[0].id = CORBA::string_dup ("LifeCycle_Service");
-      this->namingContext_var_->unbind (generic_Factory_Name ACE_ENV_ARG_PARAMETER);
+      this->namingContext_var_->unbind (generic_Factory_Name);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "User Exception");
+      ex._tao_print_exception ("User Exception");
     }
-  ACE_ENDTRY;
 }
 
 int
 Life_Cycle_Service_Server::init (int argc,
-                                 ACE_TCHAR *argv[]
-                                  ACE_ENV_ARG_DECL)
+                                 ACE_TCHAR *argv[])
 {
   int retval = 0;
 
@@ -55,8 +53,7 @@ Life_Cycle_Service_Server::init (int argc,
   ACE_Argv_Type_Converter command(argc, argv);
 
   retval = this->orb_manager_.init (command.get_argc(),
-                                    command.get_ASCII_argv()
-                                    ACE_ENV_ARG_PARAMETER);
+                                    command.get_ASCII_argv());
 
   if (retval == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -79,14 +76,13 @@ Life_Cycle_Service_Server::init (int argc,
 
   // Activate the object.
   CORBA::String_var str  =
-    this->orb_manager_.activate (this->life_Cycle_Service_i_ptr_
-                                 ACE_ENV_ARG_PARAMETER);
+    this->orb_manager_.activate (this->life_Cycle_Service_i_ptr_);
 
   if (this->debug_level_ >= 2)
     ACE_DEBUG ((LM_DEBUG, "LifeCycle_Service: IOR is: <%s>\n", ACE_TEXT_CHAR_TO_TCHAR(str.in ())));
 
   // Register the LifeCycle Service with the Naming Service.
-  ACE_TRY
+  try
     {
       if (this->debug_level_ >= 2)
         ACE_DEBUG ((LM_DEBUG,
@@ -94,15 +90,14 @@ Life_Cycle_Service_Server::init (int argc,
 
       // Get the Naming Service object reference.
       CORBA::Object_var namingObj_var =
-        orb_manager_.orb()->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
+        orb_manager_.orb()->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil (namingObj_var.in ()))
         ACE_ERROR ((LM_ERROR,
                    " LifeCycle_Service: Unable get the Naming Service.\n"));
 
       // Narrow the object reference to a Naming Context.
-      namingContext_var_ = CosNaming::NamingContext::_narrow (namingObj_var.in ()
-                                                              ACE_ENV_ARG_PARAMETER);
+      namingContext_var_ = CosNaming::NamingContext::_narrow (namingObj_var.in ());
 
 
       if (CORBA::is_nil (namingContext_var_.in ()))
@@ -120,18 +115,17 @@ Life_Cycle_Service_Server::init (int argc,
       CORBA::Object_ptr tmp = this->life_Cycle_Service_i_ptr_->_this();
 
       namingContext_var_->bind (life_Cycle_Service_Name,
-                                tmp
-                                ACE_ENV_ARG_PARAMETER);
+                                tmp);
 
       if (this->debug_level_ >= 2)
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT("LifeCycle_Service: Bound the LifeCycle Service to the Naming Context.\n")));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Life_Cycle_Service_Server::init");
+      ex._tao_print_exception (
+        "Life_Cycle_Service_Server::init");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -191,25 +185,22 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv [])
 {
   Life_Cycle_Service_Server life_Cycle_Service_Server;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       int check = life_Cycle_Service_Server.init (argc,
-                                                  argv
-                                                  ACE_ENV_ARG_PARAMETER);
+                                                  argv);
 
       if (check)
         return 1;
       else
         {
           life_Cycle_Service_Server.run ();
-          ACE_TRY_CHECK
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "LifeCycleService::main");
+      ex._tao_print_exception ("LifeCycleService::main");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h
index 0bf9a550b4a..112c0e431b5 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h
@@ -38,8 +38,7 @@ public:
   // Destructor
 
   int init (int argc,
-            ACE_TCHAR *argv[]
-            ACE_ENV_ARG_DECL);
+            ACE_TCHAR *argv[]);
   // Initialize the Server state - parsing arguments and ...
 
   int run (void);
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp
index be7c57ef82f..1e9e4c158ec 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp
@@ -37,8 +37,7 @@ Life_Cycle_Service_i::~Life_Cycle_Service_i (void)
 
 
 CORBA::Boolean
-Life_Cycle_Service_i::supports (const CosLifeCycle::Key &
-                                ACE_ENV_ARG_DECL_NOT_USED)
+Life_Cycle_Service_i::supports (const CosLifeCycle::Key &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
@@ -46,8 +45,7 @@ Life_Cycle_Service_i::supports (const CosLifeCycle::Key &
 
 CORBA::Object_ptr
 Life_Cycle_Service_i::create_object (const CosLifeCycle::Key &factory_key,
-                                     const CosLifeCycle::Criteria &the_criteria
-                                     ACE_ENV_ARG_DECL)
+                                     const CosLifeCycle::Criteria &the_criteria)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosLifeCycle::NoFactory,
                    CosLifeCycle::InvalidCriteria,
@@ -95,19 +93,17 @@ Life_Cycle_Service_i::create_object (const CosLifeCycle::Key &factory_key,
       else
         {
           CosLifeCycle::GenericFactory_var genericFactory_var;
-          ACE_TRY
+          try
             {
               genericFactory_var =
-                CosLifeCycle::GenericFactory::_narrow (genericFactoryObj_ptr
-                                                       ACE_ENV_ARG_PARAMETER);
+                CosLifeCycle::GenericFactory::_narrow (genericFactoryObj_ptr);
             }
-          ACE_CATCHANY
+          catch (const CORBA::Exception& ex)
             {
               // see if there is an exception, if yes then throw the
               // NoFactory exception throw a NoFactory exception
-              ACE_TRY_THROW (CosLifeCycle::NoFactory (factory_key));
+              throw CosLifeCycle::NoFactory (factory_key);
             }
-          ACE_ENDTRY;
 
           if (CORBA::is_nil (genericFactory_var.in()))
             ACE_ERROR_RETURN ((LM_ERROR,
@@ -119,8 +115,7 @@ Life_Cycle_Service_i::create_object (const CosLifeCycle::Key &factory_key,
 
           // Now retrieve the Object obj ref corresponding to the key.
           CORBA::Object_var object_var = genericFactory_var->create_object (factory_key,
-                                                                            the_criteria
-                                                                            ACE_ENV_ARG_PARAMETER);
+                                                                            the_criteria);
 
           if (this->debug_level_ >= 2)
             ACE_DEBUG ((LM_DEBUG,
@@ -148,8 +143,7 @@ void
 Life_Cycle_Service_i::register_factory (const char * name,
                                         const char * location,
                                         const char * description,
-                                        CORBA::Object_ptr object
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+                                        CORBA::Object_ptr object)
   ACE_THROW_SPEC (( CORBA::SystemException))
 {
   if (factory_trader_ptr_ == 0)
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h
index 2997da242a5..327ae2c4b20 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h
@@ -29,15 +29,13 @@ public:
   Life_Cycle_Service_i (int debug_level = 1);
   ~Life_Cycle_Service_i (void);
 
-  CORBA::Boolean supports (const CosLifeCycle::Key &factory_key
-                           ACE_ENV_ARG_DECL)
+  CORBA::Boolean supports (const CosLifeCycle::Key &factory_key)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns true if the Generic Factory is able to forward a request
   // for creating an object described by the <factory_key>.
 
   CORBA::Object_ptr create_object (const CosLifeCycle::Key &factory_key,
-                                   const CosLifeCycle::Criteria &the_criteria
-                                   ACE_ENV_ARG_DECL)
+                                   const CosLifeCycle::Criteria &the_criteria)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosLifeCycle::NoFactory,
                        CosLifeCycle::InvalidCriteria,
@@ -49,8 +47,7 @@ public:
   void register_factory (const char * name,
                          const char * location,
                          const char * description,
-                         CORBA::Object_ptr object
-                         ACE_ENV_ARG_DECL)
+                         CORBA::Object_ptr object)
       ACE_THROW_SPEC (( CORBA::SystemException));
 
   // Registers a factory with specified properties
diff --git a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp
index f522c570e45..820cd1ff934 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp
+++ b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp
@@ -40,8 +40,7 @@ usage (const ACE_TCHAR * cmd)
 void
 parse_args (int argc,
             ACE_TCHAR *argv[],
-            int & default_strategy
-            ACE_ENV_ARG_DECL)
+            int & default_strategy)
 {
   ACE_Get_Opt get_opts (argc, argv, ACE_TEXT ("o:s:h"));
 
@@ -77,7 +76,7 @@ parse_args (int argc,
 
         default:
           ::usage (argv[0]);
-          ACE_THROW (CORBA::BAD_PARAM ());
+          throw CORBA::BAD_PARAM ();
         }
     }
 }
@@ -97,19 +96,17 @@ TAO_LB_run_load_manager (void * orb_arg)
   //    delivered to this thread on Linux.
   ACE_Sig_Guard signal_guard;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       orb->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            "TAO Load Manager");
 
       return reinterpret_cast<void *> (-1);
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -118,23 +115,19 @@ TAO_LB_run_load_manager (void * orb_arg)
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // The usual server side boilerplate code.
 
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            ""
-                                            ACE_ENV_ARG_PARAMETER);
+                                            "");
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -150,8 +143,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       // Check the non-ORB arguments.
       ::parse_args (argc,
                     argv,
-                    default_strategy
-                    ACE_ENV_ARG_PARAMETER);
+                    default_strategy);
 
       TAO_LB_LoadManager * lm = 0;
       ACE_NEW_THROW_EX (lm,
@@ -167,8 +159,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       // Initalize the LoadManager servant.
       lm->init (orb->orb_core ()->reactor (),
                 orb.in (),
-                root_poa.in ()
-                ACE_ENV_ARG_PARAMETER);
+                root_poa.in ());
 
       PortableGroup::Properties props (1);
       props.length (1);
@@ -198,26 +189,22 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       props[0].val <<= strategy_info;
 
-      lm->set_default_properties (props
-                                  ACE_ENV_ARG_PARAMETER);
+      lm->set_default_properties (props);
 
       CosLoadBalancing::LoadManager_var load_manager =
         lm->_this ();
 
       CORBA::String_var str =
-        orb->object_to_string (load_manager.in ()
-                               ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (load_manager.in ());
 
       // to support corbaloc
       // Get a reference to the IOR table.
-      CORBA::Object_var tobj = orb->resolve_initial_references ("IORTable"
-                                                               ACE_ENV_ARG_PARAMETER);
+      CORBA::Object_var tobj = orb->resolve_initial_references ("IORTable");
 
-      IORTable::Table_var table = IORTable::Table::_narrow (tobj.in ()
-                                                            ACE_ENV_ARG_PARAMETER);
+      IORTable::Table_var table = IORTable::Table::_narrow (tobj.in ());
 
       // bind your stringified IOR in the IOR table
-      table->bind ("LoadManager", str.in () ACE_ENV_ARG_PARAMETER);
+      table->bind ("LoadManager", str.in ());
 
       FILE * lm_ior = ACE_OS::fopen (lm_ior_file, "w");
       ACE_OS::fprintf (lm_ior, "%s", str.in ());
@@ -275,18 +262,17 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       orb->destroy ();
     }
-//   ACE_CATCH (PortableGroup::InvalidProperty, ex)
+//   catch (const PortableGroup::InvalidProperty& ex)
 //     {
 //       ACE_DEBUG ((LM_DEBUG, "Property ----> %s\n", ex.nam[0].id.in ()));
 //     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            "TAO Load Manager");
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp
index b309f43b49d..a23edc1bbfc 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp
+++ b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp
@@ -48,8 +48,7 @@ usage (const ACE_TCHAR * cmd)
 
 void
 parse_args (int argc,
-            ACE_TCHAR *argv[]
-            ACE_ENV_ARG_DECL)
+            ACE_TCHAR *argv[])
 {
   ACE_Get_Opt get_opts (argc, argv, ACE_TEXT ("l:k:t:s:i:m:h"));
 
@@ -89,7 +88,7 @@ parse_args (int argc,
                            ACE_TEXT ("ERROR: Invalid push interval: %s\n"),
                            s));
 
-              ACE_THROW (CORBA::BAD_PARAM ());
+              throw CORBA::BAD_PARAM ();
             }
           break;
 
@@ -100,7 +99,7 @@ parse_args (int argc,
 
         default:
           ::usage (argv[0]);
-          ACE_THROW (CORBA::BAD_PARAM ());
+          throw CORBA::BAD_PARAM ();
         }
     }
 }
@@ -120,19 +119,17 @@ TAO_LB_run_load_monitor (void * orb_arg)
   //    delivered to this thread on Linux.
   ACE_Sig_Guard signal_guard;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       orb->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            "TAO Load Monitor");
 
       return reinterpret_cast<void *> (-1);
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -141,17 +138,14 @@ TAO_LB_run_load_monitor (void * orb_arg)
 
 CosLoadBalancing::LoadMonitor_ptr
 get_load_monitor (CORBA::ORB_ptr orb,
-                  PortableServer::POA_ptr root_poa
-                  ACE_ENV_ARG_DECL)
+                  PortableServer::POA_ptr root_poa)
 {
   if (::custom_monitor_ior != 0)
     {
       CORBA::Object_var obj =
-        orb->string_to_object (::custom_monitor_ior
-                               ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object (::custom_monitor_ior);
 
-      return CosLoadBalancing::LoadMonitor::_narrow (obj.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+      return CosLoadBalancing::LoadMonitor::_narrow (obj.in ());
     }
   else
     {
@@ -205,8 +199,7 @@ register_load_monitor (CosLoadBalancing::LoadManager_ptr manager,
                        CosLoadBalancing::LoadMonitor_ptr monitor,
                        TAO_LB_Push_Handler * handler,
                        ACE_Reactor * reactor,
-                       long & timer_id
-                       ACE_ENV_ARG_DECL)
+                       long & timer_id)
 {
   if (ACE_OS::strcasecmp (::mstyle, "PULL") == 0)
     {
@@ -214,8 +207,7 @@ register_load_monitor (CosLoadBalancing::LoadManager_ptr manager,
         monitor->the_location ();
 
       manager->register_load_monitor (location.in (),
-                                      monitor
-                                      ACE_ENV_ARG_PARAMETER);
+                                      monitor);
     }
   else if (ACE_OS::strcasecmp (::mstyle, "PUSH") == 0)
     {
@@ -232,7 +224,7 @@ register_load_monitor (CosLoadBalancing::LoadManager_ptr manager,
                       ACE_TEXT ("ERROR: Unable to schedule timer for ")
                       ACE_TEXT ("\"PUSH\" style load monitoring.\n")));
 
-          ACE_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
     }
   else
@@ -242,52 +234,44 @@ register_load_monitor (CosLoadBalancing::LoadManager_ptr manager,
                   ACE_TEXT ("style: <%s>.\n"),
                   ::mstyle));
 
-      ACE_THROW (CORBA::BAD_PARAM ());
+      throw CORBA::BAD_PARAM ();
     }
 }
 
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // The usual server side boilerplate code.
 
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            ""
-                                            ACE_ENV_ARG_PARAMETER);
+                                            "");
 
       // Check the non-ORB arguments.
       ::parse_args (argc,
-                    argv
-                    ACE_ENV_ARG_PARAMETER);
+                    argv);
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in ());
 
       CosLoadBalancing::LoadMonitor_var load_monitor =
         ::get_load_monitor (orb.in (),
-                            root_poa.in ()
-                            ACE_ENV_ARG_PARAMETER);
+                            root_poa.in ());
 
       PortableGroup::Location_var location =
         load_monitor->the_location ();
 
       // The "LoadManager" reference should have already been
       // registered with the ORB by its ORBInitializer.
-      obj = orb->resolve_initial_references ("LoadManager"
-                                             ACE_ENV_ARG_PARAMETER);
+      obj = orb->resolve_initial_references ("LoadManager");
 
       CosLoadBalancing::LoadManager_var load_manager =
-        CosLoadBalancing::LoadManager::_narrow (obj.in ()
-                                                ACE_ENV_ARG_PARAMETER);
+        CosLoadBalancing::LoadManager::_narrow (obj.in ());
 
       // This "push" handler will only be used if the load monitor
       // style is "PUSH".
@@ -303,8 +287,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                                load_monitor.in (),
                                &push_handler,
                                reactor,
-                               timer_id
-                               ACE_ENV_ARG_PARAMETER);
+                               timer_id);
 
       CosLoadBalancing::LoadManager_ptr tmp;;
 
@@ -345,8 +328,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       // load monitoring case.
       if (timer_id == -1)
         {
-          load_manager->remove_load_monitor (location.in ()
-                                             ACE_ENV_ARG_PARAMETER);
+          load_manager->remove_load_monitor (location.in ());
         }
 #else
       // Activate/register the signal handler that (attempts) to
@@ -384,14 +366,13 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            "TAO Load Monitor");
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp b/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp
index 64a76141ddd..78dedf29364 100644
--- a/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp
+++ b/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp
@@ -21,20 +21,18 @@ TAO_LB_Monitor_Signal_Handler::TAO_LB_Monitor_Signal_Handler (
 int
 TAO_LB_Monitor_Signal_Handler::perform_cleanup (int signum)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Deregister the LoadMonitor from the LoadManager in the PULL
       // load monitoring case.
       if (!CORBA::is_nil (this->load_manager_.in ()))
         {
-          this->load_manager_->remove_load_monitor (this->location_
-                                                    ACE_ENV_ARG_PARAMETER);
+          this->load_manager_->remove_load_monitor (this->location_);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            "Caught exception");
 
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -43,7 +41,6 @@ TAO_LB_Monitor_Signal_Handler::perform_cleanup (int signum)
                          signum),
                         -1);
     }
-  ACE_ENDTRY;
 
   return this->TAO_LB_Signal_Handler::perform_cleanup (signum);
 }
diff --git a/TAO/orbsvcs/LoadBalancer/Push_Handler.cpp b/TAO/orbsvcs/LoadBalancer/Push_Handler.cpp
index ef5085cccb6..45c866503ef 100644
--- a/TAO/orbsvcs/LoadBalancer/Push_Handler.cpp
+++ b/TAO/orbsvcs/LoadBalancer/Push_Handler.cpp
@@ -23,8 +23,7 @@ TAO_LB_Push_Handler::handle_timeout (
   const ACE_Time_Value & /* current_time */,
   const void * /* arg */)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CosLoadBalancing::LoadList_var loads =
         this->monitor_->loads ();
@@ -37,19 +36,17 @@ TAO_LB_Push_Handler::handle_timeout (
 //                   loads[0].value));
 
       this->manager_->push_loads (this->location_,
-                                  loads.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+                                  loads.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Catch the exception and ignore it.
       //  @@ Yah?
 
       if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+        ACE_PRINT_EXCEPTION (ex,
                              "(%P|%t) Push_Handler::handle_timeout()\n");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp b/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp
index 4b139aef6a1..cd1b29bc34c 100644
--- a/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp
+++ b/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp
@@ -113,24 +113,21 @@ TAO_LB_Signal_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *)
 int
 TAO_LB_Signal_Handler::perform_cleanup (int signum)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Shutdown the POA.
       //
       // Shutting down the POA will cause servants "owned" by the POA
       // to be destroyed.  Servants will then have the opportunity to
       // clean up all resources they are responsible for.
-      this->poa_->destroy (1, 1
-                           ACE_ENV_ARG_PARAMETER);
+      this->poa_->destroy (1, 1);
 
       // Now shutdown the ORB.
-      this->orb_->shutdown (1
-                            ACE_ENV_ARG_PARAMETER);
+      this->orb_->shutdown (1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            "Caught exception");
 
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -138,7 +135,6 @@ TAO_LB_Signal_Handler::perform_cleanup (int signum)
                          signum),
                         -1);
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp
index 61cbc5424ca..5d5f6cf252d 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp
@@ -34,7 +34,6 @@ Logging_Svc_Shutdown::operator() (int which_signal)
                 "Basic_Logging_Service: shutting down on signal %d\n",
                 which_signal));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
   (void) this->svc_.shutdown ();
 }
 
@@ -48,12 +47,11 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   Logging_Svc_Shutdown killer (service);
   Service_Shutdown kill_contractor (killer);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       int rc;
 
-      rc = service.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      rc = service.init (argc, argv);
       if (rc == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Failed to initialize the Telecom Log Service.\n"),
@@ -65,13 +63,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                            "Failed to start the Telecom Log Service.\n"),
                           1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            "Failed to start the Telecom Log Service.\n");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp
index 4da473033d9..c9b50d21f7e 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp
@@ -26,21 +26,17 @@ Basic_Logging_Service::~Basic_Logging_Service (void)
 }
 
 void
-Basic_Logging_Service::init_ORB (int& argc, char *argv []
-                                 ACE_ENV_ARG_DECL)
+Basic_Logging_Service::init_ORB (int& argc, char *argv [])
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                ""
-                                ACE_ENV_ARG_PARAMETER);
+                                "");
 
   CORBA::Object_var poa_object =
-    this->orb_->resolve_initial_references("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references("RootPOA");
 
   this->poa_ =
-    PortableServer::POA::_narrow (poa_object.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (poa_object.in ());
 
   PortableServer::POAManager_var poa_manager =
     this->poa_->the_POAManager ();
@@ -97,11 +93,10 @@ Basic_Logging_Service::parse_args (int argc, char *argv[])
 }
 
 int
-Basic_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
+Basic_Logging_Service::init (int argc, char *argv[])
 {
   // initialize the ORB.
-  this->init_ORB (argc, argv
-                  ACE_ENV_ARG_PARAMETER);
+  this->init_ORB (argc, argv);
 
   if (this->parse_args (argc, argv) == -1)
     return -1;
@@ -109,18 +104,16 @@ Basic_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
   // Activate the basic log factory
   DsLogAdmin::BasicLogFactory_var obj =
     this->basic_log_factory_.activate (this->orb_.in (),
-                                       this->poa_.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+                                       this->poa_.in ());
   ACE_ASSERT (!CORBA::is_nil (obj.in ()));
 
   CORBA::String_var ior =
-    this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
+    this->orb_->object_to_string (obj.in ());
 
   if (true)
     {
       CORBA::Object_var table_object =
-        this->orb_->resolve_initial_references ("IORTable"
-                                                ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("IORTable");
 
       IORTable::Table_var adapter =
         IORTable::Table::_narrow (table_object.in ());
@@ -165,8 +158,7 @@ Basic_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
       name[0].id = CORBA::string_dup (this->service_name_);
 
       this->naming_->rebind (name,
-                             obj.in ()
-                             ACE_ENV_ARG_PARAMETER);
+                             obj.in ());
     }
 
   return 0;
@@ -176,16 +168,14 @@ void
 Basic_Logging_Service::resolve_naming_service (void)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references ("NameService"
-                                            ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references ("NameService");
 
   // Need to check return value for errors.
   if (CORBA::is_nil (naming_obj.in ()))
-    ACE_THROW (CORBA::UNKNOWN ());
+    throw CORBA::UNKNOWN ();
 
   this->naming_ =
-    CosNaming::NamingContext::_narrow (naming_obj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+    CosNaming::NamingContext::_narrow (naming_obj.in ());
 }
 
 int
@@ -208,16 +198,14 @@ Basic_Logging_Service::run (void)
 int
 Basic_Logging_Service::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       this->orb_->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -231,8 +219,7 @@ Basic_Logging_Service::shutdown (void)
       name.length (1);
       name[0].id = CORBA::string_dup (this->service_name_);
 
-      this->naming_->unbind (name
-                             ACE_ENV_ARG_PARAMETER);
+      this->naming_->unbind (name);
     }
 
   // shutdown the ORB.
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h
index e6a6849918c..8bb63d5fa73 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h
@@ -39,7 +39,7 @@ class Basic_Logging_Service
   virtual ~Basic_Logging_Service (void);
   // Destructor.
 
-  int init (int argc, char *argv[] ACE_ENV_ARG_DECL);
+  int init (int argc, char *argv[]);
   // Initializes the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
@@ -52,8 +52,7 @@ class Basic_Logging_Service
   // Returns 0 on success, -1 on error.
 
 protected:
-  void init_ORB (int& argc, char *argv []
-                 ACE_ENV_ARG_DECL);
+  void init_ORB (int& argc, char *argv []);
   // initialize the ORB.
 
   int parse_args (int argc, char *argv []);
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp
index 3a624fa0835..356385b9fc1 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp
@@ -34,7 +34,6 @@ Logging_Svc_Shutdown::operator() (int which_signal)
                 "Event_Logging_Service: shutting down on signal %d\n",
                 which_signal));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
   (void) this->svc_.shutdown ();
 }
 
@@ -50,12 +49,11 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   Logging_Svc_Shutdown killer (service);
   Service_Shutdown kill_contractor (killer);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       int rc;
 
-      rc = service.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      rc = service.init (argc, argv);
       if (rc == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Failed to initialize the Telecom Log Service.\n"),
@@ -67,13 +65,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                            "Failed to start the Telecom Log Service.\n"),
                           1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            "Failed to start the Telecom Log Service.\n");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
index 63fcdcd4460..8cb5f6492a4 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
@@ -27,21 +27,17 @@ Event_Logging_Service::~Event_Logging_Service (void)
 }
 
 void
-Event_Logging_Service::init_ORB (int& argc, char *argv []
-				 ACE_ENV_ARG_DECL)
+Event_Logging_Service::init_ORB (int& argc, char *argv [])
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                ""
-                                ACE_ENV_ARG_PARAMETER);
+                                "");
 
   CORBA::Object_var poa_object =
-    this->orb_->resolve_initial_references("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references("RootPOA");
 
   this->poa_ =
-    PortableServer::POA::_narrow (poa_object.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (poa_object.in ());
 
   PortableServer::POAManager_var poa_manager =
     this->poa_->the_POAManager ();
@@ -98,11 +94,10 @@ Event_Logging_Service::parse_args (int argc, char *argv[])
 }
 
 int
-Event_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
+Event_Logging_Service::init (int argc, char *argv[])
 {
   // initialize the ORB.
-  this->init_ORB (argc, argv
-                  ACE_ENV_ARG_PARAMETER);
+  this->init_ORB (argc, argv);
 
   if (this->parse_args (argc, argv) == -1)
     return -1;
@@ -114,18 +109,16 @@ Event_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
 
   DsEventLogAdmin::EventLogFactory_var obj =
     this->event_log_factory_->activate (this->orb_.in (),
-                                        this->poa_.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+                                        this->poa_.in ());
   ACE_ASSERT (!CORBA::is_nil (obj.in ()));
 
   CORBA::String_var ior =
-    this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
+    this->orb_->object_to_string (obj.in ());
 
   if (true)
     {
       CORBA::Object_var table_object =
-        this->orb_->resolve_initial_references ("IORTable"
-                                                ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("IORTable");
 
       IORTable::Table_var adapter =
         IORTable::Table::_narrow (table_object.in ());
@@ -170,8 +163,7 @@ Event_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
       name[0].id = CORBA::string_dup (this->service_name_);
 
       this->naming_->rebind (name,
-                             obj.in ()
-                             ACE_ENV_ARG_PARAMETER);
+                             obj.in ());
     }
 
   return 0;
@@ -181,16 +173,14 @@ void
 Event_Logging_Service::resolve_naming_service (void)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references ("NameService"
-                                            ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references ("NameService");
 
   // Need to check return value for errors.
   if (CORBA::is_nil (naming_obj.in ()))
-    ACE_THROW (CORBA::UNKNOWN ());
+    throw CORBA::UNKNOWN ();
 
   this->naming_ =
-    CosNaming::NamingContext::_narrow (naming_obj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+    CosNaming::NamingContext::_narrow (naming_obj.in ());
 }
 
 int
@@ -213,16 +203,14 @@ Event_Logging_Service::run (void)
 int
 Event_Logging_Service::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       this->orb_->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -236,8 +224,7 @@ Event_Logging_Service::shutdown (void)
       name.length (1);
       name[0].id = CORBA::string_dup (this->service_name_);
 
-      this->naming_->unbind (name
-                             ACE_ENV_ARG_PARAMETER);
+      this->naming_->unbind (name);
     }
 
   // shutdown the ORB.
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h
index d12d7e1c79c..2104309ecee 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h
@@ -40,7 +40,7 @@ class Event_Logging_Service
   virtual ~Event_Logging_Service (void);
   // Destructor.
 
-  int init (int argc, char *argv[] ACE_ENV_ARG_DECL);
+  int init (int argc, char *argv[]);
   // Initializes the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
@@ -53,8 +53,7 @@ class Event_Logging_Service
   // Returns 0 on success, -1 on error.
 
 protected:
-  void init_ORB (int& argc, char *argv []
-                 ACE_ENV_ARG_DECL);
+  void init_ORB (int& argc, char *argv []);
   // initialize the ORB.
 
   int parse_args (int argc, char *argv []);
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp
index 35cf0317a9b..63f52b56c03 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp
@@ -34,7 +34,6 @@ Logging_Svc_Shutdown::operator() (int which_signal)
                 "Notify_Logging_Service: shutting down on signal %d\n",
                 which_signal));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
   (void) this->svc_.shutdown ();
 }
 
@@ -48,12 +47,11 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   Logging_Svc_Shutdown killer (service);
   Service_Shutdown kill_contractor (killer);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       int rc;
 
-      rc = service.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      rc = service.init (argc, argv);
       if (rc == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Failed to initialize the Telecom Log Service.\n"),
@@ -65,13 +63,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                            "Failed to start the Telecom Log Service.\n"),
                           1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            "Failed to start the Telecom Log Service.\n");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
index 4d8edd64f6a..8b09945cdd7 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
@@ -28,13 +28,11 @@ Notify_Logging_Service::~Notify_Logging_Service (void)
 }
 
 int
-Notify_Logging_Service::init_ORB (int& argc, char *argv []
-                                  ACE_ENV_ARG_DECL)
+Notify_Logging_Service::init_ORB (int& argc, char *argv [])
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                ""
-                                ACE_ENV_ARG_PARAMETER);
+                                "");
 
   this->notify_service_ = ACE_Dynamic_Service<TAO_Notify_Service>::instance (TAO_NOTIFY_DEF_EMO_FACTORY_NAME);
 
@@ -45,8 +43,7 @@ Notify_Logging_Service::init_ORB (int& argc, char *argv []
     }
 
   CORBA::Object_var poa_object =
-    this->orb_->resolve_initial_references("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references("RootPOA");
 
   if (CORBA::is_nil (poa_object.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -54,8 +51,7 @@ Notify_Logging_Service::init_ORB (int& argc, char *argv []
                       -1);
 
   this->poa_ =
-    PortableServer::POA::_narrow (poa_object.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (poa_object.in ());
 
   PortableServer::POAManager_var poa_manager =
     this->poa_->the_POAManager ();
@@ -114,23 +110,20 @@ Notify_Logging_Service::parse_args (int argc, char *argv[])
 }
 
 int
-Notify_Logging_Service::init (int argc, char *argv[]
-                          ACE_ENV_ARG_DECL)
+Notify_Logging_Service::init (int argc, char *argv[])
 {
   // initialize the ORB.
-  if (this->init_ORB (argc, argv
-                      ACE_ENV_ARG_PARAMETER) != 0)
+  if (this->init_ORB (argc, argv) != 0)
     return -1;
 
   if (this->parse_args (argc, argv) == -1)
     return -1;
 
-  this->notify_service_->init_service (this->orb_.in () ACE_ENV_ARG_PARAMETER);
+  this->notify_service_->init_service (this->orb_.in ());
 
   // Activate the factory
   this->notify_factory_ =
-    notify_service_->create (this->poa_.in ()
-                            ACE_ENV_ARG_PARAMETER);
+    notify_service_->create (this->poa_.in ());
 
   ACE_NEW_THROW_EX (this->notify_log_factory_,
                       TAO_NotifyLogFactory_i (this->notify_factory_.in ()),
@@ -138,18 +131,16 @@ Notify_Logging_Service::init (int argc, char *argv[]
 
   DsNotifyLogAdmin::NotifyLogFactory_var obj =
     notify_log_factory_->activate (this->orb_.in (),
-                                   this->poa_.in ()
-                                   ACE_ENV_ARG_PARAMETER);
+                                   this->poa_.in ());
 
 
   CORBA::String_var ior =
-    this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
+    this->orb_->object_to_string (obj.in ());
 
   if (true)
     {
       CORBA::Object_var table_object =
-        this->orb_->resolve_initial_references ("IORTable"
-                                                ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("IORTable");
 
       IORTable::Table_var adapter =
         IORTable::Table::_narrow (table_object.in ());
@@ -194,8 +185,7 @@ Notify_Logging_Service::init (int argc, char *argv[]
       name[0].id = CORBA::string_dup (this->service_name_);
 
       this->naming_->rebind (name,
-                             obj.in ()
-                             ACE_ENV_ARG_PARAMETER);
+                             obj.in ());
     }
 
   return 0;
@@ -205,16 +195,14 @@ void
 Notify_Logging_Service::resolve_naming_service (void)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references ("NameService"
-                                            ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references ("NameService");
 
   // Need to check return value for errors.
   if (CORBA::is_nil (naming_obj.in ()))
-    ACE_THROW (CORBA::UNKNOWN ());
+    throw CORBA::UNKNOWN ();
 
   this->naming_ =
-    CosNaming::NamingContext::_narrow (naming_obj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+    CosNaming::NamingContext::_narrow (naming_obj.in ());
 }
 
 int
@@ -237,16 +225,14 @@ Notify_Logging_Service::run (void)
 int
 Notify_Logging_Service::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       this->orb_->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -260,8 +246,7 @@ Notify_Logging_Service::shutdown (void)
       name.length (1);
       name[0].id = CORBA::string_dup (this->service_name_);
 
-      this->naming_->unbind (name
-                             ACE_ENV_ARG_PARAMETER);
+      this->naming_->unbind (name);
     }
 
   // shutdown the ORB.
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h
index 23a16d3cd7f..64247a620fa 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h
@@ -44,7 +44,7 @@ class Notify_Logging_Service
   virtual ~Notify_Logging_Service (void);
   // Destructor.
 
-  int init (int argc, char *argv[] ACE_ENV_ARG_DECL);
+  int init (int argc, char *argv[]);
   // Initializes the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
@@ -57,8 +57,7 @@ class Notify_Logging_Service
   // Returns 0 on success, -1 on error.
 
 protected:
-  int init_ORB (int& argc, char *argv []
-                ACE_ENV_ARG_DECL);
+  int init_ORB (int& argc, char *argv []);
   // initialize the ORB.
 
   int parse_args (int argc, char *argv[]);
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp
index 9769150c6f6..b6a5154876b 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp
@@ -35,7 +35,6 @@ Logging_Svc_Shutdown::operator() (int which_signal)
                 "RTEvent_Logging_Service: shutting down on signal %d\n",
                 which_signal));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
   (void) this->svc_.shutdown ();
 }
 
@@ -51,12 +50,11 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   Logging_Svc_Shutdown killer (service);
   Service_Shutdown kill_contractor (killer);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       int rc;
 
-      rc = service.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      rc = service.init (argc, argv);
       if (rc == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Failed to initialize the Telecom Log Service.\n"),
@@ -68,13 +66,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                            "Failed to start the Telecom Log Service.\n"),
                           1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            "Failed to start the Telecom Log Service.\n");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
index ef34fdd3359..3166aab62c9 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
@@ -25,21 +25,17 @@ RTEvent_Logging_Service::~RTEvent_Logging_Service (void)
 }
 
 void
-RTEvent_Logging_Service::init_ORB (int& argc, char *argv[]
-                                   ACE_ENV_ARG_DECL)
+RTEvent_Logging_Service::init_ORB (int& argc, char *argv[])
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                ""
-                                ACE_ENV_ARG_PARAMETER);
+                                "");
 
   CORBA::Object_var poa_object =
-    this->orb_->resolve_initial_references("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references("RootPOA");
 
   this->poa_ =
-    PortableServer::POA::_narrow (poa_object.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (poa_object.in ());
 
   PortableServer::POAManager_var poa_manager =
     this->poa_->the_POAManager ();
@@ -97,11 +93,10 @@ RTEvent_Logging_Service::parse_args (int argc, char *argv[])
 }
 
 int
-RTEvent_Logging_Service::init (int argc, char* argv[] ACE_ENV_ARG_DECL)
+RTEvent_Logging_Service::init (int argc, char* argv[])
 {
   // initialize the ORB.
-  this->init_ORB (argc, argv
-                  ACE_ENV_ARG_PARAMETER);
+  this->init_ORB (argc, argv);
 
   if (this->parse_args (argc, argv) == -1)
     return -1;
@@ -112,8 +107,7 @@ RTEvent_Logging_Service::init (int argc, char* argv[] ACE_ENV_ARG_DECL)
                     CORBA::NO_MEMORY ());
 
   if (this->rtevent_log_factory_->init (orb_.in (),
-                                        poa_.in ()
-                                        ACE_ENV_ARG_PARAMETER) != 0)
+                                        poa_.in ()) != 0)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%P|%t) Unable to initialize "
@@ -125,13 +119,12 @@ RTEvent_Logging_Service::init (int argc, char* argv[] ACE_ENV_ARG_DECL)
     this->rtevent_log_factory_->activate ();
 
   CORBA::String_var ior =
-    this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
+    this->orb_->object_to_string (obj.in ());
 
   if (true)
     {
       CORBA::Object_var table_object =
-        this->orb_->resolve_initial_references ("IORTable"
-                                                ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("IORTable");
 
       IORTable::Table_var adapter =
         IORTable::Table::_narrow (table_object.in ());
@@ -175,8 +168,7 @@ RTEvent_Logging_Service::init (int argc, char* argv[] ACE_ENV_ARG_DECL)
       name[0].id = CORBA::string_dup (this->service_name_);
 
       this->naming_->rebind (name,
-                             obj.in ()
-                             ACE_ENV_ARG_PARAMETER);
+                             obj.in ());
     }
 
   return 0;
@@ -186,16 +178,14 @@ void
 RTEvent_Logging_Service::resolve_naming_service (void)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references ("NameService"
-                                            ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references ("NameService");
 
   // Need to check return value for errors.
   if (CORBA::is_nil (naming_obj.in ()))
-    ACE_THROW (CORBA::UNKNOWN ());
+    throw CORBA::UNKNOWN ();
 
   this->naming_ =
-    CosNaming::NamingContext::_narrow (naming_obj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+    CosNaming::NamingContext::_narrow (naming_obj.in ());
 }
 
 int
@@ -218,16 +208,14 @@ RTEvent_Logging_Service::run (void)
 int
 RTEvent_Logging_Service::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       this->orb_->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -241,8 +229,7 @@ RTEvent_Logging_Service::shutdown (void)
       name.length (1);
       name[0].id = CORBA::string_dup (this->service_name_);
 
-      this->naming_->unbind (name
-                             ACE_ENV_ARG_PARAMETER);
+      this->naming_->unbind (name);
     }
 
   // shutdown the ORB.
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h
index 01450ceb8c6..31db988dc4f 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h
@@ -50,8 +50,7 @@ public:
   // Returns 0 on success, -1 on error.
 
 protected:
-  void init_ORB (int& argc, char *argv []
-		 ACE_ENV_ARG_DECL);
+  void init_ORB (int& argc, char *argv []);
   // initializes the ORB.
 
   int parse_args (int argc, char* argv[]);
diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
index b6b7dc75e91..2c1a9364ed6 100644
--- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
@@ -64,18 +64,16 @@ TAO_NT_Naming_Service::handle_control (DWORD control_code)
       // When the reactor is stopped it calls ORB::destroy(), which in turn
       // calls ORB::shutdown(1) *and* unbinds the ORB from the ORB table.
 
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
+      try
         {
-          TAO_ORB_Core_instance ()->orb ()->shutdown (1 ACE_ENV_ARG_PARAMETER);
+          TAO_ORB_Core_instance ()->orb ()->shutdown (1);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           // What should we do here? Even the log messages are not
           // showing up, since the thread that runs this is not an ACE
           // thread. It is allways spawned/controlled by Windows ...
         }
-      ACE_ENDTRY;
     }
   else
   {
@@ -167,8 +165,7 @@ TAO_NT_Naming_Service::svc (void)
                            argv_) == -1)
     return -1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Just in case handle_control does not get the chance
       // to execute, or is never called by Windows. This instance's
@@ -180,14 +177,12 @@ TAO_NT_Naming_Service::svc (void)
 
       naming_service.run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG ((LM_INFO, "Exception in service - exitting\n"));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "TAO NT Naming Service");
+      ex._tao_print_exception ("TAO NT Naming Service");
       return -1;
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_INFO, "Exiting gracefully\n"));
   return 0;
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
index 9d450fb754d..0bfcc78a1fc 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
@@ -49,17 +49,15 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                        ACE_TEXT("Failed to start the Naming Service.\n")),
                       1);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       naming_service.run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "NamingService");
+      ex._tao_print_exception ("NamingService");
       return 1;
     }
-  ACE_ENDTRY;
 
   naming_service.fini ();
 
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
index e7a804a592b..cee5062bfff 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
@@ -30,15 +30,14 @@ TAO_Naming_Service::init (int argc,
 {
   int result;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Copy command line parameter.
       ACE_Argv_Type_Converter command_line(argc, argv);
 
       // Initialize the ORB
       this->orb_ =
-        CORBA::ORB_init (command_line.get_argc(), command_line.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (command_line.get_argc(), command_line.get_ASCII_argv(), 0);
 
       // Parse the args for '-t' option. If '-t' option is passed, do
       // the needful and then remove the option from the list of
@@ -54,12 +53,11 @@ TAO_Naming_Service::init (int argc,
       if (result == -1)
         return result;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Naming_Service::init");
+      ex._tao_print_exception ("TAO_Naming_Service::init");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -112,7 +110,7 @@ TAO_Naming_Service::run (void)
   else
     {
       ACE_Time_Value tv (time_);
-      this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
+      this->orb_->run (tv);
     }
 
   return 0;
@@ -121,27 +119,25 @@ TAO_Naming_Service::run (void)
 void
 TAO_Naming_Service::shutdown (void)
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 int
 TAO_Naming_Service::fini (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   this->my_naming_server_.fini();
 
-  ACE_TRY
+  try
   {
     // destroy implies shutdown
     this->orb_->destroy ();
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Naming_Service::fini");
+    ex._tao_print_exception ("TAO_Naming_Service::fini");
     return -1;
   }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
index 01fdda3a5ca..9ad03908c0c 100644
--- a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
+++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
@@ -129,22 +129,19 @@ TAO_NT_Notify_Service::svc (void)
 {
   TAO_Notify_Service_Driver notify_service;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      if (notify_service.init (argc_, argv_ ACE_ENV_ARG_PARAMETER) == -1)
+      if (notify_service.init (argc_, argv_) == -1)
         return -1;
 
       report_status (SERVICE_RUNNING);
       notify_service.run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "TAO NT Notify Service");
+      ex._tao_print_exception ("TAO NT Notify Service");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Server.cpp b/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
index f6c1bf84ba9..37a6e780994 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
+++ b/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
@@ -48,8 +48,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   Notify_Service_Shutdown_Functor killer (notify_service);
   Service_Shutdown kill_contractor (killer);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY_NEW_ENV
+  try
     {
       // Set the properties instance before initializing the notify
       // service.  Using the static singleton can cause static
@@ -58,7 +57,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       TAO_Notify_Properties properties;
       TAO_Notify_Properties::instance (&properties);
 
-      int result = notify_service.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      int result = notify_service.init (argc, argv);
 
        if (result == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -67,13 +66,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       notify_service.run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            ACE_TEXT("Failed to run the Notification Service\n"));
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
index 89daeba2950..b00423c6575 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
@@ -36,20 +36,17 @@ TAO_Notify_Service_Driver::~TAO_Notify_Service_Driver (void)
 }
 
 int
-TAO_Notify_Service_Driver::init_ORB (int& argc, ACE_TCHAR *argv []
-                                     ACE_ENV_ARG_DECL)
+TAO_Notify_Service_Driver::init_ORB (int& argc, ACE_TCHAR *argv [])
 {
   // Copy command line parameter.
   ACE_Argv_Type_Converter command_line(argc, argv);
 
   this->orb_ = CORBA::ORB_init (command_line.get_argc(),
                                 command_line.get_ASCII_argv(),
-                                ""
-                                ACE_ENV_ARG_PARAMETER);
+                                "");
 
   CORBA::Object_var object =
-    this->orb_->resolve_initial_references("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references("RootPOA");
 
   if (CORBA::is_nil (object.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -57,8 +54,7 @@ TAO_Notify_Service_Driver::init_ORB (int& argc, ACE_TCHAR *argv []
                       -1);
 
   this->poa_ =
-    PortableServer::POA::_narrow (object.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (object.in ());
 
   PortableServer::POAManager_var poa_manager =
     this->poa_->the_POAManager ();
@@ -69,30 +65,26 @@ TAO_Notify_Service_Driver::init_ORB (int& argc, ACE_TCHAR *argv []
 }
 
 int
-TAO_Notify_Service_Driver::init_dispatching_ORB (int& argc, ACE_TCHAR *argv []
-                              ACE_ENV_ARG_DECL)
+TAO_Notify_Service_Driver::init_dispatching_ORB (int& argc, ACE_TCHAR *argv [])
 {
   // Copy command line parameter.
   ACE_Argv_Type_Converter command_line(argc, argv);
 
   this->dispatching_orb_ = CORBA::ORB_init (command_line.get_argc(),
                                 command_line.get_ASCII_argv(),
-                                "dispatcher"
-                                ACE_ENV_ARG_PARAMETER);
+                                "dispatcher");
 
   return 0;
 }
 
 int
-TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
-                                 ACE_ENV_ARG_DECL)
+TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[])
 {
   if (this->parse_args(argc, argv) != 0)
     return -1;
 
   // initalize the ORB.
-  if (this->init_ORB (argc, argv
-                      ACE_ENV_ARG_PARAMETER) != 0)
+  if (this->init_ORB (argc, argv) != 0)
     return -1;
 
   this->notify_service_ = ACE_Dynamic_Service<TAO_Notify_Service>::instance (TAO_NOTIFICATION_SERVICE_NAME);
@@ -110,17 +102,16 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
 
   if (this->separate_dispatching_orb_)
     {
-      if (this->init_dispatching_ORB (argc, argv
-                                      ACE_ENV_ARG_PARAMETER) != 0)
+      if (this->init_dispatching_ORB (argc, argv) != 0)
         {
           return -1;
         }
 
-      this->notify_service_->init_service2 (this->orb_.in (), this->dispatching_orb_.in() ACE_ENV_ARG_PARAMETER);
+      this->notify_service_->init_service2 (this->orb_.in (), this->dispatching_orb_.in());
     }
   else
     {
-      this->notify_service_->init_service (this->orb_.in () ACE_ENV_ARG_PARAMETER);
+      this->notify_service_->init_service (this->orb_.in ());
     }
 
   if (this->nthreads_ > 0) // we have chosen to run in a thread pool.
@@ -159,18 +150,17 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
 
   // Activate the factory
   this->notify_factory_ =
-    notify_service_->create (this->poa_.in () ACE_ENV_ARG_PARAMETER);
+    notify_service_->create (this->poa_.in ());
 
   ACE_ASSERT (!CORBA::is_nil (this->notify_factory_.in ()));
 
   if (this->bootstrap_) // Enable corbaloc usage
     {
       CORBA::Object_var table_object =
-        this->orb_->resolve_initial_references ("IORTable"
-                                                ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("IORTable");
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
+        IORTable::Table::_narrow (table_object.in ());
       if (CORBA::is_nil (adapter.in ()))
         {
           ACE_ERROR ((LM_ERROR, "Nil IORTable. corbaloc support not enabled.\n"));
@@ -178,10 +168,8 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
       else
         {
           CORBA::String_var ior =
-            this->orb_->object_to_string (this->notify_factory_.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-          adapter->bind (this->notify_factory_name_.c_str (), ior.in ()
-                         ACE_ENV_ARG_PARAMETER);
+            this->orb_->object_to_string (this->notify_factory_.in ());
+          adapter->bind (this->notify_factory_name_.c_str (), ior.in ());
         }
     }
 
@@ -192,13 +180,11 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
       ACE_ASSERT (!CORBA::is_nil (this->naming_.in ()));
 
       CosNaming::Name_var name =
-        this->naming_->to_name (this->notify_factory_name_.c_str ()
-                                ACE_ENV_ARG_PARAMETER);
+        this->naming_->to_name (this->notify_factory_name_.c_str ());
 
 
       this->naming_->rebind (name.in (),
-                             this->notify_factory_.in ()
-                             ACE_ENV_ARG_PARAMETER);
+                             this->notify_factory_.in ());
 
       ACE_DEBUG ((LM_DEBUG,
                   "Registered with the naming service as: %s\n",
@@ -215,15 +201,12 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
           CosNotifyChannelAdmin::EventChannel_var ec =
             this->notify_factory_->create_channel (initial_qos,
                                                    initial_admin,
-                                                   id
-                                                   ACE_ENV_ARG_PARAMETER);
+                                                   id);
 
-          name = this->naming_->to_name (this->notify_channel_name_.c_str ()
-                                         ACE_ENV_ARG_PARAMETER);
+          name = this->naming_->to_name (this->notify_channel_name_.c_str ());
 
           this->naming_->rebind (name.in (),
-                                 ec.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+                                 ec.in ());
 
           ACE_DEBUG ((LM_DEBUG,
                       "Registered an Event Channel with the naming service as: %s\n",
@@ -235,8 +218,7 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
   // Write IOR to a file, if asked.
   // Note: do this last to ensure that we're up and running before the file is written
   CORBA::String_var str =
-    this->orb_->object_to_string (this->notify_factory_.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+    this->orb_->object_to_string (this->notify_factory_.in ());
 
   if (this->ior_output_file_)
     {
@@ -258,8 +240,7 @@ int
 TAO_Notify_Service_Driver::resolve_naming_service (void)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references ("NameService"
-                                            ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references ("NameService");
 
   // Need to check return value for errors.
   if (CORBA::is_nil (naming_obj.in ()))
@@ -268,7 +249,7 @@ TAO_Notify_Service_Driver::resolve_naming_service (void)
                       -1);
 
   this->naming_ =
-    CosNaming::NamingContextExt::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
+    CosNaming::NamingContextExt::_narrow (naming_obj.in ());
 
   return 0;
 }
@@ -299,11 +280,9 @@ TAO_Notify_Service_Driver::shutdown (void)
     {
       // Unbind from the naming service.
       CosNaming::Name_var name =
-        this->naming_->to_name (this->notify_factory_name_.c_str ()
-                                ACE_ENV_ARG_PARAMETER);
+        this->naming_->to_name (this->notify_factory_name_.c_str ());
 
-      this->naming_->unbind (name.in ()
-                             ACE_ENV_ARG_PARAMETER);
+      this->naming_->unbind (name.in ());
     }
 
   // shutdown the ORB.
@@ -467,15 +446,13 @@ Worker::svc (void)
   ACE_DEBUG ((LM_DEBUG, "Activated Worker Thread to run the ORB @ priority:%d \n", priority));
 #endif
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       this->orb_->run ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.h b/TAO/orbsvcs/Notify_Service/Notify_Service.h
index 615d432c567..1967f1b0a8f 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.h
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.h
@@ -70,8 +70,7 @@ class TAO_Notify_Service_Driver
   virtual ~TAO_Notify_Service_Driver (void);
   // Destructor.
 
-  int init (int argc, ACE_TCHAR *argv[]
-            ACE_ENV_ARG_DECL);
+  int init (int argc, ACE_TCHAR *argv[]);
   // Initializes the Service.
   // Returns 0 on success, -1 on error.
 
@@ -87,11 +86,9 @@ class TAO_Notify_Service_Driver
   // CosNotifyChannelAdmin::EventChannelFactory_var obj;
   //
 protected:
-  int init_ORB (int& argc, ACE_TCHAR *argv []
-                ACE_ENV_ARG_DECL);
+  int init_ORB (int& argc, ACE_TCHAR *argv []);
   // initialize the ORB.
-  int init_dispatching_ORB (int& argc, ACE_TCHAR *argv []
-                ACE_ENV_ARG_DECL);
+  int init_dispatching_ORB (int& argc, ACE_TCHAR *argv []);
   // initialize the dispatching ORB.
 
   TAO_Notify_Service* notify_service_;
diff --git a/TAO/orbsvcs/PSS/PSDL_Code_Gen.cpp b/TAO/orbsvcs/PSS/PSDL_Code_Gen.cpp
index 1ea00ad9f20..f070e65ec31 100644
--- a/TAO/orbsvcs/PSS/PSDL_Code_Gen.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Code_Gen.cpp
@@ -29,15 +29,13 @@ TAO_PSDL_Code_Gen::~TAO_PSDL_Code_Gen (void)
 int
 TAO_PSDL_Code_Gen::set_codec (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   // Obtain a reference to the CodecFactory.
   CORBA::Object_var obj =
-    this->orb_->resolve_initial_references ("CodecFactory"
-                                            ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references ("CodecFactory");
 
   IOP::CodecFactory_var codec_factory =
-    IOP::CodecFactory::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+    IOP::CodecFactory::_narrow (obj.in ());
 
   // Set up a structure that contains information necessary to
   // create a GIOP 1.1 CDR encapsulation Codec.
@@ -48,7 +46,7 @@ TAO_PSDL_Code_Gen::set_codec (void)
 
   // Obtain the CDR encapsulation Codec.
   this->codec_ =
-    codec_factory->create_codec (encoding ACE_ENV_ARG_PARAMETER);
+    codec_factory->create_codec (encoding);
 
   if (this->codec_.in () == 0)
     {
@@ -61,8 +59,7 @@ TAO_PSDL_Code_Gen::set_codec (void)
 
 int
 TAO_PSDL_Code_Gen::set_name_obj_ref (const char *name,
-                                     const char *string_obj_ref
-                                     ACE_ENV_ARG_DECL)
+                                     const char *string_obj_ref)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Invoke the helper encode method which will
@@ -71,8 +68,7 @@ TAO_PSDL_Code_Gen::set_name_obj_ref (const char *name,
   // hash_map to the database.
 
   // Encode the stringified object reference to a CORBA::OctetSeq *
-  CORBA::OctetSeq_var octet_seq = this->encode (string_obj_ref
-                                                ACE_ENV_ARG_PARAMETER);
+  CORBA::OctetSeq_var octet_seq = this->encode (string_obj_ref);
 
   // Insert the new entry to the hash map which contains all the
   // name-octet_seq entries. And, write the hash_map to a file.
@@ -96,8 +92,7 @@ TAO_PSDL_Code_Gen::set_name_obj_ref (const char *name,
 }
 
 const char *
-TAO_PSDL_Code_Gen::get_obj_ref (const char *name
-                                ACE_ENV_ARG_DECL)
+TAO_PSDL_Code_Gen::get_obj_ref (const char *name)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get from the hash_map saved in the database, the corresponding entry
@@ -113,8 +108,7 @@ TAO_PSDL_Code_Gen::get_obj_ref (const char *name
   if (result == 0)
     {
       // Decode the octet_seq.
-      const char *obj_ref = this->decode (octet_seq
-                                          ACE_ENV_ARG_PARAMETER);
+      const char *obj_ref = this->decode (octet_seq);
 
       return CORBA::string_dup (obj_ref);
     }
@@ -129,8 +123,7 @@ TAO_PSDL_Code_Gen::get_obj_ref (const char *name
 
 
 CORBA::OctetSeq *
-TAO_PSDL_Code_Gen::encode (const char *string_obj_ref
-                           ACE_ENV_ARG_DECL)
+TAO_PSDL_Code_Gen::encode (const char *string_obj_ref)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any data;
@@ -138,7 +131,7 @@ TAO_PSDL_Code_Gen::encode (const char *string_obj_ref
 
   CORBA::OctetSeq *encoded_data = 0;
 
-  encoded_data = this->codec_->encode (data ACE_ENV_ARG_PARAMETER);
+  encoded_data = this->codec_->encode (data);
 
   CORBA::OctetSeq_var safe_encoded_data = encoded_data;
 
@@ -146,16 +139,14 @@ TAO_PSDL_Code_Gen::encode (const char *string_obj_ref
 }
 
 const char *
-TAO_PSDL_Code_Gen::decode (const CORBA::OctetSeq &data
-                           ACE_ENV_ARG_DECL)
+TAO_PSDL_Code_Gen::decode (const CORBA::OctetSeq &data)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const char *extracted_value;
 
   // Extract the data from the octet sequence.
   CORBA::Any_var decoded_data =
-    this->codec_->decode (data
-                          ACE_ENV_ARG_PARAMETER);
+    this->codec_->decode (data);
 
   decoded_data.in() >>= extracted_value;
 
diff --git a/TAO/orbsvcs/PSS/PSDL_Code_Gen.h b/TAO/orbsvcs/PSS/PSDL_Code_Gen.h
index 60bfb96a508..7ec81dfdc5e 100644
--- a/TAO/orbsvcs/PSS/PSDL_Code_Gen.h
+++ b/TAO/orbsvcs/PSS/PSDL_Code_Gen.h
@@ -46,32 +46,28 @@ class TAO_PSDL_Export TAO_PSDL_Code_Gen
   /// Initializes a IOP::CodecFactory and IOP::Codec to take care of
   /// the marshalling and demarshalling of data.
   int set_codec (void);
-  
+
   /// Method to save the name-stringified object reference pair
   /// to the database. Returns -1 on failure.
   int set_name_obj_ref (const char *name,
-                        const char *string_obj_ref
-                        ACE_ENV_ARG_DECL)
+                        const char *string_obj_ref)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Get the stringified form of the object reference given the name
   /// of the object.
-  const char *get_obj_ref (const char *name
-                           ACE_ENV_ARG_DECL)
+  const char *get_obj_ref (const char *name)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
  private:
 
   /// Helper method which serializes the data and saves it to the
   /// database.
-  CORBA::OctetSeq *encode (const char *string_obj_ref
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  CORBA::OctetSeq *encode (const char *string_obj_ref)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
   /// Helper method to get the octet sequence
-  const char *decode (const CORBA::OctetSeq &data
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  const char *decode (const CORBA::OctetSeq &data)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// File where the persistent data is stored.
diff --git a/TAO/orbsvcs/PSS/PSDL_Exception_Visitor.cpp b/TAO/orbsvcs/PSS/PSDL_Exception_Visitor.cpp
index b9644240c23..65932b082f1 100644
--- a/TAO/orbsvcs/PSS/PSDL_Exception_Visitor.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Exception_Visitor.cpp
@@ -165,12 +165,12 @@ TAO_PSDL_Exception_Visitor::print_class_for_exception (void)
   *ps_sh << "\n";
   *ps_sh << "      virtual void _tao_encode (\n";
   *ps_sh << "          TAO_OutputCDR &\n";
-  *ps_sh << "          ACE_ENV_ARG_DECL_NOT_USED\n";
+  *ps_sh << "\n";
   *ps_sh << "        ) const;\n";
   *ps_sh << "      \n";
   *ps_sh << "      virtual void _tao_decode (\n";
   *ps_sh << "          TAO_InputCDR &\n";
-  *ps_sh << "          ACE_ENV_ARG_DECL_NOT_USED\n";
+  *ps_sh << "\n";
   *ps_sh << "        );\n";
   *ps_sh << "      \n";
 
diff --git a/TAO/orbsvcs/PSS/PSDL_Interface_Visitor.cpp b/TAO/orbsvcs/PSS/PSDL_Interface_Visitor.cpp
index 08d6005e47a..e90926cd1fa 100644
--- a/TAO/orbsvcs/PSS/PSDL_Interface_Visitor.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Interface_Visitor.cpp
@@ -226,7 +226,7 @@ TAO_PSDL_Interface_Visitor::print_for_forward_dcl (void)
 
   *ps_sh << "CORBA::Object *";
   ps_sh->nl ();
-  *ps_sh << "ACE_ENV_ARG_DECL_NOT_USED";
+  *ps_sh << "";
 
   ps_sh->decr_indent (0);
   ps_sh->nl ();
@@ -382,7 +382,7 @@ TAO_PSDL_Interface_Visitor::print_for_forward_dcl (void)
   *ps_sh << "CORBA::Object *";
   ps_sh->nl ();
 
-  *ps_sh << "ACE_ENV_ARG_DECL_NOT_USED";
+  *ps_sh << "";
 
   ps_sh->decr_indent (0);
   ps_sh->nl ();
@@ -471,13 +471,13 @@ TAO_PSDL_Interface_Visitor::print_class_for_interface (void)
 
   *ps_sh << "static " << this->interface_name_ << "_ptr _narrow (";  ps_sh->nl ();
   *ps_sh << "CORBA::Object_ptr obj";  ps_sh->nl ();
-  *ps_sh << "ACE_ENV_ARG_DECL_WITH_DEFAULTS";  ps_sh->nl ();
+  *ps_sh << "";  ps_sh->nl ();
   *ps_sh << ");";  ps_sh->nl ();
 
   *ps_sh << "static " << this->interface_name_
          << "_ptr _unchecked_narrow (";  ps_sh->nl ();
   *ps_sh << "CORBA::Object_ptr obj";  ps_sh->nl ();
-  *ps_sh << "ACE_ENV_ARG_DECL_WITH_DEFAULTS";  ps_sh->nl ();
+  *ps_sh << "";  ps_sh->nl ();
   *ps_sh << ");";  ps_sh->nl ();
 
   *ps_sh << "static " << this->interface_name_ << "_ptr _nil (void)";  ps_sh->nl ();
@@ -504,7 +504,7 @@ TAO_PSDL_Interface_Visitor::print_end_for_interface (void)
 
   *ps_sh << "virtual CORBA::Boolean _is_a (";  ps_sh->nl ();
   *ps_sh << "const CORBA::Char *type_id";  ps_sh->nl ();
-  *ps_sh << "ACE_ENV_ARG_DECL_WITH_DEFAULTS";  ps_sh->nl ();
+  *ps_sh << "";  ps_sh->nl ();
   *ps_sh << ");";  ps_sh->nl ();
 
   *ps_sh << "virtual void *_tao_QueryInterface (ptrdiff_t type);";  ps_sh->nl ();
@@ -620,7 +620,7 @@ TAO_PSDL_Interface_Visitor::print_end_for_interface (void)
   *ps_sh << "virtual ~_TAO_" << this->interface_name_ << "_Proxy_Broker (void);";  ps_sh->nl ();
   *ps_sh << "virtual _TAO_" << this->interface_name_ << "_Proxy_Impl &select_proxy (";  ps_sh->nl ();
   *ps_sh << this->interface_name_ << "*object";  ps_sh->nl ();
-  *ps_sh << "ACE_ENV_ARG_DECL_WITH_DEFAULTS";  ps_sh->nl ();
+  *ps_sh << "";  ps_sh->nl ();
   *ps_sh << ") = 0;";  ps_sh->nl ();
 
   *ps_sh << "protected:";  ps_sh->nl ();
@@ -659,7 +659,7 @@ TAO_PSDL_Interface_Visitor::print_end_for_interface (void)
 
   *ps_sh << "virtual _TAO_" << this->interface_name_ << "_Proxy_Impl &select_proxy (";  ps_sh->nl ();
   *ps_sh << this->interface_name_ << "*object";  ps_sh->nl ();
-  *ps_sh << "ACE_ENV_ARG_DECL";  ps_sh->nl ();
+  *ps_sh << "";  ps_sh->nl ();
   *ps_sh << ");";  ps_sh->nl ();
 
   *ps_sh << "private:";  ps_sh->nl ();
@@ -771,7 +771,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
   *ps_si << "CORBA::Object *p";
   ps_si->nl ();
 
-  *ps_si << "ACE_ENV_ARG_DECL";   ps_si->nl ();
+  *ps_si << "";   ps_si->nl ();
   *ps_si << ")";
   ps_si->decr_indent (0);
   ps_si->nl ();
@@ -781,7 +781,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
   ps_si->nl ();
 
   *ps_si << "return " << this->interface_name_
-         << "::_narrow (p ACE_ENV_ARG_PARAMETER);";
+         << "::_narrow (p);";
   ps_si->decr_indent (0);
   ps_si->nl ();
   *ps_si << "}";
@@ -1126,7 +1126,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
   ps_si->nl ();
 
   *ps_si << "CORBA::Object *p";   ps_si->nl ();
-  *ps_si << "ACE_ENV_ARG_DECL";   ps_si->nl ();
+  *ps_si << "";   ps_si->nl ();
   *ps_si << ")";
 
   ps_si->decr_indent (0);
@@ -1137,7 +1137,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
   ps_si->nl ();
 
   *ps_si << "return ::" << this->interface_name_
-         << "::_narrow (p ACE_ENV_ARG_PARAMETER);";
+         << "::_narrow (p);";
 
   ps_si->decr_indent (0);
   ps_si->nl ();
@@ -1474,7 +1474,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
   ps_si->incr_indent (0);
   ps_si->nl ();
   *ps_si << "::" << this->interface_name_ << " *";   ps_si->nl ();
-  *ps_si << "ACE_ENV_ARG_DECL_NOT_USED";   ps_si->nl ();
+  *ps_si << "";   ps_si->nl ();
   *ps_si << ")";
   ps_si->decr_indent (0);
   ps_si->nl ();
@@ -1600,7 +1600,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
   ps_si->incr_indent (0);
   ps_si->nl ();
   *ps_si << "CORBA::Object_ptr obj";   ps_si->nl ();
-  *ps_si << "ACE_ENV_ARG_DECL";
+  *ps_si << "";
 
   ps_si->decr_indent (0);
   ps_si->nl ();
@@ -1629,7 +1629,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
   ps_si->nl ();
 
   *ps_si << "CORBA::Boolean is_a = obj->_is_a (\"IDL:"
-         << this->interface_name_ << ":1.0\" ACE_ENV_ARG_PARAMETER);";
+         << this->interface_name_ << ":1.0\");";
   ps_si->nl ();
 
   *ps_si << "if (is_a == 0)";
@@ -1645,7 +1645,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
   ps_si->nl ();
 
   *ps_si << "return " << this->interface_name_
-         << "::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);";
+         << "::_unchecked_narrow (obj);";
 
   ps_si->decr_indent (0);
   ps_si->nl ();
@@ -1660,7 +1660,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
   ps_si->incr_indent (0);
   ps_si->nl ();
   *ps_si << "CORBA::Object_ptr obj";   ps_si->nl ();
-  *ps_si << "ACE_ENV_ARG_DECL_NOT_USED";   ps_si->nl ();
+  *ps_si << "";   ps_si->nl ();
   *ps_si << ")";
 
   ps_si->decr_indent (0);
@@ -1856,7 +1856,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
   ps_si->nl ();
 
   *ps_si << "CORBA::Boolean " << this->interface_name_
-         << "::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)";   ps_si->nl ();
+         << "::_is_a (const CORBA::Char *value)";   ps_si->nl ();
 
   *ps_si << "{";
   ps_si->incr_indent (0);
@@ -1879,7 +1879,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
 
   ps_si->incr_indent (0);
   ps_si->nl ();
-  *ps_si << "return this->Object::_is_a (value ACE_ENV_ARG_PARAMETER);";
+  *ps_si << "return this->Object::_is_a (value);";
   ps_si->decr_indent (0);
   ps_si->decr_indent (0);
   ps_si->nl ();
@@ -2141,7 +2141,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
   ps_si->incr_indent (0);
   ps_si->nl ();
   *ps_si << "_tc_" << this->interface_name_ << "";   ps_si->nl ();
-  *ps_si << "ACE_ENV_ARG_PARAMETER";
+  *ps_si << "";
 
   ps_si->decr_indent (0);
   ps_si->nl ();
@@ -2321,7 +2321,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
   ps_si->nl ();
 
   *ps_si << "obj.in ()";   ps_si->nl ();
-  *ps_si << "ACE_ENV_ARG_PARAMETER";
+  *ps_si << "";
 
   ps_si->decr_indent (0);
   ps_si->nl ();
diff --git a/TAO/orbsvcs/PSS/PSDL_Struct_Visitor.cpp b/TAO/orbsvcs/PSS/PSDL_Struct_Visitor.cpp
index 553ad04e041..87662739954 100644
--- a/TAO/orbsvcs/PSS/PSDL_Struct_Visitor.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Struct_Visitor.cpp
@@ -369,7 +369,7 @@ TAO_PSDL_Struct_Visitor::gen_code_for_si (void)
   ps_si->incr_indent (0); ps_si->nl ();
 
   *ps_si << "_tc_" << this->struct_name_ << ""; ps_si->nl ();
-  *ps_si << "ACE_ENV_ARG_PARAMETER";
+  *ps_si << "";
 
   ps_si->decr_indent (0); ps_si->nl ();
 
diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
index 5ee5019fab1..8e9c433e38b 100644
--- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
+++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
@@ -50,13 +50,13 @@ TAO_Scheduling_Service::init (int argc, ACE_TCHAR* argv[])
   CORBA::ORB_var orb;
   PortableServer::POAManager_ptr poa_manager;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       // Copy command line parameter.
       ACE_Argv_Type_Converter command_line(argc, argv);
 
       // Initialize ORB manager.
-      this->orb_manager_.init (command_line.get_argc(), command_line.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
+      this->orb_manager_.init (command_line.get_argc(), command_line.get_ASCII_argv());
 
       orb = this->orb_manager_.orb ();
 
@@ -95,20 +95,20 @@ TAO_Scheduling_Service::init (int argc, ACE_TCHAR* argv[])
 
       // Locate the naming service.
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to locate the Naming Service.\n"),
                           -1);
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
       RtecScheduler::Scheduler_var scheduler =
         this->scheduler_impl_->_this ();
 
       CORBA::String_var scheduler_ior_string =
-        orb->object_to_string (scheduler.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (scheduler.in ());
 
       ACE_DEBUG ((LM_DEBUG, ACE_TEXT("The scheduler IOR is <%s>\n"),
                             ACE_TEXT_CHAR_TO_TCHAR(scheduler_ior_string.in ())));
@@ -117,7 +117,7 @@ TAO_Scheduling_Service::init (int argc, ACE_TCHAR* argv[])
       CosNaming::Name schedule_name (1);
       schedule_name.length (1);
       schedule_name[0].id = CORBA::string_dup (this->service_name_.rep());
-      naming_context->rebind (schedule_name, scheduler.in () ACE_ENV_ARG_PARAMETER);
+      naming_context->rebind (schedule_name, scheduler.in ());
 
       if (this->ior_file_name_.rep() != 0)
         {
@@ -143,12 +143,11 @@ TAO_Scheduling_Service::init (int argc, ACE_TCHAR* argv[])
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Scheduling_Service::init");
+      ex._tao_print_exception ("TAO_Scheduling_Service::init");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -233,7 +232,7 @@ TAO_Scheduling_Service::parse_args (int argc, ACE_TCHAR* argv[])
 
 int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       TAO_Scheduling_Service scheduling_service;
 
@@ -248,12 +247,11 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 
       scheduling_service.run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "schedule_service");
+      ex._tao_print_exception ("schedule_service");
           return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/TAO_Service/TAO_Service.cpp b/TAO/orbsvcs/TAO_Service/TAO_Service.cpp
index ea24fac6cf9..7063ce4f534 100644
--- a/TAO/orbsvcs/TAO_Service/TAO_Service.cpp
+++ b/TAO/orbsvcs/TAO_Service/TAO_Service.cpp
@@ -39,14 +39,13 @@ extern "C" void handler (int)
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       ACE_Argv_Type_Converter argcon (argc, argv);
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
         CORBA::ORB_init (argcon.get_argc (), argcon.get_ASCII_argv (),
-                         "" ACE_ENV_ARG_PARAMETER);
+                         "");
 
       ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGHUP);
 
@@ -54,7 +53,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         {
           ACE_Time_Value tv (5, 0);
 
-          orb->perform_work (tv ACE_ENV_ARG_PARAMETER);
+          orb->perform_work (tv);
 
           ACE_DEBUG ((LM_DEBUG,
                       "Reconfig flag = %d\n",
@@ -65,11 +64,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         }
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, argv[0]);
+      ex._tao_print_exception (argv[0]);
     }
-  ACE_ENDTRY;
 
   return -1;
 }
diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.cpp b/TAO/orbsvcs/Time_Service/Clerk_i.cpp
index d3c59beb716..eebad3712a2 100644
--- a/TAO/orbsvcs/Time_Service/Clerk_i.cpp
+++ b/TAO/orbsvcs/Time_Service/Clerk_i.cpp
@@ -59,8 +59,7 @@ Clerk_i::read_ior (const ACE_TCHAR* filename)
 
   int result = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       for (char *str = ACE_OS::strtok (data, "\n");
            str != 0 ;
@@ -71,8 +70,7 @@ Clerk_i::read_ior (const ACE_TCHAR* filename)
                       ACE_TEXT_CHAR_TO_TCHAR(str)));
 
           CORBA::Object_var objref =
-            this->orb_->string_to_object (str
-                                          ACE_ENV_ARG_PARAMETER);
+            this->orb_->string_to_object (str);
 
           // Return if the server reference is nil.
           if (CORBA::is_nil (objref.in ()))
@@ -84,17 +82,15 @@ Clerk_i::read_ior (const ACE_TCHAR* filename)
             }
 
           CosTime::TimeService_ptr server =
-            CosTime::TimeService::_narrow (objref.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+            CosTime::TimeService::_narrow (objref.in ());
 
           this->insert_server (server);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_TEXT("Exception"));
+      ex._tao_print_exception (ACE_TEXT("Exception"));
     }
-  ACE_ENDTRY;
 
   ACE_OS::close (f_handle);
   ior_buffer.alloc ()->free (data);
@@ -175,8 +171,7 @@ Clerk_i::parse_args (int argc,
 int
 Clerk_i::get_first_IOR (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       char host_name[MAXHOSTNAMELEN];
 
@@ -192,13 +187,11 @@ Clerk_i::get_first_IOR (void)
 
       // Resolve name.
       CORBA::Object_var temp_object =
-        this->naming_client_->resolve (server_context_name
-                                       ACE_ENV_ARG_PARAMETER);
+        this->naming_client_->resolve (server_context_name);
 
 
       CosNaming::NamingContext_var server_context =
-        CosNaming::NamingContext::_narrow (temp_object.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (temp_object.in ());
 
       if (CORBA::is_nil (server_context.in ()))
         ACE_DEBUG ((LM_DEBUG,
@@ -215,12 +208,10 @@ Clerk_i::get_first_IOR (void)
       server_name[0].id = bindings_list[0u].binding_name[0].id;
 
       temp_object =
-        server_context->resolve (server_name
-                                 ACE_ENV_ARG_PARAMETER);
+        server_context->resolve (server_name);
 
       CosTime::TimeService_var obj =
-        CosTime::TimeService::_narrow (temp_object.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+        CosTime::TimeService::_narrow (temp_object.in ());
 
       if (CORBA::is_nil (obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -240,12 +231,11 @@ Clerk_i::get_first_IOR (void)
                            ACE_TEXT("[CLERK] Process/Thread Id : (%P/%t) Unable to get next N IORs ")),
                           -1);;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_TEXT("Exception"));
+      ex._tao_print_exception (ACE_TEXT("Exception"));
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -258,15 +248,13 @@ int
 Clerk_i::next_n_IORs (CosNaming::BindingIterator_var iter,
                       CosNaming::NamingContext_var server_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CosNaming::Binding_var binding;
 
       if (!CORBA::is_nil (iter.in ()))
         {
-          while (iter->next_one (binding.out ()
-                                 ACE_ENV_ARG_PARAMETER))
+          while (iter->next_one (binding.out ()))
             {
 
               ACE_DEBUG ((LM_DEBUG,
@@ -278,12 +266,10 @@ Clerk_i::next_n_IORs (CosNaming::BindingIterator_var iter,
               server_name[0].id = binding->binding_name[0].id;
 
               CORBA::Object_var temp_object =
-                server_context->resolve (server_name
-                                         ACE_ENV_ARG_PARAMETER);
+                server_context->resolve (server_name);
 
               CosTime::TimeService_ptr server =
-                CosTime::TimeService::_narrow (temp_object.in ()
-                                               ACE_ENV_ARG_PARAMETER);
+                CosTime::TimeService::_narrow (temp_object.in ());
 
               this->insert_server (server);
             }
@@ -291,13 +277,12 @@ Clerk_i::next_n_IORs (CosNaming::BindingIterator_var iter,
         }
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            ACE_TEXT("Unexpected exception in next_n_IORs\n"));
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -316,8 +301,7 @@ Clerk_i::init_naming_service ()
 int
 Clerk_i::create_clerk (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
 
       // Create a new clerk object. Pass it the timer value, the set
@@ -334,8 +318,7 @@ Clerk_i::create_clerk (void)
 
       // Convert the clerk reference to a string.
       CORBA::String_var objref_clerk =
-        this->orb_->object_to_string (this->time_service_clerk_.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        this->orb_->object_to_string (this->time_service_clerk_.in ());
 
       // Print the clerk IOR on the console.
       ACE_DEBUG ((LM_DEBUG,
@@ -354,12 +337,11 @@ Clerk_i::create_clerk (void)
       // Register the clerk implementation with the Interface
       // Repository.  init_IR();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_TEXT("Exception"));
+      ex._tao_print_exception (ACE_TEXT("Exception"));
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -370,8 +352,7 @@ Clerk_i::create_clerk (void)
 int
 Clerk_i::register_clerk (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Bind the Clerk in its appropriate Context.
 
@@ -379,18 +360,15 @@ Clerk_i::register_clerk (void)
       clerk_context_name.length (1);
       clerk_context_name[0].id = CORBA::string_dup ("ClerkContext");
 
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY_EX(bind_new_context)
+      try
         {
           CosNaming::NamingContext_var clerk_context =
 	    this->naming_client_->bind_new_context(clerk_context_name);
-	  ACE_TRY_CHECK_EX(bind_new_context);
 	}
-      ACE_CATCH(CosNaming::NamingContext::AlreadyBound, ex)
+      catch (const CosNaming::NamingContext::AlreadyBound& )
         {
 	  // OK, naming context already exists.
         }
-      ACE_ENDTRY;
 
       char host_name[MAXHOSTNAMELEN];
       char clerk_mc_name[MAXHOSTNAMELEN];
@@ -407,16 +385,14 @@ Clerk_i::register_clerk (void)
       clerk_name[1].id = CORBA::string_dup (clerk_mc_name);
 
       this->naming_client_->rebind (clerk_name,
-                                     this->time_service_clerk_.in ()
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this->time_service_clerk_.in ());
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            ACE_TEXT("(%P|%t) Exception from init_naming_service ()\n"));
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -425,10 +401,9 @@ Clerk_i::register_clerk (void)
 
 int
 Clerk_i::init (int argc,
-               ACE_TCHAR *argv[]
-               ACE_ENV_ARG_DECL)
+               ACE_TCHAR *argv[])
 {
-  ACE_TRY
+  try
     {
       // Make a copy of command line parameter.
       ACE_Argv_Type_Converter command(argc, argv);
@@ -442,14 +417,12 @@ Clerk_i::init (int argc,
 
 
       this->orb_manager_.init (command.get_argc(),
-                               command.get_ASCII_argv()
-                               ACE_ENV_ARG_PARAMETER);
+                               command.get_ASCII_argv());
 
 
       if (this->orb_manager_.init_child_poa (command.get_argc(),
                                              command.get_ASCII_argv(),
-                                             "child_poa"
-                                             ACE_ENV_ARG_PARAMETER) == -1)
+                                             "child_poa") == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT("%p\n"),
                            ACE_TEXT("init_child_poa")),
@@ -496,13 +469,12 @@ Clerk_i::init (int argc,
       // Close the open file handler.
       // ACE_OS::fclose (this->ior_fp_);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            ACE_TEXT("(%P|%t) Exception in Clerk_i::init ()\n"));
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -510,7 +482,7 @@ Clerk_i::init (int argc,
 int
 Clerk_i::run (void)
 {
-  ACE_TRY
+  try
     {
       // Run the main event loop for the ORB.
       int r = this->orb_manager_.run ();
@@ -520,12 +492,11 @@ Clerk_i::run (void)
                            ACE_TEXT("[SERVER] Process/Thread Id : (%P/%t) Clerk_i::run")),
                           -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            ACE_TEXT("(%P|%t) Exception in Clerk_i::run ()\n"));
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.h b/TAO/orbsvcs/Time_Service/Clerk_i.h
index 8f3ec2d5980..bd9ce302f01 100644
--- a/TAO/orbsvcs/Time_Service/Clerk_i.h
+++ b/TAO/orbsvcs/Time_Service/Clerk_i.h
@@ -51,8 +51,7 @@ public:
   // Set of available Time servers.
 
   int init (int argc,
-            ACE_TCHAR *argv[]
-            ACE_ENV_ARG_DECL);
+            ACE_TCHAR *argv[]);
   // Initialize the Clerk state - parsing arguments and waiting.
 
   int run (void);
diff --git a/TAO/orbsvcs/Time_Service/Server_i.cpp b/TAO/orbsvcs/Time_Service/Server_i.cpp
index 53f4ca1e6ac..626dc419c58 100644
--- a/TAO/orbsvcs/Time_Service/Server_i.cpp
+++ b/TAO/orbsvcs/Time_Service/Server_i.cpp
@@ -81,8 +81,7 @@ Server_i::init_naming_service ()
 int
 Server_i::create_server (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
 
       // Create a new server object.
@@ -93,18 +92,15 @@ Server_i::create_server (void)
       // Register a servant with the child poa.
       CORBA::String_var server_str =
         this->orb_manager_.activate_under_child_poa ("server",
-                                                     this->time_service_server_impl_
-                                                     ACE_ENV_ARG_PARAMETER);
+                                                     this->time_service_server_impl_);
 
       PortableServer::ObjectId_var id =
         PortableServer::string_to_ObjectId ("server");
 
       CORBA::Object_var server_ref =
-        this->orb_manager_.child_poa ()->id_to_reference (id.in ()
-                                                          ACE_ENV_ARG_PARAMETER);
+        this->orb_manager_.child_poa ()->id_to_reference (id.in ());
 
-      this->time_service_server_ = CosTime::TimeService::_narrow (server_ref.in ()
-                                                                  ACE_ENV_ARG_PARAMETER);
+      this->time_service_server_ = CosTime::TimeService::_narrow (server_ref.in ());
 
       // All this !! just to register a servant with the child poa.
       // Instead of using _this ().
@@ -112,8 +108,7 @@ Server_i::create_server (void)
       //Convert the server reference to a string.
 
       CORBA::String_var objref_server =
-        this->orb_->object_to_string (server_ref.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        this->orb_->object_to_string (server_ref.in ());
 
       // Print the server IOR on the console.
       ACE_DEBUG ((LM_DEBUG,
@@ -132,13 +127,12 @@ Server_i::create_server (void)
           ACE_OS::fclose (this->ior_output_file_);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            ACE_TEXT("Exception in Server_i::create_server ()"));
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -149,25 +143,21 @@ Server_i::create_server (void)
 int
 Server_i::register_server (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CosNaming::Name server_context_name;
       server_context_name.length (1);
       server_context_name[0].id = CORBA::string_dup ("ServerContext");
 
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY_EX(bind_new_context)
+      try
         {
           CosNaming::NamingContext_var server_context =
 	    this->naming_client_->bind_new_context(server_context_name);
-          ACE_TRY_CHECK_EX(bind_new_context);
         }
-      ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
+      catch (const CosNaming::NamingContext::AlreadyBound& )
         {
 	  // OK, naming context already exists.
 	}
-      ACE_ENDTRY;
 
       char host_name[MAXHOSTNAMELEN];
       char server_mc_name[MAXHOSTNAMELEN];
@@ -184,20 +174,18 @@ Server_i::register_server (void)
       // to the Naming Server.
 
       this->naming_client_->rebind (server_name,
-                                    this->time_service_server_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
+                                    this->time_service_server_.in ());
 
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT("Binding ServerContext -> %s\n"),
                   ACE_TEXT_CHAR_TO_TCHAR(server_name[1].id.in ())));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            ACE_TEXT("(%P|%t) Exception from Register Server ()\n"));
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -208,10 +196,9 @@ Server_i::register_server (void)
 
 int
 Server_i::init (int argc,
-                ACE_TCHAR *argv[]
-                ACE_ENV_ARG_DECL)
+                ACE_TCHAR *argv[])
 {
-  ACE_TRY
+  try
     {
       // Make a copy of command line parameter.
       ACE_Argv_Type_Converter command(argc, argv);
@@ -222,8 +209,7 @@ Server_i::init (int argc,
       int retval = this->orb_manager_.init_child_poa (
                       command.get_argc(),
                       command.get_ASCII_argv(),
-                      "time_server"
-                      ACE_ENV_ARG_PARAMETER);
+                      "time_server");
 
       if (retval == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -252,12 +238,11 @@ Server_i::init (int argc,
       this->register_server ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_TEXT("Exception:"));
+      ex._tao_print_exception (ACE_TEXT("Exception:"));
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/Time_Service/Server_i.h b/TAO/orbsvcs/Time_Service/Server_i.h
index 390586bebc2..2727cc51ec8 100644
--- a/TAO/orbsvcs/Time_Service/Server_i.h
+++ b/TAO/orbsvcs/Time_Service/Server_i.h
@@ -41,8 +41,7 @@ public:
   // Destructor.
 
   int init (int argc,
-            ACE_TCHAR *argv[]
-            ACE_ENV_ARG_DECL);
+            ACE_TCHAR *argv[]);
   // Initialize the Server state.
 
   int run (void);
diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp b/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp
index 2b4f14da4a8..8a0347b8c09 100644
--- a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp
+++ b/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp
@@ -15,10 +15,9 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
   ACE_DEBUG ((LM_DEBUG,
               "[SERVER] Process/Thread Id : (%P/%t) Time Service clerk\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      int r = clerk.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      int r = clerk.init (argc, argv);
       if (r == -1)
         return 1;
       else
@@ -26,17 +25,16 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
           clerk.run ();
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      userex._tao_print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp b/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp
index 360517aaa19..4b2714a3c24 100644
--- a/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp
+++ b/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp
@@ -15,10 +15,9 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
   ACE_DEBUG ((LM_DEBUG,
               "[SERVER] Process/Thread Id : (%P/%t) Time Service server\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      int r = server.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      int r = server.init (argc, argv);
 
       if (r == -1)
         return 1;
@@ -27,17 +26,16 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
           server.run ();
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      userex._tao_print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Server.cpp b/TAO/orbsvcs/Trading_Service/Trading_Server.cpp
index f52fca4f0c5..c9edd7d053c 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Server.cpp
+++ b/TAO/orbsvcs/Trading_Service/Trading_Server.cpp
@@ -10,10 +10,10 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   Trading_Service trader;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       int check =
-        trader.init (argc, argv ACE_ENV_ARG_PARAMETER);
+        trader.init (argc, argv);
 
       if (check != -1)
         {
@@ -24,12 +24,11 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
                            "Failed to initialize the trader.\n"),
                           1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Trading Service");
+      ex._tao_print_exception ("Trading Service");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
index 77e5a442561..3b644cb93bd 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
+++ b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
@@ -49,8 +49,7 @@ Trading_Service::~Trading_Service (void)
 
 int
 Trading_Service::init (int argc,
-                       ACE_TCHAR *argv[]
-                       ACE_ENV_ARG_DECL_NOT_USED)
+                       ACE_TCHAR *argv[])
 {
   int result_trader =
     this->trading_loader_.init (argc, argv);
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.h b/TAO/orbsvcs/Trading_Service/Trading_Service.h
index 32ca5177e48..b33337661f7 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Service.h
+++ b/TAO/orbsvcs/Trading_Service/Trading_Service.h
@@ -63,8 +63,7 @@ public:
   // Destructor
 
   int init (int argc,
-            ACE_TCHAR *argv[]
-            ACE_ENV_ARG_DECL);
+            ACE_TCHAR *argv[]);
   // Initialize the Trading Service with arguments.
 
   int run (void);
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
index 8925acbf13b..4c890f828b4 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
@@ -24,8 +24,7 @@ TAO_CosEventChannelFactory_i::~TAO_CosEventChannelFactory_i (void)
 int
 TAO_CosEventChannelFactory_i::init (PortableServer::POA_ptr poa,
                                     const char* child_poa_name,
-                                    CosNaming::NamingContext_ptr naming
-                                    ACE_ENV_ARG_DECL)
+                                    CosNaming::NamingContext_ptr naming)
 {
   // Check if we have a parent poa.
   if (CORBA::is_nil (poa))
@@ -37,12 +36,10 @@ TAO_CosEventChannelFactory_i::init (PortableServer::POA_ptr poa,
   // Create a UNIQUE_ID and USER_ID policy because we want the POA
   // to detect duplicates for us.
   PortableServer::IdUniquenessPolicy_var idpolicy =
-    poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID
-                                      ACE_ENV_ARG_PARAMETER);
+    poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID);
 
   PortableServer::IdAssignmentPolicy_var assignpolicy =
-    poa->create_id_assignment_policy (PortableServer::USER_ID
-                                      ACE_ENV_ARG_PARAMETER);
+    poa->create_id_assignment_policy (PortableServer::USER_ID);
 
   // Create a PolicyList
   CORBA::PolicyList policy_list;
@@ -59,8 +56,7 @@ TAO_CosEventChannelFactory_i::init (PortableServer::POA_ptr poa,
   // Create the child POA.
   this->poa_ = poa->create_POA (child_poa_name,
                                 manager,
-                                policy_list
-                                ACE_ENV_ARG_PARAMETER);
+                                policy_list);
 
 
   idpolicy->destroy ();
@@ -74,8 +70,7 @@ TAO_CosEventChannelFactory_i::init (PortableServer::POA_ptr poa,
 
 CosEventChannelAdmin::EventChannel_ptr
 TAO_CosEventChannelFactory_i::create (const char * channel_id,
-                                      CORBA::Boolean store_in_naming_service
-                                      ACE_ENV_ARG_DECL)
+                                      CORBA::Boolean store_in_naming_service)
   ACE_THROW_SPEC ((
         CORBA::SystemException,
         CosEventChannelFactory::DuplicateChannel,
@@ -86,7 +81,7 @@ TAO_CosEventChannelFactory_i::create (const char * channel_id,
 
   CosEventChannelAdmin::EventChannel_var ec_return;
 
-  ACE_TRY
+  try
     {
       PortableServer::ObjectId_var oid =
         PortableServer::string_to_ObjectId (channel_id);
@@ -107,13 +102,12 @@ TAO_CosEventChannelFactory_i::create (const char * channel_id,
       impl->activate ();
 
       this->poa_->activate_object_with_id (oid.in (),
-                                           ec.get ()
-                                           ACE_ENV_ARG_PARAMETER);
+                                           ec.get ());
 
       ec.release ();
 
       CORBA::Object_var obj =
-        this->poa_->id_to_reference (oid.in () ACE_ENV_ARG_PARAMETER);
+        this->poa_->id_to_reference (oid.in ());
 
       if (store_in_naming_service &&
           !CORBA::is_nil (this->naming_.in ()))
@@ -123,53 +117,51 @@ TAO_CosEventChannelFactory_i::create (const char * channel_id,
           name[0].id = CORBA::string_dup (channel_id);
 
           this->naming_->rebind (name,
-                                 obj.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+                                 obj.in ());
         }
 
       ec_return = CosEventChannelAdmin::EventChannel::_narrow (obj.in ());
     }
-  ACE_CATCH (PortableServer::POA::ServantAlreadyActive, sa_ex)
+  catch (const PortableServer::POA::ServantAlreadyActive& sa_ex)
     {
       ACE_THROW_RETURN (CosEventChannelFactory::DuplicateChannel (),
                         ec_return._retn ());
     }
-  ACE_CATCH (PortableServer::POA::ObjectAlreadyActive, oaa_ex)
+  catch (const PortableServer::POA::ObjectAlreadyActive& oaa_ex)
     {
       ACE_THROW_RETURN (CosEventChannelFactory::DuplicateChannel (),
                         ec_return._retn ());
     }
-  ACE_CATCH (PortableServer::POA::WrongPolicy, wp_ex)
+  catch (const PortableServer::POA::WrongPolicy& wp_ex)
     {
       ACE_THROW_RETURN (CORBA::UNKNOWN (),
                         ec_return._retn ());
     }
-  ACE_CATCH (PortableServer::POA::ObjectNotActive, ona_ex)
+  catch (const PortableServer::POA::ObjectNotActive& ona_ex)
     {
       ACE_THROW_RETURN (CosEventChannelFactory::BindFailed (),
                         ec_return._retn ());
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, nf_ex)
+  catch (const CosNaming::NamingContext::NotFound& nf_ex)
     {
       ACE_THROW_RETURN (CosEventChannelFactory::BindFailed (),
                         ec_return._retn ());
     }
-  ACE_CATCH (CosNaming::NamingContext::CannotProceed, cp_ex)
+  catch (const CosNaming::NamingContext::CannotProceed& cp_ex)
     {
       ACE_THROW_RETURN (CosEventChannelFactory::BindFailed (),
                         ec_return._retn ());
     }
-  ACE_CATCH (CosNaming::NamingContext::InvalidName, in_ex)
+  catch (const CosNaming::NamingContext::InvalidName& in_ex)
     {
       ACE_THROW_RETURN (CosEventChannelFactory::BindFailed (),
                         ec_return._retn ());
     }
-  ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ab)
+  catch (const CosNaming::NamingContext::AlreadyBound& ab)
     {
       ACE_THROW_RETURN (CosEventChannelFactory::BindFailed (),
                         ec_return._retn ());
     }
-  ACE_ENDTRY;
 
   return ec_return._retn ();
 }
@@ -179,7 +171,6 @@ TAO_CosEventChannelFactory_i::destroy
 (
  const char * channel_id,
  CORBA::Boolean unbind_from_naming_service
- ACE_ENV_ARG_DECL
  )
  ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -188,19 +179,17 @@ TAO_CosEventChannelFactory_i::destroy
 {
   ACE_ASSERT (!CORBA::is_nil (this->poa_.in ()));
 
-  ACE_TRY
+  try
     {
       // Get hold of the objectid first.
       PortableServer::ObjectId_var oid =
         PortableServer::string_to_ObjectId (channel_id);
 
       CORBA::Object_var obj =
-        this->poa_->id_to_reference (oid.in ()
-                                     ACE_ENV_ARG_PARAMETER);
+        this->poa_->id_to_reference (oid.in ());
 
       CosEventChannelAdmin::EventChannel_var fact_ec =
-        CosEventChannelAdmin::EventChannel::_narrow (obj.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+        CosEventChannelAdmin::EventChannel::_narrow (obj.in ());
 
       fact_ec->destroy ();
 
@@ -212,34 +201,31 @@ TAO_CosEventChannelFactory_i::destroy
           name.length (1);
           name[0].id = CORBA::string_dup (channel_id);
 
-          this->naming_->unbind (name
-                                 ACE_ENV_ARG_PARAMETER);
+          this->naming_->unbind (name);
         }
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, nf_ex)
+  catch (const CosNaming::NamingContext::NotFound& nf_ex)
     {
       return; // don't bother the user with exceptions if unbind fails.
     }
-  ACE_CATCH (CosNaming::NamingContext::CannotProceed, cp_ex)
+  catch (const CosNaming::NamingContext::CannotProceed& cp_ex)
     {
       return; // don't bother the user with exceptions if unbind fails.
     }
-  ACE_CATCH (CosNaming::NamingContext::InvalidName, in_ex)
+  catch (const CosNaming::NamingContext::InvalidName& in_ex)
     {
       return; // don't bother the user with exceptions if unbind fails.
     }
-  ACE_CATCH (CORBA::UserException, ue) // Translate any other user exception.
+  catch (const CORBA::UserException& ue)// Translate any other user exception.
     {
-      ACE_THROW (CosEventChannelFactory::NoSuchChannel ());
+      throw CosEventChannelFactory::NoSuchChannel ();
     }
-  ACE_ENDTRY;
 }
 
 CosEventChannelAdmin::EventChannel_ptr
 TAO_CosEventChannelFactory_i::find
 (
  const char * channel_id
- ACE_ENV_ARG_DECL
  )
   ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -250,23 +236,21 @@ TAO_CosEventChannelFactory_i::find
 
   CosEventChannelAdmin::EventChannel_var ec_return;
 
-  ACE_TRY
+  try
     {
       PortableServer::ObjectId_var oid =
         PortableServer::string_to_ObjectId (channel_id);
 
       CORBA::Object_var obj =
-        this->poa_->id_to_reference (oid.in ()
-                                     ACE_ENV_ARG_PARAMETER);
+        this->poa_->id_to_reference (oid.in ());
 
       ec_return = CosEventChannelAdmin::EventChannel::_narrow (obj.in ());
     }
-  ACE_CATCH (CORBA::UserException, ue) // Translate any user exception.
+  catch (const CORBA::UserException& ue)// Translate any user exception.
     {
       ACE_THROW_RETURN (CosEventChannelFactory::NoSuchChannel (),
                         ec_return._retn ());
     }
-  ACE_ENDTRY;
 
   return ec_return._retn ();
 }
@@ -275,7 +259,6 @@ char*
 TAO_CosEventChannelFactory_i::find_channel_id
 (
  CosEventChannelAdmin::EventChannel_ptr channel
- ACE_ENV_ARG_DECL
  )
   ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -285,20 +268,18 @@ TAO_CosEventChannelFactory_i::find_channel_id
   ACE_ASSERT (!CORBA::is_nil (this->poa_.in ()));
 
   CORBA::String_var str_return;
-  ACE_TRY
+  try
     {
       PortableServer::ObjectId_var oid =
-        this->poa_->reference_to_id (channel
-                                     ACE_ENV_ARG_PARAMETER);
+        this->poa_->reference_to_id (channel);
 
       str_return = PortableServer::ObjectId_to_string (oid.in ());
     }
-  ACE_CATCH (CORBA::UserException, ue) // Translate any user exception.
+  catch (const CORBA::UserException& ue)// Translate any user exception.
     {
       ACE_THROW_RETURN (CosEventChannelFactory::NoSuchChannel (),
                         str_return._retn ());
     }
-  ACE_ENDTRY;
 
   return str_return._retn ();
 }
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h
index f1a137b5372..0afbde49bd2 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h
+++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h
@@ -42,8 +42,7 @@ class TAO_CosEventChannelFactory_i :
 
   int init (PortableServer::POA_ptr poa,
             const char* child_poa_name,
-            CosNaming::NamingContext_ptr naming = CosNaming::NamingContext::_nil ()
-            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+            CosNaming::NamingContext_ptr naming = CosNaming::NamingContext::_nil ());
   // This method creates a child poa with <poa> as the
   // parent. It also accepts a Naming_Context which is used to register
   // the event channels if specified.
@@ -58,7 +57,7 @@ class TAO_CosEventChannelFactory_i :
   //    doesn't have to be exposed through the IDL interface. Anyway,
   //    there must be a way to cleanup any resources created by the
   //    factory, and you must avoid CORBA calls in the destructor,
-  //    first because you won't have an ACE_ENV_SINGLE_ARG_PARAMETER and second because
+  //    first because you won't have an and second because
   //    exceptions in destructors are evil.
   // @@ Pradeep: anyway you can just use exceptions and not return -1?
 
@@ -67,7 +66,6 @@ class TAO_CosEventChannelFactory_i :
     (
      const char * channel_id,
      CORBA::Boolean store_in_naming_service
-     ACE_ENV_ARG_DECL
      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -79,7 +77,6 @@ class TAO_CosEventChannelFactory_i :
     (
      const char * channel_id,
      CORBA::Boolean unbind_from_naming_service
-     ACE_ENV_ARG_DECL
      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -89,7 +86,6 @@ class TAO_CosEventChannelFactory_i :
   virtual CosEventChannelAdmin::EventChannel_ptr find
     (
      const char * channel_id
-     ACE_ENV_ARG_DECL
      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -99,7 +95,6 @@ class TAO_CosEventChannelFactory_i :
   virtual char * find_channel_id
     (
      CosEventChannelAdmin::EventChannel_ptr channel
-     ACE_ENV_ARG_DECL
      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
index 5b34fa18129..44632007a6a 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
@@ -21,7 +21,7 @@ public:
   virtual ~FactoryClient (void);
   // destructor.
 
-  void init_ORB (int argc, char *argv [] ACE_ENV_ARG_DECL);
+  void init_ORB (int argc, char *argv []);
   // Initializes the ORB.
 
   void resolve_naming_service (void);
@@ -40,20 +40,16 @@ public:
 protected:
   CosEventChannelAdmin::EventChannel_ptr
       create_channel (const char *channel_id,
-                     CosEventChannelFactory::ChannelFactory_ptr factory
-                     ACE_ENV_ARG_DECL);
+                     CosEventChannelFactory::ChannelFactory_ptr factory);
   // Create a channel.
 
-  void destroy_channel (const char *channel_id
-                       ACE_ENV_ARG_DECL);
+  void destroy_channel (const char *channel_id);
   // Destroy the channel.
 
-  void find_channel (const char* channel_id
-                    ACE_ENV_ARG_DECL);
+  void find_channel (const char* channel_id);
   // Find a channel.
 
-  void find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel
-                       ACE_ENV_ARG_DECL);
+  void find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel);
   // Find a channel.
 
   // = Protected Data members.
@@ -87,28 +83,25 @@ FactoryClient::~FactoryClient (void)
 
 void
 FactoryClient::init_ORB (int argc,
-                       char *argv []
-                       ACE_ENV_ARG_DECL)
+                       char *argv [])
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                ""
-                                ACE_ENV_ARG_PARAMETER);
+                                "");
 }
 
 void
 FactoryClient::resolve_naming_service (void)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references ("NameService"
-                                            ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references ("NameService");
 
   // Need to check return value for errors.
   if (CORBA::is_nil (naming_obj.in ()))
-    ACE_THROW (CORBA::UNKNOWN ());
+    throw CORBA::UNKNOWN ();
 
   this->naming_context_ =
-    CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
+    CosNaming::NamingContext::_narrow (naming_obj.in ());
 
   this->use_naming_service = 1;
 }
@@ -123,12 +116,10 @@ FactoryClient::resolve_factory (void)
   name[0].id = CORBA::string_dup (this->factory_name_);
 
   CORBA::Object_var obj =
-    this->naming_context_->resolve (name
-                                   ACE_ENV_ARG_PARAMETER);
+    this->naming_context_->resolve (name);
 
   this->factory_ =
-    CosEventChannelFactory::ChannelFactory::_narrow (obj.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+    CosEventChannelFactory::ChannelFactory::_narrow (obj.in ());
 }
 
 CosEventChannelFactory::ChannelFactory_ptr
@@ -140,8 +131,7 @@ FactoryClient::create_factory (void)
 
 CosEventChannelAdmin::EventChannel_ptr
 FactoryClient::create_channel (const char *channel_id,
-                            CosEventChannelFactory::ChannelFactory_ptr factory
-                              ACE_ENV_ARG_DECL)
+                            CosEventChannelFactory::ChannelFactory_ptr factory)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Trying to create channel %s\n", channel_id));
@@ -149,11 +139,10 @@ FactoryClient::create_channel (const char *channel_id,
   CosEventChannelAdmin::EventChannel_var ec =
     CosEventChannelAdmin::EventChannel::_nil ();
 
-  ACE_TRY
+  try
     {
       ec = factory->create (channel_id,
-                            this->use_naming_service
-                            ACE_ENV_ARG_PARAMETER);
+                            this->use_naming_service);
 
       ACE_ASSERT (!CORBA::is_nil (ec.in ()));
 
@@ -161,90 +150,75 @@ FactoryClient::create_channel (const char *channel_id,
                   "Created Cos Event Channel \"%s \"\n",
                   channel_id));
     }
- ACE_CATCH (CORBA::UserException, ue)
+ catch (const CORBA::UserException& ue)
    {
-     ACE_PRINT_EXCEPTION (ue,
-                          "User Exception in createChannel: ");
+     ue._tao_print_exception ("User Exception in createChannel: ");
      return CosEventChannelAdmin::EventChannel::_nil ();
    }
-  ACE_CATCH (CORBA::SystemException, se)
+  catch (const CORBA::SystemException& se)
     {
-      ACE_PRINT_EXCEPTION (se,
-                           "System Exception in createChannel: ");
+      se._tao_print_exception ("System Exception in createChannel: ");
       return CosEventChannelAdmin::EventChannel::_nil ();
     }
-  ACE_ENDTRY;
 
   return ec._retn ();
 }
 
 void
-FactoryClient::destroy_channel (const char *channel_id
-                               ACE_ENV_ARG_DECL)
+FactoryClient::destroy_channel (const char *channel_id)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Destroying Cos Event Channel \"%s \"\n",
               channel_id));
 
   this->factory_->destroy (channel_id,
-                           use_naming_service
-                           ACE_ENV_ARG_PARAMETER);
+                           use_naming_service);
 }
 
 void
-FactoryClient::find_channel (const char* channel_id
-                            ACE_ENV_ARG_DECL)
+FactoryClient::find_channel (const char* channel_id)
 {
-  ACE_TRY
+  try
     {
       ACE_DEBUG ((LM_DEBUG,
                   "trying to find the Channel \"%s \"\n",
                   channel_id));
 
       CosEventChannelAdmin::EventChannel_var channel =
-        this->factory_->find (channel_id
-                              ACE_ENV_ARG_PARAMETER);
+        this->factory_->find (channel_id);
 
 
       CORBA::String_var str =
-        orb_->object_to_string (channel.in ()
-                                ACE_ENV_ARG_PARAMETER);
+        orb_->object_to_string (channel.in ());
 
       ACE_DEBUG ((LM_DEBUG,
               "Find returned - %s \n",
                   str.in ()));
 
-      this->find_channel_id (channel.in ()
-                             ACE_ENV_ARG_PARAMETER);
+      this->find_channel_id (channel.in ());
     }
-  ACE_CATCH (CORBA::UserException, ue)
+  catch (const CORBA::UserException& ue)
     {
-      ACE_PRINT_EXCEPTION (ue,
-                           "User Exception in findchannel: ");
+      ue._tao_print_exception ("User Exception in findchannel: ");
     }
-  ACE_CATCH (CORBA::SystemException, se)
+  catch (const CORBA::SystemException& se)
     {
-      ACE_PRINT_EXCEPTION (se,
-                           "System Exception in findchannel: ");
+      se._tao_print_exception ("System Exception in findchannel: ");
     }
-  ACE_ENDTRY;
 }
 
 void
-FactoryClient::find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel
-                                ACE_ENV_ARG_DECL)
+FactoryClient::find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel)
 {
   CORBA::String_var str =
-    orb_->object_to_string (channel
-                            ACE_ENV_ARG_PARAMETER);
+    orb_->object_to_string (channel);
 
   ACE_DEBUG ((LM_DEBUG,
               "trying to find the Channel %s \n",
               str.in ()));
 
   char *channel_id =
-    this->factory_->find_channel_id (channel
-                                     ACE_ENV_ARG_PARAMETER);
+    this->factory_->find_channel_id (channel);
 
   ACE_DEBUG ((LM_DEBUG,
               "find returned %s\n", channel_id));
@@ -264,70 +238,53 @@ FactoryClient::run_test (void)
 
   // create the first cosec
   cosec[0] = this->create_channel (channel_id[0],
-                                   this->factory_.in ()
-                                   ACE_ENV_ARG_PARAMETER);
+                                   this->factory_.in ());
 
  // create the second cosec
   cosec[1] = this->create_channel (channel_id[1],
-                                   this->factory_.in ()
-                                   ACE_ENV_ARG_PARAMETER);
+                                   this->factory_.in ());
 
   // create the third cosec
   cosec[2] = this->create_channel (channel_id[2],
-                                   this->factory_.in ()
-                                   ACE_ENV_ARG_PARAMETER);
+                                   this->factory_.in ());
 
   // see it we can destroy this one..
-  this->destroy_channel (channel_id[2]
-                         ACE_ENV_ARG_PARAMETER);
+  this->destroy_channel (channel_id[2]);
 
   // see if we can find it?
-  this->find_channel_id (cosec[2].in ()
-                         ACE_ENV_ARG_PARAMETER);
+  this->find_channel_id (cosec[2].in ());
 
   // see if we can create it again?
   cosec[2] = this->create_channel (channel_id[2],
-                                   this->factory_.in ()
-                                   ACE_ENV_ARG_PARAMETER);
+                                   this->factory_.in ());
 
   // try and find a channel that does not exist.
-  this->find_channel ("areyouthere?"
-                      ACE_ENV_ARG_PARAMETER);
+  this->find_channel ("areyouthere?");
 
   // see if it can detect duplicates.
   this->create_channel (channel_id[2],
-                        this->factory_.in ()
-                        ACE_ENV_ARG_PARAMETER);
+                        this->factory_.in ());
 
   // see if it can give us the id?
-  this->find_channel_id (cosec[0].in ()
-                         ACE_ENV_ARG_PARAMETER);
+  this->find_channel_id (cosec[0].in ());
 
-  this->find_channel_id (cosec[1].in ()
-                         ACE_ENV_ARG_PARAMETER);
+  this->find_channel_id (cosec[1].in ());
 
-  this->find_channel_id (cosec[2].in ()
-                         ACE_ENV_ARG_PARAMETER);
+  this->find_channel_id (cosec[2].in ());
 
   // check if we can get the channels from the id.
-  this->find_channel (channel_id[0]
-                      ACE_ENV_ARG_PARAMETER);
+  this->find_channel (channel_id[0]);
 
-  this->find_channel (channel_id[1]
-                      ACE_ENV_ARG_PARAMETER);
+  this->find_channel (channel_id[1]);
 
-  this->find_channel (channel_id[2]
-                      ACE_ENV_ARG_PARAMETER);
+  this->find_channel (channel_id[2]);
 
   //destroy them all.
-  this->destroy_channel (channel_id[0]
-                         ACE_ENV_ARG_PARAMETER);
+  this->destroy_channel (channel_id[0]);
 
-  this->destroy_channel (channel_id[1]
-                         ACE_ENV_ARG_PARAMETER);
+  this->destroy_channel (channel_id[1]);
 
-  this->destroy_channel (channel_id[2]
-                         ACE_ENV_ARG_PARAMETER);
+  this->destroy_channel (channel_id[2]);
 
   // end of testing.
   ACE_DEBUG ((LM_DEBUG,
@@ -339,48 +296,42 @@ main (int argc, char *argv [])
 {
   ACE_DEBUG ((LM_DEBUG,
               "The FactoryClient will test the Cos Event Channel Factory\n"));
-  ACE_TRY_NEW_ENV
+  try
     {
       FactoryClient ft;
 
       ft.init_ORB (argc,
-                   argv
-                   ACE_ENV_ARG_PARAMETER);
+                   argv);
 
-      ACE_TRY_EX (naming)
+      try
         {
           ft.resolve_naming_service ();
-          ACE_TRY_CHECK_EX (naming);
 
           ft.resolve_factory ();
-          ACE_TRY_CHECK_EX (naming);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Failed to resolve the naming service");
+          ex._tao_print_exception ("Failed to resolve the naming service");
           ACE_DEBUG ((LM_DEBUG,
                       "Creating a local Factory\n"));
           // TBD:
           ft.create_factory ();
         }
-      ACE_ENDTRY;
 
       ft.run_test ();
     }
-  ACE_CATCH (CORBA::UserException, ue)
+  catch (const CORBA::UserException& ue)
     {
-      ACE_PRINT_EXCEPTION (ue,
-                           "test failed: User Exception in FactoryClient: ");
+      ue._tao_print_exception (
+        "test failed: User Exception in FactoryClient: ");
       return 1;
     }
-  ACE_CATCH (CORBA::SystemException, se)
+  catch (const CORBA::SystemException& se)
     {
-      ACE_PRINT_EXCEPTION (se,
-                           "test failed: System Exception in FactoryClient: ");
+      se._tao_print_exception (
+        "test failed: System Exception in FactoryClient: ");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp
index fb749869600..ce42d9e6b87 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp
@@ -52,13 +52,11 @@ FactoryDriver::parse_args (int argc, char *argv [])
 int
 FactoryDriver::start (int argc, char *argv [])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       orb_ = CORBA::ORB_init (argc,
                               argv,
-                              ""
-                              ACE_ENV_ARG_PARAMETER);
+                              "");
 
       if (this->parse_args (argc, argv) == -1)
         return -1;
@@ -69,8 +67,7 @@ FactoryDriver::start (int argc, char *argv [])
                       -1);
 
       CORBA::Object_var poa_object  =
-        orb_->resolve_initial_references("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
+        orb_->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -78,8 +75,7 @@ FactoryDriver::start (int argc, char *argv [])
                           -1);
 
       root_poa_ =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa_->the_POAManager ();
@@ -100,8 +96,7 @@ FactoryDriver::start (int argc, char *argv [])
 
       if (factory_servant_->init (root_poa_.in (),
                                   child_poa_name_,
-                                  context.in ()
-                                 ACE_ENV_ARG_PARAMETER) != 0)
+                                  context.in ()) != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%P|%t) Unable to initialize "
                            "the factory. \n"),
@@ -114,8 +109,7 @@ FactoryDriver::start (int argc, char *argv [])
       factory_servant_->_remove_ref ();
 
       CORBA::String_var
-        str = orb_->object_to_string (factory_.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        str = orb_->object_to_string (factory_.in ());
 
       ACE_DEBUG ((LM_DEBUG,
                   "CosEvent_Service: The Cos Event Channel Factory IOR is <%s>\n",
@@ -125,27 +119,23 @@ FactoryDriver::start (int argc, char *argv [])
       name.length (1);
       name[0].id = CORBA::string_dup (factoryName_);
       naming_client_->rebind (name,
-                              factory_.in ()
-                              ACE_ENV_ARG_PARAMETER);
+                              factory_.in ());
 
       ACE_DEBUG ((LM_DEBUG,
                   "Registered with the naming service as %s\n", factoryName_));
 
       orb_->run ();
     }
-  ACE_CATCH (CORBA::UserException, ue)
+  catch (const CORBA::UserException& ue)
     {
-      ACE_PRINT_EXCEPTION (ue,
-                           "cosecfactory: ");
+      ue._tao_print_exception ("cosecfactory: ");
       return 1;
     }
-  ACE_CATCH (CORBA::SystemException, se)
+  catch (const CORBA::SystemException& se)
     {
-      ACE_PRINT_EXCEPTION (se,
-                           "cosecfactory: ");
+      se._tao_print_exception ("cosecfactory: ");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp
index cea16cb5a36..d065ce77b11 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp
@@ -18,21 +18,17 @@ RtEC_Based_CosEC::~RtEC_Based_CosEC (void)
 }
 
 void
-RtEC_Based_CosEC::init_ORB  (int& argc, char *argv []
-                             ACE_ENV_ARG_DECL)
+RtEC_Based_CosEC::init_ORB  (int& argc, char *argv [])
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                ""
-                                ACE_ENV_ARG_PARAMETER);
+                                "");
 
   CORBA::Object_var poa_object  =
-    this->orb_->resolve_initial_references("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references("RootPOA");
 
   this->poa_ =
-    PortableServer::POA::_narrow (poa_object.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (poa_object.in ());
 
   PortableServer::POAManager_var poa_manager =
     this->poa_->the_POAManager ();
@@ -94,18 +90,16 @@ RtEC_Based_CosEC::parse_args (int argc, char *argv [])
 }
 
 void
-RtEC_Based_CosEC::startup (int argc, char *argv[]
-                           ACE_ENV_ARG_DECL)
+RtEC_Based_CosEC::startup (int argc, char *argv[])
 {
   ACE_DEBUG ((LM_DEBUG,
               "Starting up the CosEvent Service...\n"));
 
   // initalize the ORB.
-  this->init_ORB (argc, argv
-                  ACE_ENV_ARG_PARAMETER);
+  this->init_ORB (argc, argv);
 
   if (this->parse_args (argc, argv) == -1)
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   this->resolve_naming_service ();
 
@@ -113,8 +107,7 @@ RtEC_Based_CosEC::startup (int argc, char *argv[]
               this->poa_.in (),
               this->eventTypeIds_,
               this->eventSourceIds_,
-              this->source_type_pairs_
-              ACE_ENV_ARG_PARAMETER);
+              this->source_type_pairs_);
 
   this->activate ();
 
@@ -122,11 +115,10 @@ RtEC_Based_CosEC::startup (int argc, char *argv[]
   ACE_ASSERT(!CORBA::is_nil (this->naming_.in ()));
 
   CORBA::Object_var obj =
-    this->poa_->servant_to_reference (this
-                                      ACE_ENV_ARG_PARAMETER);
+    this->poa_->servant_to_reference (this);
 
   CORBA::String_var str =
-    this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
+    this->orb_->object_to_string (obj.in ());
 
   ACE_DEBUG ((LM_DEBUG,
               "The CosEC IOR is <%s>\n", str.in ()));
@@ -136,8 +128,7 @@ RtEC_Based_CosEC::startup (int argc, char *argv[]
   name[0].id = CORBA::string_dup (this->service_name);
 
   this->naming_->rebind (name,
-                         obj.in ()
-                         ACE_ENV_ARG_PARAMETER);
+                         obj.in ());
 
   ACE_DEBUG ((LM_DEBUG,
               "Registered with the naming service as: %s\n",
@@ -193,44 +184,38 @@ RtEC_Based_CosEC::locate_rtec (void)
     CORBA::string_dup (this->rt_service_name);
 
   CORBA::Object_var obj =
-    this->naming_->resolve (ref_name
-                            ACE_ENV_ARG_PARAMETER);
+    this->naming_->resolve (ref_name);
 
   this->rtec_ =
-    RtecEventChannelAdmin::EventChannel::_narrow (obj.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
+    RtecEventChannelAdmin::EventChannel::_narrow (obj.in ());
 }
 
 void
 RtEC_Based_CosEC::resolve_naming_service (void)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references ("NameService"
-                                            ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references ("NameService");
 
   // Need to check return value for errors.
   if (CORBA::is_nil (naming_obj.in ()))
-    ACE_THROW (CORBA::UNKNOWN ());
+    throw CORBA::UNKNOWN ();
 
   this->naming_ =
-    CosNaming::NamingContext::_narrow (naming_obj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+    CosNaming::NamingContext::_narrow (naming_obj.in ());
 }
 
 int
 RtEC_Based_CosEC::run (void)
 {
   ACE_DEBUG ((LM_DEBUG, "%s: Running the CosEventService\n", __FILE__));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       this->orb_->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), 1);
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -246,8 +231,7 @@ RtEC_Based_CosEC::shutdown (void)
   name.length (1);
   name[0].id = CORBA::string_dup (this->service_name);
 
-  this->naming_->unbind (name
-                         ACE_ENV_ARG_PARAMETER);
+  this->naming_->unbind (name);
 
   // shutdown the ORB.
   if (!CORBA::is_nil (this->orb_.in ()))
@@ -261,11 +245,10 @@ main (int argc, char *argv[])
 
   RtEC_Based_CosEC service;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       service.startup (argc,
-                       argv
-                       ACE_ENV_ARG_PARAMETER);
+                       argv);
 
       if (service.run () == -1)
         {
@@ -275,13 +258,11 @@ main (int argc, char *argv[])
                             1);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Failed to start CosEventService");
+      ex._tao_print_exception ("Failed to start CosEventService");
       return 1;
     }
-  ACE_ENDTRY;
 
   service.shutdown ();
 
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h
index 7c56f01d24d..38e44aebee7 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h
@@ -43,8 +43,7 @@ class RtEC_Based_CosEC : public CosEC_ServantBase
   int parse_args (int argc, char *argv []);
   // Parses the command line arguments.
 
-  void startup (int argc, char *argv[]
-               ACE_ENV_ARG_DECL);
+  void startup (int argc, char *argv[]);
   // Initializes the COS Event Service.
   // Returns 0 on success, -1 on error.
 
@@ -68,8 +67,7 @@ protected:
   virtual void deactivate_rtec (void);
   // Deactivates the rtec.
 
-  void init_ORB (int& argc, char *argv []
-                 ACE_ENV_ARG_DECL);
+  void init_ORB (int& argc, char *argv []);
   // initialize the ORB.
 
   void resolve_naming_service (void);
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp
index dfa5ddf64a0..f3df43e46d5 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp
@@ -34,8 +34,7 @@ CosEC_ServantBase::init (PortableServer::POA_ptr thispoa,
                          PortableServer::POA_ptr poa,
                          char *,
                          char *,
-                         char *
-                         ACE_ENV_ARG_DECL)
+                         char *)
 {
   ACE_ASSERT (!CORBA::is_nil (thispoa));
   ACE_ASSERT (!CORBA::is_nil (poa));
@@ -73,21 +72,18 @@ CosEC_ServantBase::activate (void)
    // Note that the POA is <thispoa_>
 
    PortableServer::ObjectId_var oid =
-     this->thispoa_->activate_object (this
-                                      ACE_ENV_ARG_PARAMETER);
+     this->thispoa_->activate_object (this);
 
    this->_remove_ref ();
 
    CORBA::Object_var obj =
-     this->thispoa_->id_to_reference (oid.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+     this->thispoa_->id_to_reference (oid.in ());
 
    return 0; // success.
 }
 
 int
-CosEC_ServantBase::activate (const char* servant_id
-                             ACE_ENV_ARG_DECL)
+CosEC_ServantBase::activate (const char* servant_id)
 {
   ACE_ASSERT (!CORBA::is_nil (this->poa_.in ()));
   ACE_ASSERT (!CORBA::is_nil (this->thispoa_.in ()));
@@ -106,14 +102,12 @@ CosEC_ServantBase::activate (const char* servant_id
   // Activate ourselves.
   // Note that the POA is <thispoa_>
   this->thispoa_->activate_object_with_id (oid.in (),
-                                           this
-                                           ACE_ENV_ARG_PARAMETER);
+                                           this);
 
   this->_remove_ref ();
 
   CORBA::Object_var obj =
-    this->thispoa_->id_to_reference (oid.in ()
-                                     ACE_ENV_ARG_PARAMETER);
+    this->thispoa_->id_to_reference (oid.in ());
 
   return 0; // success.
 }
@@ -123,14 +117,12 @@ CosEC_ServantBase::activate_rtec (void)
 {
   // Activate the Rtec
   PortableServer::ObjectId_var oid =
-    this->poa_->activate_object (this->rtec_servant_
-                                 ACE_ENV_ARG_PARAMETER);
+    this->poa_->activate_object (this->rtec_servant_);
 
   this->rtec_servant_->_remove_ref ();
 
   CORBA::Object_var obj =
-    this->poa_->id_to_reference (oid.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+    this->poa_->id_to_reference (oid.in ());
 
   this->rtec_ =
     RtecEventChannelAdmin::EventChannel::_narrow (obj.in ());
@@ -161,20 +153,17 @@ CosEC_ServantBase::activate_cosec (void)
 
   if (this->cosec_servant_->init (consumerqos,
                                   supplierqos,
-                                  this->rtec_.in ()
-                                  ACE_ENV_ARG_PARAMETER) != 0)
+                                  this->rtec_.in ()) != 0)
     return -1;
 
   // Activate the CosEC
   PortableServer::ObjectId_var oid =
-    this->poa_->activate_object (this->cosec_servant_
-                                 ACE_ENV_ARG_PARAMETER);
+    this->poa_->activate_object (this->cosec_servant_);
 
   this->cosec_servant_->_remove_ref ();
 
   CORBA::Object_var obj =
-    this->poa_->id_to_reference (oid.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+    this->poa_->id_to_reference (oid.in ());
 
   this->cosec_ =
     CosEventChannelAdmin::EventChannel::_narrow (obj.in ());
@@ -191,12 +180,10 @@ CosEC_ServantBase::deactivate (void)
 
   // Finally we go away..
   PortableServer::ObjectId_var oid =
-    this->thispoa_->servant_to_id (this
-                                   ACE_ENV_ARG_PARAMETER);
+    this->thispoa_->servant_to_id (this);
 
   // deactivate from the poa.
-  this->thispoa_->deactivate_object (oid.in ()
-                                     ACE_ENV_ARG_PARAMETER);
+  this->thispoa_->deactivate_object (oid.in ());
 }
 
 void
@@ -204,12 +191,10 @@ CosEC_ServantBase::deactivate_rtec (void)
 {
   // Deactivate the rtec.
   PortableServer::ObjectId_var oid =
-    this->poa_->servant_to_id (this->rtec_servant_
-                               ACE_ENV_ARG_PARAMETER);
+    this->poa_->servant_to_id (this->rtec_servant_);
 
   // deactivate from the poa.
-  this->poa_->deactivate_object (oid.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+  this->poa_->deactivate_object (oid.in ());
 }
 
 void
@@ -217,12 +202,10 @@ CosEC_ServantBase::deactivate_cosec (void)
 {
   // Deactivate the cosec.
   PortableServer::ObjectId_var oid =
-    this->poa_->servant_to_id (this->cosec_servant_
-                               ACE_ENV_ARG_PARAMETER);
+    this->poa_->servant_to_id (this->cosec_servant_);
 
   // deactivate from the poa.
-  this->poa_->deactivate_object (oid.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+  this->poa_->deactivate_object (oid.in ());
 }
 
 CosEventChannelAdmin::ConsumerAdmin_ptr
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h
index f24503e8d5d..26eaf55e438 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h
@@ -50,8 +50,7 @@ class TAO_RTEC_COSEC_Export CosEC_ServantBase :
                      PortableServer::POA_ptr poa,
                      char *eventTypeIds,
                      char *eventSourceIds,
-                     char *source_type_pairs
-                     ACE_ENV_ARG_DECL);
+                     char *source_type_pairs);
   // This method creates a local scheduler, rtec and cosec.
   // The POA <poa> specified here is used when <activate> is called to
   // activate the contained servants.
@@ -60,7 +59,7 @@ class TAO_RTEC_COSEC_Export CosEC_ServantBase :
   int activate (void);
   // Activates the CosEC with <thispoa_> and friends with the <poa_>
 
-  int activate (const char* servant_id ACE_ENV_ARG_DECL);
+  int activate (const char* servant_id);
   // If the servant_id is not nil then it is used to supply the object id
   // for <this> servant.
 
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp
index fa31fe01016..6559d30c427 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp
@@ -19,8 +19,7 @@ TAO_CosEC_EventChannel_i::~TAO_CosEC_EventChannel_i (void)
 int
 TAO_CosEC_EventChannel_i::init (const RtecEventChannelAdmin::ConsumerQOS &consumerqos,
                                 const RtecEventChannelAdmin::SupplierQOS &supplierqos,
-                                RtecEventChannelAdmin::EventChannel_ptr rtec
-                                ACE_ENV_ARG_DECL)
+                                RtecEventChannelAdmin::EventChannel_ptr rtec)
 {
   // Allocate the admins..
   TAO_CosEC_ConsumerAdmin_i *consumer_;
@@ -97,11 +96,9 @@ TAO_CosEC_EventChannel_i::destroy (void)
   PortableServer::POA_var poa =
     this->_default_POA ();
 
-  PortableServer::ObjectId_var id = poa->servant_to_id (this
-                                                        ACE_ENV_ARG_PARAMETER);
+  PortableServer::ObjectId_var id = poa->servant_to_id (this);
 
-  poa->deactivate_object (id.in ()
-                          ACE_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in ());
 
   this->supplieradmin_ =  CosEventChannelAdmin::SupplierAdmin::_nil ();
   this->consumeradmin_ =  CosEventChannelAdmin::ConsumerAdmin::_nil ();
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h
index c21f321099f..82e16cc01fd 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h
@@ -50,8 +50,7 @@ public:
 
   int init (const RtecEventChannelAdmin::ConsumerQOS &consumerqos,
             const RtecEventChannelAdmin::SupplierQOS &supplierqos,
-            RtecEventChannelAdmin::EventChannel_ptr rtec
-            ACE_ENV_ARG_DECL);
+            RtecEventChannelAdmin::EventChannel_ptr rtec);
   // Activates the ConsumerAdmin and SupplierAdmin servants.  Returns
   // -1 on error, 0 on success.
 
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp
index eecc6a49195..626c6226fed 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp
@@ -73,11 +73,9 @@ TAO_CosEC_PushSupplierWrapper::disconnect_push_supplier (void)
     this->_default_POA ();
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this
-                        ACE_ENV_ARG_PARAMETER);
+    poa->servant_to_id (this);
 
-  poa->deactivate_object (id.in ()
-                          ACE_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in ());
 
   // @@ If we keep a list remember to remove this object from the
   // list.
@@ -98,8 +96,7 @@ TAO_CosEC_ProxyPushConsumer_i::~TAO_CosEC_ProxyPushConsumer_i (void)
 }
 
 void
-TAO_CosEC_ProxyPushConsumer_i::push (const CORBA::Any &data
-                                     ACE_ENV_ARG_DECL)
+TAO_CosEC_ProxyPushConsumer_i::push (const CORBA::Any &data)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecEventComm::Event buffer[1];
@@ -132,8 +129,7 @@ TAO_CosEC_ProxyPushConsumer_i::push (const CORBA::Any &data
 
   e.data.any_value = data;
 
-  this->proxypushconsumer_->push (events
-                                  ACE_ENV_ARG_PARAMETER);
+  this->proxypushconsumer_->push (events);
 }
 
 void
@@ -147,21 +143,18 @@ TAO_CosEC_ProxyPushConsumer_i::disconnect_push_consumer (void)
     this->_default_POA ();
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this
-                        ACE_ENV_ARG_PARAMETER);
+    poa->servant_to_id (this);
 
-  poa->deactivate_object (id.in ()
-                          ACE_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in ());
 }
 
 void
-TAO_CosEC_ProxyPushConsumer_i::connect_push_supplier (CosEventComm::PushSupplier_ptr push_supplier
-                                                      ACE_ENV_ARG_DECL)
+TAO_CosEC_ProxyPushConsumer_i::connect_push_supplier (CosEventComm::PushSupplier_ptr push_supplier)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosEventChannelAdmin::AlreadyConnected))
 {
   if (this->connected ())
-    ACE_THROW (CosEventChannelAdmin::AlreadyConnected ());
+    throw CosEventChannelAdmin::AlreadyConnected ();
 
   TAO_CosEC_PushSupplierWrapper *wrapper;
 
@@ -180,8 +173,7 @@ TAO_CosEC_ProxyPushConsumer_i::connect_push_supplier (CosEventComm::PushSupplier
 
   this->proxypushconsumer_->connect_push_supplier
     (rtecpushsupplier,
-     this->qos_
-     ACE_ENV_ARG_PARAMETER);
+     this->qos_);
 
   this->wrapper_ = auto_wrapper.release ();
 }
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h
index ae38714b7bf..3d56f52ed16 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h
@@ -53,8 +53,7 @@ public:
   ~TAO_CosEC_ProxyPushConsumer_i (void);
   // Destructor.
 
-  virtual void push (const CORBA::Any &data
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const CORBA::Any &data)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Suppliers call this method to pass data to connected consumers.
 
@@ -62,8 +61,7 @@ public:
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Disconnects the supplier from the event communication.
 
-  virtual void connect_push_supplier(CosEventComm::PushSupplier_ptr push_supplier
-                                     ACE_ENV_ARG_DECL)
+  virtual void connect_push_supplier(CosEventComm::PushSupplier_ptr push_supplier)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosEventChannelAdmin::AlreadyConnected));
   // Connects a push supplier.
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp
index 5a98c83414f..df20e0046e1 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp
@@ -30,8 +30,7 @@ public:
   ~TAO_CosEC_PushConsumerWrapper (void);
   // Destructor.
 
-  virtual void push (const RtecEventComm::EventSet & data
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet & data)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // This method is called by the RTEvent Channel to supply data.
 
@@ -61,24 +60,21 @@ TAO_CosEC_PushConsumerWrapper::~TAO_CosEC_PushConsumerWrapper ()
 }
 
 void
-TAO_CosEC_PushConsumerWrapper::push (const RtecEventComm::EventSet& set
-                                     ACE_ENV_ARG_DECL)
+TAO_CosEC_PushConsumerWrapper::push (const RtecEventComm::EventSet& set)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   for (CORBA::ULong i = 0;
        i < set.length ();
        ++i)
     {
-      ACE_TRY
+      try
         {
-          this->consumer_->push (set[i].data.any_value
-                                 ACE_ENV_ARG_PARAMETER);
+          this->consumer_->push (set[i].data.any_value);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           // Ignore the exception...
         }
-      ACE_ENDTRY;
     }
 }
 
@@ -93,11 +89,9 @@ TAO_CosEC_PushConsumerWrapper::disconnect_push_consumer (void)
     this->_default_POA ();
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this
-                        ACE_ENV_ARG_PARAMETER);
+    poa->servant_to_id (this);
 
-  poa->deactivate_object (id.in ()
-                          ACE_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in ());
 
   // @@ If we keep a list remember to remove this object from the
   // list.
@@ -129,28 +123,25 @@ TAO_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (void)
     this->_default_POA ();
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this
-                        ACE_ENV_ARG_PARAMETER);
+    poa->servant_to_id (this);
 
-  poa->deactivate_object (id.in ()
-                          ACE_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in ());
 
   // @@ If we keep a list remember to remove this object from the
   // list.
 }
 
 void
-TAO_CosEC_ProxyPushSupplier_i::connect_push_consumer (CosEventComm::PushConsumer_ptr push_consumer
-                                                      ACE_ENV_ARG_DECL)
+TAO_CosEC_ProxyPushSupplier_i::connect_push_consumer (CosEventComm::PushConsumer_ptr push_consumer)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosEventChannelAdmin::AlreadyConnected,
                        CosEventChannelAdmin::TypeError))
 {
   if (this->connected ())
-    ACE_THROW (CosEventChannelAdmin::AlreadyConnected ());
+    throw CosEventChannelAdmin::AlreadyConnected ();
 
   if (push_consumer == CosEventComm::PushConsumer::_nil())
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   TAO_CosEC_PushConsumerWrapper *wrapper;
   ACE_NEW_THROW_EX (wrapper,
@@ -167,8 +158,7 @@ TAO_CosEC_ProxyPushSupplier_i::connect_push_consumer (CosEventComm::PushConsumer
   auto_wrapper.get ()->_remove_ref ();
 
   this->pps_->connect_push_consumer (rtecpushconsumer,
-                                     this->qos_
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this->qos_);
 
   this->wrapper_ = auto_wrapper.release ();
 }
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h
index c81cd6a4a04..bb26a3ef8fa 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h
@@ -50,8 +50,7 @@ public:
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Ends the event communication and disposes this object.
 
-  virtual void connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer
-                                     ACE_ENV_ARG_DECL)
+  virtual void connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosEventChannelAdmin::AlreadyConnected,
                        CosEventChannelAdmin::TypeError));
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp
index b9f7d2691f3..8598acf7d98 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp
@@ -9,28 +9,24 @@ main (int argc, char *argv [])
 {
   Basic basic;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      basic.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      basic.init (argc, argv);
 
       basic.run ();
 
       basic.shutdown ();
     }
-  ACE_CATCH (CORBA::UserException, ue)
+  catch (const CORBA::UserException& ue)
     {
-      ACE_PRINT_EXCEPTION (ue,
-                           "CosEC_Basic user exception: ");
+      ue._tao_print_exception ("CosEC_Basic user exception: ");
       return 1;
     }
-  ACE_CATCH (CORBA::SystemException, se)
+  catch (const CORBA::SystemException& se)
     {
-      ACE_PRINT_EXCEPTION (se,
-                           "CosEC_Basic system exception: ");
+      se._tao_print_exception ("CosEC_Basic system exception: ");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -46,34 +42,29 @@ Basic::~Basic (void)
 }
 
 void
-Basic::init (int argc, char *argv[]
-                   ACE_ENV_ARG_DECL)
+Basic::init (int argc, char *argv[])
 {
-  this->init_ORB (argc, argv ACE_ENV_ARG_PARAMETER);
+  this->init_ORB (argc, argv);
 
   this->init_CosEC ();
 }
 
 void
-Basic::init_ORB  (int argc, char *argv []
-                        ACE_ENV_ARG_DECL)
+Basic::init_ORB  (int argc, char *argv [])
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                ""
-                                ACE_ENV_ARG_PARAMETER);
+                                "");
 
   CORBA::Object_var poa_object  =
-    this->orb_->resolve_initial_references("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references("RootPOA");
 
   if (CORBA::is_nil (poa_object.in ()))
     ACE_ERROR ((LM_ERROR,
                 " (%P|%t) Unable to initialize the POA.\n"));
 
   root_poa_ =
-    PortableServer::POA::_narrow (poa_object.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (poa_object.in ());
 
   PortableServer::POAManager_var poa_manager =
     root_poa_->the_POAManager ();
@@ -94,21 +85,19 @@ Basic::init_CosEC (void)
 
   ec->init (this->root_poa_.in(),
             this->root_poa_.in(),
-            0,0,0
-            ACE_ENV_ARG_PARAMETER);
+            0,0,0);
 
   int retval = ec->activate ();
 
   if (retval == -1)
-    ACE_THROW (CORBA::UNKNOWN ());
+    throw CORBA::UNKNOWN ();
   // @@ look for more descriptive exception to throw here
 
   CORBA::Object_var obj =
-    this->root_poa_->servant_to_reference (ec ACE_ENV_ARG_PARAMETER);
+    this->root_poa_->servant_to_reference (ec);
 
   this->cos_ec_ =
-    CosEventChannelAdmin::EventChannel::_narrow (obj._retn ()
-                                                 ACE_ENV_ARG_PARAMETER);
+    CosEventChannelAdmin::EventChannel::_narrow (obj._retn ());
 }
 
 void
@@ -119,18 +108,15 @@ Basic::run (void)
   any <<= (CORBA::Long)50;
 
   this->consumer_.open (this->cos_ec_.in (),
-                        this->orb_.in ()
-                        ACE_ENV_ARG_PARAMETER);
+                        this->orb_.in ());
 
   this->consumer_.connect ();
 
-  this->supplier_.open (this->cos_ec_.in ()
-                        ACE_ENV_ARG_PARAMETER);
+  this->supplier_.open (this->cos_ec_.in ());
 
   this->supplier_.connect ();
 
-  this->supplier_.send_event (any
-                              ACE_ENV_ARG_PARAMETER);
+  this->supplier_.send_event (any);
 
   // this->orb_->run ();
   // @@ commenting out the run-shutdown mechanism for now because it gives
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h
index 667cde63000..333049506ef 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h
@@ -36,7 +36,7 @@ public:
   ~Basic (void);
   // Destructor.
 
-  void init (int argc, char *argv[] ACE_ENV_ARG_DECL);
+  void init (int argc, char *argv[]);
   // Starts up an ORB and the CosEC.
   // Returns 0 on success, -1 on error.
 
@@ -48,7 +48,7 @@ public:
   // Closes down the CosEC.
 
 private:
-  void init_ORB (int argc, char *argv[] ACE_ENV_ARG_DECL);
+  void init_ORB (int argc, char *argv[]);
   // initializes the ORB.
   // Returns 0 on success, -1 on error.
 
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp
index ef40ec37bf5..b2385f752dc 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp
@@ -5,8 +5,7 @@
 
 void
 Consumer::open (CosEventChannelAdmin::EventChannel_ptr event_channel,
-                     CORBA::ORB_ptr orb
-                     ACE_ENV_ARG_DECL)
+                     CORBA::ORB_ptr orb)
 {
   this->orb_ = orb;
 
@@ -36,8 +35,7 @@ Consumer::connect (void)
   this->supplier_proxy_ =
     this->consumer_admin_->obtain_push_supplier ();
 
-  this->supplier_proxy_->connect_push_consumer (objref.in ()
-                                                ACE_ENV_ARG_PARAMETER);
+  this->supplier_proxy_->connect_push_consumer (objref.in ());
 }
 
 void
@@ -54,8 +52,7 @@ Consumer::disconnect (void)
 }
 
 void
-Consumer::push (const CORBA::Any &
-                     ACE_ENV_ARG_DECL_NOT_USED)
+Consumer::push (const CORBA::Any &)
  ACE_THROW_SPEC ((
         CORBA::SystemException,
         CosEventComm::Disconnected
@@ -79,9 +76,7 @@ Consumer::disconnect_push_consumer (void)
     this->_default_POA ();
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this
-                        ACE_ENV_ARG_PARAMETER);
+    poa->servant_to_id (this);
 
-  poa->deactivate_object (id.in ()
-                          ACE_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in ());
 }
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h
index 1a9cda33bed..d1d61414dbb 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h
@@ -33,8 +33,7 @@ class Consumer : public POA_CosEventComm::PushConsumer
 
 public:
   void open (CosEventChannelAdmin::EventChannel_ptr event_channel,
-             CORBA::ORB_ptr orb
-             ACE_ENV_ARG_DECL);
+             CORBA::ORB_ptr orb);
   // This method connects the consumer to the EC.
 
   void close (void);
@@ -47,8 +46,7 @@ public:
   // Disconnect from the supplier, but do not forget about it or close
   // it.
 
-  virtual void push (const CORBA::Any &data
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const CORBA::Any &data)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         CosEventComm::Disconnected
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp
index b1d3bb54051..886bf57af84 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp
@@ -4,8 +4,7 @@
 #include "Supplier.h"
 
 void
-Supplier::open (CosEventChannelAdmin::EventChannel_ptr event_channel
-                     ACE_ENV_ARG_DECL)
+Supplier::open (CosEventChannelAdmin::EventChannel_ptr event_channel)
 {
   // = Connect as a consumer.
   this->supplier_admin_ =
@@ -32,8 +31,7 @@ Supplier::connect (void)
 
   CosEventComm::PushSupplier_var objref = this->_this ();
 
-  this->consumer_proxy_->connect_push_supplier (objref.in ()
-                                                ACE_ENV_ARG_PARAMETER);
+  this->consumer_proxy_->connect_push_supplier (objref.in ());
 }
 
 void
@@ -50,10 +48,9 @@ Supplier::disconnect (void)
 }
 
 void
-Supplier::send_event (const CORBA::Any & data
-                           ACE_ENV_ARG_DECL)
+Supplier::send_event (const CORBA::Any & data)
 {
-  this->consumer_proxy_->push (data ACE_ENV_ARG_PARAMETER);
+  this->consumer_proxy_->push (data);
 }
 
 void
@@ -68,9 +65,7 @@ Supplier::disconnect_push_supplier (void)
     this->_default_POA ();
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this
-                        ACE_ENV_ARG_PARAMETER);
+    poa->servant_to_id (this);
 
-  poa->deactivate_object (id.in ()
-                          ACE_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in ());
 }
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h
index 76c4f16fc6d..1d2d6a0117a 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h
@@ -31,8 +31,7 @@ class Supplier : public POA_CosEventComm::PushSupplier
   //   The Supplier is a simple Push Supplier that connects to
   //   the CosEC and sends events to it.
 public:
-  void open (CosEventChannelAdmin::EventChannel_ptr event_channel
-             ACE_ENV_ARG_DECL);
+  void open (CosEventChannelAdmin::EventChannel_ptr event_channel);
   // This method connects the supplier to the EC.
 
   void close (void);
@@ -43,8 +42,7 @@ public:
   void disconnect (void);
   // Disconnect from the EC, but do not forget about it or close it.
 
-  void send_event (const CORBA::Any &data
-                   ACE_ENV_ARG_DECL);
+  void send_event (const CORBA::Any &data);
   // Send one event.
 
   virtual void disconnect_push_supplier (void)
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
index 0af6ef66545..5755ed1d97d 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
@@ -44,8 +44,7 @@ Consumer::parse_args (int argc, char *argv [])
 }
 
 void
-Consumer::open (CosEventChannelAdmin::EventChannel_ptr event_channel
-                     ACE_ENV_ARG_DECL)
+Consumer::open (CosEventChannelAdmin::EventChannel_ptr event_channel)
 {
   // = Connect as a consumer.
   this->consumer_admin_ =
@@ -73,8 +72,7 @@ Consumer::connect (void)
   this->supplier_proxy_ =
     this->consumer_admin_->obtain_push_supplier ();
 
-  this->supplier_proxy_->connect_push_consumer (objref.in ()
-                                                ACE_ENV_ARG_PARAMETER);
+  this->supplier_proxy_->connect_push_consumer (objref.in ());
 }
 
 void
@@ -91,8 +89,7 @@ Consumer::disconnect (void)
 }
 
 void
-Consumer::push (const CORBA::Any &
-                     ACE_ENV_ARG_DECL)
+Consumer::push (const CORBA::Any &)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         CosEventComm::Disconnected
@@ -133,31 +130,25 @@ Consumer::disconnect_push_consumer (void)
     this->_default_POA ();
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this
-                        ACE_ENV_ARG_PARAMETER);
+    poa->servant_to_id (this);
 
-  poa->deactivate_object (id.in ()
-                          ACE_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in ());
 }
 
 int
 Consumer::init_Consumer (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
    {
-      this->open (this->cos_ec_
-                  ACE_ENV_ARG_PARAMETER);
+      this->open (this->cos_ec_);
 
       this->connect ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in Consumer::connect (void)\n");
+      ex._tao_print_exception ("Exception in Consumer::connect (void)\n");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h
index 34b3ac56b02..757c4a062cd 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h
@@ -40,8 +40,7 @@ public:
   int init_Consumer (void);
   // Initialize the Consumer.
 
-  void open (CosEventChannelAdmin::EventChannel_ptr event_channel
-             ACE_ENV_ARG_DECL);
+  void open (CosEventChannelAdmin::EventChannel_ptr event_channel);
   // This method connects the consumer to the EC.
 
   void close (void);
@@ -54,8 +53,7 @@ public:
   // Disconnect from the supplier, but do not forget about it or close
   // it.
 
-  virtual void push (const CORBA::Any &data
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const CORBA::Any &data)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         CosEventComm::Disconnected
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp
index 2bf8bb0251c..18620778f22 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp
@@ -39,17 +39,14 @@ Multiple::init (int argc, char *argv[])
 int
 Multiple::init_ORB  (int argc, char *argv [])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       this->orb_ = CORBA::ORB_init (argc,
                                     argv,
-                                    ""
-                                    ACE_ENV_ARG_PARAMETER);
+                                    "");
 
       CORBA::Object_var poa_object  =
-        this->orb_->resolve_initial_references("RootPOA"
-                                               ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -57,21 +54,18 @@ Multiple::init_ORB  (int argc, char *argv [])
                           -1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
 
       poa_manager->activate ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in Multiple::init_ORB\n");
+      ex._tao_print_exception ("Exception in Multiple::init_ORB\n");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -79,8 +73,7 @@ Multiple::init_ORB  (int argc, char *argv [])
 int
 Multiple::init_CosEC (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialization of the naming service.
       if (this->naming_client_.init (this->orb_.in ()) != 0)
@@ -95,23 +88,19 @@ Multiple::init_CosEC (void)
         CORBA::string_dup (this->service_name);
 
       CORBA::Object_var EC_obj =
-        this->naming_client_->resolve (ec_ref_name
-                                      ACE_ENV_ARG_PARAMETER);
+        this->naming_client_->resolve (ec_ref_name);
 
       // The CORBA::Object_var object is downcast to
       // CosEventChannelAdmin::EventChannel
       // using the <_narrow> method.
       this->cos_ec_ =
-        CosEventChannelAdmin::EventChannel::_narrow (EC_obj.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+        CosEventChannelAdmin::EventChannel::_narrow (EC_obj.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in Multiple::init_ORB\n");
+      ex._tao_print_exception ("Exception in Multiple::init_ORB\n");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -119,16 +108,14 @@ Multiple::init_CosEC (void)
 int
 Multiple::runORB (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       this->orb_->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), 1);
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
index 229e900ebc1..3a0e1addb11 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
@@ -43,8 +43,7 @@ Supplier::parse_args (int argc, char *argv [])
 }
 
 void
-Supplier::open (CosEventChannelAdmin::EventChannel_ptr event_channel
-                     ACE_ENV_ARG_DECL)
+Supplier::open (CosEventChannelAdmin::EventChannel_ptr event_channel)
 {
   // = Connect as a consumer.
   this->supplier_admin_ =
@@ -71,8 +70,7 @@ Supplier::connect (void)
 
   CosEventComm::PushSupplier_var objref = this->_this ();
 
-  this->consumer_proxy_->connect_push_supplier (objref.in ()
-                                                ACE_ENV_ARG_PARAMETER);
+  this->consumer_proxy_->connect_push_supplier (objref.in ());
 }
 
 void
@@ -89,10 +87,9 @@ Supplier::disconnect (void)
 }
 
 void
-Supplier::send_event (const CORBA::Any & data
-                           ACE_ENV_ARG_DECL)
+Supplier::send_event (const CORBA::Any & data)
 {
-  this->consumer_proxy_->push (data ACE_ENV_ARG_PARAMETER);
+  this->consumer_proxy_->push (data);
 }
 
 void
@@ -107,25 +104,21 @@ Supplier::disconnect_push_supplier (void)
     this->_default_POA ();
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this
-                        ACE_ENV_ARG_PARAMETER);
+    poa->servant_to_id (this);
 
-  poa->deactivate_object (id.in ()
-                          ACE_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in ());
 }
 
 void
 Supplier::run (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Create an Any type to pass to the Cos EC.
       CORBA::Any any;
       any <<= CORBA::Long (50);
 
-      this->open (this->cos_ec_
-                  ACE_ENV_ARG_PARAMETER);
+      this->open (this->cos_ec_);
 
       this->connect ();
 
@@ -137,8 +130,7 @@ Supplier::run (void)
            count != 0;
            count--)
         {
-          this->send_event (any
-                            ACE_ENV_ARG_PARAMETER);
+          this->send_event (any);
         }
 
       ACE_DEBUG ((LM_DEBUG,
@@ -146,12 +138,10 @@ Supplier::run (void)
 
       this->close ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in CosEC_Multiple::run\n");
+      ex._tao_print_exception ("Exception in CosEC_Multiple::run\n");
     }
-  ACE_ENDTRY;
 }
 
 int
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h
index 8877f23fb43..1041ae6a163 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h
@@ -37,8 +37,7 @@ public:
   Supplier ();
   // Constructor.
 
-  void open (CosEventChannelAdmin::EventChannel_ptr event_channel
-             ACE_ENV_ARG_DECL);
+  void open (CosEventChannelAdmin::EventChannel_ptr event_channel);
   // This method connects the supplier to the EC.
 
   void close (void);
@@ -49,8 +48,7 @@ public:
   void disconnect (void);
   // Disconnect from the EC, but do not forget about it or close it.
 
-  void send_event (const CORBA::Any &data
-                   ACE_ENV_ARG_DECL);
+  void send_event (const CORBA::Any &data);
   // Send one event.
 
   virtual void disconnect_push_supplier (void)
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp
index 3b1a89cd878..6934b616a9a 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp
@@ -25,12 +25,11 @@ Consumer::Consumer (void)
 int
 Consumer::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       // Do *NOT* make a copy because we don't want the ORB to outlive
       // the Consumer object.
@@ -44,9 +43,9 @@ Consumer::run (int argc, char* argv[])
         }
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
         poa->the_POAManager ();
       poa_manager->activate ();
@@ -55,11 +54,10 @@ Consumer::run (int argc, char* argv[])
       // command line argument or resolve_initial_references(), but
       // this is simpler...
       object =
-        orb->string_to_object (argv[1] ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object (argv[1]);
 
       CosEventChannelAdmin::EventChannel_var event_channel =
-        CosEventChannelAdmin::EventChannel::_narrow (object.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
+        CosEventChannelAdmin::EventChannel::_narrow (object.in ());
 
       // The canonical protocol to connect to the EC
       CosEventChannelAdmin::ConsumerAdmin_var consumer_admin =
@@ -71,7 +69,7 @@ Consumer::run (int argc, char* argv[])
       CosEventComm::PushConsumer_var consumer =
         this->_this ();
 
-      supplier->connect_push_consumer (consumer.in () ACE_ENV_ARG_PARAMETER);
+      supplier->connect_push_consumer (consumer.in ());
 
       // Wait for events, using work_pending()/perform_work() may help
       // or using another thread, this example is too simple for that.
@@ -84,18 +82,16 @@ Consumer::run (int argc, char* argv[])
       // work_pending()/perform_work() to do more interesting stuff.
       // Check the supplier for the proper way to do cleanup.
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Consumer::run");
+      ex._tao_print_exception ("Consumer::run");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 void
-Consumer::push (const CORBA::Any &
-                ACE_ENV_ARG_DECL_NOT_USED)
+Consumer::push (const CORBA::Any &)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->event_count_ ++;
@@ -114,6 +110,6 @@ Consumer::disconnect_push_consumer (void)
   // In this example we shutdown the ORB when we disconnect from the
   // EC (or rather the EC disconnects from us), but this doesn't have
   // to be the case....
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h
index 7866f29a31a..2915b51441e 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h
@@ -40,8 +40,7 @@ public:
 
   // = The CosEventComm::PushConsumer methods
 
-  virtual void push (const CORBA::Any &event
-                     ACE_ENV_ARG_DECL_NOT_USED)
+  virtual void push (const CORBA::Any &event)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp
index b0ea4951164..9f43341d23b 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp
@@ -18,12 +18,11 @@ main (int argc, char* argv[])
 {
   TAO_CEC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) == -1)
         {
@@ -33,9 +32,9 @@ main (int argc, char* argv[])
         }
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
         poa->the_POAManager ();
       poa_manager->activate ();
@@ -50,7 +49,7 @@ main (int argc, char* argv[])
         ec_impl._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (event_channel.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (event_channel.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -78,12 +77,11 @@ main (int argc, char* argv[])
       // work_pending()/perform_work() to do more interesting stuff.
       // Check the supplier for the proper way to do cleanup.
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp
index 51c8024d371..e87e81c10b4 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp
@@ -25,12 +25,11 @@ Supplier::Supplier (void)
 int
 Supplier::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       if (argc <= 1)
         {
@@ -40,9 +39,9 @@ Supplier::run (int argc, char* argv[])
         }
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
         poa->the_POAManager ();
       poa_manager->activate ();
@@ -51,11 +50,10 @@ Supplier::run (int argc, char* argv[])
       // command line argument or resolve_initial_references(), but
       // this is simpler...
       object =
-        orb->string_to_object (argv[1] ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object (argv[1]);
 
       CosEventChannelAdmin::EventChannel_var event_channel =
-        CosEventChannelAdmin::EventChannel::_narrow (object.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
+        CosEventChannelAdmin::EventChannel::_narrow (object.in ());
 
       // The canonical protocol to connect to the EC
       CosEventChannelAdmin::SupplierAdmin_var supplier_admin =
@@ -67,7 +65,7 @@ Supplier::run (int argc, char* argv[])
       CosEventComm::PushSupplier_var supplier =
         this->_this ();
 
-      consumer->connect_push_supplier (supplier.in () ACE_ENV_ARG_PARAMETER);
+      consumer->connect_push_supplier (supplier.in ());
 
       // Push the events...
       ACE_Time_Value sleep_time (0, 10000); // 10 milliseconds
@@ -77,7 +75,7 @@ Supplier::run (int argc, char* argv[])
 
       for (int i = 0; i != 2000; ++i)
         {
-          consumer->push (event ACE_ENV_ARG_PARAMETER);
+          consumer->push (event);
           ACE_OS::sleep (sleep_time);
         }
 
@@ -89,18 +87,17 @@ Supplier::run (int argc, char* argv[])
 
       // Deactivate this object...
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-      poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
+        poa->servant_to_id (this);
+      poa->deactivate_object (id.in ());
 
       // Destroy the POA
-      poa->destroy (1, 0 ACE_ENV_ARG_PARAMETER);
+      poa->destroy (1, 0);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Supplier::run");
+      ex._tao_print_exception ("Supplier::run");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp
index f503810130a..123e0604a04 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp
@@ -13,28 +13,26 @@ int
 main (int argc, char* argv[])
 {
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_obj =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (poa_obj.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_obj.in ());
       PortableServer::POAManager_var poa_manager =
         poa->the_POAManager ();
       poa_manager->activate ();
 
       // Obtain the event channel using the Naming Service.
       CORBA::Object_var nam_obj =
-        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER );
+        orb->resolve_initial_references ("NameService" );
 
       CosNaming::NamingContext_var root_context =
-        CosNaming::NamingContext::_narrow(nam_obj.in ()
-                                          ACE_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow(nam_obj.in ());
 
       CosNaming::Name channel_name (1);
       channel_name.length (1);
@@ -45,8 +43,7 @@ main (int argc, char* argv[])
 
       // Downcast the object reference to a TypedEventChannel reference
       CosTypedEventChannelAdmin::TypedEventChannel_var typed_event_channel =
-        CosTypedEventChannelAdmin::TypedEventChannel::_narrow(ec_obj.in ()
-                                                              ACE_ENV_ARG_PARAMETER);
+        CosTypedEventChannelAdmin::TypedEventChannel::_narrow(ec_obj.in ());
 
       // Initialise the Country Impl
       Country_i country (orb.in ());
@@ -57,13 +54,12 @@ main (int argc, char* argv[])
         typed_event_channel->for_consumers ();
 
       CosEventChannelAdmin::ProxyPushSupplier_var proxy_push_supplier =
-        typed_consumer_admin->obtain_typed_push_supplier (_tc_Country->id()
-                                                          ACE_ENV_ARG_PARAMETER);
+        typed_consumer_admin->obtain_typed_push_supplier (_tc_Country->id());
 
       proxy_push_supplier->connect_push_consumer (typed_consumer.in () );
 
       CORBA::String_var str =
-         orb->object_to_string (typed_consumer.in () ACE_ENV_ARG_PARAMETER);
+         orb->object_to_string (typed_consumer.in ());
 
       const char* ior_file_name = "Consumer.ior";
       FILE *output_file=
@@ -84,17 +80,16 @@ main (int argc, char* argv[])
       ACE_DEBUG ((LM_DEBUG, "...ORB shutdown\n"));
 
       // Destroy the POA
-      poa->destroy (1, 0 ACE_ENV_ARG_PARAMETER);
+      poa->destroy (1, 0);
 
       // Destroy the ORB
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "main");
+      ex._tao_print_exception ("main");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp
index 0c5d3120256..cb0a13b15a6 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp
@@ -16,8 +16,7 @@ Country_i::~Country_i (void)
 }
 
 void Country_i::update_population (const char * country,
-                                   CORBA::Long population
-                                   ACE_ENV_ARG_DECL_NOT_USED)
+                                   CORBA::Long population)
   ACE_THROW_SPEC ((CORBA::SystemException))
 
 {
@@ -43,7 +42,7 @@ Country_i::get_typed_consumer (void)
 
 void
 Country_i::push (const CORBA::Any & /* data */
-                 ACE_ENV_ARG_DECL_NOT_USED)
+                 )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosEventComm::Disconnected))
 
@@ -64,12 +63,12 @@ Country_i::disconnect_push_consumer (void)
     this->_default_POA ();
 
   PortableServer::ObjectId_var t_id =
-    t_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
+    t_poa->servant_to_id (this);
 
-  t_poa->deactivate_object (t_id.in () ACE_ENV_ARG_PARAMETER);
+  t_poa->deactivate_object (t_id.in ());
 
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Country_i::disconnect_push_consumer, ")
               ACE_TEXT ("calling ORB shutdown...\n")));
-  orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.h b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.h
index dc31a1c0429..11231abba89 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.h
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.h
@@ -22,15 +22,13 @@ public:
   virtual ~Country_i (void);
 
   virtual void update_population (const char * country,
-                                  CORBA::Long population
-                                  ACE_ENV_ARG_DECL)
+                                  CORBA::Long population)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Object_ptr get_typed_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void push (const CORBA::Any & data
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const CORBA::Any & data)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventComm::Disconnected));
 
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp
index 785f9a8f2e5..2617c8f9daf 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp
@@ -10,20 +10,18 @@ int
 main (int argc, char* argv[])
 {
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       // Obtain the event channel using the Naming Service.
       CORBA::Object_var nam_obj =
-        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER );
+        orb->resolve_initial_references ("NameService" );
 
       CosNaming::NamingContext_var root_context =
-        CosNaming::NamingContext::_narrow(nam_obj.in ()
-                                          ACE_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow(nam_obj.in ());
 
       CosNaming::Name channel_name (1);
       channel_name.length (1);
@@ -34,19 +32,16 @@ main (int argc, char* argv[])
 
       // Downcast the object reference to a TypedEventChannel reference
       CosTypedEventChannelAdmin::TypedEventChannel_var typed_event_channel =
-        CosTypedEventChannelAdmin::TypedEventChannel::_narrow(ec_obj.in ()
-                                                              ACE_ENV_ARG_PARAMETER);
+        CosTypedEventChannelAdmin::TypedEventChannel::_narrow(ec_obj.in ());
 
       // Connect to the typed channel
       CosTypedEventChannelAdmin::TypedSupplierAdmin_var typed_supplier_admin =
         typed_event_channel->for_suppliers ();
 
       CosTypedEventChannelAdmin::TypedProxyPushConsumer_var typed_proxy_push_consumer =
-        typed_supplier_admin->obtain_typed_push_consumer (_tc_Country->id()
-                                                          ACE_ENV_ARG_PARAMETER);
+        typed_supplier_admin->obtain_typed_push_consumer (_tc_Country->id());
 
-      typed_proxy_push_consumer->connect_push_supplier (CosEventComm::PushSupplier::_nil()
-                                                        ACE_ENV_ARG_PARAMETER);
+      typed_proxy_push_consumer->connect_push_supplier (CosEventComm::PushSupplier::_nil());
 
       // Obtain the interface from the event channel
       CORBA::Object_var typed_consumer =
@@ -58,7 +53,7 @@ main (int argc, char* argv[])
       // Invoke the events...
       for (int i = 0; i != 100; ++i)
         {
-          typed_supplier->update_population ("England", i ACE_ENV_ARG_PARAMETER);
+          typed_supplier->update_population ("England", i);
         }
 
       // Disconnect from the EC
@@ -67,12 +62,11 @@ main (int argc, char* argv[])
       // Destroy the EC....
       typed_event_channel->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "main");
+      ex._tao_print_exception ("main");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp
index ab3ca193d29..a2ef5f64119 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp
@@ -11,15 +11,13 @@
 #include "ReplicaController.h"
 
 void
-ORB_Initializer::pre_init (PortableInterceptor::ORBInitInfo_ptr
-                           ACE_ENV_ARG_DECL_NOT_USED)
+ORB_Initializer::pre_init (PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-ORB_Initializer::post_init (PortableInterceptor::ORBInitInfo_ptr info
-                            ACE_ENV_ARG_DECL)
+ORB_Initializer::post_init (PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocate slot id.
@@ -49,6 +47,5 @@ ORB_Initializer::post_init (PortableInterceptor::ORBInitInfo_ptr info
     interceptor = tmp_interceptor;
   }
 
-  info->add_server_request_interceptor (interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+  info->add_server_request_interceptor (interceptor.in ());
 }
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h
index d11b2a41aa2..219ef9fa590 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h
@@ -15,13 +15,11 @@ class ORB_Initializer :
 public:
 
   virtual void
-  pre_init (PortableInterceptor::ORBInitInfo_ptr info
-            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void
-  post_init (PortableInterceptor::ORBInitInfo_ptr info
-             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
index 62da70797a9..0f39c065b71 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
@@ -54,26 +54,24 @@ get_state ()
 void Checkpointable::
 associate_state (CORBA::ORB_ptr orb, CORBA::Any const& state)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
     CORBA::Object_var pic_obj =
-      orb->resolve_initial_references ("PICurrent" ACE_ENV_ARG_PARAMETER);
+      orb->resolve_initial_references ("PICurrent");
 
 
     PortableInterceptor::Current_var pic =
       PortableInterceptor::Current::_narrow (
-        pic_obj.in () ACE_ENV_ARG_PARAMETER);
+        pic_obj.in ());
 
 
-    pic->set_slot (state_slot_id (), state ACE_ENV_ARG_PARAMETER);
+    pic->set_slot (state_slot_id (), state);
 
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Caught exception:");
+    ex._tao_print_exception ("Caught exception:");
   }
-  ACE_ENDTRY;
 }
 
 // ReplyLogger
@@ -89,21 +87,19 @@ ReplicaController::
 ReplicaController (CORBA::ORB_ptr orb)
     : orb_ (CORBA::ORB::_duplicate (orb))
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
     CORBA::Object_var poa_object =
-      orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+      orb_->resolve_initial_references ("RootPOA");
 
     root_poa_ = PortableServer::POA::_narrow (
-      poa_object.in () ACE_ENV_ARG_PARAMETER);
+      poa_object.in ());
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Caught exception:");
+    ex._tao_print_exception ("Caught exception:");
     ACE_OS::abort ();
   }
-  ACE_ENDTRY;
 
   // Generate member id
   ACE_Utils::UUID uuid;
@@ -220,21 +216,19 @@ namespace
 {
   FT::FTRequestServiceContext*
   extract_context (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException));
+    PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException));
 }
 
 #if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1
 void
 ReplicaController::tao_ft_interception_point (
   PortableInterceptor::ServerRequestInfo_ptr ri,
-  CORBA::OctetSeq_out ocs
-  ACE_ENV_ARG_DECL)
+  CORBA::OctetSeq_out ocs)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
   FT::FTRequestServiceContext_var ftr (
-    extract_context (ri ACE_ENV_ARG_PARAMETER));
+    extract_context (ri));
 
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Received request from %s with rid %i\n",
@@ -264,12 +258,11 @@ ReplicaController::tao_ft_interception_point (
 
 void
 ReplicaController::send_reply (
-  PortableInterceptor::ServerRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   FT::FTRequestServiceContext_var ftr (
-    extract_context (ri ACE_ENV_ARG_PARAMETER));
+    extract_context (ri));
 
 
   ACE_DEBUG ((LM_DEBUG,
@@ -430,13 +423,11 @@ ReplicaController::send_reply (
 namespace
 {
   FT::FTRequestServiceContext*
-  extract_context (PortableInterceptor::ServerRequestInfo_ptr ri
-                   ACE_ENV_ARG_DECL)
+  extract_context (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     IOP::ServiceContext_var svc =
-      ri->get_request_service_context (IOP::FT_REQUEST
-                                       ACE_ENV_ARG_PARAMETER);
+      ri->get_request_service_context (IOP::FT_REQUEST);
 
     TAO_InputCDR cdr (reinterpret_cast<const char*> (svc->context_data.get_buffer ()),
                       svc->context_data.length ());
@@ -446,7 +437,7 @@ namespace
     if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
     {
       //@@ what to throw?
-      ACE_THROW (CORBA::BAD_CONTEXT ());
+      throw CORBA::BAD_CONTEXT ();
     }
 
     cdr.reset_byte_order (static_cast<int> (byte_order));
@@ -474,7 +465,7 @@ namespace
     if (!cdr.good_bit ())
     {
       //@@ what to throw?
-      ACE_THROW (CORBA::UNKNOWN ());
+      throw CORBA::UNKNOWN ();
     }
 
     return req._retn ();
@@ -491,8 +482,7 @@ ReplicaController::name (void)
 
 void
 ReplicaController::send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -500,8 +490,7 @@ ReplicaController::send_exception (
 
 void
 ReplicaController::send_other (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -515,8 +504,7 @@ ReplicaController::destroy (void)
 
 void
 ReplicaController::receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -525,8 +513,7 @@ ReplicaController::receive_request_service_contexts (
 
 void
 ReplicaController::receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h
index 419e6694379..fe4e1aa1f86 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h
@@ -51,43 +51,37 @@ public:
   virtual void
   tao_ft_interception_point (
     PortableInterceptor::ServerRequestInfo_ptr ri,
-    CORBA::OctetSeq_out ocs
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    CORBA::OctetSeq_out ocs)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 #endif /*TAO_HAS_EXTENDED_FT_INTERCEPTORS*/
 
   virtual void
   receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void
   receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void
   send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void
   send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void
   send_other (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp
index c1445dec04a..20d9f800e63 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp
@@ -39,8 +39,7 @@ set_state (CORBA::Any const& state)
 
 
 CORBA::Short
-RolyPoly_i::number (char *&str
-                ACE_ENV_ARG_DECL_NOT_USED)
+RolyPoly_i::number (char *&str)
   ACE_THROW_SPEC ((CORBA::SystemException, RolyPoly::E))
 {
   CORBA::string_free (str);
@@ -68,5 +67,5 @@ RolyPoly_i::shutdown (void)
 {
   ACE_DEBUG ((LM_DEBUG, "Server is shutting down.\n"));
 
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.h b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.h
index 6056af89eb4..99cc4b79c68 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.h
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.h
@@ -28,7 +28,7 @@ public:
   // RolyPoly
   //
   virtual CORBA::Short
-  number (char *&s ACE_ENV_ARG_DECL)
+  number (char *&s)
     ACE_THROW_SPEC ((CORBA::SystemException, RolyPoly::E));
 
   virtual void
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp
index 26f0113ffc4..9a92f7672b7 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp
@@ -55,13 +55,11 @@ main (int argc, char *argv[])
 {
   int status = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            "Client ORB"
-                                            ACE_ENV_ARG_PARAMETER);
+                                            "Client ORB");
 
       if (::parse_args (argc, argv) != 0) return -1;
 
@@ -98,17 +96,16 @@ main (int argc, char *argv[])
         CORBA::Object_var object_primary;
 
         object_primary =
-          orb->string_to_object (ior->c_str() ACE_ENV_ARG_PARAMETER);
+          orb->string_to_object (ior->c_str());
 
 
         // Get an object reference for the ORBs IORManipultion object!
         CORBA::Object_ptr IORM =
           orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-                                           0
-                                           ACE_ENV_ARG_PARAMETER);
+                                           0);
 
         TAO_IOP::TAO_IOR_Manipulation_ptr iorm =
-          TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM ACE_ENV_ARG_PARAMETER);
+          TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM);
 
 
         // Create the list
@@ -123,13 +120,13 @@ main (int argc, char *argv[])
             ior_iter.next (ior);
             ACE_DEBUG ((LM_DEBUG, "IOR%d: %s\n",cntr, ior->c_str ()));
             iors [cntr] =
-              orb->string_to_object (ior->c_str() ACE_ENV_ARG_PARAMETER);
+              orb->string_to_object (ior->c_str());
 
           }
 
         ACE_DEBUG ((LM_DEBUG, "Prepare to merge IORs.\n"));
         // Create a merged set 1;
-        object = iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
+        object = iorm->merge_iors (iors);
 
 
 
@@ -157,13 +154,11 @@ main (int argc, char *argv[])
 
         // Set the property
         CORBA::Boolean retval = iorm->set_property (&iogr_prop,
-                                                    object.in ()
-                                                    ACE_ENV_ARG_PARAMETER);
+                                                    object.in ());
 
         retval = iorm->set_primary (&iogr_prop,
                                     object_primary.in (),
-                                    object.in ()
-                                    ACE_ENV_ARG_PARAMETER);
+                                    object.in ());
 
       }
       else
@@ -173,11 +168,11 @@ main (int argc, char *argv[])
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Unable to extract the only IOR string\n"),
                             -1);
-        object = orb->string_to_object (ior->c_str() ACE_ENV_ARG_PARAMETER);
+        object = orb->string_to_object (ior->c_str());
       }
 
       RolyPoly_var server =
-        RolyPoly::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        RolyPoly::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
       {
@@ -195,8 +190,7 @@ main (int argc, char *argv[])
 
         try
         {
-          number = server->number (str.inout ()
-                                   ACE_ENV_ARG_PARAMETER);
+          number = server->number (str.inout ());
         }
         catch (RolyPoly::E const& e)
         {
@@ -215,13 +209,12 @@ main (int argc, char *argv[])
 
       server->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            "Caught exception:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return status;
 }
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp
index 6ee21282f1b..abe5e41242a 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp
@@ -42,8 +42,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       if (::parse_args (argc, argv) != 0) return -1;
 
@@ -55,14 +54,13 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "Server ORB");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -70,7 +68,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -89,7 +87,7 @@ main (int argc, char *argv[])
       CORBA::PolicyList policies;  // Empty policy list.
 
       CORBA::String_var ior =
-        orb->object_to_string (t.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (t.in ());
 
       poa_manager->activate ();
 
@@ -111,19 +109,18 @@ main (int argc, char *argv[])
       // Run the ORB event loop.
       orb->run ();
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1);
 
       orb->destroy ();
 
       ACE_DEBUG ((LM_DEBUG, "Event loop finished.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            "Caught exception:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp
index 9b2da4d88c8..ece45247c66 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp
@@ -252,7 +252,7 @@ int TestClient::svc()
   {
     ACE_ERROR((LM_ERROR,"CORBA client error with (%d.%d.%d.%d):%s\n",
                threadNum, i, objIter, requestIter, currentIOR.c_str()));
-    ACE_PRINT_EXCEPTION(ex, "");
+    ex._tao_print_exception ("");
   }
   return 1;
 }
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp
index 5864e974d00..d62ce2c7645 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp
@@ -74,7 +74,7 @@ int main (int argc, char* argv[])
     orb->destroy();
 
   } catch (CORBA::Exception& e) {
-    ACE_PRINT_EXCEPTION(e, "Combined Service:");
+    e._tao_print_exception ("Combined Service:");
   }
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/controller.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/controller.cpp
index 0bab1bfd6aa..2985512d78c 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/controller.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/controller.cpp
@@ -55,7 +55,7 @@ int main(int argc, char* argv[]) {
     Object_var obj = orb->resolve_initial_references("ServiceConfig");
     ServiceConfigurator_var sc = ServiceConfigurator::_narrow(obj.in());
     ACE_ASSERT(! is_nil(sc.in()));
- 
+
     if (directive.length() > 0) {
       ACE_DEBUG((LM_DEBUG, "Controller: sending directive <%s>...\n", directive.c_str()));
       sc->process_directive(directive.c_str());
@@ -67,7 +67,7 @@ int main(int argc, char* argv[]) {
 
     return 0;
   } catch (CORBA::Exception& e) {
-    ACE_PRINT_EXCEPTION(e, "Controller:");
+    e._tao_print_exception ("Controller:");
   }
   return 1;
 }
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp
index 8566023c945..2ee3c788095 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp
@@ -63,7 +63,7 @@ DynServer_Loader::DynServer_Loader(void)
 }
 
 int
-DynServer_Loader::init (int argc, ACE_TCHAR* argv[] ACE_ENV_ARG_DECL)
+DynServer_Loader::init (int argc, ACE_TCHAR* argv[])
 {
   try {
 
@@ -111,7 +111,7 @@ DynServer_Loader::init (int argc, ACE_TCHAR* argv[] ACE_ENV_ARG_DECL)
     ACE_DEBUG((LM_DEBUG, "dynserver: running.\n"));
 
   } catch (Exception& e) {
-    ACE_PRINT_EXCEPTION(e, "DynServer::init()");
+    e._tao_print_exception ("DynServer::init()");
   }
   return 0;
 }
@@ -135,7 +135,7 @@ DynServer_Loader::fini (void)
     return 0;
 
   } catch (Exception& e) {
-    ACE_PRINT_EXCEPTION(e, "DynServer::fini()");
+    e._tao_print_exception ("DynServer::fini()");
   }
   return -1;
 }
@@ -143,8 +143,7 @@ DynServer_Loader::fini (void)
 Object_ptr
 DynServer_Loader::create_object (ORB_ptr,
                                  int,
-                                 ACE_TCHAR **
-                                 ACE_ENV_ARG_DECL)
+                                 ACE_TCHAR **)
                                  ACE_THROW_SPEC ((SystemException))
 {
   ACE_THROW_RETURN(NO_IMPLEMENT(), Object::_nil());
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp
index 0976425f762..b74936e8804 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp
@@ -19,12 +19,12 @@
 
 using namespace CORBA;
 
-int 
-main (int argc, char* argv[]) 
+int
+main (int argc, char* argv[])
 {
-  try 
+  try
     {
- 
+
       ORB_var orb = ORB_init (argc, argv);
 
       Object_var obj = orb->resolve_initial_references ("Test");
@@ -34,14 +34,14 @@ main (int argc, char* argv[])
       Long n = test->get ();
       Long m = test->get ();
       assertTrue (m == n + 1);
- 
+
       ACE_DEBUG ((LM_DEBUG, "All tests ran successfully.\n"));
 
       return 0;
-    } 
-  catch (CORBA::Exception& e) 
+    }
+  catch (CORBA::Exception& e)
     {
-      ACE_PRINT_EXCEPTION (e, "test:");
+      e._tao_print_exception ("test:");
     }
   return 1;
 }
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp
index 514c2e69b97..2298cb7bf6c 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp
@@ -87,7 +87,7 @@ int main(int argc, char* argv[]) {
     orb->destroy();
 
   } catch (CORBA::Exception& e) {
-    ACE_PRINT_EXCEPTION(e, "TestServer::init()");
+    e._tao_print_exception ("TestServer::init()");
   }
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp
index 256fc9ad668..d6da384d62b 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp
@@ -20,16 +20,14 @@ ORBInitializer::ORBInitializer (void)
 
 void
 ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -44,8 +42,7 @@ ORBInitializer::post_init (
   PortableInterceptor::ServerRequestInterceptor_var sr_interceptor =
     this->interceptor_;
 
-  info->add_server_request_interceptor (sr_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+  info->add_server_request_interceptor (sr_interceptor.in ());
 
   PortableInterceptor::ServerRequestInterceptor_ptr reject_interceptor;
   ACE_NEW_THROW_EX (reject_interceptor,
@@ -59,8 +56,7 @@ ORBInitializer::post_init (
   PortableInterceptor::ServerRequestInterceptor_var safe_reject_interceptor =
     reject_interceptor;
 
-  info->add_server_request_interceptor (safe_reject_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+  info->add_server_request_interceptor (safe_reject_interceptor.in ());
 }
 
 
diff --git a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.h b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.h
index b366f733e93..ac320b21e63 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.h
+++ b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.h
@@ -58,12 +58,10 @@ public:
    * interface.
    */
   //@{
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h
index fb623e0852e..048cd1bb10f 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h
+++ b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h
@@ -50,8 +50,7 @@ public:
   /**
    * The returned "Location" is a sequence of length 1.
    */
-  virtual CosLoadBalancing::Location * the_location (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CosLoadBalancing::Location * the_location ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the average CPU load at the location which this
@@ -61,8 +60,7 @@ public:
    *         equal to CosLoadBalancing::LoadAverage, and the average CPU
    *         load.
    */
-  virtual CosLoadBalancing::LoadList * loads (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CosLoadBalancing::LoadList * loads ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@}
diff --git a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp
index a99b6790c45..a1a291b4a94 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp
@@ -29,8 +29,7 @@ ServerRequestInterceptor::destroy (void)
 
 void
 ServerRequestInterceptor::receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr /* ri */
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr /* ri */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -39,8 +38,7 @@ ServerRequestInterceptor::receive_request_service_contexts (
 
 void
 ServerRequestInterceptor::receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -48,16 +46,14 @@ ServerRequestInterceptor::receive_request (
 
 void
 ServerRequestInterceptor::send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr /* ri */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr /* ri */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ServerRequestInterceptor::send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -65,8 +61,7 @@ ServerRequestInterceptor::send_exception (
 
 void
 ServerRequestInterceptor::send_other (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h
index aaa221fb225..15e73de4d43 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h
+++ b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h
@@ -68,31 +68,26 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_request_service_contexts (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_request (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_reply (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_exception (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_other (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
   //@}
diff --git a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp
index df699b43783..cdd1fd226e1 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp
@@ -30,5 +30,5 @@ void
 StockFactory::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/examples/LoadBalancing/client.cpp b/TAO/orbsvcs/examples/LoadBalancing/client.cpp
index 76981136d71..767eba855dd 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/client.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/client.cpp
@@ -51,19 +51,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior);
 
       Test::StockFactory_var stockfactory =
-        Test::StockFactory::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER);
+        Test::StockFactory::_narrow (tmp.in ());
 
       if (CORBA::is_nil (stockfactory.in ()))
         {
@@ -93,13 +93,12 @@ main (int argc, char *argv[])
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            "Exception caught in client.cpp:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/LoadBalancing/server.cpp b/TAO/orbsvcs/examples/LoadBalancing/server.cpp
index 017c1bb85a6..17b400165b5 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/server.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/server.cpp
@@ -74,16 +74,13 @@ parse_args (int argc, char *argv[])
 CORBA::Object_ptr
 join_object_group (CORBA::ORB_ptr orb,
                    CosLoadBalancing::LoadManager_ptr lm,
-                   const PortableGroup::Location & location
-                   ACE_ENV_ARG_PARAMETER)
+                   const PortableGroup::Location & location)
 {
   CORBA::Object_var ns_object =
-    orb->resolve_initial_references ("NameService"
-                                     ACE_ENV_ARG_PARAMETER);
+    orb->resolve_initial_references ("NameService");
 
   CosNaming::NamingContext_var nc =
-    CosNaming::NamingContext::_narrow (ns_object.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+    CosNaming::NamingContext::_narrow (ns_object.in ());
 
   CosNaming::Name name (1);
   name.length (1);
@@ -93,12 +90,11 @@ join_object_group (CORBA::ORB_ptr orb,
 
   CORBA::Object_var group;
 
-  ACE_TRY
+  try
     {
-      group = nc->resolve (name
-                           ACE_ENV_ARG_PARAMETER);
+      group = nc->resolve (name);
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+  catch (const CosNaming::NamingContext::NotFound& )
     {
       // Object group not created.  Create one.
       const char repository_id[] = "IDL:Test/StockFactory:1.0";
@@ -120,15 +116,12 @@ join_object_group (CORBA::ORB_ptr orb,
 
       group = lm->create_object (repository_id,
                                  criteria,
-                                 fcid.out ()
-                                 ACE_ENV_ARG_PARAMETER);
+                                 fcid.out ());
 
-      ACE_TRY_EX (foo)
+      try
         {
           nc->bind (name,
-                    group.in ()
-                    ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (foo);
+                    group.in ());
 
           PortableGroup::Properties props (1);
           props.length (1);
@@ -190,24 +183,17 @@ join_object_group (CORBA::ORB_ptr orb,
 
           props[0].val <<= strategy_info;
 
-          lm->set_default_properties (props
-                                      ACE_ENV_ARG_PARAMETER);
+          lm->set_default_properties (props);
         }
-      ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
+      catch (const CosNaming::NamingContext::AlreadyBound& )
         {
           // Somebody beat us to creating the object group.  Clean up
           // the one we created.
-          lm->delete_object (fcid.in ()
-                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (foo);
+          lm->delete_object (fcid.in ());
 
-          group = nc->resolve (name
-                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (foo);
+          group = nc->resolve (name);
         }
-      ACE_ENDTRY;
     }
-  ACE_ENDTRY;
 
   StockFactory * stockfactory_impl;
   ACE_NEW_THROW_EX (stockfactory_impl,
@@ -221,8 +207,7 @@ join_object_group (CORBA::ORB_ptr orb,
 
   group = lm->add_member (group.in (),
                           location,
-                          stockfactory.in ()
-                          ACE_ENV_ARG_PARAMETER);
+                          stockfactory.in ());
 
   return group._retn ();
 }
@@ -230,7 +215,7 @@ join_object_group (CORBA::ORB_ptr orb,
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       ORBInitializer *initializer = 0;
       ACE_NEW_RETURN (initializer,
@@ -239,16 +224,14 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -256,8 +239,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -268,12 +250,10 @@ main (int argc, char *argv[])
       poa_manager->activate ();
 
       CORBA::Object_var lm_object =
-        orb->resolve_initial_references ("LoadManager"
-                                         ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("LoadManager");
 
       CosLoadBalancing::LoadManager_var load_manager =
-        CosLoadBalancing::LoadManager::_narrow (lm_object.in ()
-                                                ACE_ENV_ARG_PARAMETER);
+        CosLoadBalancing::LoadManager::_narrow (lm_object.in ());
 
       RPS_Monitor * monitor_servant;
       ACE_NEW_THROW_EX (monitor_servant,
@@ -291,8 +271,7 @@ main (int argc, char *argv[])
       CORBA::Object_var stockfactory =
         ::join_object_group (orb.in (),
                              load_manager.in (),
-                             location.in ()
-                             ACE_ENV_ARG_PARAMETER);
+                             location.in ());
 
       TAO_LB_LoadAlert & alert_servant = initializer->load_alert ();
 
@@ -301,7 +280,7 @@ main (int argc, char *argv[])
 
 
       CORBA::String_var ior =
-        orb->object_to_string (stockfactory.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (stockfactory.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -314,28 +293,25 @@ main (int argc, char *argv[])
       ACE_OS::fclose (output_file);
 
       load_manager->register_load_monitor (location.in (),
-                                           load_monitor.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+                                           load_monitor.in ());
 
       load_manager->register_load_alert (location.in (),
-                                         load_alert.in ()
-                                         ACE_ENV_ARG_PARAMETER);
+                                         load_alert.in ());
 
       orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1);
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            "lb_server exception");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp
index 13c374d5418..b69c80ac456 100644
--- a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp
+++ b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp
@@ -25,37 +25,34 @@ TLS_Client::~TLS_Client ()
 }
 
 void
-TLS_Client::init (int argc, char *argv [] ACE_ENV_ARG_DECL)
+TLS_Client::init (int argc, char *argv [])
 {
-  init_ORB (argc, argv ACE_ENV_ARG_PARAMETER);
+  init_ORB (argc, argv);
   resolve_naming_service ();
   resolve_TLS_Basic_factory ();
 }
 
 void
 TLS_Client::init_ORB (int argc,
-                      char *argv []
-                      ACE_ENV_ARG_DECL)
+                      char *argv [])
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                ""
-                                ACE_ENV_ARG_PARAMETER);
+                                "");
 }
 
 void
 TLS_Client::resolve_naming_service (void)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
-                                            ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references (NAMING_SERVICE_NAME);
 
   // Need to check return value for errors.
   if (CORBA::is_nil (naming_obj.in ()))
-    ACE_THROW (CORBA::UNKNOWN ());
+    throw CORBA::UNKNOWN ();
 
   this->naming_context_ =
-    CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
+    CosNaming::NamingContext::_narrow (naming_obj.in ());
 }
 
 void
@@ -66,12 +63,10 @@ TLS_Client::resolve_TLS_Basic_factory (void)
   name[0].id = CORBA::string_dup (BASIC_TLS_LOG_FACTORY_NAME);
 
   CORBA::Object_var obj =
-    this->naming_context_->resolve (name
-                                   ACE_ENV_ARG_PARAMETER);
+    this->naming_context_->resolve (name);
 
   this->basic_log_factory_ =
-    DsLogAdmin::BasicLogFactory::_narrow (obj.in ()
-                                          ACE_ENV_ARG_PARAMETER);
+    DsLogAdmin::BasicLogFactory::_narrow (obj.in ());
 }
 
 void
@@ -92,8 +87,7 @@ TLS_Client::run_tests (void)
   DsLogAdmin::BasicLog_var basic_log =
     this->basic_log_factory_->create (logfullaction,
                                       max_size,
-                                      logid
-                                      ACE_ENV_ARG_PARAMETER);
+                                      logid);
 
   ACE_DEBUG ((LM_DEBUG,
               "Create returned logid = %d\n",logid));
@@ -109,7 +103,7 @@ TLS_Client::run_tests (void)
 
   ACE_DEBUG ((LM_DEBUG,
               "Writing %d records...\n", LOG_EVENT_COUNT));
-  basic_log->write_records (any_seq ACE_ENV_ARG_PARAMETER);
+  basic_log->write_records (any_seq);
 
   ACE_DEBUG ((LM_DEBUG,
               "Calling BasicLog::get_n_records...\n"));
@@ -152,7 +146,7 @@ TLS_Client::run_tests (void)
   ACE_DEBUG ((LM_DEBUG,
               "Deleting records... \n"));
 
-  retval = basic_log->delete_records (QUERY_LANG, QUERY_2 ACE_ENV_ARG_PARAMETER);
+  retval = basic_log->delete_records (QUERY_LANG, QUERY_2);
 
   ACE_DEBUG ((LM_DEBUG,
               "Calling BasicLog::get_n_records...\n"));
diff --git a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h
index c8a1449a7ac..505e6adae5b 100644
--- a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h
+++ b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h
@@ -31,14 +31,14 @@ class TLS_Client
   TLS_Client (void);
   ~TLS_Client ();
 
-  void init (int argc, char *argv [] ACE_ENV_ARG_DECL);
+  void init (int argc, char *argv []);
   // Init the Client.
 
   void run_tests (void);
   // Run the tests..
 
  protected:
-  void init_ORB (int argc, char *argv [] ACE_ENV_ARG_DECL);
+  void init_ORB (int argc, char *argv []);
   // Initializes the ORB.
 
   void resolve_naming_service (void);
diff --git a/TAO/orbsvcs/examples/Log/Basic/main.cpp b/TAO/orbsvcs/examples/Log/Basic/main.cpp
index 7940caf6185..e3fb93ff58c 100644
--- a/TAO/orbsvcs/examples/Log/Basic/main.cpp
+++ b/TAO/orbsvcs/examples/Log/Basic/main.cpp
@@ -11,27 +11,23 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   TLS_Client client; // Telecom Log Service Client
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      client.init (argc, argv
-                   ACE_ENV_ARG_PARAMETER); //Init the Client
+      client.init (argc, argv); //Init the Client
 
       client.run_tests (); //Init the Client
 
     }
-  ACE_CATCH (CORBA::UserException, ue)
+  catch (const CORBA::UserException& ue)
     {
-      ACE_PRINT_EXCEPTION (ue,
-                           "TLS_Client user error: ");
+      ue._tao_print_exception ("TLS_Client user error: ");
       return 1;
     }
-  ACE_CATCH (CORBA::SystemException, se)
+  catch (const CORBA::SystemException& se)
     {
-      ACE_PRINT_EXCEPTION (se,
-                           "TLS_Client system error: ");
+      se._tao_print_exception ("TLS_Client system error: ");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
index daa132a06ca..47d97183f2a 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
@@ -27,48 +27,44 @@ Consumer::Consumer (void)
 int
 Consumer::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       // Do *NOT* make a copy because we don't want the ORB to outlive
       // the Consumer object.
       this->orb_ = orb.in ();
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
         poa->the_POAManager ();
       poa_manager->activate ();
 
       // Obtain the event channel
       CORBA::Object_var naming_obj =
-        this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
-                                            ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references (NAMING_SERVICE_NAME);
 
       // Need to check return value for errors.
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_THROW_RETURN (CORBA::UNKNOWN (),0);
 
       this->naming_context_ =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
       CosNaming::Name name (1);
       name.length (1);
       name[0].id = CORBA::string_dup (EVENT_TLS_LOG_FACTORY_NAME);
 
       CORBA::Object_var obj =
-        this->naming_context_->resolve (name
-                                       ACE_ENV_ARG_PARAMETER);
+        this->naming_context_->resolve (name);
 
       this->event_log_factory_ =
-        DsEventLogAdmin::EventLogFactory::_narrow (obj.in ()
-                                              ACE_ENV_ARG_PARAMETER);
+        DsEventLogAdmin::EventLogFactory::_narrow (obj.in ());
 
       this->supplier_ =
         this->event_log_factory_->obtain_push_supplier ();
@@ -76,7 +72,7 @@ Consumer::run (int argc, char* argv[])
       CosEventComm::PushConsumer_var consumer =
         this->_this ();
 
-      this->supplier_->connect_push_consumer (consumer.in () ACE_ENV_ARG_PARAMETER);
+      this->supplier_->connect_push_consumer (consumer.in ());
 
       orb_->run ();
 
@@ -87,18 +83,16 @@ Consumer::run (int argc, char* argv[])
       // work_pending()/perform_work() to do more interesting stuff.
       // Check the supplier for the proper way to do cleanup.
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Consumer::run");
+      ex._tao_print_exception ("Consumer::run");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 void
-Consumer::push (const CORBA::Any &
-                ACE_ENV_ARG_DECL_NOT_USED)
+Consumer::push (const CORBA::Any &)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -117,6 +111,6 @@ Consumer::disconnect_push_consumer (void)
   // In this example we shutdown the ORB when we disconnect from the
   // EC (or rather the EC disconnects from us), but this doesn't have
   // to be the case....
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h
index c3bb44535a1..d552c48d738 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h
@@ -42,8 +42,7 @@ public:
 
   // = The CosEventComm::PushConsumer methods
 
-  virtual void push (const CORBA::Any &event
-                     ACE_ENV_ARG_DECL_NOT_USED)
+  virtual void push (const CORBA::Any &event)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void disconnect_push_consumer (void)
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
index e9dad2f3b4c..67b4f42765d 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
@@ -30,32 +30,30 @@ Supplier::Supplier (void)
 int
 Supplier::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       this->orb_ =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
         poa->the_POAManager ();
       poa_manager->activate ();
 
 
       CORBA::Object_var naming_obj =
-      this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
-                                            ACE_ENV_ARG_PARAMETER);
+      this->orb_->resolve_initial_references (NAMING_SERVICE_NAME);
 
       // Need to check return value for errors.
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_THROW_RETURN (CORBA::UNKNOWN (), 0);
 
       this->naming_context_ =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
 
       CosNaming::Name name (1);
@@ -63,12 +61,10 @@ Supplier::run (int argc, char* argv[])
       name[0].id = CORBA::string_dup (EVENT_TLS_LOG_FACTORY_NAME);
 
       CORBA::Object_var obj =
-        this->naming_context_->resolve (name
-                                       ACE_ENV_ARG_PARAMETER);
+        this->naming_context_->resolve (name);
 
       this->event_log_factory_ =
-        DsEventLogAdmin::EventLogFactory::_narrow (obj.in ()
-                                              ACE_ENV_ARG_PARAMETER);
+        DsEventLogAdmin::EventLogFactory::_narrow (obj.in ());
 
       ACE_ASSERT (!CORBA::is_nil (this->event_log_factory_.in ()));
 
@@ -89,8 +85,7 @@ Supplier::run (int argc, char* argv[])
         this->event_log_factory_->create (logfullaction,
                                           max_size,
                                           threshold,
-                                          logid
-                                          ACE_ENV_ARG_PARAMETER);
+                                          logid);
 
 
       ACE_DEBUG ((LM_DEBUG,
@@ -105,7 +100,7 @@ Supplier::run (int argc, char* argv[])
       CosEventComm::PushSupplier_var supplier =
         this->_this ();
 
-      this->consumer_->connect_push_supplier (supplier.in () ACE_ENV_ARG_PARAMETER);
+      this->consumer_->connect_push_supplier (supplier.in ());
 
       // Create some fake log events.
       CORBA::Any event;
@@ -113,7 +108,7 @@ Supplier::run (int argc, char* argv[])
 
       for (int d = 0; d < LOG_EVENT_COUNT; d++)
         {
-          this->consumer_->push (event ACE_ENV_ARG_PARAMETER);
+          this->consumer_->push (event);
         }
 
       ACE_DEBUG ((LM_DEBUG,
@@ -159,7 +154,7 @@ Supplier::run (int argc, char* argv[])
       ACE_DEBUG ((LM_DEBUG,
                   "Deleting records... \n"));
 
-      retval = event_log->delete_records (QUERY_LANG, QUERY_2 ACE_ENV_ARG_PARAMETER);
+      retval = event_log->delete_records (QUERY_LANG, QUERY_2);
 
       ACE_DEBUG ((LM_DEBUG,
                   "Calling EventLog::get_n_records...\n"));
@@ -190,20 +185,19 @@ Supplier::run (int argc, char* argv[])
 
       // Deactivate this object...
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
+        poa->servant_to_id (this);
 
-      poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
+      poa->deactivate_object (id.in ());
 
       // Destroy the POA
-      poa->destroy (1, 0 ACE_ENV_ARG_PARAMETER);
+      poa->destroy (1, 0);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Supplier::run");
+      ex._tao_print_exception ("Supplier::run");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
index 7d99a17e566..6f5ca7c53f0 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
@@ -35,36 +35,34 @@ Consumer::Consumer (void)
 int
 Consumer::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       // Do *NOT* make a copy because we don't want the ORB to outlive
       // the Consumer object.
       this->orb_ = orb.in ();
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
         poa->the_POAManager ();
       poa_manager->activate ();
 
       // Obtain the event channel
       CORBA::Object_var naming_obj =
-        this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
-                                            ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references (NAMING_SERVICE_NAME);
 
       // Need to check return value for errors.
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_THROW_RETURN (CORBA::UNKNOWN (), 0);
 
       this->naming_context_ =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
 
       CosNaming::Name name (1);
@@ -72,12 +70,10 @@ Consumer::run (int argc, char* argv[])
       name[0].id = CORBA::string_dup (NOTIFY_TLS_LOG_FACTORY_NAME);
 
       CORBA::Object_var obj =
-        this->naming_context_->resolve (name
-                                       ACE_ENV_ARG_PARAMETER);
+        this->naming_context_->resolve (name);
 
       this->notify_log_factory_ =
-        DsNotifyLogAdmin::NotifyLogFactory::_narrow (obj.in ()
-                                              ACE_ENV_ARG_PARAMETER);
+        DsNotifyLogAdmin::NotifyLogFactory::_narrow (obj.in ());
 
       CosNotifyComm::PushConsumer_var objref =
         this->_this ();
@@ -85,19 +81,18 @@ Consumer::run (int argc, char* argv[])
       ACE_ASSERT (!CORBA::is_nil (objref.in ()));
 
       CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
-        this->notify_log_factory_->obtain_notification_push_supplier (CosNotifyChannelAdmin::ANY_EVENT, proxy_supplier_id_ ACE_ENV_ARG_PARAMETER);
+        this->notify_log_factory_->obtain_notification_push_supplier (CosNotifyChannelAdmin::ANY_EVENT, proxy_supplier_id_);
 
       ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ()));
 
 
       this->proxy_supplier_ =
         CosNotifyChannelAdmin::ProxyPushSupplier::
-        _narrow (proxysupplier.in () ACE_ENV_ARG_PARAMETER);
+        _narrow (proxysupplier.in ());
 
       ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ()));
 
-      proxy_supplier_->connect_any_push_consumer (objref.in ()
-                                                         ACE_ENV_ARG_PARAMETER);
+      proxy_supplier_->connect_any_push_consumer (objref.in ());
 
       orb_->run ();
 
@@ -108,18 +103,16 @@ Consumer::run (int argc, char* argv[])
       // work_pending()/perform_work() to do more interesting stuff.
       // Check the supplier for the proper way to do cleanup.
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Consumer::run");
+      ex._tao_print_exception ("Consumer::run");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 void
-Consumer::push (const CORBA::Any &event
-    ACE_ENV_ARG_DECL_NOT_USED)
+Consumer::push (const CORBA::Any &event)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
@@ -148,8 +141,7 @@ Consumer::disconnect_push_consumer
 void
 Consumer::offer_change
    (const CosNotification::EventTypeSeq & /*added*/,
-    const CosNotification::EventTypeSeq & /*removed*/
-    ACE_ENV_ARG_DECL_NOT_USED)
+    const CosNotification::EventTypeSeq & /*removed*/)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         CosNotifyComm::InvalidEventType
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h
index 0a125e95824..0d2498223fb 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h
@@ -56,7 +56,6 @@ protected:
     virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -64,8 +63,7 @@ protected:
       ));
 
   // = StructuredPushSupplier methods
-virtual void push (const CORBA::Any &event
-                     ACE_ENV_ARG_DECL_NOT_USED)
+virtual void push (const CORBA::Any &event)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
@@ -73,7 +71,6 @@ virtual void push (const CORBA::Any &event
 
 
   virtual void disconnect_push_consumer (
-        ACE_ENV_SINGLE_ARG_DECL
         )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
index f54c55164e9..f84ba7374ab 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
@@ -39,25 +39,23 @@ Supplier::~Supplier ()
 int
 Supplier::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       this->orb_ =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
 
 
       CORBA::Object_var naming_obj =
-      this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
-                                              ACE_ENV_ARG_PARAMETER);
+      this->orb_->resolve_initial_references (NAMING_SERVICE_NAME);
 
       // Need to check return value for errors.
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_THROW_RETURN (CORBA::UNKNOWN (), 0);
 
       this->naming_context_ =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
 
       CosNaming::Name name (1);
@@ -65,12 +63,10 @@ Supplier::run (int argc, char* argv[])
       name[0].id = CORBA::string_dup (NOTIFY_TLS_LOG_FACTORY_NAME);
 
       CORBA::Object_var obj =
-        this->naming_context_->resolve (name
-                                       ACE_ENV_ARG_PARAMETER);
+        this->naming_context_->resolve (name);
 
       this->notify_log_factory_ =
-        DsNotifyLogAdmin::NotifyLogFactory::_narrow (obj.in ()
-                                              ACE_ENV_ARG_PARAMETER);
+        DsNotifyLogAdmin::NotifyLogFactory::_narrow (obj.in ());
 
       ACE_ASSERT (!CORBA::is_nil (this->notify_log_factory_.in ()));
 
@@ -93,8 +89,7 @@ Supplier::run (int argc, char* argv[])
                                           threshold,
                                           initial_qos,
                                           initial_admin,
-                                          logid
-                                          ACE_ENV_ARG_PARAMETER);
+                                          logid);
 
 
       ACE_DEBUG ((LM_DEBUG,
@@ -122,7 +117,7 @@ Supplier::run (int argc, char* argv[])
 
       // setup a filter at the consumer admin
       CosNotifyFilter::Filter_var sa_filter =
-        ffact->create_filter (TCL_GRAMMAR ACE_ENV_ARG_PARAMETER);
+        ffact->create_filter (TCL_GRAMMAR);
 
       ACE_ASSERT (!CORBA::is_nil (sa_filter.in ()));
 
@@ -132,16 +127,16 @@ Supplier::run (int argc, char* argv[])
       constraint_list[0].event_types.length (0);
       constraint_list[0].constraint_expr = CORBA::string_dup (SA_FILTER);
 
-      sa_filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
+      sa_filter->add_constraints (constraint_list);
 
-      supplier_admin_->add_filter (sa_filter.in () ACE_ENV_ARG_PARAMETER);
+      supplier_admin_->add_filter (sa_filter.in ());
 
       // startup the first supplier
       ACE_NEW_THROW_EX (supplier_1,
                         Filter_StructuredPushSupplier (),
                         CORBA::NO_MEMORY ());
 
-      supplier_1->connect (supplier_admin_.in () ACE_ENV_ARG_PARAMETER);
+      supplier_1->connect (supplier_admin_.in ());
 
       // operations:
       CosNotification::StructuredEvent event;
@@ -186,7 +181,7 @@ Supplier::run (int argc, char* argv[])
         // any
         event.remainder_of_body <<= (CORBA::Long)k;
 
-        supplier_1->send_event (event ACE_ENV_ARG_PARAMETER);
+        supplier_1->send_event (event);
       }
 
       ACE_DEBUG ((LM_DEBUG,
@@ -230,7 +225,7 @@ Supplier::run (int argc, char* argv[])
      ACE_DEBUG ((LM_DEBUG,
                  "Deleting records... \n"));
 
-     retval = notify_log_->delete_records (QUERY_LANG, QUERY_2 ACE_ENV_ARG_PARAMETER);
+     retval = notify_log_->delete_records (QUERY_LANG, QUERY_2);
 
      ACE_DEBUG ((LM_DEBUG,
                  "Calling NotifyLog::get_n_records...\n"));
@@ -255,12 +250,11 @@ Supplier::run (int argc, char* argv[])
      this->notify_log_->destroy();
 
      }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Supplier::run");
+      ex._tao_print_exception ("Supplier::run");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -274,24 +268,23 @@ Filter_StructuredPushSupplier::~Filter_StructuredPushSupplier ()
 }
 
 void
-Filter_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin ACE_ENV_ARG_DECL)
+Filter_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin)
 {
   CosNotifyComm::StructuredPushSupplier_var objref =
     this->_this ();
 
   CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer =
-    supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_ ACE_ENV_ARG_PARAMETER);
+    supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_);
 
   ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ()));
 
   // narrow
   this->proxy_consumer_ =
-    CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in () ACE_ENV_ARG_PARAMETER);
+    CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in ());
 
   ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ()));
 
-  proxy_consumer_->connect_structured_push_supplier (objref.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+  proxy_consumer_->connect_structured_push_supplier (objref.in ());
 }
 
 void
@@ -305,8 +298,7 @@ Filter_StructuredPushSupplier::disconnect (void)
 void
 Filter_StructuredPushSupplier::subscription_change
    (const CosNotification::EventTypeSeq & /*added*/,
-    const CosNotification::EventTypeSeq & /*removed */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    const CosNotification::EventTypeSeq & /*removed */)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyComm::InvalidEventType
@@ -317,11 +309,11 @@ Filter_StructuredPushSupplier::subscription_change
 
 void
 Filter_StructuredPushSupplier::send_event
-   (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL)
+   (const CosNotification::StructuredEvent& event)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
-  proxy_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER);
+  proxy_consumer_->push_structured_event (event);
 }
 
 void
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h
index 3bc639cebce..0326d711dc6 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h
@@ -80,16 +80,14 @@ class Filter_StructuredPushSupplier
   Filter_StructuredPushSupplier (void);
   // Constructor.
 
-  void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin
-                ACE_ENV_ARG_DECL);
+  void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin);
   // Connect the Supplier to the EventChannel.
   // Creates a new proxy supplier and connects to it.
 
   void disconnect (void);
   // Disconnect from the supplier.
 
-  virtual void send_event (const CosNotification::StructuredEvent& event
-                           ACE_ENV_ARG_DECL);
+  virtual void send_event (const CosNotification::StructuredEvent& event);
   // Send one event.
 
 protected:
@@ -108,7 +106,6 @@ protected:
   virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -117,7 +114,6 @@ protected:
 
   // = StructuredPushSupplier method
     virtual void disconnect_structured_push_supplier (
-        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
index 1e445a18411..17a8ff1634a 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
@@ -28,12 +28,11 @@ Consumer::Consumer (void)
 int
 Consumer::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       // Do *NOT* make a copy because we don't want the ORB to outlive
       // the run() method.
@@ -47,9 +46,9 @@ Consumer::run (int argc, char* argv[])
         }
 */
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
         poa->the_POAManager ();
       poa_manager->activate ();
@@ -58,36 +57,32 @@ Consumer::run (int argc, char* argv[])
       // command line argument or resolve_initial_references(), but
       // this is simpler...
 /*      object =
-        orb->string_to_object (argv[1] ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object (argv[1]);
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        RtecEventChannelAdmin::EventChannel::_narrow (object.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
+        RtecEventChannelAdmin::EventChannel::_narrow (object.in ());
 */
 
      // Obtain the event channel
       CORBA::Object_var naming_obj =
-        this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
-                                            ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references (NAMING_SERVICE_NAME);
 
       // Need to check return value for errors.
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_THROW_RETURN (CORBA::UNKNOWN (), 0);
 
       this->naming_context_ =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
       CosNaming::Name name (1);
       name.length (1);
       name[0].id = CORBA::string_dup (EVENT_TLS_LOG_FACTORY_NAME);
 
       CORBA::Object_var obj =
-        this->naming_context_->resolve (name
-                                       ACE_ENV_ARG_PARAMETER);
+        this->naming_context_->resolve (name);
 
       this->event_log_factory_ =
-        RTEventLogAdmin::EventLogFactory::_narrow (obj.in ()
-                                              ACE_ENV_ARG_PARAMETER);
+        RTEventLogAdmin::EventLogFactory::_narrow (obj.in ());
 
 
       // The canonical protocol to connect to the EC
@@ -112,8 +107,7 @@ Consumer::run (int argc, char* argv[])
       h1.type   = ACE_ES_EVENT_UNDEFINED; // first free event type
       h1.source = ACE_ES_EVENT_SOURCE_ANY;
 
-      this->supplier_->connect_push_consumer (consumer.in (), qos
-                                       ACE_ENV_ARG_PARAMETER);
+      this->supplier_->connect_push_consumer (consumer.in (), qos);
 
       // Wait for events, using work_pending()/perform_work() may help
       // or using another thread, this example is too simple for that.
@@ -126,18 +120,16 @@ Consumer::run (int argc, char* argv[])
       // work_pending()/perform_work() to do more interesting stuff.
       // Check the supplier for the proper way to do cleanup.
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Consumer::run");
+      ex._tao_print_exception ("Consumer::run");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 void
-Consumer::push (const RtecEventComm::EventSet& events
-                ACE_ENV_ARG_DECL_NOT_USED)
+Consumer::push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG (events);
@@ -156,6 +148,6 @@ Consumer::disconnect_push_consumer (void)
   // In this example we shutdown the ORB when we disconnect from the
   // EC (or rather the EC disconnects from us), but this doesn't have
   // to be the case....
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h
index 324f4ec7ac4..b4009a41576 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h
@@ -43,8 +43,7 @@ public:
 
   // = The RtecEventComm::PushConsumer methods
 
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
index 06161288424..e9a9215b19f 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
@@ -33,12 +33,11 @@ Supplier::Supplier (void)
 int
 Supplier::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
 
 /*
@@ -55,9 +54,9 @@ Supplier::run (int argc, char* argv[])
      // this->orb_ = orb.in ();
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
         poa->the_POAManager ();
       poa_manager->activate ();
@@ -66,23 +65,21 @@ Supplier::run (int argc, char* argv[])
       // command line argument or resolve_initial_references(), but
       // this is simpler...
 /*      object =
-        orb->string_to_object (argv[1] ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object (argv[1]);
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        RtecEventChannelAdmin::EventChannel::_narrow (object.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
+        RtecEventChannelAdmin::EventChannel::_narrow (object.in ());
 */
 
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references (NAMING_SERVICE_NAME
-                                            ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references (NAMING_SERVICE_NAME);
 
       // Need to check return value for errors.
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_THROW_RETURN (CORBA::UNKNOWN (), 0);
 
       this->naming_context_ =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
 
       CosNaming::Name name (1);
@@ -90,12 +87,10 @@ Supplier::run (int argc, char* argv[])
       name[0].id = CORBA::string_dup (EVENT_TLS_LOG_FACTORY_NAME);
 
       CORBA::Object_var obj =
-        this->naming_context_->resolve (name
-                                       ACE_ENV_ARG_PARAMETER);
+        this->naming_context_->resolve (name);
 
       this->event_log_factory_ =
-        RTEventLogAdmin::EventLogFactory::_narrow (obj.in ()
-                                              ACE_ENV_ARG_PARAMETER);
+        RTEventLogAdmin::EventLogFactory::_narrow (obj.in ());
 
       ACE_ASSERT (!CORBA::is_nil (this->event_log_factory_.in ()));
 
@@ -119,8 +114,7 @@ Supplier::run (int argc, char* argv[])
         this->event_log_factory_->create (logfullaction,
                                           max_size,
                                           threshold,
-                                          logid
-                                          ACE_ENV_ARG_PARAMETER);
+                                          logid);
 
 
       ACE_DEBUG ((LM_DEBUG,
@@ -146,8 +140,7 @@ Supplier::run (int argc, char* argv[])
       h0.type   = ACE_ES_EVENT_UNDEFINED; // first free event type
       h0.source = 1;                      // first free event source
 
-      this->consumer_->connect_push_supplier (supplier.in (), qos
-                                       ACE_ENV_ARG_PARAMETER);
+      this->consumer_->connect_push_supplier (supplier.in (), qos);
 
 
       // Create some fake log events.
@@ -162,7 +155,7 @@ Supplier::run (int argc, char* argv[])
 
       for (int i = 0; i != LOG_EVENT_COUNT; ++i)
         {
-          this->consumer_->push (event ACE_ENV_ARG_PARAMETER);
+          this->consumer_->push (event);
           ACE_OS::sleep (sleep_time);
         }
 
@@ -209,7 +202,7 @@ Supplier::run (int argc, char* argv[])
       ACE_DEBUG ((LM_DEBUG,
                   "Deleting records... \n"));
 
-      retval = event_log->delete_records (QUERY_LANG, QUERY_2 ACE_ENV_ARG_PARAMETER);
+      retval = event_log->delete_records (QUERY_LANG, QUERY_2);
 
       ACE_DEBUG ((LM_DEBUG,
                   "Calling EventLog::get_n_records...\n"));
@@ -240,20 +233,19 @@ Supplier::run (int argc, char* argv[])
 
      // Deactivate this object...
      PortableServer::ObjectId_var id =
-       poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-     poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
+       poa->servant_to_id (this);
+     poa->deactivate_object (id.in ());
 
      // Destroy the POA
-     poa->destroy (1, 0 ACE_ENV_ARG_PARAMETER);
+     poa->destroy (1, 0);
 
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Supplier::run");
+      ex._tao_print_exception ("Supplier::run");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp
index 2e901202219..9bd46c2a5a7 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp
+++ b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp
@@ -145,8 +145,7 @@ private:
   //
   virtual void
   offer_change (EventTypeSeq const&,
-                EventTypeSeq const&
-                ACE_ENV_ARG_DECL_NOT_USED)
+                EventTypeSeq const&)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNotifyComm::InvalidEventType))
   {
@@ -156,7 +155,7 @@ private:
   // StructuredPushSupplier interface.
   //
   virtual void
-  push_structured_event (StructuredEvent const& e ACE_ENV_ARG_DECL_NOT_USED)
+  push_structured_event (StructuredEvent const& e)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventComm::Disconnected))
   {
@@ -206,7 +205,7 @@ private:
 int
 main (int argc, char* argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
   {
     ORB_var orb (ORB_init (argc, argv));
 
@@ -222,8 +221,7 @@ main (int argc, char* argv[])
     // Activate the root POA.
     //
     CORBA::Object_var obj (
-      orb->resolve_initial_references ("RootPOA"
-                                       ACE_ENV_ARG_PARAMETER));
+      orb->resolve_initial_references ("RootPOA"));
 
     PortableServer::POA_var root_poa (PortableServer::POA::_narrow (obj.in ()));
 
@@ -253,12 +251,11 @@ main (int argc, char* argv[])
     }
 
 
-    ns->init_service (orb.in () ACE_ENV_ARG_PARAMETER);
+    ns->init_service (orb.in ());
 
     // Create the channel factory.
     //
-    EventChannelFactory_var factory (ns->create (root_poa.in ()
-                                                 ACE_ENV_ARG_PARAMETER));
+    EventChannelFactory_var factory (ns->create (root_poa.in ()));
 
     if (is_nil (factory.in ()))
     {
@@ -325,19 +322,16 @@ main (int argc, char* argv[])
 
     return 0;
   }
-  ACE_CATCH (CORBA::UserException, ue)
+  catch (const CORBA::UserException& ue)
   {
-    ACE_PRINT_EXCEPTION (ue,
-                         "User exception: ");
+    ue._tao_print_exception ("User exception: ");
     return 1;
   }
-  ACE_CATCH (CORBA::SystemException, se)
+  catch (const CORBA::SystemException& se)
   {
-    ACE_PRINT_EXCEPTION (se,
-                         "System exception: ");
+    se._tao_print_exception ("System exception: ");
     return 1;
   }
-  ACE_ENDTRY;
 
   return 1;
 }
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp
index 8538b217a11..19187fdb325 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp
+++ b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp
@@ -191,7 +191,7 @@ tracker ()
 }
 
 void Gate::
-push_structured_event (StructuredEvent const& e ACE_ENV_ARG_DECL_NOT_USED)
+push_structured_event (StructuredEvent const& e)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosEventComm::Disconnected))
 {
@@ -257,8 +257,7 @@ disconnect_structured_push_consumer (void)
 
 void Gate::
 offer_change (EventTypeSeq const&,
-              EventTypeSeq const&
-              ACE_ENV_ARG_DECL_NOT_USED)
+              EventTypeSeq const&)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNotifyComm::InvalidEventType))
 {
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h
index 016da30f670..d4838d078ff 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h
+++ b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h
@@ -52,16 +52,14 @@ private:
   //
   virtual void
   offer_change (CosNotification::EventTypeSeq const&,
-                CosNotification::EventTypeSeq const&
-                ACE_ENV_ARG_DECL)
+                CosNotification::EventTypeSeq const&)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNotifyComm::InvalidEventType));
 
   // StructuredPushSupplier interface.
   //
   virtual void
-  push_structured_event (CosNotification::StructuredEvent const& e
-                         ACE_ENV_ARG_DECL)
+  push_structured_event (CosNotification::StructuredEvent const& e)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventComm::Disconnected));
 
diff --git a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp
index 9ebf15df497..214179c6803 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp
+++ b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp
@@ -35,7 +35,7 @@ using namespace CosNotifyChannelAdmin;
 int
 main (int argc, char* argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
   {
     ORB_var orb (ORB_init (argc, argv));
 
@@ -50,8 +50,7 @@ main (int argc, char* argv[])
     // Activate the root POA.
     //
     CORBA::Object_var obj (
-      orb->resolve_initial_references ("RootPOA"
-                                       ACE_ENV_ARG_PARAMETER));
+      orb->resolve_initial_references ("RootPOA"));
 
     PortableServer::POA_var root_poa (PortableServer::POA::_narrow (obj.in ()));
 
@@ -81,12 +80,11 @@ main (int argc, char* argv[])
     }
 
 
-    ns->init_service (orb.in () ACE_ENV_ARG_PARAMETER);
+    ns->init_service (orb.in ());
 
     // Create the channel factory.
     //
-    EventChannelFactory_var factory (ns->create (root_poa.in ()
-                                                 ACE_ENV_ARG_PARAMETER));
+    EventChannelFactory_var factory (ns->create (root_poa.in ()));
 
     if (is_nil (factory.in ()))
     {
@@ -176,19 +174,16 @@ main (int argc, char* argv[])
 
     return 0;
   }
-  ACE_CATCH (CORBA::UserException, ue)
+  catch (const CORBA::UserException& ue)
   {
-    ACE_PRINT_EXCEPTION (ue,
-                         "User exception: ");
+    ue._tao_print_exception ("User exception: ");
     return 1;
   }
-  ACE_CATCH (CORBA::SystemException, se)
+  catch (const CORBA::SystemException& se)
   {
-    ACE_PRINT_EXCEPTION (se,
-                         "System exception: ");
+    se._tao_print_exception ("System exception: ");
     return 1;
   }
-  ACE_ENDTRY;
 
   return 1;
 }
diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp
index eb8e92c2897..9f9d0c62cac 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp
+++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp
@@ -28,9 +28,9 @@ FilterClient::~FilterClient ()
 }
 
 void
-FilterClient::init (int argc, char *argv [] ACE_ENV_ARG_DECL)
+FilterClient::init (int argc, char *argv [])
 {
-  init_ORB (argc, argv ACE_ENV_ARG_PARAMETER);
+  init_ORB (argc, argv);
 
   resolve_naming_service ();
 
@@ -68,17 +68,14 @@ FilterClient::done (void)
 
 void
 FilterClient::init_ORB (int argc,
-                      char *argv []
-                      ACE_ENV_ARG_DECL)
+                      char *argv [])
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                ""
-                                ACE_ENV_ARG_PARAMETER);
+                                "");
 
   CORBA::Object_ptr poa_object  =
-    this->orb_->resolve_initial_references("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references("RootPOA");
 
   if (CORBA::is_nil (poa_object))
     {
@@ -87,8 +84,7 @@ FilterClient::init_ORB (int argc,
       return;
     }
   this->root_poa_ =
-    PortableServer::POA::_narrow (poa_object
-                                  ACE_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (poa_object);
 
   PortableServer::POAManager_var poa_manager =
     root_poa_->the_POAManager ();
@@ -100,15 +96,14 @@ void
 FilterClient::resolve_naming_service (void)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
-                                            ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references (NAMING_SERVICE_NAME);
 
   // Need to check return value for errors.
   if (CORBA::is_nil (naming_obj.in ()))
-    ACE_THROW (CORBA::UNKNOWN ());
+    throw CORBA::UNKNOWN ();
 
   this->naming_context_ =
-    CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
+    CosNaming::NamingContext::_narrow (naming_obj.in ());
 }
 
 void
@@ -119,12 +114,10 @@ FilterClient::resolve_Notify_factory (void)
   name[0].id = CORBA::string_dup (NOTIFY_FACTORY_NAME);
 
   CORBA::Object_var obj =
-    this->naming_context_->resolve (name
-                                   ACE_ENV_ARG_PARAMETER);
+    this->naming_context_->resolve (name);
 
   this->notify_factory_ =
-    CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in ()
-                                                         ACE_ENV_ARG_PARAMETER);
+    CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in ());
 }
 
 void
@@ -134,8 +127,7 @@ FilterClient::create_EC (void)
 
   ec_ = notify_factory_->create_channel (initial_qos_,
                                          initial_admin_,
-                                         id
-                                         ACE_ENV_ARG_PARAMETER);
+                                         id);
 
   ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
 }
@@ -146,7 +138,7 @@ FilterClient::create_supplieradmin (void)
   CosNotifyChannelAdmin::AdminID adminid = 0;
 
   supplier_admin_ =
-    ec_->new_for_suppliers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER);
+    ec_->new_for_suppliers (this->ifgop_, adminid);
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
 
@@ -155,7 +147,7 @@ FilterClient::create_supplieradmin (void)
 
   // setup a filter at the consumer admin
   CosNotifyFilter::Filter_var sa_filter =
-    ffact->create_filter (TCL_GRAMMAR ACE_ENV_ARG_PARAMETER);
+    ffact->create_filter (TCL_GRAMMAR);
 
   ACE_ASSERT (!CORBA::is_nil (sa_filter.in ()));
 
@@ -165,9 +157,9 @@ FilterClient::create_supplieradmin (void)
   constraint_list[0].event_types.length (0);
   constraint_list[0].constraint_expr = CORBA::string_dup (SA_FILTER);
 
-  sa_filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
+  sa_filter->add_constraints (constraint_list);
 
-  supplier_admin_->add_filter (sa_filter.in () ACE_ENV_ARG_PARAMETER);
+  supplier_admin_->add_filter (sa_filter.in ());
 }
 
 void
@@ -176,7 +168,7 @@ FilterClient:: create_consumeradmin (void)
   CosNotifyChannelAdmin::AdminID adminid = 0;
 
   consumer_admin_ =
-    ec_->new_for_consumers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER);
+    ec_->new_for_consumers (this->ifgop_, adminid);
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
 
@@ -185,7 +177,7 @@ FilterClient:: create_consumeradmin (void)
 
   // setup a filter at the consumer admin
   CosNotifyFilter::Filter_var ca_filter =
-    ffact->create_filter (TCL_GRAMMAR ACE_ENV_ARG_PARAMETER);
+    ffact->create_filter (TCL_GRAMMAR);
 
   ACE_ASSERT (!CORBA::is_nil (ca_filter.in ()));
 
@@ -200,9 +192,9 @@ FilterClient:: create_consumeradmin (void)
   constraint_list[0].event_types.length (0);
   constraint_list[0].constraint_expr = CORBA::string_dup (CA_FILTER);
 
-  ca_filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
+  ca_filter->add_constraints (constraint_list);
 
-  consumer_admin_->add_filter (ca_filter.in () ACE_ENV_ARG_PARAMETER);
+  consumer_admin_->add_filter (ca_filter.in ());
 }
 
 void
@@ -213,14 +205,14 @@ FilterClient::create_consumers (void)
                     Filter_StructuredPushConsumer (this, "consumer1"),
                     CORBA::NO_MEMORY ());
 
-  consumer_1->connect (consumer_admin_.in () ACE_ENV_ARG_PARAMETER);
+  consumer_1->connect (consumer_admin_.in ());
 
   // startup the second consumer.
   ACE_NEW_THROW_EX (consumer_2,
                     Filter_StructuredPushConsumer (this, "consumer2"),
                     CORBA::NO_MEMORY ());
 
-  consumer_2->connect (consumer_admin_.in () ACE_ENV_ARG_PARAMETER);
+  consumer_2->connect (consumer_admin_.in ());
 }
 
 void
@@ -231,14 +223,14 @@ FilterClient::create_suppliers (void)
                     Filter_StructuredPushSupplier ("supplier1"),
                     CORBA::NO_MEMORY ());
 
-  supplier_1->connect (supplier_admin_.in () ACE_ENV_ARG_PARAMETER);
+  supplier_1->connect (supplier_admin_.in ());
 
   // startup the second supplier
   ACE_NEW_THROW_EX (supplier_2,
                     Filter_StructuredPushSupplier ("supplier2"),
                     CORBA::NO_MEMORY ());
 
-  supplier_2->connect (supplier_admin_.in () ACE_ENV_ARG_PARAMETER);
+  supplier_2->connect (supplier_admin_.in ());
 }
 
 void
@@ -287,9 +279,9 @@ FilterClient::send_events (void)
       // any
       event.remainder_of_body <<= (CORBA::Long)i;
 
-      supplier_1->send_event (event ACE_ENV_ARG_PARAMETER);
+      supplier_1->send_event (event);
 
-      supplier_2->send_event (event ACE_ENV_ARG_PARAMETER);
+      supplier_2->send_event (event);
     }
 }
 
@@ -305,26 +297,25 @@ Filter_StructuredPushConsumer::~Filter_StructuredPushConsumer (void)
 }
 
 void
-Filter_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL)
+Filter_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
 {
   // Activate the consumer with the default_POA_
   CosNotifyComm::StructuredPushConsumer_var objref =
     this->_this ();
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
-    consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_ ACE_ENV_ARG_PARAMETER);
+    consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_);
 
   ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ()));
 
   // narrow
   this->proxy_supplier_ =
     CosNotifyChannelAdmin::StructuredProxyPushSupplier::
-    _narrow (proxysupplier.in () ACE_ENV_ARG_PARAMETER);
+    _narrow (proxysupplier.in ());
 
   ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ()));
 
-  proxy_supplier_->connect_structured_push_consumer (objref.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+  proxy_supplier_->connect_structured_push_consumer (objref.in ());
 }
 
 void
@@ -338,7 +329,7 @@ void
 Filter_StructuredPushConsumer::offer_change
    (const CosNotification::EventTypeSeq & /*added*/,
     const CosNotification::EventTypeSeq & /*removed*/
-    ACE_ENV_ARG_DECL_NOT_USED)
+    )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         CosNotifyComm::InvalidEventType
@@ -349,8 +340,7 @@ Filter_StructuredPushConsumer::offer_change
 
 void
 Filter_StructuredPushConsumer::push_structured_event
-   (const CosNotification::StructuredEvent & notification
-    ACE_ENV_ARG_DECL_NOT_USED)
+   (const CosNotification::StructuredEvent & notification)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
@@ -397,24 +387,23 @@ Filter_StructuredPushSupplier::~Filter_StructuredPushSupplier ()
 }
 
 void
-Filter_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin ACE_ENV_ARG_DECL)
+Filter_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin)
 {
   CosNotifyComm::StructuredPushSupplier_var objref =
     this->_this ();
 
   CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer =
-    supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_ ACE_ENV_ARG_PARAMETER);
+    supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_);
 
   ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ()));
 
   // narrow
   this->proxy_consumer_ =
-    CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in () ACE_ENV_ARG_PARAMETER);
+    CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in ());
 
   ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ()));
 
-  proxy_consumer_->connect_structured_push_supplier (objref.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+  proxy_consumer_->connect_structured_push_supplier (objref.in ());
 }
 
 void
@@ -429,7 +418,7 @@ void
 Filter_StructuredPushSupplier::subscription_change
    (const CosNotification::EventTypeSeq & /*added*/,
     const CosNotification::EventTypeSeq & /*removed */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyComm::InvalidEventType
@@ -440,14 +429,14 @@ Filter_StructuredPushSupplier::subscription_change
 
 void
 Filter_StructuredPushSupplier::send_event
-   (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL)
+   (const CosNotification::StructuredEvent& event)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
   ACE_DEBUG ((LM_DEBUG,
               "%s is sending an event \n", my_name_.fast_rep ()));
 
-  proxy_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER);
+  proxy_consumer_->push_structured_event (event);
 }
 
 void
diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.h b/TAO/orbsvcs/examples/Notify/Filter/Filter.h
index ecd6679122c..6f4263808f6 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/Filter.h
+++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.h
@@ -40,7 +40,7 @@ class FilterClient
   ~FilterClient ();
   // Destructor
 
-  void init (int argc, char *argv [] ACE_ENV_ARG_DECL);
+  void init (int argc, char *argv []);
   // Init the Client.
 
   void run (void);
@@ -50,7 +50,7 @@ class FilterClient
   // Consumer calls done, We're done.
 
  protected:
-  void init_ORB (int argc, char *argv [] ACE_ENV_ARG_DECL);
+  void init_ORB (int argc, char *argv []);
   // Initializes the ORB.
 
   void resolve_naming_service (void);
@@ -140,7 +140,7 @@ class Filter_StructuredPushConsumer
   Filter_StructuredPushConsumer (FilterClient* filter, const char *my_name);
   // Constructor.
 
-  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL);
+  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin);
   // Connect the Consumer to the EventChannel.
   // Creates a new proxy supplier and connects to it.
 
@@ -170,7 +170,6 @@ protected:
     virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -180,7 +179,6 @@ protected:
   // = StructuredPushSupplier methods
   virtual void push_structured_event (
         const CosNotification::StructuredEvent & notification
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -188,7 +186,6 @@ protected:
        ));
 
   virtual void disconnect_structured_push_consumer (
-        ACE_ENV_SINGLE_ARG_DECL
         )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -211,16 +208,14 @@ class Filter_StructuredPushSupplier
   Filter_StructuredPushSupplier (const char* my_name);
   // Constructor.
 
-  void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin
-                ACE_ENV_ARG_DECL);
+  void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin);
   // Connect the Supplier to the EventChannel.
   // Creates a new proxy supplier and connects to it.
 
   void disconnect (void);
   // Disconnect from the supplier.
 
-  virtual void send_event (const CosNotification::StructuredEvent& event
-                           ACE_ENV_ARG_DECL);
+  virtual void send_event (const CosNotification::StructuredEvent& event);
   // Send one event.
 
 protected:
@@ -242,7 +237,6 @@ protected:
   virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -251,7 +245,6 @@ protected:
 
   // = StructuredPushSupplier method
     virtual void disconnect_structured_push_supplier (
-        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/examples/Notify/Filter/main.cpp b/TAO/orbsvcs/examples/Notify/Filter/main.cpp
index 86f80717ef8..5d095aa8faa 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/main.cpp
+++ b/TAO/orbsvcs/examples/Notify/Filter/main.cpp
@@ -8,26 +8,22 @@ main (int argc, char *argv [])
 {
   FilterClient client;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      client.init (argc, argv
-                   ACE_ENV_ARG_PARAMETER); //Init the Client
+      client.init (argc, argv); //Init the Client
 
       client.run ();
     }
-  ACE_CATCH (CORBA::UserException, ue)
+  catch (const CORBA::UserException& ue)
     {
-      ACE_PRINT_EXCEPTION (ue,
-                           "TLS_Client user error: ");
+      ue._tao_print_exception ("TLS_Client user error: ");
       return 1;
     }
-  ACE_CATCH (CORBA::SystemException, se)
+  catch (const CORBA::SystemException& se)
     {
-      ACE_PRINT_EXCEPTION (se,
-                           "Filter system error: ");
+      se._tao_print_exception ("Filter system error: ");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp
index 4ade161f36f..17adfa7d657 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp
@@ -17,7 +17,7 @@ TAO_Notify_Lanes_Consumer::~TAO_Notify_Lanes_Consumer (void)
 }
 
 void
-TAO_Notify_Lanes_Consumer::init (PortableServer::POA_var& poa, CosNotifyChannelAdmin::ConsumerAdmin_var& admin, ACE_CString& event_type ACE_ENV_ARG_DECL)
+TAO_Notify_Lanes_Consumer::init (PortableServer::POA_var& poa, CosNotifyChannelAdmin::ConsumerAdmin_var& admin, ACE_CString& event_type)
 {
   this->default_POA_ = poa;
   this->admin_ = admin;
@@ -46,18 +46,17 @@ TAO_Notify_Lanes_Consumer::connect (void)
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     this->admin_->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT
-                                                     , proxy_supplier_id_ ACE_ENV_ARG_PARAMETER);
+                                                     , proxy_supplier_id_);
 
   ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ()));
 
   // narrow
   this->proxy_supplier_ =
-    CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (proxysupplier.in () ACE_ENV_ARG_PARAMETER);
+    CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (proxysupplier.in ());
 
   ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ()));
 
-  this->proxy_supplier_->connect_structured_push_consumer (objref.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+  this->proxy_supplier_->connect_structured_push_consumer (objref.in ());
 
   // Call subscription_change to inform the supplier that this consumer is available.
   CosNotification::EventTypeSeq added (1);
@@ -67,7 +66,7 @@ TAO_Notify_Lanes_Consumer::connect (void)
   added[0].domain_name = CORBA::string_dup ("TEST_DOMAIN");
   added[0].type_name = CORBA::string_dup (this->event_type_.c_str ());
 
-  this->proxy_supplier_->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
+  this->proxy_supplier_->subscription_change (added, removed);
 }
 
 void
@@ -79,7 +78,7 @@ TAO_Notify_Lanes_Consumer::disconnect (void)
 void
 TAO_Notify_Lanes_Consumer::offer_change (const CosNotification::EventTypeSeq & /*added*/,
                                const CosNotification::EventTypeSeq & /*removed*/
-                               ACE_ENV_ARG_DECL_NOT_USED)
+                               )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyComm::InvalidEventType
@@ -89,14 +88,13 @@ TAO_Notify_Lanes_Consumer::offer_change (const CosNotification::EventTypeSeq & /
 }
 
 void
-TAO_Notify_Lanes_Consumer::push_structured_event (const CosNotification::StructuredEvent & notification
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_Lanes_Consumer::push_structured_event (const CosNotification::StructuredEvent & notification)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
                    ))
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Check the current threads priority.
       RTCORBA::Priority thread_priority =
@@ -129,14 +127,12 @@ TAO_Notify_Lanes_Consumer::push_structured_event (const CosNotification::Structu
       // We received the event, shutdown the ORB.
       this->orb_objects_.orb_->shutdown (1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
-                          ACE_TEXT ("Consumer error "));
+      ex._tao_print_exception (ACE_TEXT ("Consumer error "));
 
       return;
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -144,11 +140,9 @@ TAO_Notify_Lanes_Consumer::deactivate (void)
 {
   PortableServer::POA_var poa (this->_default_POA ());
 
-  PortableServer::ObjectId_var id (poa->servant_to_id (this
-                                                       ACE_ENV_ARG_PARAMETER));
+  PortableServer::ObjectId_var id (poa->servant_to_id (this));
 
-  poa->deactivate_object (id.in()
-                          ACE_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in());
 }
 
 void
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h
index 779f093620b..f1f16034ae1 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h
@@ -35,7 +35,7 @@ public:
   TAO_Notify_Lanes_Consumer (TAO_Notify_ORB_Objects& orb_objects);
 
   /// Init
-  void init (PortableServer::POA_var& poa, CosNotifyChannelAdmin::ConsumerAdmin_var& admin, ACE_CString& event_type ACE_ENV_ARG_DECL);
+  void init (PortableServer::POA_var& poa, CosNotifyChannelAdmin::ConsumerAdmin_var& admin, ACE_CString& event_type);
 
   /// Run
   void run (void);
@@ -82,7 +82,6 @@ protected:
   virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -92,7 +91,6 @@ protected:
   // = StructuredPushSupplier methods
   virtual void push_structured_event (
         const CosNotification::StructuredEvent & notification
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -100,7 +98,6 @@ protected:
        ));
 
   virtual void disconnect_structured_push_consumer (
-        ACE_ENV_SINGLE_ARG_DECL
         )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
index 23bbaa14770..7515eafacf3 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
@@ -75,7 +75,7 @@ TAO_Notify_Lanes_Consumer_Client::initialize (void)
 
   if (channel_seq->length() > 0)
     {
-      ec = ecf->get_event_channel (channel_seq[0] ACE_ENV_ARG_PARAMETER);
+      ec = ecf->get_event_channel (channel_seq[0]);
     }
   else
     {
@@ -87,7 +87,7 @@ TAO_Notify_Lanes_Consumer_Client::initialize (void)
   CosNotifyChannelAdmin::AdminID adminid = 0;
 
   CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->new_for_consumers (CosNotifyChannelAdmin::AND_OP, adminid ACE_ENV_ARG_PARAMETER);
+    ec->new_for_consumers (CosNotifyChannelAdmin::AND_OP, adminid);
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin.in ()));
 
@@ -97,7 +97,7 @@ TAO_Notify_Lanes_Consumer_Client::initialize (void)
   this->consumer_ = new TAO_Notify_Lanes_Consumer (this->orb_objects_);
 
   // Initialize it.
-  this->consumer_->init (rt_poa, consumer_admin, this->event_type_ ACE_ENV_ARG_PARAMETER);
+  this->consumer_->init (rt_poa, consumer_admin, this->event_type_);
 }
 
 PortableServer::POA_ptr
@@ -110,13 +110,12 @@ TAO_Notify_Lanes_Consumer_Client::create_rt_poa (void)
   CORBA::Policy_var lanes_policy;
 
   CORBA::Policy_var activation_policy =
-    this->orb_objects_.root_poa_->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER);
+    this->orb_objects_.root_poa_->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION);
 
   // Create a priority model policy.
   priority_model_policy =
     this->orb_objects_.rt_orb_->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED
-                                                              , 0
-                                                              ACE_ENV_ARG_PARAMETER);
+                                                              , 0);
 
   RTCORBA::ThreadpoolLanes lanes (1);
   lanes.length (1);
@@ -140,13 +139,11 @@ TAO_Notify_Lanes_Consumer_Client::create_rt_poa (void)
                                                               allow_borrowing,
                                                               allow_request_buffering,
                                                               max_buffered_requests,
-                                                              max_request_buffer_size
-                                                              ACE_ENV_ARG_PARAMETER);
+                                                              max_request_buffer_size);
 
   // Create a thread-pool policy.
   lanes_policy =
-    this->orb_objects_.rt_orb_->create_threadpool_policy (threadpool_id
-                                                          ACE_ENV_ARG_PARAMETER);
+    this->orb_objects_.rt_orb_->create_threadpool_policy (threadpool_id);
 
   CORBA::PolicyList poa_policy_list;
 
@@ -160,8 +157,7 @@ TAO_Notify_Lanes_Consumer_Client::create_rt_poa (void)
 
   rt_poa = this->orb_objects_.root_poa_->create_POA ("RT POA!",
                                                      poa_manager.in (),
-                                                     poa_policy_list
-                                                     ACE_ENV_ARG_PARAMETER);
+                                                     poa_policy_list);
 
   return rt_poa._retn ();
 }
@@ -175,22 +171,20 @@ TAO_Notify_Lanes_Consumer_Client::run (void)
 int
 TAO_Notify_Lanes_Consumer_Client::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize this threads priority.
-      this->orb_objects_.current_->the_priority (0 ACE_ENV_ARG_PARAMETER);
+      this->orb_objects_.current_->the_priority (0);
 
       this->initialize (); //Init the Client
 
       this->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
-                          ACE_TEXT ("Supplier error "));
+      ex._tao_print_exception (ACE_TEXT ("Supplier error "));
 
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -198,17 +192,16 @@ TAO_Notify_Lanes_Consumer_Client::svc (void)
 int
 main (int argc, char *argv [])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize an ORB
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            ""
-                                            ACE_ENV_ARG_PARAMETER);
+                                            "");
 
       TAO_Notify_ORB_Objects orb_objects;
 
-      orb_objects.init (orb ACE_ENV_ARG_PARAMETER);
+      orb_objects.init (orb);
 
       TAO_Notify_ORB_Run_Task orb_run_task (orb_objects);
 
@@ -240,12 +233,10 @@ main (int argc, char *argv [])
       orb_run_task.thr_mgr ()->wait ();
       client.thr_mgr ()->wait ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
-                          ACE_TEXT ("Consumer Client error "));
+      ex._tao_print_exception (ACE_TEXT ("Consumer Client error "));
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp
index 9790bf16f98..420ece6b765 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp
@@ -9,34 +9,28 @@ TAO_Notify_ORB_Objects::TAO_Notify_ORB_Objects (void)
 }
 
 void
-TAO_Notify_ORB_Objects::init (CORBA::ORB_var& orb ACE_ENV_ARG_DECL)
+TAO_Notify_ORB_Objects::init (CORBA::ORB_var& orb)
 {
   this->orb_ = orb;
 
-  CORBA::Object_var object =  this->orb_->resolve_initial_references("RootPOA"
-                                                                     ACE_ENV_ARG_PARAMETER);
+  CORBA::Object_var object =  this->orb_->resolve_initial_references("RootPOA");
 
-  this->root_poa_ = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+  this->root_poa_ = PortableServer::POA::_narrow (object.in ());
 
   // Resolve the RTORB.
-  object = this->orb_->resolve_initial_references ("RTORB"
-                                                       ACE_ENV_ARG_PARAMETER);
+  object = this->orb_->resolve_initial_references ("RTORB");
 
-  this->rt_orb_ = RTCORBA::RTORB::_narrow (object.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+  this->rt_orb_ = RTCORBA::RTORB::_narrow (object.in ());
 
   // Resolve the Current
-  object = this->orb_->resolve_initial_references ("RTCurrent"
-                                                   ACE_ENV_ARG_PARAMETER);
+  object = this->orb_->resolve_initial_references ("RTCurrent");
 
-  this->current_ = RTCORBA::Current::_narrow (object.in ()
-                                              ACE_ENV_ARG_PARAMETER);
+  this->current_ = RTCORBA::Current::_narrow (object.in ());
 
   // Resolve the Naming service
-  object = this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
+  object = this->orb_->resolve_initial_references ("NameService");
 
-  this->naming_ = CosNaming::NamingContextExt::_narrow (object.in ()
-                                                                    ACE_ENV_ARG_PARAMETER);
+  this->naming_ = CosNaming::NamingContextExt::_narrow (object.in ());
 }
 
 TAO_Notify_ORB_Objects::~TAO_Notify_ORB_Objects ()
@@ -53,9 +47,9 @@ TAO_Notify_ORB_Objects::notify_factory (void)
   name.length (1);
   name[0].id = CORBA::string_dup ("NotifyEventChannelFactory");
 
-  CORBA::Object_var object = this->naming_->resolve (name ACE_ENV_ARG_PARAMETER);
+  CORBA::Object_var object = this->naming_->resolve (name);
 
-  ecf = CosNotifyChannelAdmin::EventChannelFactory::_narrow (object.in() ACE_ENV_ARG_PARAMETER);
+  ecf = CosNotifyChannelAdmin::EventChannelFactory::_narrow (object.in());
 
   return ecf._retn ();
 }
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h
index 97a10af69c3..ddd8ed23da8 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h
@@ -35,7 +35,7 @@ public:
   ~TAO_Notify_ORB_Objects ();
 
   /// Resolves all the references.
-  void init (CORBA::ORB_var& orb ACE_ENV_ARG_DECL);
+  void init (CORBA::ORB_var& orb);
 
   /// Resolve Notification
   CosNotifyChannelAdmin::EventChannelFactory_ptr notify_factory (void);
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp
index 2477f15457a..93abf1aba22 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp
@@ -16,16 +16,15 @@ TAO_Notify_ORB_Run_Task::~TAO_Notify_ORB_Run_Task ()
 int
 TAO_Notify_ORB_Run_Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->orb_objects_.current_->the_priority (0 ACE_ENV_ARG_PARAMETER);
+      this->orb_objects_.current_->the_priority (0);
 
       this->orb_objects_.orb_->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp
index 22d6e8cf5bf..44c4a0fd1a6 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp
@@ -20,7 +20,7 @@ TAO_Notify_Lanes_Supplier::~TAO_Notify_Lanes_Supplier ()
 }
 
 void
-TAO_Notify_Lanes_Supplier::init (CosNotifyChannelAdmin::SupplierAdmin_var& admin, int expected_consumer_count ACE_ENV_ARG_DECL)
+TAO_Notify_Lanes_Supplier::init (CosNotifyChannelAdmin::SupplierAdmin_var& admin, int expected_consumer_count)
 {
   // First initialize the class members.
   this->admin_ = admin;
@@ -50,7 +50,7 @@ TAO_Notify_Lanes_Supplier::run (void)
   for (int i = 0; i < this->expected_consumer_count_; ++i, ++priority)
     {
       // Set this threads priority.
-      this->orb_objects_.current_->the_priority (priority ACE_ENV_ARG_PARAMETER);
+      this->orb_objects_.current_->the_priority (priority);
 
       // Make sure the priority was set, get the priority of the current thread.
       RTCORBA::Priority thread_priority =
@@ -81,7 +81,7 @@ TAO_Notify_Lanes_Supplier::run (void)
                   "(%P, %t) Supplier is sending an event of type %s at priority %d\n", type, thread_priority));
 
       // send the event
-      this->send_event (event ACE_ENV_ARG_PARAMETER);
+      this->send_event (event);
     } // repeat for the next consumer at the next priority.
 
   // Disconnect from the EC
@@ -103,19 +103,18 @@ TAO_Notify_Lanes_Supplier::connect (void)
   // Obtain the proxy.
   CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer =
     this->admin_->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT
-                                                     , proxy_consumer_id_ ACE_ENV_ARG_PARAMETER);
+                                                     , proxy_consumer_id_);
 
   ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ()));
 
   // narrow
   this->proxy_consumer_ =
-    CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in () ACE_ENV_ARG_PARAMETER);
+    CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in ());
 
   ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ()));
 
   // connect to the proxyconsumer.
-  proxy_consumer_->connect_structured_push_supplier (objref.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+  proxy_consumer_->connect_structured_push_supplier (objref.in ());
 }
 
 void
@@ -131,17 +130,15 @@ TAO_Notify_Lanes_Supplier::deactivate (void)
 {
   PortableServer::POA_var poa (this->_default_POA ());
 
-  PortableServer::ObjectId_var id (poa->servant_to_id (this
-                                                       ACE_ENV_ARG_PARAMETER));
+  PortableServer::ObjectId_var id (poa->servant_to_id (this));
 
-  poa->deactivate_object (id.in()
-                          ACE_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in());
 }
 
 void
 TAO_Notify_Lanes_Supplier::subscription_change (const CosNotification::EventTypeSeq & added,
                                       const CosNotification::EventTypeSeq & /*removed */
-                                      ACE_ENV_ARG_DECL_NOT_USED)
+                                      )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyComm::InvalidEventType
@@ -158,11 +155,11 @@ TAO_Notify_Lanes_Supplier::subscription_change (const CosNotification::EventType
 }
 
 void
-TAO_Notify_Lanes_Supplier::send_event (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL)
+TAO_Notify_Lanes_Supplier::send_event (const CosNotification::StructuredEvent& event)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
-  proxy_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER);
+  proxy_consumer_->push_structured_event (event);
 }
 
 void
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h
index 6930c1592a8..f7c96ab45c1 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h
@@ -36,7 +36,7 @@ class TAO_Notify_Lanes_Supplier
   TAO_Notify_Lanes_Supplier (TAO_Notify_ORB_Objects& orb_objects);
 
   /// Init
-  void init (CosNotifyChannelAdmin::SupplierAdmin_var& admin, int count ACE_ENV_ARG_DECL);
+  void init (CosNotifyChannelAdmin::SupplierAdmin_var& admin, int count);
 
   /// Run
   void run (void);
@@ -55,7 +55,7 @@ protected:
   void deactivate (void);
 
   /// Send one event.
-  virtual void send_event (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL);
+  virtual void send_event (const CosNotification::StructuredEvent& event);
 
   /// Destructor
   virtual ~TAO_Notify_Lanes_Supplier ();
@@ -64,7 +64,6 @@ protected:
   virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
index 5fd38a1da4c..40b7845407f 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
@@ -74,7 +74,7 @@ TAO_Notify_Lanes_Supplier_Client::initialize (void)
   CosNotifyChannelAdmin::AdminID adminid = 0;
 
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin =
-    ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP, adminid ACE_ENV_ARG_PARAMETER);
+    ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP, adminid);
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin.in ()));
 
@@ -82,7 +82,7 @@ TAO_Notify_Lanes_Supplier_Client::initialize (void)
   this->supplier_ = new TAO_Notify_Lanes_Supplier (this->orb_objects_);
 
   // Initialize it.
-  this->supplier_->init (supplier_admin, this->consumer_count_ ACE_ENV_ARG_PARAMETER);
+  this->supplier_->init (supplier_admin, this->consumer_count_);
 }
 
 CosNotifyChannelAdmin::EventChannel_ptr
@@ -101,8 +101,7 @@ TAO_Notify_Lanes_Supplier_Client::create_ec (void)
 
   ec = ecf->create_channel (qos,
                             admin,
-                            id
-                            ACE_ENV_ARG_PARAMETER);
+                            id);
 
   // Set the Qos : 2 Lanes
   NotifyExt::ThreadPoolLanesParams tpl_params;
@@ -142,7 +141,7 @@ TAO_Notify_Lanes_Supplier_Client::create_ec (void)
   qos[0].value <<= tpl_params;
 
   // Note that instead of <set_qos>, the <qos> can also be passed while creating the channel.
-  ec->set_qos (qos ACE_ENV_ARG_PARAMETER);
+  ec->set_qos (qos);
 
   return ec._retn ();
 }
@@ -167,7 +166,7 @@ TAO_Notify_Lanes_Supplier_Client::write_ior (void)
   if (ior_output_file != 0)
     {
       CORBA::String_var str =
-        this->orb_objects_.orb_->object_to_string (objref.in () ACE_ENV_ARG_PARAMETER);
+        this->orb_objects_.orb_->object_to_string (objref.in ());
 
       ACE_OS::fprintf (ior_output_file,
                        "%s",
@@ -179,21 +178,19 @@ TAO_Notify_Lanes_Supplier_Client::write_ior (void)
 int
 TAO_Notify_Lanes_Supplier_Client::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->orb_objects_.current_->the_priority (0 ACE_ENV_ARG_PARAMETER);
+      this->orb_objects_.current_->the_priority (0);
 
       this->initialize (); //Init the Client
 
       this->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
-                          ACE_TEXT ("Supplier error "));
+      ex._tao_print_exception (ACE_TEXT ("Supplier error "));
 
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -201,18 +198,17 @@ TAO_Notify_Lanes_Supplier_Client::svc (void)
 int
 main (int argc, char *argv [])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize an ORB
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            ""
-                                            ACE_ENV_ARG_PARAMETER);
+                                            "");
 
       // Create a holder for the common ORB Objects.
       TAO_Notify_ORB_Objects orb_objects;
 
-      orb_objects.init (orb ACE_ENV_ARG_PARAMETER);
+      orb_objects.init (orb);
 
       /* Run the ORB in a seperate thread */
       TAO_Notify_ORB_Run_Task orb_run_task (orb_objects);
@@ -246,12 +242,10 @@ main (int argc, char *argv [])
       orb_run_task.thr_mgr ()->wait ();
       client.thr_mgr ()->wait ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
-                          ACE_TEXT ("Supplier Client error "));
+      ex._tao_print_exception (ACE_TEXT ("Supplier Client error "));
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
index b677c11d0db..2e3c6a5ff22 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
@@ -31,9 +31,9 @@ Subscribe::~Subscribe ()
 }
 
 void
-Subscribe::init (int argc, char *argv [] ACE_ENV_ARG_DECL)
+Subscribe::init (int argc, char *argv [])
 {
-  init_ORB (argc, argv ACE_ENV_ARG_PARAMETER);
+  init_ORB (argc, argv);
   resolve_naming_service ();
   resolve_Notify_factory ();
   create_EC ();
@@ -64,17 +64,14 @@ Subscribe::done (void)
 
 void
 Subscribe::init_ORB (int argc,
-                      char *argv []
-                      ACE_ENV_ARG_DECL)
+                      char *argv [])
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                ""
-                                ACE_ENV_ARG_PARAMETER);
+                                "");
 
   CORBA::Object_ptr poa_object  =
-    this->orb_->resolve_initial_references("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references("RootPOA");
 
   if (CORBA::is_nil (poa_object))
     {
@@ -83,7 +80,7 @@ Subscribe::init_ORB (int argc,
       return;
     }
   this->root_poa_ =
-    PortableServer::POA::_narrow (poa_object ACE_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (poa_object);
 
   PortableServer::POAManager_var poa_manager =
     root_poa_->the_POAManager ();
@@ -95,15 +92,14 @@ void
 Subscribe::resolve_naming_service (void)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
-                                            ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references (NAMING_SERVICE_NAME);
 
   // Need to check return value for errors.
   if (CORBA::is_nil (naming_obj.in ()))
-    ACE_THROW (CORBA::UNKNOWN ());
+    throw CORBA::UNKNOWN ();
 
   this->naming_context_ =
-    CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
+    CosNaming::NamingContext::_narrow (naming_obj.in ());
 }
 
 void
@@ -114,12 +110,10 @@ Subscribe::resolve_Notify_factory (void)
   name[0].id = CORBA::string_dup (NOTIFY_FACTORY_NAME);
 
   CORBA::Object_var obj =
-    this->naming_context_->resolve (name
-                                   ACE_ENV_ARG_PARAMETER);
+    this->naming_context_->resolve (name);
 
   this->notify_factory_ =
-    CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in ()
-                                                         ACE_ENV_ARG_PARAMETER);
+    CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in ());
 }
 
 void
@@ -129,8 +123,7 @@ Subscribe::create_EC (void)
 
   ec_ = notify_factory_->create_channel (initial_qos_,
                                          initial_admin_,
-                                         id
-                                         ACE_ENV_ARG_PARAMETER);
+                                         id);
 
   ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
 }
@@ -141,7 +134,7 @@ Subscribe::create_supplieradmin (void)
   CosNotifyChannelAdmin::AdminID adminid;
 
   supplier_admin_ =
-    ec_->new_for_suppliers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER);
+    ec_->new_for_suppliers (this->ifgop_, adminid);
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
 }
@@ -152,7 +145,7 @@ Subscribe:: create_consumeradmin (void)
   CosNotifyChannelAdmin::AdminID adminid;
 
   consumer_admin_ =
-    ec_->new_for_consumers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER);
+    ec_->new_for_consumers (this->ifgop_, adminid);
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
 }
@@ -161,24 +154,20 @@ void
 Subscribe::create_consumers (void)
 {
   consumer_1_ = new Subscribe_StructuredPushConsumer (this);
-  consumer_1_->connect (this->consumer_admin_.in ()
-                        ACE_ENV_ARG_PARAMETER);
+  consumer_1_->connect (this->consumer_admin_.in ());
 
   consumer_2_ = new Subscribe_StructuredPushConsumer (this);
-  consumer_2_->connect (this->consumer_admin_.in ()
-                        ACE_ENV_ARG_PARAMETER);
+  consumer_2_->connect (this->consumer_admin_.in ());
 }
 
 void
 Subscribe::create_suppliers (void)
 {
   supplier_1_ = new Subscribe_StructuredPushSupplier ();
-  supplier_1_->connect (this->supplier_admin_.in ()
-                        ACE_ENV_ARG_PARAMETER);
+  supplier_1_->connect (this->supplier_admin_.in ());
 
   supplier_2_ = new Subscribe_StructuredPushSupplier ();
-  supplier_2_->connect (this->supplier_admin_.in ()
-                        ACE_ENV_ARG_PARAMETER);
+  supplier_2_->connect (this->supplier_admin_.in ());
 }
 
 void
@@ -192,7 +181,7 @@ Subscribe::send_events (void)
   added[0].domain_name =  CORBA::string_dup (DOMAIN_A);
   added[0].type_name = CORBA::string_dup (TYPE_A);
 
-  this->consumer_admin_->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
+  this->consumer_admin_->subscription_change (added, removed);
 
   // Setup the Consumer 1 to receive event_type : "domain_B", "Type_b"
   CosNotification::EventTypeSeq added_1(1);
@@ -203,8 +192,7 @@ Subscribe::send_events (void)
   added_1.length (1);
   removed_1.length (0);
 
-  this->consumer_1_->get_proxy_supplier ()->subscription_change (added_1, removed_1
-                                                           ACE_ENV_ARG_PARAMETER);
+  this->consumer_1_->get_proxy_supplier ()->subscription_change (added_1, removed_1);
 
   // Setup the Consumer 2 to receive event_type : "domain_C", "Type_c"
   CosNotification::EventTypeSeq added_2(1);
@@ -215,8 +203,7 @@ Subscribe::send_events (void)
   added_2.length (1);
   removed_2.length (0);
 
-  this->consumer_2_->get_proxy_supplier ()->subscription_change (added_2, removed_2
-                                                           ACE_ENV_ARG_PARAMETER);
+  this->consumer_2_->get_proxy_supplier ()->subscription_change (added_2, removed_2);
 
   // Create the events - one of each type
   // Event 1
@@ -255,9 +242,9 @@ Subscribe::send_events (void)
  // let supplier 1 send all these events
   for (int i = 0; i < 1; ++i)
     {
-      supplier_1_->send_event (event1 ACE_ENV_ARG_PARAMETER);
-      supplier_1_->send_event (event2 ACE_ENV_ARG_PARAMETER);
-      supplier_1_->send_event (event3 ACE_ENV_ARG_PARAMETER);
+      supplier_1_->send_event (event1);
+      supplier_1_->send_event (event2);
+      supplier_1_->send_event (event3);
     }
 }
 
@@ -273,27 +260,25 @@ Subscribe_StructuredPushConsumer::~Subscribe_StructuredPushConsumer ()
 
 void
 Subscribe_StructuredPushConsumer::connect
-   (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-    ACE_ENV_ARG_DECL)
+   (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
 {
   // Activate the consumer with the default_POA_
   CosNotifyComm::StructuredPushConsumer_var objref =
     this->_this ();
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
-    consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_ ACE_ENV_ARG_PARAMETER);
+    consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_);
 
   ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ()));
 
   // narrow
   this->proxy_supplier_ =
     CosNotifyChannelAdmin::StructuredProxyPushSupplier::
-    _narrow (proxysupplier.in () ACE_ENV_ARG_PARAMETER);
+    _narrow (proxysupplier.in ());
 
   ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ()));
 
-  proxy_supplier_->connect_structured_push_consumer (objref.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+  proxy_supplier_->connect_structured_push_consumer (objref.in ());
 }
 
 void
@@ -307,7 +292,7 @@ void
 Subscribe_StructuredPushConsumer::offer_change
    (const CosNotification::EventTypeSeq & /*added*/,
     const CosNotification::EventTypeSeq & /*removed*/
-    ACE_ENV_ARG_DECL_NOT_USED)
+    )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         CosNotifyComm::InvalidEventType
@@ -318,8 +303,7 @@ Subscribe_StructuredPushConsumer::offer_change
 
 void
 Subscribe_StructuredPushConsumer::push_structured_event
-   (const CosNotification::StructuredEvent & notification
-    ACE_ENV_ARG_DECL_NOT_USED)
+   (const CosNotification::StructuredEvent & notification)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
@@ -366,25 +350,23 @@ Subscribe_StructuredPushSupplier::~Subscribe_StructuredPushSupplier ()
 
 void
 Subscribe_StructuredPushSupplier::connect
-   (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin
-    ACE_ENV_ARG_DECL)
+   (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin)
 {
   CosNotifyComm::StructuredPushSupplier_var objref =
     this->_this ();
 
   CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer =
-    supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_ ACE_ENV_ARG_PARAMETER);
+    supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_);
 
   ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ()));
 
   // narrow
   this->proxy_consumer_ =
-    CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in () ACE_ENV_ARG_PARAMETER);
+    CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in ());
 
   ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ()));
 
-  proxy_consumer_->connect_structured_push_supplier (objref.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+  proxy_consumer_->connect_structured_push_supplier (objref.in ());
 }
 
 void
@@ -399,7 +381,7 @@ void
 Subscribe_StructuredPushSupplier::subscription_change
    (const CosNotification::EventTypeSeq & /*added*/,
     const CosNotification::EventTypeSeq & /*removed */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyComm::InvalidEventType
@@ -410,12 +392,11 @@ Subscribe_StructuredPushSupplier::subscription_change
 
 void
 Subscribe_StructuredPushSupplier::send_event
-   (const CosNotification::StructuredEvent& event
-    ACE_ENV_ARG_DECL)
+   (const CosNotification::StructuredEvent& event)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
-  proxy_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER);
+  proxy_consumer_->push_structured_event (event);
 }
 
 void
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h
index 7fd58ae9b1d..e309467114b 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h
@@ -35,7 +35,7 @@ class Subscribe
   Subscribe (void);
   ~Subscribe ();
 
-  void init (int argc, char *argv [] ACE_ENV_ARG_DECL);
+  void init (int argc, char *argv []);
   // Init the Client.
 
   void run (void);
@@ -45,7 +45,7 @@ class Subscribe
   // Called when all events we are waiting for have occured.
 
  protected:
-  void init_ORB (int argc, char *argv [] ACE_ENV_ARG_DECL);
+  void init_ORB (int argc, char *argv []);
   // Initializes the ORB.
 
   void resolve_naming_service (void);
@@ -129,7 +129,7 @@ class Subscribe_StructuredPushConsumer
   Subscribe_StructuredPushConsumer (Subscribe* subscribe);
   // Constructor.
 
-  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL);
+  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin);
   // Connect the Consumer to the EventChannel.
   // Creates a new proxy supplier and connects to it.
 
@@ -158,7 +158,6 @@ protected:
     virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -168,7 +167,6 @@ protected:
   // = StructuredPushSupplier methods
   virtual void push_structured_event (
         const CosNotification::StructuredEvent & notification
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -176,7 +174,6 @@ protected:
        ));
 
   virtual void disconnect_structured_push_consumer (
-        ACE_ENV_SINGLE_ARG_DECL
         )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -199,16 +196,14 @@ class Subscribe_StructuredPushSupplier
   Subscribe_StructuredPushSupplier (void);
   // Constructor.
 
-  void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin
-                ACE_ENV_ARG_DECL);
+  void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin);
   // Connect the Supplier to the EventChannel.
   // Creates a new proxy consumer and connects to it.
 
   void disconnect (void);
   // Disconnect from the supplier.
 
-  virtual void send_event (const CosNotification::StructuredEvent& event
-                           ACE_ENV_ARG_DECL);
+  virtual void send_event (const CosNotification::StructuredEvent& event);
   // Send one event.
 
 protected:
@@ -227,7 +222,6 @@ protected:
   virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -236,7 +230,6 @@ protected:
 
   // = StructuredPushSupplier method
     virtual void disconnect_structured_push_supplier (
-        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp
index 18d86e4232a..05c916eab0d 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp
@@ -8,26 +8,22 @@ main (int argc, char *argv [])
 {
   Subscribe client;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      client.init (argc, argv
-                   ACE_ENV_ARG_PARAMETER); //Init the Client
+      client.init (argc, argv); //Init the Client
 
       client.run ();
     }
-  ACE_CATCH (CORBA::UserException, ue)
+  catch (const CORBA::UserException& ue)
     {
-      ACE_PRINT_EXCEPTION (ue,
-                           "TLS_Client user error: ");
+      ue._tao_print_exception ("TLS_Client user error: ");
       return 1;
     }
-  ACE_CATCH (CORBA::SystemException, se)
+  catch (const CORBA::SystemException& se)
     {
-      ACE_PRINT_EXCEPTION (se,
-                           "Filter system error: ");
+      se._tao_print_exception ("Filter system error: ");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp
index 489f6aabb9e..29cabc964bb 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp
@@ -29,7 +29,7 @@ TAO_Notify_ThreadPool_Consumer::~TAO_Notify_ThreadPool_Consumer (void)
 
 void
 TAO_Notify_ThreadPool_Consumer::init (PortableServer::POA_var& poa, CosNotifyChannelAdmin::ConsumerAdmin_var& admin,
-                       int proxy_supplier_thread_count, int max_events, long delay ACE_ENV_ARG_DECL)
+                       int proxy_supplier_thread_count, int max_events, long delay)
 {
   this->default_POA_ = poa;
   this->admin_ = admin;
@@ -65,7 +65,7 @@ TAO_Notify_ThreadPool_Consumer::connect (void)
   if (this->proxy_supplier_thread_count_ != 0)
     {
       // Narrow to the extended interface.
-      NotifyExt::ConsumerAdmin_var admin_ext = NotifyExt::ConsumerAdmin::_narrow (this->admin_.in ()ACE_ENV_ARG_PARAMETER);
+      NotifyExt::ConsumerAdmin_var admin_ext = NotifyExt::ConsumerAdmin::_narrow (this->admin_.in ());
 
       NotifyExt::ThreadPoolParams tp_params = { NotifyExt::CLIENT_PROPAGATED, 0,
                                                 0, this->proxy_supplier_thread_count_, 0, 0, 0, 0, 0 };
@@ -77,24 +77,23 @@ TAO_Notify_ThreadPool_Consumer::connect (void)
 
       // Obtain the proxy. The QoS is applied to the POA in which the Proxy is hosted.
       proxysupplier = admin_ext->obtain_notification_push_supplier_with_qos (CosNotifyChannelAdmin::STRUCTURED_EVENT
-                                                                                   , proxy_supplier_id_, qos ACE_ENV_ARG_PARAMETER);
+                                                                                   , proxy_supplier_id_, qos);
     }
   else
     {
       proxysupplier = this->admin_->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT
-                                                                       , proxy_supplier_id_ ACE_ENV_ARG_PARAMETER);
+                                                                       , proxy_supplier_id_);
     }
 
   ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ()));
 
   // narrow
   this->proxy_supplier_ =
-    CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (proxysupplier.in () ACE_ENV_ARG_PARAMETER);
+    CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (proxysupplier.in ());
 
   ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ()));
 
-  this->proxy_supplier_->connect_structured_push_consumer (objref.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+  this->proxy_supplier_->connect_structured_push_consumer (objref.in ());
 
   // Call subscription_change to inform the supplier that this consumer is available.
   CosNotification::EventTypeSeq added (1);
@@ -109,7 +108,7 @@ TAO_Notify_ThreadPool_Consumer::connect (void)
 
   added[0].type_name = CORBA::string_dup (type);
 
-  this->proxy_supplier_->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
+  this->proxy_supplier_->subscription_change (added, removed);
 
   ACE_DEBUG ((LM_DEBUG, "(%P,%t) Created Consumer %d with %d threads at the ProxySupplier\n", proxy_supplier_id_,
               this->proxy_supplier_thread_count_));
@@ -124,7 +123,7 @@ TAO_Notify_ThreadPool_Consumer::disconnect (void)
 void
 TAO_Notify_ThreadPool_Consumer::offer_change (const CosNotification::EventTypeSeq & /*added*/,
                                const CosNotification::EventTypeSeq & /*removed*/
-                               ACE_ENV_ARG_DECL_NOT_USED)
+                               )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyComm::InvalidEventType
@@ -135,7 +134,7 @@ TAO_Notify_ThreadPool_Consumer::offer_change (const CosNotification::EventTypeSe
 
 void
 TAO_Notify_ThreadPool_Consumer::push_structured_event (const CosNotification::StructuredEvent & /*notification*/
-                                            ACE_ENV_ARG_DECL)
+                                            )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
@@ -189,11 +188,9 @@ TAO_Notify_ThreadPool_Consumer::deactivate (void)
 {
   PortableServer::POA_var poa (this->_default_POA ());
 
-  PortableServer::ObjectId_var id (poa->servant_to_id (this
-                                                       ACE_ENV_ARG_PARAMETER));
+  PortableServer::ObjectId_var id (poa->servant_to_id (this));
 
-  poa->deactivate_object (id.in()
-                          ACE_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in());
 }
 
 void
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h
index ee5620f4aae..3d2b581f8bd 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h
@@ -36,7 +36,7 @@ public:
   TAO_Notify_ThreadPool_Consumer (TAO_Notify_ORB_Objects& orb_objects);
 
   /// Init
-  void init (PortableServer::POA_var& poa, CosNotifyChannelAdmin::ConsumerAdmin_var& admin, int proxy_supplier_thread_count, int max_events, long delay ACE_ENV_ARG_DECL);
+  void init (PortableServer::POA_var& poa, CosNotifyChannelAdmin::ConsumerAdmin_var& admin, int proxy_supplier_thread_count, int max_events, long delay);
 
   /// Run
   void run (void);
@@ -66,7 +66,6 @@ protected:
   virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -76,7 +75,6 @@ protected:
   // = StructuredPushSupplier methods
   virtual void push_structured_event (
         const CosNotification::StructuredEvent & notification
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -84,7 +82,6 @@ protected:
        ));
 
   virtual void disconnect_structured_push_consumer (
-        ACE_ENV_SINGLE_ARG_DECL
         )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
index d97ec85e0c5..13bce82edd1 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
@@ -79,7 +79,7 @@ TAO_Notify_ThreadPool_Consumer_Client::_init (void)
 
   if (channel_seq->length() > 0)
     {
-      ec = ecf->get_event_channel (channel_seq[0] ACE_ENV_ARG_PARAMETER);
+      ec = ecf->get_event_channel (channel_seq[0]);
     }
   else
     {
@@ -91,7 +91,7 @@ TAO_Notify_ThreadPool_Consumer_Client::_init (void)
   CosNotifyChannelAdmin::AdminID adminid = 0;
 
   CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->new_for_consumers (CosNotifyChannelAdmin::AND_OP, adminid ACE_ENV_ARG_PARAMETER);
+    ec->new_for_consumers (CosNotifyChannelAdmin::AND_OP, adminid);
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin.in ()));
 
@@ -101,7 +101,7 @@ TAO_Notify_ThreadPool_Consumer_Client::_init (void)
   this->consumer_ = new TAO_Notify_ThreadPool_Consumer (this->orb_objects_);
 
   // Initialize it.
-  this->consumer_->init (rt_poa, consumer_admin, this->proxy_supplier_thread_count_, this->max_events_, this->delay_ ACE_ENV_ARG_PARAMETER);
+  this->consumer_->init (rt_poa, consumer_admin, this->proxy_supplier_thread_count_, this->max_events_, this->delay_);
 }
 
 PortableServer::POA_ptr
@@ -114,13 +114,12 @@ TAO_Notify_ThreadPool_Consumer_Client::create_rt_poa (void)
   CORBA::Policy_var thread_pool_policy;
 
   CORBA::Policy_var activation_policy =
-    this->orb_objects_.root_poa_->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER);
+    this->orb_objects_.root_poa_->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION);
 
   // Create a priority model policy.
   priority_model_policy =
     this->orb_objects_.rt_orb_->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED
-                                                              , 0
-                                                              ACE_ENV_ARG_PARAMETER);
+                                                              , 0);
 
   CORBA::ULong stacksize = 0;
   CORBA::ULong static_threads = 1;
@@ -138,12 +137,10 @@ TAO_Notify_ThreadPool_Consumer_Client::create_rt_poa (void)
                                                    default_priority,
                                                    allow_request_buffering,
                                                    max_buffered_requests,
-                                                   max_request_buffer_size
-                                                   ACE_ENV_ARG_PARAMETER);
+                                                   max_request_buffer_size);
 
   thread_pool_policy =
-    this->orb_objects_.rt_orb_->create_threadpool_policy (threadpool_id
-                                      ACE_ENV_ARG_PARAMETER);
+    this->orb_objects_.rt_orb_->create_threadpool_policy (threadpool_id);
 
   CORBA::PolicyList poa_policy_list;
 
@@ -157,8 +154,7 @@ TAO_Notify_ThreadPool_Consumer_Client::create_rt_poa (void)
 
   rt_poa = this->orb_objects_.root_poa_->create_POA ("RT POA!",
                                                      poa_manager.in (),
-                                                     poa_policy_list
-                                                     ACE_ENV_ARG_PARAMETER);
+                                                     poa_policy_list);
 
   return rt_poa._retn ();
 }
@@ -178,22 +174,20 @@ TAO_Notify_ThreadPool_Consumer_Client::dump_stats (void)
 int
 TAO_Notify_ThreadPool_Consumer_Client::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize this threads priority.
-      this->orb_objects_.current_->the_priority (0 ACE_ENV_ARG_PARAMETER);
+      this->orb_objects_.current_->the_priority (0);
 
       this->_init (); //Init the Client
 
       this->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
-                          ACE_TEXT ("Supplier error "));
+      ex._tao_print_exception (ACE_TEXT ("Supplier error "));
 
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -201,17 +195,16 @@ TAO_Notify_ThreadPool_Consumer_Client::svc (void)
 int
 main (int argc, char *argv [])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize an ORB
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            ""
-                                            ACE_ENV_ARG_PARAMETER);
+                                            "");
 
       TAO_Notify_ORB_Objects orb_objects;
 
-      orb_objects.init (orb ACE_ENV_ARG_PARAMETER);
+      orb_objects.init (orb);
 
       TAO_Notify_ORB_Run_Task orb_run_task (orb_objects);
 
@@ -245,12 +238,10 @@ main (int argc, char *argv [])
 
           client.dump_stats ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
-                          ACE_TEXT ("Consumer Client error "));
+      ex._tao_print_exception (ACE_TEXT ("Consumer Client error "));
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp
index 9790bf16f98..420ece6b765 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp
@@ -9,34 +9,28 @@ TAO_Notify_ORB_Objects::TAO_Notify_ORB_Objects (void)
 }
 
 void
-TAO_Notify_ORB_Objects::init (CORBA::ORB_var& orb ACE_ENV_ARG_DECL)
+TAO_Notify_ORB_Objects::init (CORBA::ORB_var& orb)
 {
   this->orb_ = orb;
 
-  CORBA::Object_var object =  this->orb_->resolve_initial_references("RootPOA"
-                                                                     ACE_ENV_ARG_PARAMETER);
+  CORBA::Object_var object =  this->orb_->resolve_initial_references("RootPOA");
 
-  this->root_poa_ = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+  this->root_poa_ = PortableServer::POA::_narrow (object.in ());
 
   // Resolve the RTORB.
-  object = this->orb_->resolve_initial_references ("RTORB"
-                                                       ACE_ENV_ARG_PARAMETER);
+  object = this->orb_->resolve_initial_references ("RTORB");
 
-  this->rt_orb_ = RTCORBA::RTORB::_narrow (object.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+  this->rt_orb_ = RTCORBA::RTORB::_narrow (object.in ());
 
   // Resolve the Current
-  object = this->orb_->resolve_initial_references ("RTCurrent"
-                                                   ACE_ENV_ARG_PARAMETER);
+  object = this->orb_->resolve_initial_references ("RTCurrent");
 
-  this->current_ = RTCORBA::Current::_narrow (object.in ()
-                                              ACE_ENV_ARG_PARAMETER);
+  this->current_ = RTCORBA::Current::_narrow (object.in ());
 
   // Resolve the Naming service
-  object = this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
+  object = this->orb_->resolve_initial_references ("NameService");
 
-  this->naming_ = CosNaming::NamingContextExt::_narrow (object.in ()
-                                                                    ACE_ENV_ARG_PARAMETER);
+  this->naming_ = CosNaming::NamingContextExt::_narrow (object.in ());
 }
 
 TAO_Notify_ORB_Objects::~TAO_Notify_ORB_Objects ()
@@ -53,9 +47,9 @@ TAO_Notify_ORB_Objects::notify_factory (void)
   name.length (1);
   name[0].id = CORBA::string_dup ("NotifyEventChannelFactory");
 
-  CORBA::Object_var object = this->naming_->resolve (name ACE_ENV_ARG_PARAMETER);
+  CORBA::Object_var object = this->naming_->resolve (name);
 
-  ecf = CosNotifyChannelAdmin::EventChannelFactory::_narrow (object.in() ACE_ENV_ARG_PARAMETER);
+  ecf = CosNotifyChannelAdmin::EventChannelFactory::_narrow (object.in());
 
   return ecf._retn ();
 }
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h
index a95318ae05c..6be4c596901 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h
@@ -34,7 +34,7 @@ public:
   ~TAO_Notify_ORB_Objects ();
 
   /// Resolves all the references.
-  void init (CORBA::ORB_var& orb ACE_ENV_ARG_DECL);
+  void init (CORBA::ORB_var& orb);
 
   /// Resolve Notification
   CosNotifyChannelAdmin::EventChannelFactory_ptr notify_factory (void);
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp
index 2477f15457a..93abf1aba22 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp
@@ -16,16 +16,15 @@ TAO_Notify_ORB_Run_Task::~TAO_Notify_ORB_Run_Task ()
 int
 TAO_Notify_ORB_Run_Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->orb_objects_.current_->the_priority (0 ACE_ENV_ARG_PARAMETER);
+      this->orb_objects_.current_->the_priority (0);
 
       this->orb_objects_.orb_->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp
index 1985911cc5e..d7f25a61eb8 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp
@@ -23,7 +23,7 @@ TAO_Notify_ThreadPool_Supplier::~TAO_Notify_ThreadPool_Supplier ()
 
 void
 TAO_Notify_ThreadPool_Supplier::init (CosNotifyChannelAdmin::SupplierAdmin_var& admin, int expected_consumer_count ,int max_events,
-                       int proxy_consumer_thread_count ACE_ENV_ARG_DECL)
+                       int proxy_consumer_thread_count)
 {
   // First initialize the class members.
   this->admin_ = admin;
@@ -56,7 +56,7 @@ TAO_Notify_ThreadPool_Supplier::run (void)
       for (int j = 0; j < this->expected_consumer_count_; ++j)
         {
           // send the event
-          this->send_event (this->event_[j] ACE_ENV_ARG_PARAMETER);
+          this->send_event (this->event_[j]);
         }
     }
 
@@ -81,7 +81,7 @@ TAO_Notify_ThreadPool_Supplier::connect (void)
   if (this->proxy_consumer_thread_count_ != 0)
     {
       // Narrow to the extended interface.
-      NotifyExt::SupplierAdmin_var admin_ext = NotifyExt::SupplierAdmin::_narrow (this->admin_.in ()ACE_ENV_ARG_PARAMETER);
+      NotifyExt::SupplierAdmin_var admin_ext = NotifyExt::SupplierAdmin::_narrow (this->admin_.in ());
 
       NotifyExt::ThreadPoolParams tp_params = { NotifyExt::CLIENT_PROPAGATED, 0,
                                                 0, this->proxy_consumer_thread_count_, 0, 0, 0, 0, 0 };
@@ -93,26 +93,25 @@ TAO_Notify_ThreadPool_Supplier::connect (void)
 
       // Obtain the proxy. The QoS is applied to the POA in which the Proxy is hosted.
       proxyconsumer = admin_ext->obtain_notification_push_consumer_with_qos (CosNotifyChannelAdmin::STRUCTURED_EVENT
-                                                                                   , proxy_consumer_id_, qos ACE_ENV_ARG_PARAMETER);
+                                                                                   , proxy_consumer_id_, qos);
     }
   else
     {
       // Obtain the proxy.
       proxyconsumer = this->admin_->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT
-                                                                       , proxy_consumer_id_ ACE_ENV_ARG_PARAMETER);
+                                                                       , proxy_consumer_id_);
     }
 
   ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ()));
 
   // narrow
   this->proxy_consumer_ =
-    CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in () ACE_ENV_ARG_PARAMETER);
+    CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in ());
 
   ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ()));
 
   // connect to the proxyconsumer.
-  proxy_consumer_->connect_structured_push_supplier (objref.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+  proxy_consumer_->connect_structured_push_supplier (objref.in ());
 
   ACE_DEBUG ((LM_DEBUG, "(%P,%t) Created Supplier %d with %d threads at the ProxyConsumer\n", proxy_consumer_id_,
               this->proxy_consumer_thread_count_));
@@ -131,17 +130,15 @@ TAO_Notify_ThreadPool_Supplier::deactivate (void)
 {
   PortableServer::POA_var poa (this->_default_POA ());
 
-  PortableServer::ObjectId_var id (poa->servant_to_id (this
-                                                       ACE_ENV_ARG_PARAMETER));
+  PortableServer::ObjectId_var id (poa->servant_to_id (this));
 
-  poa->deactivate_object (id.in()
-                          ACE_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in());
 }
 
 void
 TAO_Notify_ThreadPool_Supplier::subscription_change (const CosNotification::EventTypeSeq & added,
                                       const CosNotification::EventTypeSeq & /*removed */
-                                      ACE_ENV_ARG_DECL_NOT_USED)
+                                      )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyComm::InvalidEventType
@@ -167,11 +164,11 @@ TAO_Notify_ThreadPool_Supplier::subscription_change (const CosNotification::Even
 }
 
 void
-TAO_Notify_ThreadPool_Supplier::send_event (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL)
+TAO_Notify_ThreadPool_Supplier::send_event (const CosNotification::StructuredEvent& event)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
-  proxy_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER);
+  proxy_consumer_->push_structured_event (event);
 }
 
 void
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h
index 70fbadc6b83..4f46c83ac87 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h
@@ -38,7 +38,7 @@ public:
 
   /// Init
   void init (CosNotifyChannelAdmin::SupplierAdmin_var& admin, int expected_consumer_count, int max_events,
-             int proxy_consumer_thread_count ACE_ENV_ARG_DECL);
+             int proxy_consumer_thread_count);
 
   /// Run
   void run (void);
@@ -57,7 +57,7 @@ protected:
   void deactivate (void);
 
   /// Send one event.
-  virtual void send_event (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL);
+  virtual void send_event (const CosNotification::StructuredEvent& event);
 
   /// Destructor
   virtual ~TAO_Notify_ThreadPool_Supplier ();
@@ -66,7 +66,6 @@ protected:
   virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
index 77d7f498645..509520dfe09 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
@@ -93,7 +93,7 @@ TAO_Notify_ThreadPool_Supplier_Client::_init (void)
   CosNotifyChannelAdmin::AdminID adminid = 0;
 
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin =
-    ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP, adminid ACE_ENV_ARG_PARAMETER);
+    ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP, adminid);
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin.in ()));
 
@@ -101,8 +101,7 @@ TAO_Notify_ThreadPool_Supplier_Client::_init (void)
   this->supplier_ = new TAO_Notify_ThreadPool_Supplier (this->orb_objects_);
 
   // Initialize it.
-  this->supplier_->init (supplier_admin, this->consumer_count_, this->max_events_, this->proxy_consumer_thread_count_
-                         ACE_ENV_ARG_PARAMETER);
+  this->supplier_->init (supplier_admin, this->consumer_count_, this->max_events_, this->proxy_consumer_thread_count_);
 }
 
 CosNotifyChannelAdmin::EventChannel_ptr
@@ -121,8 +120,7 @@ TAO_Notify_ThreadPool_Supplier_Client::create_ec (void)
 
   ec = ecf->create_channel (qos,
                             admin,
-                            id
-                            ACE_ENV_ARG_PARAMETER);
+                            id);
 
   // Set the Qos
   // See $TAO_ROOT/orbsvcs/orbsvcs/NotifyExt.idl
@@ -137,7 +135,7 @@ TAO_Notify_ThreadPool_Supplier_Client::create_ec (void)
       qos[0].value <<= tp_params;
 
       // Note that instead of <set_qos>, the <qos> can also be passed while creating the channel.
-      ec->set_qos (qos ACE_ENV_ARG_PARAMETER);
+      ec->set_qos (qos);
     }
 
   ACE_DEBUG ((LM_DEBUG, "(%P,%t) Created Event Channel with %d threads\n", this->ec_thread_count_));
@@ -165,7 +163,7 @@ TAO_Notify_ThreadPool_Supplier_Client::write_ior (void)
   if (ior_output_file != 0)
     {
       CORBA::String_var str =
-        this->orb_objects_.orb_->object_to_string (objref.in () ACE_ENV_ARG_PARAMETER);
+        this->orb_objects_.orb_->object_to_string (objref.in ());
 
       ACE_OS::fprintf (ior_output_file,
                        "%s",
@@ -177,21 +175,19 @@ TAO_Notify_ThreadPool_Supplier_Client::write_ior (void)
 int
 TAO_Notify_ThreadPool_Supplier_Client::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->orb_objects_.current_->the_priority (0 ACE_ENV_ARG_PARAMETER);
+      this->orb_objects_.current_->the_priority (0);
 
       this->_init (); //Init the Client
 
       this->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
-                          ACE_TEXT ("Supplier error "));
+      ex._tao_print_exception (ACE_TEXT ("Supplier error "));
 
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -199,18 +195,17 @@ TAO_Notify_ThreadPool_Supplier_Client::svc (void)
 int
 main (int argc, char *argv [])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize an ORB
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            ""
-                                            ACE_ENV_ARG_PARAMETER);
+                                            "");
 
       // Create a holder for the common ORB Objects.
       TAO_Notify_ORB_Objects orb_objects;
 
-      orb_objects.init (orb ACE_ENV_ARG_PARAMETER);
+      orb_objects.init (orb);
 
       /* Run the ORB in a seperate thread */
       TAO_Notify_ORB_Run_Task orb_run_task (orb_objects);
@@ -244,12 +239,10 @@ main (int argc, char *argv [])
       orb_run_task.thr_mgr ()->wait ();
       client.thr_mgr ()->wait ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
-                          ACE_TEXT ("Supplier Client error "));
+      ex._tao_print_exception (ACE_TEXT ("Supplier Client error "));
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp
index 3b1f0194992..8730f4dfcec 100644
--- a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp
+++ b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp
@@ -15,19 +15,16 @@ Gateway_ObjRef_Factory (
 CORBA::Object_ptr
 Gateway_ObjRef_Factory::
 make_object (const char *interface_repository_id,
-             const PortableInterceptor::ObjectId & id
-             ACE_ENV_ARG_DECL)
+             const PortableInterceptor::ObjectId & id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_var object =
     this->old_factory_->make_object (interface_repository_id,
-                                     id
-                                     ACE_ENV_ARG_PARAMETER);
+                                     id);
 
   CORBA::Object_ptr object_ptr =
     this->gateway_object_factory_->create_object (interface_repository_id,
-                                                  object.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
+                                                  object.in ());
 
   return object_ptr;
 }
diff --git a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h
index 3af0da985b3..e0bcb4bbb67 100644
--- a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h
+++ b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h
@@ -26,8 +26,7 @@ public:
 
   virtual CORBA::Object_ptr make_object (
       const char *repository_id,
-      const PortableInterceptor::ObjectId &id
-      ACE_ENV_ARG_DECL)
+      const PortableInterceptor::ObjectId &id)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/examples/ORT/Gateway_i.cpp b/TAO/orbsvcs/examples/ORT/Gateway_i.cpp
index 81967f296f0..1b2b044effd 100644
--- a/TAO/orbsvcs/examples/ORT/Gateway_i.cpp
+++ b/TAO/orbsvcs/examples/ORT/Gateway_i.cpp
@@ -29,8 +29,7 @@ Gateway_i (CORBA::ORB_ptr orb,
 }
 
 void
-Gateway_i::invoke (CORBA::ServerRequest_ptr request
-                   ACE_ENV_ARG_DECL)
+Gateway_i::invoke (CORBA::ServerRequest_ptr request)
 {
   PortableServer::ObjectId_var target_id =
     this->poa_current_->get_object_id ();
@@ -39,8 +38,7 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request
     PortableServer::ObjectId_to_string (target_id.in ());
 
   CORBA::Object_var target_object =
-    this->orb_->string_to_object (stringified_object_id.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+    this->orb_->string_to_object (stringified_object_id.in ());
 
   // Use the IfR interfaces to query the NVList for this object...
   CORBA::InterfaceDef_var target_interface =
@@ -71,8 +69,7 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request
   // Build the NVList based on the info from the IfR
   CORBA::NVList_ptr arguments;
   this->orb_->create_list (parameters->length (),
-                           arguments
-                           ACE_ENV_ARG_PARAMETER);
+                           arguments);
 
   CORBA::Flags flags = 0;
 
@@ -103,20 +100,18 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request
 
       arguments->add_value (parameters[i].name,
                             any,
-                            flags
-                            ACE_ENV_ARG_PARAMETER);
+                            flags);
     }
 
   // Extract the values of the arguments from the DSI ServerRequest
-  request->arguments (arguments ACE_ENV_ARG_PARAMETER);
+  request->arguments (arguments);
 
   // Use the NVList (with values) to create a DII Request...
   CORBA::Request_var dii_request;
 
   CORBA::NamedValue *named_value = 0;
 
-  this->orb_->create_named_value (named_value
-                                  ACE_ENV_ARG_PARAMETER);
+  this->orb_->create_named_value (named_value);
 
   CORBA::ContextList *context_list = 0;
   CORBA::ExceptionList *exceptions = 0;
@@ -128,13 +123,12 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request
                                   exceptions,
                                   context_list, /* Context List */
                                   dii_request.inout (),
-                                  CORBA::Flags (0)
-                                  ACE_ENV_ARG_PARAMETER);
+                                  CORBA::Flags (0));
 
   // Set the return type...
   dii_request->set_return_type (result_typecode.in ());
 
-  ACE_TRY
+  try
     {
       // Make the DII request
       dii_request->invoke ();
@@ -142,13 +136,13 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request
       // At this point the NVList contains all the out and inout
       // arguments, but we need to extract the return value...
     }
-  ACE_CATCH (CORBA::UnknownUserException, user_ex)
+  catch (CORBA::UnknownUserException& user_ex)
     {
       // Pass the exception back to the server request...
       request->set_exception (user_ex.exception ());
       return;
     }
-  ACE_CATCH (CORBA::SystemException, sys_ex)
+  catch (const CORBA::SystemException& sys_ex)
     {
       CORBA::Any any;
       any <<= sys_ex;
@@ -156,8 +150,9 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request
       request->set_exception (any);
       return;
     }
-  ACE_CATCHANY;
-  ACE_ENDTRY;
+  catch (const CORBA::Exception&)
+    {
+    }
 
   request->set_result (dii_request->return_value ());
   // Using the same NVList for both the DSI Server Request and the DII
@@ -166,8 +161,7 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request
 
 CORBA::RepositoryId
 Gateway_i::_primary_interface (const PortableServer::ObjectId &,
-                               PortableServer::POA_ptr
-                               ACE_ENV_ARG_DECL_NOT_USED)
+                               PortableServer::POA_ptr)
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/ORT/Gateway_i.h b/TAO/orbsvcs/examples/ORT/Gateway_i.h
index a49d7a1e73a..16ff2ca5d56 100644
--- a/TAO/orbsvcs/examples/ORT/Gateway_i.h
+++ b/TAO/orbsvcs/examples/ORT/Gateway_i.h
@@ -32,13 +32,11 @@ public:
   Gateway_i (CORBA::ORB_ptr orb,
              PortableServer::Current_ptr poa_current);
 
-  virtual void invoke (CORBA::ServerRequest_ptr request
-                       ACE_ENV_ARG_DECL);
+  virtual void invoke (CORBA::ServerRequest_ptr request);
 
   virtual CORBA::RepositoryId _primary_interface (
       const PortableServer::ObjectId &oid,
-      PortableServer::POA_ptr poa
-      ACE_ENV_ARG_DECL);
+      PortableServer::POA_ptr poa);
 
  private:
 
diff --git a/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp b/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp
index 3b270a039c6..d6e510b8edf 100644
--- a/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp
+++ b/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp
@@ -14,12 +14,11 @@ Object_Factory_i::Object_Factory_i (CORBA::ORB_ptr orb,
 
 CORBA::Object_ptr
 Object_Factory_i::create_object (const char *interface_repository_id,
-                                 CORBA::Object_ptr gatewayed_object
-                                 ACE_ENV_ARG_DECL)
+                                 CORBA::Object_ptr gatewayed_object)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::String_var stringified_object =
-    this->orb_->object_to_string (gatewayed_object ACE_ENV_ARG_PARAMETER);
+    this->orb_->object_to_string (gatewayed_object);
 
   const PortableServer::ObjectId_var id =
     PortableServer::string_to_ObjectId (stringified_object.in ());
@@ -39,8 +38,7 @@ Object_Factory_i::create_object (const char *interface_repository_id,
 
   CORBA::Object_ptr object_ptr =
     ort->make_object (interface_repository_id,
-                      *obj_id
-                      ACE_ENV_ARG_PARAMETER);
+                      *obj_id);
 */
 
   return CORBA::Object::_nil();
diff --git a/TAO/orbsvcs/examples/ORT/Object_Factory_i.h b/TAO/orbsvcs/examples/ORT/Object_Factory_i.h
index add32112dbd..35febb7b331 100644
--- a/TAO/orbsvcs/examples/ORT/Object_Factory_i.h
+++ b/TAO/orbsvcs/examples/ORT/Object_Factory_i.h
@@ -32,8 +32,7 @@ class Object_Factory_i : public virtual POA_Gateway::Object_Factory
 
   CORBA::Object_ptr
     create_object (const char *interface_repository_id,
-                   CORBA::Object_ptr gatewayed_object
-                   ACE_ENV_ARG_DECL)
+                   CORBA::Object_ptr gatewayed_object)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
  private:
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp
index 05a9ef46866..8806a482225 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp
@@ -37,16 +37,14 @@ Server_IORInterceptor::destroy (void)
 
 void
 Server_IORInterceptor::establish_components (
-    PortableInterceptor::IORInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::IORInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_IORInterceptor::components_established (
-    PortableInterceptor::IORInfo_ptr ior_info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::IORInfo_ptr ior_info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Gateway_ObjRef_Factory *my_factory = 0;
@@ -59,15 +57,13 @@ Server_IORInterceptor::components_established (
                                             current_factory.in ()),
                     CORBA::NO_MEMORY ());
 
-  ior_info->current_factory (my_factory
-                             ACE_ENV_ARG_PARAMETER);
+  ior_info->current_factory (my_factory);
 }
 
 void
 Server_IORInterceptor::adapter_manager_state_changed (
     const char *,
-    PortableInterceptor::AdapterState
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::AdapterState)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -75,8 +71,7 @@ Server_IORInterceptor::adapter_manager_state_changed (
 void
 Server_IORInterceptor:: adapter_state_changed (
     const PortableInterceptor::ObjectReferenceTemplateSeq &,
-    PortableInterceptor::AdapterState
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::AdapterState)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
index 86da86a019e..50e62b9e707 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
@@ -45,25 +45,21 @@ public:
 
   /// Add the tagged components to the IOR.
   virtual void establish_components (
-      PortableInterceptor::IORInfo_ptr info
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::IORInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void components_established (
-      PortableInterceptor::IORInfo_ptr info
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::IORInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void adapter_manager_state_changed (
       const char * id,
-      PortableInterceptor::AdapterState state
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::AdapterState state)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void adapter_state_changed (
       const PortableInterceptor::ObjectReferenceTemplateSeq & templates,
-      PortableInterceptor::AdapterState state
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::AdapterState state)
      ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@}
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp
index 051dc3be61f..c9aeca5ca75 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp
@@ -13,25 +13,22 @@ ACE_RCSID (ORT,
 void
 Server_IORInterceptor_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr /* info */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_IORInterceptor_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_var obj =
-    info->resolve_initial_references ("Gateway_Object_Factory"
-                                      ACE_ENV_ARG_PARAMETER);
+    info->resolve_initial_references ("Gateway_Object_Factory");
 
   /// Narrow it down correctly.
   Gateway::Object_Factory_var gateway_object_factory =
-    Gateway::Object_Factory::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+    Gateway::Object_Factory::_narrow (obj.in ());
 
   /// Check for nil reference
   if (CORBA::is_nil (gateway_object_factory.in ()))
@@ -50,6 +47,5 @@ Server_IORInterceptor_ORBInitializer::post_init (
 
   PortableInterceptor::IORInterceptor_var ior_interceptor = gateway;
 
-  info->add_ior_interceptor (ior_interceptor.in ()
-                             ACE_ENV_ARG_PARAMETER);
+  info->add_ior_interceptor (ior_interceptor.in ());
 }
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h
index 5fd0887f014..51af3ab3a94 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h
@@ -25,13 +25,11 @@ class Server_IORInterceptor_ORBInitializer
 
   //@{
   /// The pre-initialization hook.
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// The post-initialization hook.
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/examples/ORT/client.cpp b/TAO/orbsvcs/examples/ORT/client.cpp
index 0298ae64c3c..49cb266aa2e 100644
--- a/TAO/orbsvcs/examples/ORT/client.cpp
+++ b/TAO/orbsvcs/examples/ORT/client.cpp
@@ -35,20 +35,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "client_sum_orb" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "client_sum_orb");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var obj =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior);
 
       ORT::sum_server_var server =
-        ORT::sum_server::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+        ORT::sum_server::_narrow (obj.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -62,20 +61,17 @@ main (int argc, char *argv[])
       CORBA::ULong b = 3;
 
       CORBA::ULong result = server->add_variables (a,
-                                                   b
-                                                   ACE_ENV_ARG_PARAMETER);
+                                                   b);
 
       if (result != 8)
         ACE_DEBUG ((LM_DEBUG,
                     "Error: Add Variables did not return the right value\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "ORT example on client side :");
+      ex._tao_print_exception ("ORT example on client side :");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/ORT/gateway_server.cpp b/TAO/orbsvcs/examples/ORT/gateway_server.cpp
index c5efc7af294..171295c1325 100644
--- a/TAO/orbsvcs/examples/ORT/gateway_server.cpp
+++ b/TAO/orbsvcs/examples/ORT/gateway_server.cpp
@@ -36,26 +36,23 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       /// Initialize the ORB.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            "gateway_server_orb"
-                                            ACE_ENV_ARG_PARAMETER);
+                                            "gateway_server_orb");
 
       if (parse_args (argc, argv) != 0)
         return -1;
 
       /// Resolve reference to RootPOA
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
 
       /// Narrow it down correctly.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in ());
 
       /// Check for nil references
       if (CORBA::is_nil (root_poa.in ()))
@@ -76,23 +73,19 @@ main (int argc, char *argv[])
       policies.length (3);
 
       policies [0] =
-        root_poa->create_servant_retention_policy (PortableServer::RETAIN
-                                                   ACE_ENV_ARG_PARAMETER);
+        root_poa->create_servant_retention_policy (PortableServer::RETAIN);
 
       policies [1] =
-        root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT
-                                                    ACE_ENV_ARG_PARAMETER);
+        root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT);
 
 
       policies [2] =
-        root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID
-                                               ACE_ENV_ARG_PARAMETER);
+        root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID);
 
       PortableServer::POA_var gateway_poa =
         root_poa->create_POA ("Gateway_POA",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
+                              policies);
 
       for (CORBA::ULong i = 0; i != policies.length (); ++i) {
         policies[i]->destroy ();
@@ -100,13 +93,11 @@ main (int argc, char *argv[])
 
       // Get the POA Current object reference
       obj =
-        orb->resolve_initial_references ("POACurrent"
-                                         ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("POACurrent");
 
       // Narrow the object reference to a POA Current reference
       PortableServer::Current_var poa_current =
-        PortableServer::Current::_narrow (obj.in ()
-                                          ACE_ENV_ARG_PARAMETER);
+        PortableServer::Current::_narrow (obj.in ());
 
       Gateway_i *gateway;
 
@@ -115,7 +106,7 @@ main (int argc, char *argv[])
                                    poa_current.in ()),
                         CORBA::NO_MEMORY ());
 
-      gateway_poa->set_servant (gateway ACE_ENV_ARG_PARAMETER);
+      gateway_poa->set_servant (gateway);
 
       /// Get the ObjectID
       PortableServer::ObjectId_var oid =
@@ -131,8 +122,7 @@ main (int argc, char *argv[])
 
       /// Activate the Object_Factory_i Object
       gateway_poa->activate_object_with_id (oid.in (),
-                                            object_factory
-                                            ACE_ENV_ARG_PARAMETER);
+                                            object_factory);
 
       // Get the object reference.
       CORBA::Object_var gateway_object_factory =
@@ -140,8 +130,7 @@ main (int argc, char *argv[])
 
       /// Convert the object reference to a string format.
       CORBA::String_var ior =
-        orb->object_to_string (gateway_object_factory.in ()
-                               ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (gateway_object_factory.in ());
 
       /// If the ior_output_file exists, output the IOR to it.
       if (ior_output_file != 0)
@@ -159,14 +148,12 @@ main (int argc, char *argv[])
 
       orb->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "ORT test (gateway_server):");
+      ex._tao_print_exception ("ORT test (gateway_server):");
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/ORT/server.cpp b/TAO/orbsvcs/examples/ORT/server.cpp
index af419e9cdef..3980941b2f5 100644
--- a/TAO/orbsvcs/examples/ORT/server.cpp
+++ b/TAO/orbsvcs/examples/ORT/server.cpp
@@ -37,8 +37,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
 #if TAO_HAS_INTERCEPTORS == 1
 
@@ -52,8 +51,7 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer_var =
         orb_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer_var.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+      PortableInterceptor::register_orb_initializer (orb_initializer_var.in ());
 
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
 
@@ -62,20 +60,18 @@ main (int argc, char *argv[])
       // Initialize the ORB.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            "server_sum_orb"
-                                            ACE_ENV_ARG_PARAMETER);
+                                            "server_sum_orb");
 
       if (parse_args (argc, argv) != 0)
         return -1;
 
       // Resolve reference to RootPOA
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
 
       // Narrow it down correctly.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in ());
 
       // Check for nil references
       if (CORBA::is_nil (root_poa.in ()))
@@ -98,8 +94,7 @@ main (int argc, char *argv[])
 
       // Narrow it down.
       ORT::sum_server_var sum_server =
-        ORT::sum_server::_narrow (obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+        ORT::sum_server::_narrow (obj.in ());
 
       // Check for nil reference
       if (CORBA::is_nil (sum_server.in ()))
@@ -110,7 +105,7 @@ main (int argc, char *argv[])
 
       // Convert the object reference to a string format.
       CORBA::String_var ior =
-        orb->object_to_string (sum_server.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (sum_server.in ());
 
       // If the ior_output_file exists, output the IOR to it.
       if (ior_output_file != 0)
@@ -130,13 +125,11 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_INFO, "Successful.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "ORT example server:");
+      ex._tao_print_exception ("ORT example server:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/ORT/sum_server_i.cpp b/TAO/orbsvcs/examples/ORT/sum_server_i.cpp
index 9b14117125e..31987a4feab 100644
--- a/TAO/orbsvcs/examples/ORT/sum_server_i.cpp
+++ b/TAO/orbsvcs/examples/ORT/sum_server_i.cpp
@@ -12,8 +12,7 @@ sum_server_i::sum_server_i ()
 
 CORBA::Long
 sum_server_i::add_variables (CORBA::Long a,
-                             CORBA::Long b
-                             ACE_ENV_ARG_DECL_NOT_USED)
+                             CORBA::Long b)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return a+b;
diff --git a/TAO/orbsvcs/examples/ORT/sum_server_i.h b/TAO/orbsvcs/examples/ORT/sum_server_i.h
index ea38c4ae7ab..e093073e790 100644
--- a/TAO/orbsvcs/examples/ORT/sum_server_i.h
+++ b/TAO/orbsvcs/examples/ORT/sum_server_i.h
@@ -31,8 +31,7 @@ class sum_server_i : public virtual POA_ORT::sum_server
 
   /// add variables method
   CORBA::Long add_variables (CORBA::Long a,
-                             CORBA::Long b
-                             ACE_ENV_ARG_DECL)
+                             CORBA::Long b)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 };
diff --git a/TAO/orbsvcs/examples/PSS/Simple_Naming.cpp b/TAO/orbsvcs/examples/PSS/Simple_Naming.cpp
index 73677dbb51a..5c61b3bfc7f 100644
--- a/TAO/orbsvcs/examples/PSS/Simple_Naming.cpp
+++ b/TAO/orbsvcs/examples/PSS/Simple_Naming.cpp
@@ -54,26 +54,24 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
+                         "");
 
       if (parse_args (argc, argv) == -1)
         return -1;
 
       // Get a reference to the RootPOA
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
 
       // Narrow down to the correct reference
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       // Set a POA Manager
       PortableServer::POAManager_var poa_manager =
@@ -87,21 +85,18 @@ main (int argc, char *argv[])
 
       // Id Assignment policy
       policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                               ACE_ENV_ARG_PARAMETER);
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID);
 
       // Lifespan policy
       policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                          ACE_ENV_ARG_PARAMETER);
+        root_poa->create_lifespan_policy (PortableServer::PERSISTENT);
 
       // We use a different POA, otherwise the user would have to change
       // the object key each time it invokes the server.
       PortableServer::POA_var poa =
         root_poa->create_POA ("Simple_Naming",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
+                              policies);
 
       // Creation of the new POAs over, so destroy the Policy_ptr's.
       for (CORBA::ULong i = 0;
@@ -119,8 +114,7 @@ main (int argc, char *argv[])
         simple_naming_i._this ();
 
       CORBA::String_var string_obj_ref =
-        orb->object_to_string (simple_naming.in ()
-                               ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (simple_naming.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -134,17 +128,16 @@ main (int argc, char *argv[])
 
       orb->run ();
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1);
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            "Unexpected excpeption in PSS Test");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/PSS/Simple_Naming_i.cpp b/TAO/orbsvcs/examples/PSS/Simple_Naming_i.cpp
index c1a47f4e299..efdfdc48b71 100644
--- a/TAO/orbsvcs/examples/PSS/Simple_Naming_i.cpp
+++ b/TAO/orbsvcs/examples/PSS/Simple_Naming_i.cpp
@@ -20,26 +20,24 @@ Naming_Context_i::~Naming_Context_i ()
 
 int
 Naming_Context_i::bind (const char *n,
-                        const char *obj
-                        ACE_ENV_ARG_DECL)
+                        const char *obj)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Save the binding to database.
   int result =
-    this->code_gen_->set_name_obj_ref (n, obj ACE_ENV_ARG_PARAMETER);
+    this->code_gen_->set_name_obj_ref (n, obj);
 
   return result;
 }
 
 char *
-Naming_Context_i::find (const char *n
-                        ACE_ENV_ARG_DECL)
+Naming_Context_i::find (const char *n)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the Stringified object reference corresponding to
   // 'n'
   CORBA::String_var obj_ref =
-    this->code_gen_->get_obj_ref (n ACE_ENV_ARG_PARAMETER);
+    this->code_gen_->get_obj_ref (n);
 
   return CORBA::string_dup (obj_ref.in ());
 }
diff --git a/TAO/orbsvcs/examples/PSS/Simple_Naming_i.h b/TAO/orbsvcs/examples/PSS/Simple_Naming_i.h
index 1306d245f9b..84bb1e2bed4 100644
--- a/TAO/orbsvcs/examples/PSS/Simple_Naming_i.h
+++ b/TAO/orbsvcs/examples/PSS/Simple_Naming_i.h
@@ -36,12 +36,10 @@ class Naming_Context_i : public virtual POA_Simple_Naming::Naming_Context
   ~Naming_Context_i (void);
 
   virtual int bind (const char *n,
-                    const char *obj
-                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                    const char *obj)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual char *find (const char *n
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual char *find (const char *n)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/examples/PSS/client.cpp b/TAO/orbsvcs/examples/PSS/client.cpp
index 95f4df6406d..2c7925e15b2 100644
--- a/TAO/orbsvcs/examples/PSS/client.cpp
+++ b/TAO/orbsvcs/examples/PSS/client.cpp
@@ -26,22 +26,20 @@
 int main (int argc, char *argv [])
 {
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         "" /* the ORB name, it can be anything! */
-                         ACE_ENV_ARG_PARAMETER);
+                         "" /* the ORB name, it can be anything! */);
 
       // Get a reference to the RootPOA
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
 
       // Narrow down to the correct reference
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       // Set a POA Manager
       PortableServer::POAManager_var poa_manager =
@@ -52,27 +50,23 @@ int main (int argc, char *argv [])
 
       // Get a reference to Simple_Naming
       CORBA::Object_var simple_naming_object =
-        orb->resolve_initial_references ("Simple_Naming" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("Simple_Naming");
 
       // Narrow down the reference
       Simple_Naming::Naming_Context_var simple_naming =
-        Simple_Naming::Naming_Context::_narrow (simple_naming_object.in()
-                                                ACE_ENV_ARG_PARAMETER);
+        Simple_Naming::Naming_Context::_narrow (simple_naming_object.in());
 
       Simple_Naming::Name name = CORBA::string_dup ("Server");
 
       CORBA::String_var ior_string =
-        simple_naming->find (name
-                             ACE_ENV_ARG_PARAMETER);
+        simple_naming->find (name);
 
       // Connect to the server
       CORBA::Object_var tmp =
-        orb->string_to_object(ior_string.in ()
-                              ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object(ior_string.in ());
 
       Simple_Server::Server_var server =
-        Simple_Server::Server::_narrow (tmp.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+        Simple_Server::Server::_narrow (tmp.in ());
 
       CORBA::String_var status =
         server->get_status ();
@@ -84,12 +78,11 @@ int main (int argc, char *argv [])
           return -1;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            "Client raised an exception:\n");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/PSS/server.cpp b/TAO/orbsvcs/examples/PSS/server.cpp
index 015225c079f..16a8c018a7c 100644
--- a/TAO/orbsvcs/examples/PSS/server.cpp
+++ b/TAO/orbsvcs/examples/PSS/server.cpp
@@ -27,23 +27,21 @@ ACE_RCSID (PSS, client, "$Id$")
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
+                         "");
 
       // Get a reference to the RootPOA
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
 
       // Narrow down to the correct reference
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       // Set a POA Manager
       PortableServer::POAManager_var poa_manager =
@@ -57,39 +55,34 @@ main (int argc, char *argv[])
       Simple_Server::Server_var server = server_i._this ();
 
       CORBA::String_var string_obj_ref =
-        orb->object_to_string (server.in ()
-                               ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (server.in ());
 
       // Get a reference to Simple_Naming
       CORBA::Object_var simple_naming_object =
-        orb->resolve_initial_references ("Simple_Naming"
-                                         ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("Simple_Naming");
 
       // Narrow down the reference
       Simple_Naming::Naming_Context_var simple_naming =
-        Simple_Naming::Naming_Context::_narrow (simple_naming_object.in()
-                                                ACE_ENV_ARG_PARAMETER);
+        Simple_Naming::Naming_Context::_narrow (simple_naming_object.in());
 
       Simple_Naming::Name name = CORBA::string_dup ("Server");
 
       // Bind the name to stringified objecte refernce
       simple_naming->bind (CORBA::string_dup (name),
-                           string_obj_ref.in ()
-                           ACE_ENV_ARG_PARAMETER);
+                           string_obj_ref.in ());
 
       orb->run ();
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1);
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            "Unexpected excpeption in PSS Test");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
index 9702c23c46f..e170689137b 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
@@ -35,8 +35,7 @@ Consumer::Consumer (void)
 int
 Consumer::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // First parse our command line options
       if (this->parse_args(argc, argv) != 0)
@@ -46,23 +45,23 @@ Consumer::run (int argc, char* argv[])
 
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       // Do *NOT* make a copy because we don't want the ORB to outlive
       // the run() method.
       this->orb_ = orb.in ();
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
         poa->the_POAManager ();
       poa_manager->activate ();
 
       // Obtain the event channel from the naming service
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -70,18 +69,17 @@ Consumer::run (int argc, char* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
       CosNaming::Name name (1);
       name.length (1);
       name[0].id = CORBA::string_dup (ecname);
 
       CORBA::Object_var ec_obj =
-        naming_context->resolve (name ACE_ENV_ARG_PARAMETER);
+        naming_context->resolve (name);
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
+        RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ());
 
       if (CORBA::is_nil (event_channel.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -109,8 +107,7 @@ Consumer::run (int argc, char* argv[])
                       MY_EVENT_TYPE + i,  // Event Type
                       0);             // handle to the rt_info
         }
-      supplier->connect_push_consumer (consumer.in (), qos
-                                       ACE_ENV_ARG_PARAMETER);
+      supplier->connect_push_consumer (consumer.in (), qos);
 
       // Wait for events, using work_pending()/perform_work() may help
       // or using another thread, this example is too simple for that.
@@ -123,18 +120,16 @@ Consumer::run (int argc, char* argv[])
       // work_pending()/perform_work() to do more interesting stuff.
       // Check the supplier for the proper way to do cleanup.
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Consumer::run");
+      ex._tao_print_exception ("Consumer::run");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 void
-Consumer::push (const RtecEventComm::EventSet& events
-                ACE_ENV_ARG_DECL_NOT_USED)
+Consumer::push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
@@ -160,7 +155,7 @@ Consumer::disconnect_push_consumer (void)
   // In this example we shutdown the ORB when we disconnect from the
   // EC (or rather the EC disconnects from us), but this doesn't have
   // to be the case....
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 int
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h
index 8436a13c898..8541290d29a 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h
@@ -37,8 +37,7 @@ public:
   // = The RtecEventComm::PushConsumer methods
 
   // The skeleton methods.
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp
index 6dcfcf0961a..e474a7706d7 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp
@@ -34,8 +34,7 @@ EC::run (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // First parse our command line options
       if (this->parse_args(argc, argv) != 0)
@@ -45,13 +44,13 @@ EC::run (int argc, char* argv[])
 
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var rootpoa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
 
       PortableServer::POAManager_var root_poa_manager =
         rootpoa->the_POAManager ();
@@ -61,19 +60,16 @@ EC::run (int argc, char* argv[])
       policies.length (2);
 
       policies[0] =
-        rootpoa->create_id_assignment_policy (PortableServer::USER_ID
-                                          ACE_ENV_ARG_PARAMETER);
+        rootpoa->create_id_assignment_policy (PortableServer::USER_ID);
 
       policies[1] =
-        rootpoa->create_lifespan_policy (PortableServer::PERSISTENT
-                                        ACE_ENV_ARG_PARAMETER);
+        rootpoa->create_lifespan_policy (PortableServer::PERSISTENT);
 
       ACE_CString poaname = "POA";
       PortableServer::POA_var child_poa_ =
          rootpoa->create_POA (poaname.c_str (),
                           root_poa_manager.in (),
-                          policies
-                          ACE_ENV_ARG_PARAMETER);
+                          policies);
 
       // Create a local event channel and register it with the RootPOA.
       TAO_EC_Event_Channel_Attributes attributes (rootpoa.in (), rootpoa.in ());
@@ -85,18 +81,18 @@ EC::run (int argc, char* argv[])
 
       PortableServer::ObjectId_var ecId = PortableServer::string_to_ObjectId(ecname);
 
-      child_poa_->activate_object_with_id(ecId.in(), &ec_impl ACE_ENV_ARG_PARAMETER);
+      child_poa_->activate_object_with_id(ecId.in(), &ec_impl);
 
-      CORBA::Object_var ec_obj = child_poa_->id_to_reference(ecId.in() ACE_ENV_ARG_PARAMETER);
+      CORBA::Object_var ec_obj = child_poa_->id_to_reference(ecId.in());
 
       RtecEventChannelAdmin::EventChannel_var ec =
-        RtecEventChannelAdmin::EventChannel::_narrow(ec_obj.in() ACE_ENV_ARG_PARAMETER);
+        RtecEventChannelAdmin::EventChannel::_narrow(ec_obj.in());
 
       // Find the Naming Service.
-      object = orb->resolve_initial_references("NameService" ACE_ENV_ARG_PARAMETER);
+      object = orb->resolve_initial_references("NameService");
 
       CosNaming::NamingContextExt_var naming_context =
-        CosNaming::NamingContextExt::_narrow(object.in() ACE_ENV_ARG_PARAMETER);
+        CosNaming::NamingContextExt::_narrow(object.in());
 
       // Create a name.
       CosNaming::Name name;
@@ -105,7 +101,7 @@ EC::run (int argc, char* argv[])
       name[0].kind = CORBA::string_dup ("");
 
       // Register with the name server
-      naming_context->rebind (name, ec.in () ACE_ENV_ARG_PARAMETER);
+      naming_context->rebind (name, ec.in ());
 
       root_poa_manager->activate ();
 
@@ -113,12 +109,11 @@ EC::run (int argc, char* argv[])
       // or using another thread, this example is too simple for that.
       orb->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "EC::run");
+      ex._tao_print_exception ("EC::run");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp
index 18ae02c517b..14cefe9d1e7 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp
@@ -35,8 +35,7 @@ Gateway::run (int argc, char* argv[])
 {
   TAO_EC_Gateway_IIOP_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // First parse our command line options
       if (this->parse_args(argc, argv) != 0)
@@ -46,19 +45,19 @@ Gateway::run (int argc, char* argv[])
 
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
         poa->the_POAManager ();
       poa_manager->activate ();
 
       // Obtain the event channel from the naming service
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -66,25 +65,24 @@ Gateway::run (int argc, char* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
       CosNaming::Name supplierecname (1);
       supplierecname.length (1);
       supplierecname[0].id = CORBA::string_dup (supplierec);
 
       CORBA::Object_var supplierec_obj =
-        naming_context->resolve (supplierecname ACE_ENV_ARG_PARAMETER);
+        naming_context->resolve (supplierecname);
 
       CosNaming::Name consumerecname (1);
       consumerecname.length (1);
       consumerecname[0].id = CORBA::string_dup (consumerec);
 
       CORBA::Object_var consumerec_obj =
-        naming_context->resolve (consumerecname ACE_ENV_ARG_PARAMETER);
+        naming_context->resolve (consumerecname);
 
       RtecEventChannelAdmin::EventChannel_var supplier_event_channel =
-        RtecEventChannelAdmin::EventChannel::_narrow (supplierec_obj.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
+        RtecEventChannelAdmin::EventChannel::_narrow (supplierec_obj.in ());
 
       if (CORBA::is_nil (supplier_event_channel.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -92,8 +90,7 @@ Gateway::run (int argc, char* argv[])
                           1);
 
       RtecEventChannelAdmin::EventChannel_var consumer_event_channel =
-        RtecEventChannelAdmin::EventChannel::_narrow (consumerec_obj.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
+        RtecEventChannelAdmin::EventChannel::_narrow (consumerec_obj.in ());
 
       if (CORBA::is_nil (consumer_event_channel.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -102,38 +99,36 @@ Gateway::run (int argc, char* argv[])
 
       TAO_EC_Gateway_IIOP gateway;
 
-      gateway.init(supplier_event_channel.in(), consumer_event_channel.in() ACE_ENV_ARG_PARAMETER);
+      gateway.init(supplier_event_channel.in(), consumer_event_channel.in());
 
       PortableServer::ObjectId_var gateway_oid =
-         poa->activate_object(&gateway ACE_ENV_ARG_PARAMETER);
+         poa->activate_object(&gateway);
 
       CORBA::Object_var gateway_obj =
-         poa->id_to_reference(gateway_oid.in() ACE_ENV_ARG_PARAMETER);
+         poa->id_to_reference(gateway_oid.in());
 
        RtecEventChannelAdmin::Observer_var obs =
-         RtecEventChannelAdmin::Observer::_narrow(gateway_obj.in() ACE_ENV_ARG_PARAMETER);
+         RtecEventChannelAdmin::Observer::_narrow(gateway_obj.in());
 
        RtecEventChannelAdmin::Observer_Handle local_ec_obs_handle =
-         consumer_event_channel->append_observer (obs.in () ACE_ENV_ARG_PARAMETER);
+         consumer_event_channel->append_observer (obs.in ());
 
       // Wait for events, using work_pending()/perform_work() may help
       // or using another thread, this example is too simple for that.
       orb->run ();
 
-      consumer_event_channel->remove_observer (local_ec_obs_handle
-                                               ACE_ENV_ARG_PARAMETER);
+      consumer_event_channel->remove_observer (local_ec_obs_handle);
 
-      poa->deactivate_object (gateway_oid.in () ACE_ENV_ARG_PARAMETER);
+      poa->deactivate_object (gateway_oid.in ());
 
       // Destroy the POA
-      poa->destroy (1, 0 ACE_ENV_ARG_PARAMETER);
+      poa->destroy (1, 0);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Gateway::run");
+      ex._tao_print_exception ("Gateway::run");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
index df804cc4561..39d93a1f5ad 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
@@ -35,8 +35,7 @@ Supplier::Supplier (void)
 int
 Supplier::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // First parse our command line options
       if (this->parse_args(argc, argv) != 0)
@@ -46,19 +45,19 @@ Supplier::run (int argc, char* argv[])
 
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
         poa->the_POAManager ();
       poa_manager->activate ();
 
       // Obtain the event channel from the naming service
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -66,18 +65,17 @@ Supplier::run (int argc, char* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
       CosNaming::Name name (1);
       name.length (1);
       name[0].id = CORBA::string_dup (ecname);
 
       CORBA::Object_var ec_obj =
-        naming_context->resolve (name ACE_ENV_ARG_PARAMETER);
+        naming_context->resolve (name);
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
+        RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ());
 
       // The canonical protocol to connect to the EC
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
@@ -96,8 +94,7 @@ Supplier::run (int argc, char* argv[])
                   0,                 // handle to the rt_info structure
                   1);                // number of calls
 
-      consumer->connect_push_supplier (supplier.in (), qos
-                                       ACE_ENV_ARG_PARAMETER);
+      consumer->connect_push_supplier (supplier.in (), qos);
 
       // Push the events...
       ACE_Time_Value sleep_time (0, 10000); // 10 milliseconds
@@ -119,7 +116,7 @@ Supplier::run (int argc, char* argv[])
                          "Supplier (%P|%t): %d events send\n",
                          i));
             }
-          consumer->push (event ACE_ENV_ARG_PARAMETER);
+          consumer->push (event);
           ACE_OS::sleep (sleep_time);
         }
 
@@ -131,18 +128,17 @@ Supplier::run (int argc, char* argv[])
 
       // Deactivate this object...
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-      poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
+        poa->servant_to_id (this);
+      poa->deactivate_object (id.in ());
 
       // Destroy the POA
-      poa->destroy (1, 0 ACE_ENV_ARG_PARAMETER);
+      poa->destroy (1, 0);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Supplier::run");
+      ex._tao_print_exception ("Supplier::run");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp
index 2ff7c221a9a..20ff6a10b22 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp
@@ -9,8 +9,7 @@ Consumer::Consumer (void)
 }
 
 void
-Consumer::push (const RtecEventComm::EventSet& events
-                ACE_ENV_ARG_DECL_NOT_USED)
+Consumer::push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.h b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.h
index d0cdaf1abcd..51bacf725b8 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.h
@@ -44,8 +44,7 @@ public:
 
   // = The RtecEventComm::PushConsumer methods
 
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp
index f32c1701940..a80a268c4fb 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp
@@ -49,12 +49,11 @@ main (int argc, char* argv[])
   TAO_EC_Kokyu_Factory::init_svcs ();
 
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) == -1)
         {
@@ -64,9 +63,9 @@ main (int argc, char* argv[])
         }
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
         poa->the_POAManager ();
       poa_manager->activate ();
@@ -110,10 +109,10 @@ main (int argc, char* argv[])
       Consumer consumer_impl1, consumer_impl2;
 
       RtecScheduler::handle_t consumer1_rt_info =
-        scheduler->create ("consumer1" ACE_ENV_ARG_PARAMETER);
+        scheduler->create ("consumer1");
 
       RtecScheduler::handle_t consumer2_rt_info =
-        scheduler->create ("consumer2" ACE_ENV_ARG_PARAMETER);
+        scheduler->create ("consumer2");
 
       //consumer's rate will get propagated from the supplier.
       //so no need to specify a period here. Specifying
@@ -129,8 +128,7 @@ main (int argc, char* argv[])
                       RtecScheduler::VERY_LOW_IMPORTANCE,
                       tmp,
                       0,
-                      RtecScheduler::OPERATION
-                      ACE_ENV_ARG_PARAMETER);
+                      RtecScheduler::OPERATION);
 
       scheduler->set (consumer2_rt_info,
                       RtecScheduler::VERY_HIGH_CRITICALITY,
@@ -139,8 +137,7 @@ main (int argc, char* argv[])
                       RtecScheduler::VERY_HIGH_IMPORTANCE,
                       tmp,
                       0,
-                      RtecScheduler::OPERATION
-                      ACE_ENV_ARG_PARAMETER);
+                      RtecScheduler::OPERATION);
 
       ACE_ConsumerQOS_Factory consumer_qos1, consumer_qos2;
       //consumer_qos.start_disjunction_group ();
@@ -186,23 +183,21 @@ main (int argc, char* argv[])
       ACE_DEBUG ((LM_DEBUG, "connecting consumers\n"));
       ACE_DEBUG ((LM_DEBUG, "connecting consumer1\n"));
       supplier_proxy1->connect_push_consumer (consumer1.in (),
-                                             consumer_qos1.get_ConsumerQOS ()
-                                             ACE_ENV_ARG_PARAMETER);
+                                             consumer_qos1.get_ConsumerQOS ());
 
       ACE_DEBUG ((LM_DEBUG, "connecting consumer2\n"));
       supplier_proxy2->connect_push_consumer (consumer2.in (),
-                                             consumer_qos2.get_ConsumerQOS ()
-                                             ACE_ENV_ARG_PARAMETER);
+                                             consumer_qos2.get_ConsumerQOS ());
 
       ACE_DEBUG ((LM_DEBUG, "consumers connected\n"));
 
       // ****************************************************************
 
       RtecScheduler::handle_t supplier1_rt_info =
-        scheduler->create ("supplier1" ACE_ENV_ARG_PARAMETER);
+        scheduler->create ("supplier1");
 
       RtecScheduler::handle_t supplier2_rt_info =
-        scheduler->create ("supplier2" ACE_ENV_ARG_PARAMETER);
+        scheduler->create ("supplier2");
 
       RtecEventComm::EventSourceID supplier_id1 = 1, supplier_id2 = 2;
       ACE_SupplierQOS_Factory supplier_qos1, supplier_qos2;
@@ -237,13 +232,11 @@ main (int argc, char* argv[])
       ACE_DEBUG ((LM_DEBUG, "connecting suppliers\n"));
       ACE_DEBUG ((LM_DEBUG, "connecting supplier1\n"));
       consumer_proxy1->connect_push_supplier (supplier1.in (),
-                                             supplier_qos1.get_SupplierQOS ()
-                                             ACE_ENV_ARG_PARAMETER);
+                                             supplier_qos1.get_SupplierQOS ());
 
       ACE_DEBUG ((LM_DEBUG, "connecting supplier2\n"));
       consumer_proxy2->connect_push_supplier (supplier2.in (),
-                                             supplier_qos2.get_SupplierQOS ()
-                                             ACE_ENV_ARG_PARAMETER);
+                                             supplier_qos2.get_SupplierQOS ());
       ACE_DEBUG ((LM_DEBUG, "suppliers connected\n"));
 
       // ****************************************************************
@@ -255,7 +248,7 @@ main (int argc, char* argv[])
       Timeout_Consumer timeout_consumer_impl2(&supplier_impl2);
 
       RtecScheduler::handle_t supplier1_timeout_consumer_rt_info =
-        scheduler->create ("supplier1_timeout_consumer" ACE_ENV_ARG_PARAMETER);
+        scheduler->create ("supplier1_timeout_consumer");
 
       //Period = 1sec
       tv.set (1,0);
@@ -268,11 +261,10 @@ main (int argc, char* argv[])
                       RtecScheduler::VERY_LOW_IMPORTANCE,
                       tmp,
                       0,
-                      RtecScheduler::OPERATION
-                      ACE_ENV_ARG_PARAMETER);
+                      RtecScheduler::OPERATION);
 
       RtecScheduler::handle_t supplier2_timeout_consumer_rt_info =
-        scheduler->create ("supplier2_timeout_consumer" ACE_ENV_ARG_PARAMETER);
+        scheduler->create ("supplier2_timeout_consumer");
 
       //Period = 3sec
       tv.set (3, 0);
@@ -285,8 +277,7 @@ main (int argc, char* argv[])
                       RtecScheduler::VERY_HIGH_IMPORTANCE,
                       tmp,
                       0,
-                      RtecScheduler::OPERATION
-                      ACE_ENV_ARG_PARAMETER);
+                      RtecScheduler::OPERATION);
 
       ACE_ConsumerQOS_Factory timer_qos1, timer_qos2;
       timer_qos1.insert_time (ACE_ES_EVENT_INTERVAL_TIMEOUT,
@@ -311,13 +302,11 @@ main (int argc, char* argv[])
       ACE_DEBUG ((LM_DEBUG, "connecting timeout consumers\n"));
       timeout_supplier_proxy1->
         connect_push_consumer (safe_timeout_consumer1.in (),
-                               timer_qos1.get_ConsumerQOS ()
-                               ACE_ENV_ARG_PARAMETER);
+                               timer_qos1.get_ConsumerQOS ());
 
       timeout_supplier_proxy2->
         connect_push_consumer (safe_timeout_consumer2.in (),
-                               timer_qos2.get_ConsumerQOS ()
-                               ACE_ENV_ARG_PARAMETER);
+                               timer_qos2.get_ConsumerQOS ());
 
       ACE_DEBUG ((LM_DEBUG, "timeout consumers connected\n"));
 
@@ -328,14 +317,12 @@ main (int argc, char* argv[])
       scheduler->add_dependency (supplier1_timeout_consumer_rt_info,
                                  supplier1_rt_info,
                                  1,
-                                 RtecBase::TWO_WAY_CALL
-                                 ACE_ENV_ARG_PARAMETER);
+                                 RtecBase::TWO_WAY_CALL);
 
       scheduler->add_dependency (supplier2_timeout_consumer_rt_info,
                                  supplier2_rt_info,
                                  1,
-                                 RtecBase::TWO_WAY_CALL
-                                 ACE_ENV_ARG_PARAMETER);
+                                 RtecBase::TWO_WAY_CALL);
 
       // ****************************************************************
 
@@ -381,8 +368,7 @@ main (int argc, char* argv[])
                                      infos.out (),
                                      dependencies.out (),
                                      configs.out (),
-                                     anomalies.out ()
-                                     ACE_ENV_ARG_PARAMETER);
+                                     anomalies.out ());
 
       // Dump the schedule to a file..
       ACE_Scheduler_Factory::dump_schedule (infos.in (),
@@ -417,11 +403,11 @@ main (int argc, char* argv[])
 //         {
 //           if (i % 2 == 0)
 //             {
-//               consumer_proxy1->push (event1 ACE_ENV_ARG_PARAMETER);
+//               consumer_proxy1->push (event1);
 //             }
 //           else
 //             {
-//               consumer_proxy2->push (event2 ACE_ENV_ARG_PARAMETER);
+//               consumer_proxy2->push (event2);
 //             }
 
 //           ACE_Time_Value rate (0, 10000);
@@ -441,12 +427,11 @@ main (int argc, char* argv[])
       // just a simple demo so we are going to be lazy.
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp
index b83317551fb..ec77f956c8b 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp
@@ -33,7 +33,7 @@ Supplier::timeout_occured (void)
       event[0].header.ttl    = 1;
     }
 
-  consumer_proxy_->push (event ACE_ENV_ARG_PARAMETER);
+  consumer_proxy_->push (event);
 }
 
 void
@@ -48,8 +48,7 @@ Timeout_Consumer::Timeout_Consumer (Supplier* supplier)
 }
 
 void
-Timeout_Consumer::push (const RtecEventComm::EventSet& events
-                ACE_ENV_ARG_DECL)
+Timeout_Consumer::push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.h b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.h
index 39c51c3f386..0ca45a86b8f 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.h
@@ -73,8 +73,7 @@ public:
 
   // = The RtecEventComm::PushConsumer methods
 
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp
index 05fd4d9c983..c7ba18ae47b 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp
@@ -11,8 +11,7 @@ AddrServer::AddrServer (const RtecUDPAdmin::UDP_Addr& addr)
 
 void
 AddrServer::get_addr (const RtecEventComm::EventHeader&,
-                      RtecUDPAdmin::UDP_Addr_out addr
-                      ACE_ENV_ARG_DECL_NOT_USED)
+                      RtecUDPAdmin::UDP_Addr_out addr)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   addr = this->addr_;
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h
index 8439914f22b..deeced433db 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h
+++ b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h
@@ -40,8 +40,7 @@ public:
 
   // = The RtecUDPAdmin::AddrServer methods
   virtual void get_addr (const RtecEventComm::EventHeader& header,
-                         RtecUDPAdmin::UDP_Addr_out addr
-                         ACE_ENV_ARG_DECL_NOT_USED)
+                         RtecUDPAdmin::UDP_Addr_out addr)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp
index 6576372a4f5..3b05553e724 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp
@@ -14,8 +14,7 @@ Consumer::Consumer (void)
 }
 
 void
-Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                   ACE_ENV_ARG_DECL)
+Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin)
 {
   this->proxy_ =
     consumer_admin->obtain_push_supplier ();
@@ -39,23 +38,21 @@ Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
   h1.type   = ACE_ES_EVENT_UNDEFINED;  // first free event type
   h1.source = ACE_ES_EVENT_SOURCE_ANY; // Any source is OK
 
-  this->proxy_->connect_push_consumer (me.in (), qos
-                                       ACE_ENV_ARG_PARAMETER);
+  this->proxy_->connect_push_consumer (me.in (), qos);
 }
 
 void
 Consumer::disconnect (void)
 {
-  ACE_TRY
+  try
     {
       // Disconnect from the proxy
       this->proxy_->disconnect_push_supplier ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore exceptions
     }
-  ACE_ENDTRY;
   this->proxy_ = RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
 
   // Deactivate this object
@@ -63,14 +60,13 @@ Consumer::disconnect (void)
     this->_default_POA ();
   // Get the Object Id used for the servant..
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
+    poa->servant_to_id (this);
   // Deactivate the object
-  poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
+  poa->deactivate_object (oid.in ());
 }
 
 void
-Consumer::push (const RtecEventComm::EventSet& events
-                ACE_ENV_ARG_DECL_NOT_USED)
+Consumer::push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h
index 4e03d8bb358..9985ca129d6 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h
@@ -37,8 +37,7 @@ public:
   Consumer (void);
   // Constructor
 
-  void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                ACE_ENV_ARG_DECL);
+  void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin);
   // Connect to the Event Channel
 
   void disconnect (void);
@@ -46,8 +45,7 @@ public:
 
   // = The RtecEventComm::PushConsumer methods
 
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp
index 69f21355400..a2be1b837cd 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp
@@ -38,18 +38,17 @@ main (int argc, char* argv[])
   // and defined in $ACE_ROOT/ace/CORBA_macros.h.
   // If your platform supports native exceptions, and TAO was compiled
   // with native exception support then you can simply use try/catch
-  // and avoid the ACE_ENV_SINGLE_ARG_PARAMETER argument.
+  // and avoid the argument.
   // Unfortunately many embedded systems cannot use exceptions due to
   // the space and time overhead.
   //
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // **************** HERE STARTS THE ORB SETUP
 
       // Create the ORB, pass the argv list for parsing.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       // Parse the arguments, you usually want to do this after
       // invoking ORB_init() because ORB_init() will remove all the
@@ -66,9 +65,9 @@ main (int argc, char* argv[])
       // The POA starts in the holding state, if it is not activated
       // it will not process any requests.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
         poa->the_POAManager ();
       poa_manager->activate ();
@@ -150,8 +149,7 @@ main (int argc, char* argv[])
       TAO_EC_Servant_Var<TAO_ECG_UDP_Sender> sender = TAO_ECG_UDP_Sender::create();
       sender->init (event_channel.in (),
                     address_server.in (),
-                    endpoint
-                    ACE_ENV_ARG_PARAMETER);
+                    endpoint);
 
       // Now we connect the sender as a consumer of events, it will
       // receive any event from any source and send it to the "right"
@@ -165,7 +163,7 @@ main (int argc, char* argv[])
       sub.dependencies[0].event.header.source =
         ACE_ES_EVENT_SOURCE_ANY; // Any source is OK
 
-      sender->connect (sub ACE_ENV_ARG_PARAMETER);
+      sender->connect (sub);
 
       // To receive events we need to setup an event handler:
       TAO_EC_Servant_Var<TAO_ECG_UDP_Receiver> receiver = TAO_ECG_UDP_Receiver::create();
@@ -181,16 +179,14 @@ main (int argc, char* argv[])
       // required by all the local consumer.
       // Then it register for the multicast groups that carry those
       // events:
-      mcast_eh.open (event_channel.in ()
-                             ACE_ENV_ARG_PARAMETER);
+      mcast_eh.open (event_channel.in ());
 
       // Again the receiver connects to the event channel as a
       // supplier of events, using the Observer features to detect
       // local consumers and their interests:
       receiver->init (event_channel.in (),
                       endpoint,
-                      address_server.in ()
-                      ACE_ENV_ARG_PARAMETER);
+                      address_server.in ());
 
       // The Receiver is also a supplier of events.  The exact type of
       // events is only known to the application, because it depends
@@ -209,7 +205,7 @@ main (int argc, char* argv[])
       pub.publications[0].event.header.source = ACE_ES_EVENT_SOURCE_ANY;
       pub.is_gateway = 1;
 
-      receiver->connect (pub ACE_ENV_ARG_PARAMETER);
+      receiver->connect (pub);
 
       // **************** THAT COMPLETES THE FEDERATION SETUP
 
@@ -220,15 +216,13 @@ main (int argc, char* argv[])
       Consumer consumer;
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
         event_channel->for_consumers ();
-      consumer.connect (consumer_admin.in ()
-                        ACE_ENV_ARG_PARAMETER);
+      consumer.connect (consumer_admin.in ());
 
       // And now create a supplier
       Supplier supplier;
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
         event_channel->for_suppliers ();
-      supplier.connect (supplier_admin.in ()
-                        ACE_ENV_ARG_PARAMETER);
+      supplier.connect (supplier_admin.in ());
 
       // **************** THAT COMPLETES THE CLIENT SETUP
 
@@ -248,7 +242,7 @@ main (int argc, char* argv[])
               // perform_work() or work_pending(), so just calling
               // them results in a spin loop.
               ACE_Time_Value tv (0, 50000);
-              orb->perform_work (tv ACE_ENV_ARG_PARAMETER);
+              orb->perform_work (tv);
             }
           ACE_Time_Value tv (0, 100000);
           ACE_OS::sleep (tv);
@@ -294,14 +288,14 @@ main (int argc, char* argv[])
           ec_impl._default_POA ();
         // Get the Object Id used for the servant..
         PortableServer::ObjectId_var oid =
-          poa->servant_to_id (&ec_impl ACE_ENV_ARG_PARAMETER);
+          poa->servant_to_id (&ec_impl);
         // Deactivate the object
-        poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
+        poa->deactivate_object (oid.in ());
       }
 
       // Now we can destroy the POA, the flags mean that we want to
       // wait until the POA is really destroyed
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1);
 
       // Finally destroy the ORB
       orb->destroy ();
@@ -311,12 +305,11 @@ main (int argc, char* argv[])
       ACE_DEBUG ((LM_DEBUG,
                   "MCast example terminated\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
index 071cd1d5a98..cd918b23953 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
@@ -13,8 +13,7 @@ Supplier::Supplier (void)
 }
 
 void
-Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin
-                   ACE_ENV_ARG_DECL)
+Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin)
 {
   this->proxy_ =
     supplier_admin->obtain_push_consumer ();
@@ -33,34 +32,32 @@ Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin
   h0.type   = ACE_ES_EVENT_UNDEFINED; // first free event type
   h0.source = 1;                      // first free event source
 
-  this->proxy_->connect_push_supplier (me.in (), qos
-                                       ACE_ENV_ARG_PARAMETER);
+  this->proxy_->connect_push_supplier (me.in (), qos);
 }
 
 void
 Supplier::disconnect (void)
 {
   // Disconnect from the EC
-  ACE_TRY
+  try
     {
       this->proxy_->disconnect_push_consumer ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
     }
-  ACE_ENDTRY;
 
   PortableServer::POA_var poa =
     this->_default_POA ();
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
+    poa->servant_to_id (this);
+  poa->deactivate_object (id.in ());
 }
 
 void
 Supplier::perform_push (void)
 {
-  ACE_TRY
+  try
     {
       // The event type and source must match our publications
       RtecEventComm::EventSet event (1);
@@ -70,12 +67,11 @@ Supplier::perform_push (void)
       // Avoid loops throught the event channel federations
       event[0].header.ttl    = 1;
 
-      this->proxy_->push (event ACE_ENV_ARG_PARAMETER);
+      this->proxy_->push (event);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
     }
-  ACE_ENDTRY;
 }
 
 void
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h
index 2640f06e31e..67c885b6d08 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h
@@ -38,8 +38,7 @@ public:
   Supplier (void);
   // Constructor
 
-  void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin
-                ACE_ENV_ARG_DECL);
+  void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin);
   // Connect to the event channel
 
   void disconnect (void);
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp
index 2ff7c221a9a..20ff6a10b22 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp
@@ -9,8 +9,7 @@ Consumer::Consumer (void)
 }
 
 void
-Consumer::push (const RtecEventComm::EventSet& events
-                ACE_ENV_ARG_DECL_NOT_USED)
+Consumer::push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h
index d0cdaf1abcd..51bacf725b8 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h
@@ -44,8 +44,7 @@ public:
 
   // = The RtecEventComm::PushConsumer methods
 
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
index 01aec72c4eb..24b985f0f69 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
@@ -29,12 +29,11 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) == -1)
         {
@@ -44,9 +43,9 @@ main (int argc, char* argv[])
         }
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
         poa->the_POAManager ();
       poa_manager->activate ();
@@ -56,10 +55,10 @@ main (int argc, char* argv[])
 #if 0
       // Obtain a reference to the naming service...
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("NameService");
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 #endif /* 0 */
 
       // ****************************************************************
@@ -96,8 +95,7 @@ main (int argc, char* argv[])
       schedule_name.length (1);
       schedule_name[0].id = CORBA::string_dup ("ScheduleService");
       // Register the servant with the Naming Context....
-      naming_context->rebind (schedule_name, scheduler.in ()
-                              ACE_ENV_ARG_PARAMETER);
+      naming_context->rebind (schedule_name, scheduler.in ());
 #endif /* 0 */
 
       // ****************************************************************
@@ -122,7 +120,7 @@ main (int argc, char* argv[])
       Consumer consumer_impl;
 
       RtecScheduler::handle_t consumer_rt_info1 =
-        scheduler->create ("consumer_event_1" ACE_ENV_ARG_PARAMETER);
+        scheduler->create ("consumer_event_1");
 
       // Let's say that the execution time for event 1 is 2
       // milliseconds...
@@ -136,11 +134,10 @@ main (int argc, char* argv[])
                       RtecScheduler::VERY_LOW_IMPORTANCE,
                       time,
                       0,
-                      RtecScheduler::OPERATION
-                      ACE_ENV_ARG_PARAMETER);
+                      RtecScheduler::OPERATION);
 
       RtecScheduler::handle_t consumer_rt_info2 =
-        scheduler->create ("consumer_event_2" ACE_ENV_ARG_PARAMETER);
+        scheduler->create ("consumer_event_2");
 
       // Let's say that the execution time for event 2 is 1
       // milliseconds...
@@ -153,8 +150,7 @@ main (int argc, char* argv[])
                       RtecScheduler::VERY_LOW_IMPORTANCE,
                       time,
                       0,
-                      RtecScheduler::OPERATION
-                      ACE_ENV_ARG_PARAMETER);
+                      RtecScheduler::OPERATION);
 
       ACE_ConsumerQOS_Factory consumer_qos;
       consumer_qos.start_disjunction_group ();
@@ -177,8 +173,7 @@ main (int argc, char* argv[])
 
       ACE_DEBUG ((LM_DEBUG, "connecting consumer\n"));
       supplier_proxy->connect_push_consumer (consumer.in (),
-                                             consumer_qos.get_ConsumerQOS ()
-                                             ACE_ENV_ARG_PARAMETER);
+                                             consumer_qos.get_ConsumerQOS ());
       ACE_DEBUG ((LM_DEBUG, "consumer connected\n"));
 
       // ****************************************************************
@@ -186,7 +181,7 @@ main (int argc, char* argv[])
       Supplier supplier_impl;
 
       RtecScheduler::handle_t supplier_rt_info1 =
-        scheduler->create ("supplier_event_1" ACE_ENV_ARG_PARAMETER);
+        scheduler->create ("supplier_event_1");
 
       // The execution times are set to reasonable values, but
       // actually they are changed on the real execution, i.e. we
@@ -204,11 +199,10 @@ main (int argc, char* argv[])
                       RtecScheduler::VERY_LOW_IMPORTANCE,
                       0,
                       1,
-                      RtecScheduler::OPERATION
-                      ACE_ENV_ARG_PARAMETER);
+                      RtecScheduler::OPERATION);
 
       RtecScheduler::handle_t supplier_rt_info2 =
-        scheduler->create ("supplier_event_2" ACE_ENV_ARG_PARAMETER);
+        scheduler->create ("supplier_event_2");
 
       // The execution times are set to reasonable values, but
       // actually they are changed on the real execution, i.e. we
@@ -225,8 +219,7 @@ main (int argc, char* argv[])
                       RtecScheduler::VERY_LOW_IMPORTANCE,
                       0,
                       1,
-                      RtecScheduler::OPERATION
-                      ACE_ENV_ARG_PARAMETER);
+                      RtecScheduler::OPERATION);
 
       RtecEventComm::EventSourceID supplier_id = 1;
       ACE_SupplierQOS_Factory supplier_qos;
@@ -251,8 +244,7 @@ main (int argc, char* argv[])
 
       ACE_DEBUG ((LM_DEBUG, "connecting supplier\n"));
       consumer_proxy->connect_push_supplier (supplier.in (),
-                                             supplier_qos.get_SupplierQOS ()
-                                             ACE_ENV_ARG_PARAMETER);
+                                             supplier_qos.get_SupplierQOS ());
       ACE_DEBUG ((LM_DEBUG, "supplier connected\n"));
 
       // ****************************************************************
@@ -289,8 +281,7 @@ main (int argc, char* argv[])
                                          infos.out (),
                                          deps.out (),
                                          configs.out (),
-                                         anomalies.out ()
-                                         ACE_ENV_ARG_PARAMETER);
+                                         anomalies.out ());
 
           // Dump the schedule to a file..
           ACE_Scheduler_Factory::dump_schedule (infos.in (),
@@ -322,11 +313,11 @@ main (int argc, char* argv[])
         {
           if (i % 2 == 0)
             {
-              consumer_proxy->push (event1 ACE_ENV_ARG_PARAMETER);
+              consumer_proxy->push (event1);
             }
           else
             {
-              consumer_proxy->push (event2 ACE_ENV_ARG_PARAMETER);
+              consumer_proxy->push (event2);
             }
 
           ACE_Time_Value rate (0, 10000);
@@ -340,12 +331,11 @@ main (int argc, char* argv[])
       // just a simple demo so we are going to be lazy.
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
index 42be12fb429..8ed196efb49 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
@@ -27,28 +27,27 @@ Consumer::Consumer (void)
 int
 Consumer::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       // Do *NOT* make a copy because we don't want the ORB to outlive
       // the run() method.
       this->orb_ = orb.in ();
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
         poa->the_POAManager ();
       poa_manager->activate ();
 
       // Obtain the event channel from the naming service
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -56,18 +55,17 @@ Consumer::run (int argc, char* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
       CosNaming::Name name (1);
       name.length (1);
       name[0].id = CORBA::string_dup ("EventService");
 
       CORBA::Object_var ec_obj =
-        naming_context->resolve (name ACE_ENV_ARG_PARAMETER);
+        naming_context->resolve (name);
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
+        RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ());
 
       // The canonical protocol to connect to the EC
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
@@ -93,8 +91,7 @@ Consumer::run (int argc, char* argv[])
       h1.type   = ACE_ES_EVENT_UNDEFINED; // first free event type
       h1.source = ACE_ES_EVENT_SOURCE_ANY;
 
-      supplier->connect_push_consumer (consumer.in (), qos
-                                       ACE_ENV_ARG_PARAMETER);
+      supplier->connect_push_consumer (consumer.in (), qos);
 
       // Wait for events, using work_pending()/perform_work() may help
       // or using another thread, this example is too simple for that.
@@ -107,18 +104,16 @@ Consumer::run (int argc, char* argv[])
       // work_pending()/perform_work() to do more interesting stuff.
       // Check the supplier for the proper way to do cleanup.
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Consumer::run");
+      ex._tao_print_exception ("Consumer::run");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 void
-Consumer::push (const RtecEventComm::EventSet& events
-                ACE_ENV_ARG_DECL_NOT_USED)
+Consumer::push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
@@ -144,6 +139,6 @@ Consumer::disconnect_push_consumer (void)
   // In this example we shutdown the ORB when we disconnect from the
   // EC (or rather the EC disconnects from us), but this doesn't have
   // to be the case....
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h
index ccf75f912bc..af6a05b2b3b 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h
@@ -41,8 +41,7 @@ public:
 
   // = The RtecEventComm::PushConsumer methods
 
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp
index c1a1e7523cf..c7941fd665f 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp
@@ -19,24 +19,23 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
 	  CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
         poa->the_POAManager ();
       poa_manager->activate ();
 
 	  // Obtain the naming service
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -44,7 +43,7 @@ main (int argc, char* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
 	  TAO_EC_Event_Channel_Attributes attributes (poa.in (),
                                                   poa.in ());
@@ -62,11 +61,11 @@ main (int argc, char* argv[])
       name[0].kind = CORBA::string_dup ("");
 
       // Register with the name server
-      naming_context->bind (name, event_channel.in () ACE_ENV_ARG_PARAMETER);
+      naming_context->bind (name, event_channel.in ());
 
       // Example code: How to write ior to file
       CORBA::String_var ior =
-        orb->object_to_string (event_channel.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (event_channel.in ());
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
@@ -92,12 +91,11 @@ main (int argc, char* argv[])
       // work_pending()/perform_work() to do more interesting stuff.
       // Check the supplier for the proper way to do cleanup.
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
index 36f501d3fe9..02afe5f88d2 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
@@ -27,24 +27,23 @@ Supplier::Supplier (void)
 int
 Supplier::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
         poa->the_POAManager ();
       poa_manager->activate ();
 
       // Obtain the event channel from the naming service
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -52,18 +51,17 @@ Supplier::run (int argc, char* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
       CosNaming::Name name (1);
       name.length (1);
       name[0].id = CORBA::string_dup ("EventService");
 
       CORBA::Object_var ec_obj =
-        naming_context->resolve (name ACE_ENV_ARG_PARAMETER);
+        naming_context->resolve (name);
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
+        RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ());
 
       // The canonical protocol to connect to the EC
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
@@ -84,8 +82,7 @@ Supplier::run (int argc, char* argv[])
       h0.type   = ACE_ES_EVENT_UNDEFINED; // first free event type
       h0.source = 1;                      // first free event source
 
-      consumer->connect_push_supplier (supplier.in (), qos
-                                       ACE_ENV_ARG_PARAMETER);
+      consumer->connect_push_supplier (supplier.in (), qos);
 
       // Push the events...
       ACE_Time_Value sleep_time (0, 10000); // 10 milliseconds
@@ -98,7 +95,7 @@ Supplier::run (int argc, char* argv[])
 
       for (int i = 0; i != 2000; ++i)
         {
-          consumer->push (event ACE_ENV_ARG_PARAMETER);
+          consumer->push (event);
           ACE_OS::sleep (sleep_time);
         }
 
@@ -110,18 +107,17 @@ Supplier::run (int argc, char* argv[])
 
       // Deactivate this object...
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-      poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
+        poa->servant_to_id (this);
+      poa->deactivate_object (id.in ());
 
       // Destroy the POA
-      poa->destroy (1, 0 ACE_ENV_ARG_PARAMETER);
+      poa->destroy (1, 0);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Supplier::run");
+      ex._tao_print_exception ("Supplier::run");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp
index 0dd55de9ce9..84448bc0c75 100644
--- a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp
+++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp
@@ -20,7 +20,7 @@ SLevel1_Server_i::authorize_level1 (void)
 
   /// Get a reference to the SecurityCurrent object.
   CORBA::Object_var obj =
-    orb->resolve_initial_references ("SecurityCurrent" ACE_ENV_ARG_PARAMETER);
+    orb->resolve_initial_references ("SecurityCurrent");
 
     /// Narrow it down correctly.
   SecurityLevel1::Current_var current =
diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp
index 52c321d9be2..94fb7d414bc 100644
--- a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp
+++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp
@@ -34,19 +34,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv [])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior);
 
       SLevel1_Server_var server =
-        SLevel1_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        SLevel1_Server::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -70,13 +70,12 @@ main (int argc, char *argv [])
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            "Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp
index a5a5668efb0..da28207b229 100644
--- a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp
+++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp
@@ -11,15 +11,15 @@ const char *ior_output_file = 0;
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       /// Our regular ORB Initialization.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       /// Get a reference to the RootPOA.
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -28,7 +28,7 @@ main (int argc, char *argv[])
 
       /// Narrow down the reference to the currect interface.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       SLevel1_Server_i level1_server ();
 
@@ -36,8 +36,7 @@ main (int argc, char *argv[])
         level1_server._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in ()
-                               ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (server.in ());
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
@@ -55,15 +54,14 @@ main (int argc, char *argv[])
       // Start the ORB
       orb->run ();
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1);
 
     }
-  ACE_CATCH (CORBA::SytemException, ex)
+  catch (const CORBA::SytemException& )
     {
       ACE_DEBUG ((LM_DEBUG,
                   "System Exception raised: %s", ex));
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/Security/Send_File/client.cpp b/TAO/orbsvcs/examples/Security/Send_File/client.cpp
index d65c9b9c47d..0d973055cf4 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/client.cpp
+++ b/TAO/orbsvcs/examples/Security/Send_File/client.cpp
@@ -36,19 +36,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior);
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        Simple_Server::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -64,7 +64,7 @@ main (int argc, char *argv[])
           char *line = buf.read ('\n');
           if (line == 0)
             break;
-          server->send_line (line ACE_ENV_ARG_PARAMETER);
+          server->send_line (line);
           buf.alloc ()->free (line);
         }
 
@@ -72,13 +72,12 @@ main (int argc, char *argv[])
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            "Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/Security/Send_File/server.cpp b/TAO/orbsvcs/examples/Security/Send_File/server.cpp
index 2a9c9f54a42..c456ac7cbe9 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/server.cpp
+++ b/TAO/orbsvcs/examples/Security/Send_File/server.cpp
@@ -37,13 +37,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -51,7 +51,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -65,7 +65,7 @@ main (int argc, char *argv[])
         server_impl._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -88,17 +88,16 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1);
 
       ACE_OS::sleep (5);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            "Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp
index 63199f1aa88..858fc2c99d6 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp
+++ b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp
@@ -9,8 +9,7 @@
 ACE_RCSID(Send_File, test_i, "$Id$")
 
 void
-Simple_Server_i::send_line (const char *line
-                            ACE_ENV_ARG_DECL_NOT_USED)
+Simple_Server_i::send_line (const char *line)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "%s\n", line));
diff --git a/TAO/orbsvcs/examples/Security/Send_File/test_i.h b/TAO/orbsvcs/examples/Security/Send_File/test_i.h
index 76894de600f..dce0675446b 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/test_i.h
+++ b/TAO/orbsvcs/examples/Security/Send_File/test_i.h
@@ -31,8 +31,7 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  void send_line (const char *line
-                  ACE_ENV_ARG_DECL_NOT_USED)
+  void send_line (const char *line)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void shutdown (void)
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
index 47fbf762dd5..0b0adcf3da4 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
@@ -80,12 +80,11 @@ TAO_Basic_StreamCtrl::TAO_Basic_StreamCtrl (void)
 // Stop the transfer of data of the stream
 // Empty the_spec means apply operation to all flows
 void
-TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec
-                            ACE_ENV_ARG_DECL)
+TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow))
 {
-  ACE_TRY
+  try
     {
       // @@Call stop on the Related MediaCtrl.  call stop on the flow
       // connections.
@@ -115,23 +114,21 @@ TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Basic_StreamCtrl::stop");
+      ex._tao_print_exception ("TAO_Basic_StreamCtrl::stop");
       return;
     }
-  ACE_ENDTRY;
 }
 
 // Start the transfer of data in the stream.
 // Empty the_spec means apply operation to all flows
 void
-TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec
-                             ACE_ENV_ARG_DECL)
+TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow))
 {
-  ACE_TRY
+  try
     {
       // @@Call start on the Related MediaCtrl.
 
@@ -162,12 +159,11 @@ TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Basic_StreamCtrl::start");
+      ex._tao_print_exception ("TAO_Basic_StreamCtrl::start");
       return;
     }
-  ACE_ENDTRY;
 }
 
 // Tears down the stream. This will close the connection, and delete
@@ -175,12 +171,11 @@ TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec
 // the_spec means apply operation to all flows
 
 void
-TAO_Basic_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec
-                               ACE_ENV_ARG_DECL)
+TAO_Basic_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow))
 {
-  ACE_TRY
+  try
     {
       // call stop on the flow connections.
       if (this->flow_connection_map_.current_size () > 0)
@@ -210,12 +205,11 @@ TAO_Basic_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Basic_StreamCtrl::destroy");
+      ex._tao_print_exception ("TAO_Basic_StreamCtrl::destroy");
       return;
     }
-  ACE_ENDTRY;
 }
 
 // Changes the QoS associated with the stream
@@ -223,8 +217,7 @@ TAO_Basic_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec
 CORBA::Boolean
 
 TAO_Basic_StreamCtrl::modify_QoS (AVStreams::streamQoS & /*new_qos*/,
-                                  const AVStreams::flowSpec &/*flowspec*/
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+                                  const AVStreams::flowSpec &/*flowspec*/)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::QoSRequestFailed))
@@ -235,8 +228,7 @@ TAO_Basic_StreamCtrl::modify_QoS (AVStreams::streamQoS & /*new_qos*/,
 // Used by StreamEndPoint and VDev to inform StreamCtrl of events.
 // E.g., loss of flow, reestablishment of flow, etc..
 void
-TAO_Basic_StreamCtrl::push_event (const struct CosPropertyService::Property &/*the_event*/
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Basic_StreamCtrl::push_event (const struct CosPropertyService::Property &/*the_event*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -247,8 +239,7 @@ TAO_Basic_StreamCtrl::push_event (const struct CosPropertyService::Property &/*t
 void
 TAO_Basic_StreamCtrl::set_FPStatus (const AVStreams::flowSpec &flow_spec,
                                     const char  *fp_name,
-                                    const CORBA::Any &fp_settings
-                                    ACE_ENV_ARG_DECL)
+                                    const CORBA::Any &fp_settings)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::FPError))
@@ -256,14 +247,13 @@ TAO_Basic_StreamCtrl::set_FPStatus (const AVStreams::flowSpec &flow_spec,
 {
   if (!CORBA::is_nil (this->sep_a_.in ()))
     {
-      this->sep_a_->set_FPStatus (flow_spec, fp_name, fp_settings ACE_ENV_ARG_PARAMETER);
+      this->sep_a_->set_FPStatus (flow_spec, fp_name, fp_settings);
     }
 }
 
 // Gets the flow connection.
 CORBA::Object_ptr
-TAO_Basic_StreamCtrl::get_flow_connection (const char *flow_name
-                                           ACE_ENV_ARG_DECL)
+TAO_Basic_StreamCtrl::get_flow_connection (const char *flow_name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::notSupported))
@@ -283,23 +273,22 @@ TAO_Basic_StreamCtrl::get_flow_connection (const char *flow_name
 // Sets the flow connection.
 void
 TAO_Basic_StreamCtrl::set_flow_connection (const char *flow_name,
-                                           CORBA::Object_ptr flow_connection_obj
-                                           ACE_ENV_ARG_DECL)
+                                           CORBA::Object_ptr flow_connection_obj)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::notSupported))
 {
   AVStreams::FlowConnection_var flow_connection;
-  ACE_TRY
+  try
     {
-      flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj ACE_ENV_ARG_PARAMETER);
+      flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Basic_StreamCtrl::set_flow_connection");
+      ex._tao_print_exception (
+        "TAO_Basic_StreamCtrl::set_flow_connection");
       return;
     }
-  ACE_ENDTRY;
   // add the flowname and the flowconnection to the hashtable.
   this->flows_.length (this->flow_count_ + 1);
   this->flows_ [this->flow_count_++] = CORBA::string_dup (flow_name);
@@ -307,7 +296,7 @@ TAO_Basic_StreamCtrl::set_flow_connection (const char *flow_name,
   if (this->flow_connection_map_.bind (flow_name_key, flow_connection) != 0)
   {
     if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "(%N,%l) Cannot find flow: %s\n", flow_name ));
-    ACE_THROW (AVStreams::noSuchFlow ());// is this right?
+    throw AVStreams::noSuchFlow ();// is this right?
   }
 }
 
@@ -321,8 +310,7 @@ TAO_Basic_StreamCtrl::~TAO_Basic_StreamCtrl (void)
 
 CORBA::Boolean
 TAO_Negotiator::negotiate (AVStreams::Negotiator_ptr /* remote_negotiator */,
-                           const AVStreams::streamQoS &/* qos_spec */
-                           ACE_ENV_ARG_DECL_NOT_USED)
+                           const AVStreams::streamQoS &/* qos_spec */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -364,19 +352,17 @@ bool
 MMDevice_Map_Hash_Key::operator == (const MMDevice_Map_Hash_Key &hash_key) const
 {
   CORBA::Boolean result = 0;
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       result =
-        this->mmdevice_->_is_equivalent (hash_key.mmdevice_
-                                         ACE_ENV_ARG_PARAMETER);
+        this->mmdevice_->_is_equivalent (hash_key.mmdevice_);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "MMDevice_Map_Hash_Key::operator == ");
+      ex._tao_print_exception (
+        "MMDevice_Map_Hash_Key::operator == ");
       return false;
     }
-  ACE_ENDTRY;
 
   return result;
 }
@@ -387,26 +373,21 @@ operator < (const MMDevice_Map_Hash_Key &left,
 {
   bool result = false;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       const CORBA::ULong left_hash =
-        left.mmdevice_->_hash (left.hash_maximum_
-                               ACE_ENV_ARG_PARAMETER);
+        left.mmdevice_->_hash (left.hash_maximum_);
 
       const CORBA::ULong right_hash =
-        right.mmdevice_->_hash (right.hash_maximum_
-                                ACE_ENV_ARG_PARAMETER);
+        right.mmdevice_->_hash (right.hash_maximum_);
 
       result = left_hash < right_hash;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "operator < for MMDevice_Map_Hash_Key");
+      ex._tao_print_exception ("operator < for MMDevice_Map_Hash_Key");
       return false;
     }
-  ACE_ENDTRY;
 
   return result;
 }
@@ -415,18 +396,15 @@ u_long
 MMDevice_Map_Hash_Key::hash (void)  const
 {
   u_long result = 0;
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      result = this->mmdevice_->_hash (this->hash_maximum_
-                                       ACE_ENV_ARG_PARAMETER);
+      result = this->mmdevice_->_hash (this->hash_maximum_);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "MMDevice_Map_Hash_Key::hash");
+      ex._tao_print_exception ("MMDevice_Map_Hash_Key::hash");
       return 0;
     }
-  ACE_ENDTRY;
   return result;
 }
 
@@ -437,8 +415,7 @@ MMDevice_Map_Hash_Key::hash (void)  const
 TAO_StreamCtrl::TAO_StreamCtrl (void)
   :mcastconfigif_ (0)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       this->streamctrl_ = this->_this ();
       char buf [BUFSIZ];
@@ -448,11 +425,10 @@ TAO_StreamCtrl::TAO_StreamCtrl (void)
         ipaddr = ACE_OS::inet_addr (buf);
       this->source_id_ = TAO_AV_RTCP::alloc_srcid (ipaddr);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamCtrl::TAO_StreamCtrl");
+      ex._tao_print_exception ("TAO_StreamCtrl::TAO_StreamCtrl");
     }
-  ACE_ENDTRY;
 }
 
 TAO_StreamCtrl::~TAO_StreamCtrl (void)
@@ -464,47 +440,44 @@ TAO_StreamCtrl::~TAO_StreamCtrl (void)
 // Stop the transfer of data of the stream
 // Empty the_spec means apply operation to all flows
 void
-TAO_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec
-                      ACE_ENV_ARG_DECL)
+TAO_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow))
 {
-  ACE_TRY
+  try
     {
-      TAO_Basic_StreamCtrl::stop (flow_spec ACE_ENV_ARG_PARAMETER);
+      TAO_Basic_StreamCtrl::stop (flow_spec);
       if (this->flow_connection_map_.current_size () > 0)
         return;
       MMDevice_Map_Iterator a_iterator (this->mmdevice_a_map_);
       MMDevice_Map::ENTRY *entry = 0;
       for (;a_iterator.next (entry)!= 0;a_iterator.advance ())
         {
-          entry->int_id_.sep_->stop (flow_spec ACE_ENV_ARG_PARAMETER);
+          entry->int_id_.sep_->stop (flow_spec);
         }
       MMDevice_Map_Iterator b_iterator (this->mmdevice_b_map_);
       for (;b_iterator.next (entry)!= 0;b_iterator.advance ())
         {
-          entry->int_id_.sep_->stop (flow_spec ACE_ENV_ARG_PARAMETER);
+          entry->int_id_.sep_->stop (flow_spec);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Basic_StreamCtrl::stop");
+      ex._tao_print_exception ("TAO_Basic_StreamCtrl::stop");
       return;
     }
-  ACE_ENDTRY;
 }
 
 // Start the transfer of data in the stream.
 // Empty the_spec means apply operation to all flows
 void
-TAO_StreamCtrl::start (const AVStreams::flowSpec &flow_spec
-                       ACE_ENV_ARG_DECL)
+TAO_StreamCtrl::start (const AVStreams::flowSpec &flow_spec)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow))
 {
-  ACE_TRY
+  try
     {
-      TAO_Basic_StreamCtrl::start (flow_spec ACE_ENV_ARG_PARAMETER);
+      TAO_Basic_StreamCtrl::start (flow_spec);
       if (this->flow_connection_map_.current_size () > 0)
         return;
 
@@ -512,34 +485,32 @@ TAO_StreamCtrl::start (const AVStreams::flowSpec &flow_spec
       MMDevice_Map::ENTRY *entry = 0;
       for (;a_iterator.next (entry)!= 0;a_iterator.advance ())
         {
-          entry->int_id_.sep_->start (flow_spec ACE_ENV_ARG_PARAMETER);
+          entry->int_id_.sep_->start (flow_spec);
         }
       MMDevice_Map_Iterator b_iterator (this->mmdevice_b_map_);
       for (;b_iterator.next (entry)!= 0;b_iterator.advance ())
         {
-          entry->int_id_.sep_->start (flow_spec ACE_ENV_ARG_PARAMETER);
+          entry->int_id_.sep_->start (flow_spec);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamCtrl::start");
+      ex._tao_print_exception ("TAO_StreamCtrl::start");
       return;
     }
-  ACE_ENDTRY;
 }
 
 // Tears down the stream. This will close the connection, and delete
 // the streamendpoint and vdev associated with this stream
 // Empty the_spec means apply operation to all flows
 void
-TAO_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec
-                         ACE_ENV_ARG_DECL)
+TAO_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow))
 {
-  ACE_TRY
+  try
     {
-      TAO_Basic_StreamCtrl::destroy (flow_spec ACE_ENV_ARG_PARAMETER);
+      TAO_Basic_StreamCtrl::destroy (flow_spec);
       if (this->flow_connection_map_.current_size () > 0)
         return;
 
@@ -547,20 +518,19 @@ TAO_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec
       MMDevice_Map::ENTRY *entry = 0;
       for (;a_iterator.next (entry)!= 0;a_iterator.advance ())
         {
-          entry->int_id_.sep_->destroy (flow_spec ACE_ENV_ARG_PARAMETER);
+          entry->int_id_.sep_->destroy (flow_spec);
         }
       MMDevice_Map_Iterator b_iterator (this->mmdevice_b_map_);
       for (;b_iterator.next (entry)!= 0;b_iterator.advance ())
         {
-          entry->int_id_.sep_->destroy (flow_spec ACE_ENV_ARG_PARAMETER);
+          entry->int_id_.sep_->destroy (flow_spec);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamCtrl::destroy");
+      ex._tao_print_exception ("TAO_StreamCtrl::destroy");
       return;
     }
-  ACE_ENDTRY;
 
   int result = TAO_AV_Core::deactivate_servant (this);
   if (result < 0)
@@ -575,14 +545,13 @@ CORBA::Boolean
 TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
                            AVStreams::MMDevice_ptr b_party,
                            AVStreams::streamQoS &the_qos,
-                           const AVStreams::flowSpec &the_flows
-                           ACE_ENV_ARG_DECL)
+                           const AVStreams::flowSpec &the_flows)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::noSuchFlow,
                    AVStreams::QoSRequestFailed))
 {
-  ACE_TRY
+  try
     {
       if (CORBA::is_nil (a_party) && CORBA::is_nil (b_party))
         ACE_ERROR_RETURN ((LM_ERROR, "Both parties are nil\n"), 0);
@@ -624,8 +593,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
                                     the_qos,
                                     met_qos,
                                     named_vdev.inout (),
-                                    the_flows
-                                    ACE_ENV_ARG_PARAMETER);
+                                    the_flows);
 
               if (TAO_debug_level > 0)
                 ACE_DEBUG ((LM_DEBUG, "(%P|%t) TAO_StreamCtrl::create_A: succeeded\n"));
@@ -633,27 +601,23 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
               CORBA::Any streamctrl_any;
               streamctrl_any <<= this->streamctrl_.in ();
               this->sep_a_->define_property ("Related_StreamCtrl",
-                                             streamctrl_any
-                                             ACE_ENV_ARG_PARAMETER);
+                                             streamctrl_any);
 
               CORBA::Any vdev_a_any;
               vdev_a_any <<= this->vdev_a_.in ();
               this->sep_a_->define_property ("Related_VDev",
-                                             vdev_a_any
-                                             ACE_ENV_ARG_PARAMETER);
+                                             vdev_a_any);
 
               CORBA::Any streamendpoint_a_any;
               streamendpoint_a_any <<= this->sep_a_.in ();
               this->vdev_a_->define_property ("Related_StreamEndpoint",
-                                              streamendpoint_a_any
-                                              ACE_ENV_ARG_PARAMETER);
+                                              streamendpoint_a_any);
 
 
               CORBA::Any mmdevice_a_any;
               mmdevice_a_any <<= a_party;
               this->vdev_a_->define_property ("Related_MMDevice",
-                                              mmdevice_a_any
-                                              ACE_ENV_ARG_PARAMETER);
+                                              mmdevice_a_any);
 
               // add the mmdevice, sep and vdev to the map.
               MMDevice_Map_Entry map_entry;
@@ -690,40 +654,34 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
                                     the_qos,
                                     met_qos,
                                     named_vdev.inout (),
-                                    the_flows
-                                    ACE_ENV_ARG_PARAMETER);
+                                    the_flows);
 
               if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) TAO_StreamCtrl::create_B: succeeded\n"));
 
               if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,
                           "\n(%P|%t)stream_endpoint_b_ = %s",
-                          TAO_ORB_Core_instance ()->orb ()->object_to_string (this->sep_b_.in ()
-                                                                              ACE_ENV_ARG_PARAMETER)));
+                          TAO_ORB_Core_instance ()->orb ()->object_to_string (this->sep_b_.in ())));
               // Define ourselves as the related_streamctrl property of the sep.
               CORBA::Any streamctrl_any;
               streamctrl_any <<= this->streamctrl_.in ();
               this->sep_b_->define_property ("Related_StreamCtrl",
-                                             streamctrl_any
-                                             ACE_ENV_ARG_PARAMETER);
+                                             streamctrl_any);
 
               CORBA::Any vdev_b_any;
               vdev_b_any <<= this->vdev_b_.in ();
               this->sep_b_->define_property ("Related_VDev",
-                                             vdev_b_any
-                                             ACE_ENV_ARG_PARAMETER);
+                                             vdev_b_any);
 
               CORBA::Any streamendpoint_b_any;
               streamendpoint_b_any <<= this->sep_b_.in ();
               this->vdev_b_->define_property ("Related_StreamEndpoint",
-                                              streamendpoint_b_any
-                                              ACE_ENV_ARG_PARAMETER);
+                                              streamendpoint_b_any);
 
 
               CORBA::Any mmdevice_b_any;
               mmdevice_b_any <<= b_party;
               this->vdev_b_->define_property ("Related_MMDevice",
-                                              mmdevice_b_any
-                                              ACE_ENV_ARG_PARAMETER);
+                                              mmdevice_b_any);
               // add the mmdevice, sep and vdev to the map.
               MMDevice_Map_Entry map_entry;
               MMDevice_Map_Hash_Key key (b_party);
@@ -747,12 +705,10 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
           sep_a_peer_any <<= this->sep_b_.in();
           sep_b_peer_any <<= this->sep_a_.in();
           this->sep_a_->define_property ("PeerAdapter",
-                                          sep_a_peer_any
-                                          ACE_ENV_ARG_PARAMETER);
+                                          sep_a_peer_any);
 
           this->sep_b_->define_property ("PeerAdapter",
-                                         sep_b_peer_any
-                                         ACE_ENV_ARG_PARAMETER);
+                                         sep_b_peer_any);
         }
 
       // In the full profile case there's no VDev.
@@ -761,38 +717,33 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
           // Now set the source id for this A endpoint.
           // If the sep contains flow producers then set the source ids for those
           // instead.
-          ACE_TRY_EX (set_source_id)
+          try
             {
-              CORBA::Any_ptr flows_any = this->sep_a_->get_property_value ("Flows"
-                                                                           ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK_EX (set_source_id);
+              CORBA::Any_ptr flows_any = this->sep_a_->get_property_value ("Flows");
               AVStreams::flowSpec_var flows;
               *flows_any >>= flows.out ();
               for (CORBA::ULong i=0; i< flows->length ();++i)
                 {
                   CORBA::Object_var fep_obj =
-                    this->sep_a_->get_fep (flows [i] ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK_EX (set_source_id);
-                  ACE_TRY_EX (producer_check)
+                    this->sep_a_->get_fep (flows [i]);
+                  try
                     {
                       AVStreams::FlowProducer_var producer =
-                        AVStreams::FlowProducer::_narrow (fep_obj.in ()
-                                                          ACE_ENV_ARG_PARAMETER);
-                      ACE_TRY_CHECK_EX (producer_check);
+                        AVStreams::FlowProducer::_narrow (fep_obj.in ());
                       producer->set_source_id (this->source_id_++);
                     }
-                  ACE_CATCHANY
+                  catch (const CORBA::Exception& ex)
                     {
                       if (TAO_debug_level > 0)
                         ACE_DEBUG ((LM_DEBUG, " %s ", static_cast<char const*>(flows[i])));
 
-                      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "producer_check: not a producer");
+                      ex._tao_print_exception (
+                        "producer_check: not a producer");
 
                     }
-                  ACE_ENDTRY;
                 }
             }
-          ACE_CATCHANY
+          catch (const CORBA::Exception& ex)
             {
               // Since the full profile failed try setting the source id
               // for the sep instead.
@@ -800,10 +751,8 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
               // many producers who do not have flow interfaces. Then
               // the streamctrl has to give an array of source ids to
               // the sep.
-              this->sep_a_->set_source_id (this->source_id_++
-                                           ACE_ENV_ARG_PARAMETER);
+              this->sep_a_->set_source_id (this->source_id_++);
             }
-          ACE_ENDTRY;
           if (!this->mcastconfigif_)
             {
               ACE_NEW_RETURN (this->mcastconfigif_,
@@ -816,8 +765,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
           CORBA::Boolean result = this->vdev_a_->set_Mcast_peer (this->streamctrl_.in (),
                                                                  this->mcastconfigif_ptr_.in (),
                                                                  the_qos,
-                                                                 the_flows
-                                                                 ACE_ENV_ARG_PARAMETER);
+                                                                 the_flows);
           if (!result)
             ACE_ERROR_RETURN ((LM_ERROR, "set_Mcast_peer failed\n"), 0);
         }
@@ -831,39 +779,36 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
                 ACE_ERROR_RETURN ((LM_ERROR, "first add a source and then a sink\n"), 0);
               this->mcastconfigif_->set_peer (this->vdev_b_.in (),
                                               the_qos,
-                                              the_flows
-                                              ACE_ENV_ARG_PARAMETER);
+                                              the_flows);
             }
 
           int connect_leaf_success = 0;
-          ACE_TRY_EX (connect_leaf)
+          try
             {
               // @@: define null interfaces for Atm so that they can be implemented once
               //  ACE adds support for ATM multicast.
               connect_leaf_success = this->sep_a_->connect_leaf (this->sep_b_.in (),
                                                                  the_qos,
-                                                                 the_flows
-                                                                 ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK_EX (connect_leaf);
+                                                                 the_flows);
               connect_leaf_success = 1;
             }
-          ACE_CATCH (AVStreams::notSupported, ex)
+          catch (const AVStreams::notSupported& ex)
             {
               if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "connect_leaf failed\n"));
               connect_leaf_success = 0;
             }
-          ACE_CATCHANY
+          catch (const CORBA::Exception& ex)
             {
-              ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamCtrl::bind_devs");
+              ex._tao_print_exception (
+                "TAO_StreamCtrl::bind_devs");
             }
-          ACE_ENDTRY;
           if (!connect_leaf_success)
             {
               if (TAO_debug_level > 0)
                 ACE_DEBUG ((LM_DEBUG,"TAO_StreamCtrl::bind_devs Multiconnect\n"));
               AVStreams::flowSpec connect_flows = the_flows;
-              this->sep_a_->multiconnect (the_qos, connect_flows ACE_ENV_ARG_PARAMETER);
-              this->sep_b_->multiconnect (the_qos, connect_flows ACE_ENV_ARG_PARAMETER);
+              this->sep_a_->multiconnect (the_qos, connect_flows);
+              this->sep_b_->multiconnect (the_qos, connect_flows);
             }
         }
 
@@ -886,8 +831,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
               this->bind (this->sep_a_.in (),
                           this->sep_b_.in (),
                           the_qos,
-                          the_flows
-                          ACE_ENV_ARG_PARAMETER);
+                          the_flows);
 
 
 
@@ -903,14 +847,12 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
               this->vdev_a_->set_peer (this->streamctrl_.in (),
                                        this->vdev_b_.in (),
                                        the_qos,
-                                       the_flows
-                                       ACE_ENV_ARG_PARAMETER);
+                                       the_flows);
 
               this->vdev_b_->set_peer (this->streamctrl_.in (),
                                        this->vdev_a_.in (),
                                        the_qos,
-                                       the_flows
-                                       ACE_ENV_ARG_PARAMETER);
+                                       the_flows);
 
 
               // Now connect the streams together. This will
@@ -918,19 +860,17 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
               CORBA::Boolean result  =
                 this->sep_a_->connect (this->sep_b_.in (),
                                        the_qos,
-                                       the_flows
-                                       ACE_ENV_ARG_PARAMETER);
+                                       the_flows);
               if (result == 0)
                 ACE_ERROR_RETURN ((LM_ERROR, "sep_a->connect (sep_b) failed\n"), 0);
           }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamCtrl::bind_devs");
+      ex._tao_print_exception ("TAO_StreamCtrl::bind_devs");
       return 0;
     }
-  ACE_ENDTRY;
   return 1;
 }
 
@@ -940,8 +880,7 @@ CORBA::Boolean
 TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
                       AVStreams::StreamEndPoint_B_ptr sep_b,
                       AVStreams::streamQoS &stream_qos,
-                      const AVStreams::flowSpec &flow_spec
-                      ACE_ENV_ARG_DECL)
+                      const AVStreams::flowSpec &flow_spec)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::noSuchFlow,
@@ -951,7 +890,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
   this->sep_b_ = AVStreams::StreamEndPoint_B::_duplicate(sep_b);
 
   int result = 0;
-  ACE_TRY
+  try
     {
       if (CORBA::is_nil (sep_a_.in() ) ||
           CORBA::is_nil (sep_b_.in() ))
@@ -964,22 +903,20 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
       CORBA::Any sep_any;
       sep_any <<= sep_b;
       sep_a_->define_property ("PeerAdapter",
-                              sep_any
-                              ACE_ENV_ARG_PARAMETER);
+                              sep_any);
       sep_any <<= sep_a;
       sep_b_->define_property ("PeerAdapter",
-                              sep_any
-                              ACE_ENV_ARG_PARAMETER);
+                              sep_any);
       // since its full profile we do the viable stream setup algorithm.
       // get the flows for the A streamendpoint.
       // the flows spec is empty and hence we do a exhaustive match.
       AVStreams::flowSpec a_flows, b_flows;
       CORBA::Any_var flows_any;
-      flows_any = sep_a_->get_property_value ("Flows" ACE_ENV_ARG_PARAMETER);
+      flows_any = sep_a_->get_property_value ("Flows");
       AVStreams::flowSpec *temp_flows;
       flows_any.in () >>= temp_flows;
       a_flows = *temp_flows;
-      flows_any = sep_b_->get_property_value ("Flows" ACE_ENV_ARG_PARAMETER);
+      flows_any = sep_b_->get_property_value ("Flows");
       flows_any.in () >>= temp_flows;
       b_flows = *temp_flows;
       u_int i;
@@ -996,11 +933,9 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
           const char *flowname = a_flows[i];
           // get the flowendpoint references.
           CORBA::Object_var fep_obj =
-            sep_a_->get_fep (flowname
-                            ACE_ENV_ARG_PARAMETER);
+            sep_a_->get_fep (flowname);
           AVStreams::FlowEndPoint_var fep =
-            AVStreams::FlowEndPoint::_narrow (fep_obj.in ()
-                                              ACE_ENV_ARG_PARAMETER);
+            AVStreams::FlowEndPoint::_narrow (fep_obj.in ());
           ACE_CString fep_key (flowname);
           result = a_fep_map->bind (fep_key, fep);
           if (result == -1)
@@ -1012,11 +947,9 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
           const char *flowname = b_flows[i];
           // get the flowendpoint references.
           CORBA::Object_var fep_obj =
-            sep_b->get_fep (flowname
-                            ACE_ENV_ARG_PARAMETER);
+            sep_b->get_fep (flowname);
           AVStreams::FlowEndPoint_var fep =
-            AVStreams::FlowEndPoint::_narrow (fep_obj.in ()
-                                              ACE_ENV_ARG_PARAMETER);
+            AVStreams::FlowEndPoint::_narrow (fep_obj.in ());
           ACE_CString fep_key (flowname);
           result = b_fep_map->bind (fep_key, fep);
           if (result == -1)
@@ -1071,7 +1004,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
       // uses the first match policy.
       FlowEndPoint_Map_Iterator a_feps_iterator (*map_a);
       FlowEndPoint_Map_Entry *a_feps_entry, *b_feps_entry;
-      ACE_TRY_EX (flow_connect)
+      try
         {
 
           for (;a_feps_iterator.next (a_feps_entry) != 0;
@@ -1080,7 +1013,6 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
               AVStreams::FlowEndPoint_var fep_a = a_feps_entry->int_id_;
               AVStreams::FlowEndPoint_var connected_to =
                 fep_a->get_connected_fep ();
-              ACE_TRY_CHECK_EX (flow_connect);
 
               if (!CORBA::is_nil (connected_to.in ()))
                 {
@@ -1097,7 +1029,6 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
 
                   AVStreams::FlowEndPoint_var connected_to =
                     fep_b->get_connected_fep ();
-                  ACE_TRY_CHECK_EX (flow_connect);
 
                   if (!CORBA::is_nil (connected_to.in ()))
                     {
@@ -1105,44 +1036,32 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
                       continue;
                     }
 
-                  if (fep_a->is_fep_compatible (fep_b.in()
-                                                ACE_ENV_ARG_PARAMETER) == 1)
+                  if (fep_a->is_fep_compatible (fep_b.in()) == 1)
                     {
-                      ACE_TRY_CHECK_EX (flow_connect);
                       // assume that flow names are same so that we
                       // can use either of them.
                       CORBA::Object_var flow_connection_obj;
                       CORBA::Any_var flowname_any =
-                        fep_a->get_property_value ("FlowName"
-                                                   ACE_ENV_ARG_PARAMETER);
-                      ACE_TRY_CHECK_EX (flow_connect);
+                        fep_a->get_property_value ("FlowName");
                       const char *flowname = 0;
                       flowname_any.in () >>= flowname;
-                      ACE_TRY_EX (flow_connection)
+                      try
                         {
                           flow_connection_obj =
-                            this->get_flow_connection (flowname
-                                                       ACE_ENV_ARG_PARAMETER);
-                          ACE_TRY_CHECK_EX (flow_connection);
+                            this->get_flow_connection (flowname);
                           flow_connection =
-                            AVStreams::FlowConnection::_narrow (flow_connection_obj.in ()
-                                                                ACE_ENV_ARG_PARAMETER);
-                          ACE_TRY_CHECK_EX (flow_connection);
+                            AVStreams::FlowConnection::_narrow (flow_connection_obj.in ());
                         }
-                      ACE_CATCHANY
+                      catch (const CORBA::Exception& ex)
                         {
                           TAO_FlowConnection *flowConnection;
                           ACE_NEW_RETURN (flowConnection,
                                           TAO_FlowConnection,
                                           0);
                           flow_connection = flowConnection->_this ();
-                          ACE_TRY_CHECK_EX (flow_connect);
                           this->set_flow_connection (flowname,
-                                                     flow_connection.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-                          ACE_TRY_CHECK_EX (flow_connect);
+                                                     flow_connection.in ());
                         }
-                      ACE_ENDTRY;
 
                       // make sure that a_feps is flow_producer
                       // and b_feps is flow_consumer
@@ -1153,29 +1072,21 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
                       AVStreams::FlowProducer_var producer;
                       AVStreams::FlowConsumer_var consumer;
 
-                      ACE_TRY_EX (producer_check)
+                      try
                         {
                           producer =
-                            AVStreams::FlowProducer::_narrow (fep_a.in()
-                                                              ACE_ENV_ARG_PARAMETER);
-                          ACE_TRY_CHECK_EX (producer_check);
+                            AVStreams::FlowProducer::_narrow (fep_a.in());
                           consumer =
-                            AVStreams::FlowConsumer::_narrow (fep_b.in()
-                                                              ACE_ENV_ARG_PARAMETER);
-                          ACE_TRY_CHECK_EX (producer_check);
+                            AVStreams::FlowConsumer::_narrow (fep_b.in());
 
                           // If the types don't match then try in
                           // the opposite order
                           if (CORBA::is_nil (producer.in ()))
                             {
                               producer =
-                                AVStreams::FlowProducer::_narrow (fep_b.in()
-                                                                  ACE_ENV_ARG_PARAMETER);
-                              ACE_TRY_CHECK_EX (producer_check);
+                                AVStreams::FlowProducer::_narrow (fep_b.in());
                               consumer =
-                                AVStreams::FlowConsumer::_narrow (fep_a.in()
-                                                                  ACE_ENV_ARG_PARAMETER);
-                              ACE_TRY_CHECK_EX (producer_check);
+                                AVStreams::FlowConsumer::_narrow (fep_a.in());
                             }
                           // At this point they should both be
                           // non-nil
@@ -1184,20 +1095,17 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
                           ACE_ASSERT (!CORBA::is_nil (producer.in ()));
                           ACE_ASSERT (!CORBA::is_nil (consumer.in ()));
                         }
-                      ACE_CATCHANY
+                      catch (const CORBA::Exception& ex)
                         {
                           //Yamuna : Recheck this
-                          ACE_RE_THROW;//_EX (producer_check);
+                          throw;//_EX (producer_check);
                         }
-                      ACE_ENDTRY;
                       CORBA::String_var fep_a_name, fep_b_name;
-                      flowname_any = fep_a->get_property_value ("FlowName"
-                                                                ACE_ENV_ARG_PARAMETER);
+                      flowname_any = fep_a->get_property_value ("FlowName");
                       const char *temp_name;
                       flowname_any.in () >>= temp_name;
                       fep_a_name = CORBA::string_dup (temp_name);
-                      flowname_any = fep_b->get_property_value ("FlowName"
-                                                                ACE_ENV_ARG_PARAMETER);
+                      flowname_any = fep_b->get_property_value ("FlowName");
                       flowname_any.in () >>= temp_name;
                       fep_b_name = CORBA::string_dup (temp_name);
                       AVStreams::QoS flow_qos;
@@ -1215,31 +1123,25 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
                         }
                       flow_connection->connect (producer.in (),
                                                 consumer.in (),
-                                                flow_qos
-                                                ACE_ENV_ARG_PARAMETER);
-                      ACE_TRY_CHECK_EX (flow_connect);
+                                                flow_qos);
                     }
                 }
             }
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "TAO_StreamCtrl::bind:flow_connect block");
+          ex._tao_print_exception ("TAO_StreamCtrl::bind:flow_connect block");
           return 0;
         }
-      ACE_ENDTRY;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // error was thrown because one of the streamendpoints is light profile.
       // Now connect the streams together
       this->sep_a_->connect (this->sep_b_.in (),
                              stream_qos,
-                             flow_spec
-                             ACE_ENV_ARG_PARAMETER);
+                             flow_spec);
     }
-  ACE_ENDTRY;
   return 1;
 }
 
@@ -1248,7 +1150,7 @@ TAO_StreamCtrl::unbind (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed))
 {
-  ACE_TRY
+  try
     {
       if (this->flow_connection_map_.current_size () > 0)
         return;
@@ -1260,26 +1162,24 @@ TAO_StreamCtrl::unbind (void)
       MMDevice_Map::ENTRY *entry = 0;
       for (;a_iterator.next (entry)!= 0;a_iterator.advance ())
         {
-          entry->int_id_.sep_->destroy (flow_spec ACE_ENV_ARG_PARAMETER);
+          entry->int_id_.sep_->destroy (flow_spec);
         }
       MMDevice_Map_Iterator b_iterator (this->mmdevice_b_map_);
       for (;b_iterator.next (entry)!= 0;b_iterator.advance ())
         {
-          entry->int_id_.sep_->destroy (flow_spec ACE_ENV_ARG_PARAMETER);
+          entry->int_id_.sep_->destroy (flow_spec);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamCtrl::unbind");
+      ex._tao_print_exception ("TAO_StreamCtrl::unbind");
       return;
     }
-  ACE_ENDTRY;
 }
 
 void
 TAO_StreamCtrl::unbind_party (AVStreams::StreamEndPoint_ptr /* the_ep */,
-                              const AVStreams::flowSpec &/* the_spec */
-                              ACE_ENV_ARG_DECL_NOT_USED)
+                              const AVStreams::flowSpec &/* the_spec */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::noSuchFlow))
@@ -1288,8 +1188,7 @@ TAO_StreamCtrl::unbind_party (AVStreams::StreamEndPoint_ptr /* the_ep */,
 
 void
 TAO_StreamCtrl::unbind_dev (AVStreams::MMDevice_ptr /* dev */,
-                            const AVStreams::flowSpec & /* the_spec */
-                            ACE_ENV_ARG_DECL_NOT_USED)
+                            const AVStreams::flowSpec & /* the_spec */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::noSuchFlow))
@@ -1298,8 +1197,7 @@ TAO_StreamCtrl::unbind_dev (AVStreams::MMDevice_ptr /* dev */,
 
 AVStreams::VDev_ptr
 TAO_StreamCtrl::get_related_vdev (AVStreams::MMDevice_ptr adev,
-                                  AVStreams::StreamEndPoint_out sep
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+                                  AVStreams::StreamEndPoint_out sep)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed))
 {
@@ -1320,8 +1218,7 @@ TAO_StreamCtrl::get_related_vdev (AVStreams::MMDevice_ptr adev,
 CORBA::Boolean
 
 TAO_StreamCtrl::modify_QoS (AVStreams::streamQoS &new_qos,
-                            const AVStreams::flowSpec &the_spec
-                            ACE_ENV_ARG_DECL)
+                            const AVStreams::flowSpec &the_spec)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::QoSRequestFailed))
@@ -1338,7 +1235,7 @@ TAO_StreamCtrl::modify_QoS (AVStreams::streamQoS &new_qos,
     }
   else
     {
-      ACE_TRY
+      try
         {
           AVStreams::flowSpec in_flowspec;
           AVStreams::flowSpec out_flowspec;
@@ -1390,20 +1287,19 @@ TAO_StreamCtrl::modify_QoS (AVStreams::streamQoS &new_qos,
 
           if (in_flowspec.length () != 0)
             {
-              this->vdev_a_->modify_QoS (new_qos, in_flowspec ACE_ENV_ARG_PARAMETER);
+              this->vdev_a_->modify_QoS (new_qos, in_flowspec);
             }
 
           if (out_flowspec.length () != 0)
             {
-              this->vdev_b_->modify_QoS (new_qos, out_flowspec ACE_ENV_ARG_PARAMETER);
+              this->vdev_b_->modify_QoS (new_qos, out_flowspec);
             }
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamCtrl::modify_QoS");
+          ex._tao_print_exception ("TAO_StreamCtrl::modify_QoS");
           return 0;
         }
-      ACE_ENDTRY;
 
     }
   return 1;
@@ -1427,60 +1323,56 @@ TAO_MCastConfigIf::~TAO_MCastConfigIf (void)
 CORBA::Boolean
 TAO_MCastConfigIf::set_peer (CORBA::Object_ptr peer,
                              AVStreams::streamQoS & qos,
-                             const AVStreams::flowSpec & flow_spec
-                             ACE_ENV_ARG_DECL)
+                             const AVStreams::flowSpec & flow_spec)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::QoSRequestFailed,
                    AVStreams::streamOpFailed))
 {
-  ACE_TRY
+  try
     {
       Peer_Info *info;
       ACE_NEW_RETURN (info,
                       Peer_Info,
                       0);
-      info->peer_ = AVStreams::VDev::_narrow (peer ACE_ENV_ARG_PARAMETER);
+      info->peer_ = AVStreams::VDev::_narrow (peer);
       info->qos_ = qos;
       info->flow_spec_ = flow_spec;
       this->peer_list_.insert_tail (info);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_MCastConfigIf::set_peer");
+      ex._tao_print_exception ("TAO_MCastConfigIf::set_peer");
       return 0;
     }
-  ACE_ENDTRY;
   return 1;
 }
 
 // In future this should be a multicast message instead of point-to-point unicasts.
 void
-TAO_MCastConfigIf::configure (const CosPropertyService::Property & a_configuration
-                              ACE_ENV_ARG_DECL)
+TAO_MCastConfigIf::configure (const CosPropertyService::Property & a_configuration)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Peer_Info *info;
-  ACE_TRY
+  try
     {
       for (this->peer_list_iterator_.first ();
            (info = this->peer_list_iterator_.next ()) != 0;
            this->peer_list_iterator_.advance ())
         {
-          info->peer_->configure (a_configuration ACE_ENV_ARG_PARAMETER);
+          info->peer_->configure (a_configuration);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_MCastConfigIf::set_configure");
+      ex._tao_print_exception (
+        "TAO_MCastConfigIf::set_configure");
       return;
     }
-  ACE_ENDTRY;
 }
 
 
 void
-TAO_MCastConfigIf::set_initial_configuration (const CosPropertyService::Properties &initial
-                                              ACE_ENV_ARG_DECL_NOT_USED)
+TAO_MCastConfigIf::set_initial_configuration (const CosPropertyService::Properties &initial)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->initial_configuration_ = initial;
@@ -1489,13 +1381,12 @@ TAO_MCastConfigIf::set_initial_configuration (const CosPropertyService::Properti
 // In future this should be a multicast message instead of point-to-point unicasts.
 void
 TAO_MCastConfigIf::set_format (const char * flowName,
-                               const char * format_name
-                               ACE_ENV_ARG_DECL)
+                               const char * format_name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported))
 {
   Peer_Info *info;
-  ACE_TRY
+  try
     {
       for (this->peer_list_iterator_.first ();
            (info = this->peer_list_iterator_.next ()) != 0;
@@ -1503,29 +1394,27 @@ TAO_MCastConfigIf::set_format (const char * flowName,
         {
           if (this->in_flowSpec (info->flow_spec_, flowName))
             {
-              info->peer_->set_format (flowName, format_name ACE_ENV_ARG_PARAMETER);
+              info->peer_->set_format (flowName, format_name);
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_MCastConfigIf::set_format");
+      ex._tao_print_exception ("TAO_MCastConfigIf::set_format");
       return;
     }
-  ACE_ENDTRY;
 }
 
 // In future this should be a multicast message instead of point-to-point unicasts.
 void
 TAO_MCastConfigIf::set_dev_params (const char * flowName,
-                                   const CosPropertyService::Properties & new_params
-                                   ACE_ENV_ARG_DECL)
+                                   const CosPropertyService::Properties & new_params)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::PropertyException,
                    AVStreams::streamOpFailed))
 {
   Peer_Info *info;
-  ACE_TRY
+  try
     {
 
       for (this->peer_list_iterator_.first ();
@@ -1534,16 +1423,16 @@ TAO_MCastConfigIf::set_dev_params (const char * flowName,
         {
           if (this->in_flowSpec (info->flow_spec_, flowName))
             {
-              info->peer_->set_dev_params (flowName, new_params ACE_ENV_ARG_PARAMETER);
+              info->peer_->set_dev_params (flowName, new_params);
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_MCastConfigIf::set_dev_params");
+      ex._tao_print_exception (
+        "TAO_MCastConfigIf::set_dev_params");
       return;
     }
-  ACE_ENDTRY;
 }
 
 int
@@ -1586,22 +1475,19 @@ TAO_Base_StreamEndPoint::handle_open (void)
 }
 
 int
-TAO_Base_StreamEndPoint::handle_stop (const AVStreams::flowSpec &
-                                      ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Base_StreamEndPoint::handle_stop (const AVStreams::flowSpec &)
 {
   return 0;
 }
 
 int
-TAO_Base_StreamEndPoint::handle_start (const AVStreams::flowSpec &
-                                       ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Base_StreamEndPoint::handle_start (const AVStreams::flowSpec &)
 {
   return 0;
 }
 
 int
-TAO_Base_StreamEndPoint::handle_destroy (const AVStreams::flowSpec &
-                                         ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Base_StreamEndPoint::handle_destroy (const AVStreams::flowSpec &)
 {
   return 0;
 }
@@ -1625,8 +1511,7 @@ TAO_Base_StreamEndPoint::handle_postconnect (AVStreams::flowSpec &)
 
 // The following function is for backward compatibility.
 CORBA::Boolean
-TAO_Base_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &
-                                                 ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Base_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &)
 {
   return 1;
 }
@@ -1710,8 +1595,7 @@ TAO_StreamEndPoint::TAO_StreamEndPoint (void)
 CORBA::Boolean
 TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
                              AVStreams::streamQoS &qos,
-                             const AVStreams::flowSpec &the_spec
-                             ACE_ENV_ARG_DECL)
+                             const AVStreams::flowSpec &the_spec)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::QoSRequestFailed,
@@ -1721,7 +1605,7 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
     ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::Connect ()\n"));
   CORBA::Boolean retv = 0;
   this->peer_sep_ = AVStreams::StreamEndPoint::_duplicate (responder);
-  ACE_TRY_EX (negotiate)
+  try
     {
       if (!CORBA::is_nil (this->negotiator_.in ()))
         {
@@ -1736,29 +1620,25 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
             {
               CORBA::Boolean result =
                 this->negotiator_->negotiate (peer_negotiator,
-                                              qos
-                                              ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK_EX (negotiate);
+                                              qos);
               if (!result)
                 if (TAO_debug_level > 0)
                   ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::Connect (): negotiate failed\n"));
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamEndPoint::negotiate");
+      ex._tao_print_exception ("TAO_StreamEndPoint::negotiate");
     }
-  ACE_ENDTRY;
 
-  ACE_TRY_EX (available_protocols)
+  try
     {
       if (this->protocols_.length () > 0)
         {
           // choose protocols based on what the remote endpoint can support.
           CORBA::Any_var protocols_any =
-            responder->get_property_value ("AvailableProtocols" ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (available_protocols);
+            responder->get_property_value ("AvailableProtocols");
           AVStreams::protocolSpec peer_protocols;
           AVStreams::protocolSpec *temp_protocols;
           protocols_any.in () >>= temp_protocols;
@@ -1776,12 +1656,11 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Availableprotocols property not defined\n"));
     }
-  ACE_ENDTRY;
-  ACE_TRY
+  try
     {
       AVStreams::streamQoS network_qos;
       if (qos.length () > 0)
@@ -1840,8 +1719,7 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
       retv = responder->request_connection (streamendpoint.in (),
                                             0,
                                             network_qos,
-                                            flow_spec
-                                            ACE_ENV_ARG_PARAMETER);
+                                            flow_spec);
 
       if (TAO_debug_level > 0)
          ACE_DEBUG ((LM_DEBUG, "%N:%l request_connection returned %d\n", retv));
@@ -1879,12 +1757,11 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
       // Make the upcall to the app
       retv = this->handle_postconnect (flow_spec);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamEndPoint::connect");
+      ex._tao_print_exception ("TAO_StreamEndPoint::connect");
       return 0;
     }
-  ACE_ENDTRY;
   return retv;
 }
 
@@ -1906,13 +1783,12 @@ TAO_StreamEndPoint::translate_qos (const AVStreams::streamQoS& application_qos,
 // Empty the_spec --> apply to all flows
 
 void
-TAO_StreamEndPoint::stop (const AVStreams::flowSpec &flow_spec
-                          ACE_ENV_ARG_DECL)
+TAO_StreamEndPoint::stop (const AVStreams::flowSpec &flow_spec)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow))
 {
   // Make the upcall into the app
-  this->handle_stop (flow_spec ACE_ENV_ARG_PARAMETER);
+  this->handle_stop (flow_spec);
 
   if (flow_spec.length () > 0)
     {
@@ -1957,14 +1833,13 @@ TAO_StreamEndPoint::stop (const AVStreams::flowSpec &flow_spec
 // Start the physical flow of data on the stream
 // Empty the_spec --> apply to all flows
 void
-TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec
-                           ACE_ENV_ARG_DECL)
+TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow))
 {
   if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::start\n"));
   // Make the upcall into the app
-  this->handle_start (flow_spec ACE_ENV_ARG_PARAMETER);
+  this->handle_start (flow_spec);
 
   if (flow_spec.length () > 0)
     {
@@ -2047,19 +1922,16 @@ TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec
 
 // Close the connection
 void
-TAO_StreamEndPoint::destroy (const AVStreams::flowSpec &flow_spec
-                             ACE_ENV_ARG_DECL)
+TAO_StreamEndPoint::destroy (const AVStreams::flowSpec &flow_spec)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow))
 {
-  CORBA::Any_var vdev_any = this->get_property_value ("Related_VDev"
-                                                      ACE_ENV_ARG_PARAMETER);
+  CORBA::Any_var vdev_any = this->get_property_value ("Related_VDev");
 
   AVStreams::VDev_ptr vdev;
 
   vdev_any.in() >>= vdev;
-  CORBA::Any_var mc_any = vdev->get_property_value ("Related_MediaCtrl"
-                                                    ACE_ENV_ARG_PARAMETER);
+  CORBA::Any_var mc_any = vdev->get_property_value ("Related_MediaCtrl");
 
   // The Related_MediaCtrl property was inserted as a CORBA::Object, so we
   // must extract it as the same type.
@@ -2172,7 +2044,7 @@ TAO_StreamEndPoint::destroy (const AVStreams::flowSpec &flow_spec
     }
 
   // Make the upcall into the app
-  //  this->handle_destroy (the_spec ACE_ENV_ARG_PARAMETER);
+  //  this->handle_destroy (the_spec);
   //
 }
 
@@ -2182,8 +2054,7 @@ CORBA::Boolean
 TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiator*/,
                                         CORBA::Boolean /*is_mcast*/,
                                         AVStreams::streamQoS &qos,
-                                        AVStreams::flowSpec &flow_spec
-                                        ACE_ENV_ARG_DECL)
+                                        AVStreams::flowSpec &flow_spec)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpDenied,
                    AVStreams::noSuchFlow,
@@ -2196,7 +2067,7 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato
                 "\n(%P|%t) TAO_StreamEndPoint::request_connection called"));
 
   int result = 0;
-  ACE_TRY
+  try
     {
       AVStreams::streamQoS network_qos;
       if (qos.length () > 0)
@@ -2259,22 +2130,19 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato
         return 0;
 
       // Make the upcall to the app
-      result = this->handle_connection_requested (flow_spec ACE_ENV_ARG_PARAMETER);
+      result = this->handle_connection_requested (flow_spec);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "TAO_StreamEndpoint::request_connection");
+      ex._tao_print_exception ("TAO_StreamEndpoint::request_connection");
       return 0;
     }
-  ACE_ENDTRY;
   return result;
 }
 
 int
 TAO_StreamEndPoint::change_qos (AVStreams::streamQoS &new_qos,
-                                const AVStreams::flowSpec &the_flows
-                                ACE_ENV_ARG_DECL_NOT_USED)
+                                const AVStreams::flowSpec &the_flows)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -2310,8 +2178,7 @@ TAO_StreamEndPoint::change_qos (AVStreams::streamQoS &new_qos,
 // Refers to modification of transport QoS.
 CORBA::Boolean
 TAO_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos,
-                                const AVStreams::flowSpec &the_flows
-                                ACE_ENV_ARG_DECL)
+                                const AVStreams::flowSpec &the_flows)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::QoSRequestFailed))
@@ -2320,7 +2187,7 @@ TAO_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos,
   ACE_DEBUG ((LM_DEBUG,
               "TAO_StreamEndPoint::modify_QoS\n"));
 
-  int result =  this->change_qos (new_qos, the_flows ACE_ENV_ARG_PARAMETER);
+  int result =  this->change_qos (new_qos, the_flows);
 
   if (result != 0)
     return 0;
@@ -2332,33 +2199,30 @@ TAO_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos,
 // Sets the list of protocols this streamendpoint can understand.
 
 CORBA::Boolean
-TAO_StreamEndPoint::set_protocol_restriction (const AVStreams::protocolSpec &protocols
-                                              ACE_ENV_ARG_DECL)
+TAO_StreamEndPoint::set_protocol_restriction (const AVStreams::protocolSpec &protocols)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       CORBA::Any protocol_restriction_any;
 
       protocol_restriction_any <<= protocols;
       this->define_property ("ProtocolRestriction",
-                             protocol_restriction_any
-                             ACE_ENV_ARG_PARAMETER);
+                             protocol_restriction_any);
       this->protocols_ = protocols;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamEndPoint::set_protocol_restriction");
+      ex._tao_print_exception (
+        "TAO_StreamEndPoint::set_protocol_restriction");
       return 0;
     }
-  ACE_ENDTRY;
   return 1;
 }
 
 
 void
-TAO_StreamEndPoint::disconnect (const AVStreams::flowSpec &the_spec
-                                ACE_ENV_ARG_DECL_NOT_USED)
+TAO_StreamEndPoint::disconnect (const AVStreams::flowSpec &the_spec)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::streamOpFailed))
@@ -2371,8 +2235,7 @@ TAO_StreamEndPoint::disconnect (const AVStreams::flowSpec &the_spec
 void
 TAO_StreamEndPoint::set_FPStatus (const AVStreams::flowSpec &/*the_spec*/,
                                   const char *fp_name,
-                                  const CORBA::Any &fp_settings
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+                                  const CORBA::Any &fp_settings)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::FPError))
@@ -2385,8 +2248,7 @@ TAO_StreamEndPoint::set_FPStatus (const AVStreams::flowSpec &/*the_spec*/,
 
 
 CORBA::Object_ptr
-TAO_StreamEndPoint::get_fep (const char *flow_name
-                             ACE_ENV_ARG_DECL_NOT_USED)
+TAO_StreamEndPoint::get_fep (const char *flow_name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported,
                    AVStreams::noSuchFlow))
@@ -2399,15 +2261,14 @@ TAO_StreamEndPoint::get_fep (const char *flow_name
 }
 
 char*
-TAO_StreamEndPoint::add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep
-                                            ACE_ENV_ARG_DECL)
+TAO_StreamEndPoint::add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::streamOpFailed))
 {
   ACE_CString flow_name;
 
-  ACE_TRY
+  try
     {
       // exception implies the flow name is not defined and is system
       // generated.
@@ -2419,59 +2280,53 @@ TAO_StreamEndPoint::add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep
       CORBA::Any flowname_any;
       flowname_any <<= flow_name.c_str ();
       fep->define_property ("Flow",
-                            flowname_any
-                            ACE_ENV_ARG_PARAMETER);
+                            flowname_any);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "TAO_StreamEndPoint::add_fep");
+      ex._tao_print_exception ("TAO_StreamEndPoint::add_fep");
       return 0;
     }
-  ACE_ENDTRY;
   return ACE_OS::strdup( flow_name.c_str () );
 }
 
 char*
-TAO_StreamEndPoint::add_fep_i (AVStreams::FlowEndPoint_ptr fep
-                               ACE_ENV_ARG_DECL)
+TAO_StreamEndPoint::add_fep_i (AVStreams::FlowEndPoint_ptr fep)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::streamOpFailed))
 {
   CORBA::String_var flow_name;
-  ACE_TRY
+  try
     {
       CORBA::Any_var flow_name_any =
-        fep->get_property_value ("FlowName" ACE_ENV_ARG_PARAMETER);
+        fep->get_property_value ("FlowName");
 
       const char *tmp;
       flow_name_any >>= tmp;
       flow_name = CORBA::string_dup (tmp);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       flow_name =
-        this->add_fep_i_add_property (fep ACE_ENV_ARG_PARAMETER);
+        this->add_fep_i_add_property (fep);
     }
-  ACE_ENDTRY;
   return flow_name._retn ();
 }
 
 char *
-TAO_StreamEndPoint::add_fep (CORBA::Object_ptr fep_obj
-                             ACE_ENV_ARG_DECL)
+TAO_StreamEndPoint::add_fep (CORBA::Object_ptr fep_obj)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::streamOpFailed))
 {
   AVStreams::FlowEndPoint_var fep =
-    AVStreams::FlowEndPoint::_narrow (fep_obj ACE_ENV_ARG_PARAMETER);
+    AVStreams::FlowEndPoint::_narrow (fep_obj);
 
   CORBA::String_var flow_name =
-    this->add_fep_i (fep.in () ACE_ENV_ARG_PARAMETER);
+    this->add_fep_i (fep.in ());
 
-  ACE_TRY
+  try
     {
       fep->lock ();
       // Add it to the sequence of flowNames supported.
@@ -2489,33 +2344,30 @@ TAO_StreamEndPoint::add_fep (CORBA::Object_ptr fep_obj
       CORBA::Any flows_any;
       flows_any <<= this->flows_;
       this->define_property ("Flows",
-                             flows_any
-                             ACE_ENV_ARG_PARAMETER);
+                             flows_any);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamEndPoint::add_fep");
+      ex._tao_print_exception ("TAO_StreamEndPoint::add_fep");
       return 0;
     }
-  ACE_ENDTRY;
   return flow_name._retn ();
 }
 
 
 void
-TAO_StreamEndPoint::remove_fep (const char *flow_name
-                                ACE_ENV_ARG_DECL)
+TAO_StreamEndPoint::remove_fep (const char *flow_name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::streamOpFailed))
 {
-  ACE_TRY
+  try
     {
       ACE_CString fep_name_key (flow_name);
       AVStreams::FlowEndPoint_var fep_entry;
       // Remove the fep from the hash table.
       if (this->fep_map_.unbind (fep_name_key, fep_entry)!= 0)
-        ACE_THROW (AVStreams::streamOpFailed ());
+        throw AVStreams::streamOpFailed ();
       // redefine the "Flows" property
       AVStreams::flowSpec new_flows (this->flows_.length ());
       for (u_int i=0, j=0 ; i <this->flows_.length (); i++)
@@ -2526,47 +2378,42 @@ TAO_StreamEndPoint::remove_fep (const char *flow_name
       flows <<= new_flows;
       this->flows_ = new_flows;
       this->define_property ("Flows",
-                             flows
-                             ACE_ENV_ARG_PARAMETER);
+                             flows);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamEndPoint::remove_fep");
+      ex._tao_print_exception ("TAO_StreamEndPoint::remove_fep");
     }
-  ACE_ENDTRY;
 }
 
 // Sets the negotiator object.
 void
-TAO_StreamEndPoint::set_negotiator (AVStreams::Negotiator_ptr new_negotiator
-                                    ACE_ENV_ARG_DECL)
+TAO_StreamEndPoint::set_negotiator (AVStreams::Negotiator_ptr new_negotiator)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       CORBA::Any negotiator;
       negotiator <<= new_negotiator;
       this->define_property ("Negotiator",
-                             negotiator
-                             ACE_ENV_ARG_PARAMETER);
+                             negotiator);
       this->negotiator_ = AVStreams::Negotiator::_duplicate (new_negotiator);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamEndPoint::set_negotiator");
+      ex._tao_print_exception (
+        "TAO_StreamEndPoint::set_negotiator");
     }
-  ACE_ENDTRY;
 }
 
 
 // Sets the public key used for this streamendpoint.
 void
 TAO_StreamEndPoint::set_key (const char *flow_name,
-                             const AVStreams::key & the_key
-                             ACE_ENV_ARG_DECL)
+                             const AVStreams::key & the_key)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       this->key_ = the_key;
       CORBA::Any PublicKey;
@@ -2574,20 +2421,17 @@ TAO_StreamEndPoint::set_key (const char *flow_name,
       char PublicKey_property [BUFSIZ];
       ACE_OS::sprintf (PublicKey_property, "%s_PublicKey", flow_name);
       this->define_property (PublicKey_property,
-                             PublicKey
-                             ACE_ENV_ARG_PARAMETER);
+                             PublicKey);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamEndPoint::set_key");
+      ex._tao_print_exception ("TAO_StreamEndPoint::set_key");
     }
-  ACE_ENDTRY;
 }
 
 // Set the source id.
 void
-TAO_StreamEndPoint::set_source_id (CORBA::Long source_id
-                                   ACE_ENV_ARG_DECL_NOT_USED)
+TAO_StreamEndPoint::set_source_id (CORBA::Long source_id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->source_id_ = source_id;
@@ -2595,8 +2439,7 @@ TAO_StreamEndPoint::set_source_id (CORBA::Long source_id
 
 CORBA::Boolean
 TAO_StreamEndPoint::multiconnect (AVStreams::streamQoS &/*the_qos*/,
-                                  AVStreams::flowSpec &/*flow_spec*/
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+                                  AVStreams::flowSpec &/*flow_spec*/)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::multiconnect\n"));
@@ -2646,15 +2489,14 @@ TAO_StreamEndPoint_A::TAO_StreamEndPoint_A (void)
 // IP Multicast style connect.
 CORBA::Boolean
 TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
-                                    AVStreams::flowSpec &flow_spec
-                                    ACE_ENV_ARG_DECL)
+                                    AVStreams::flowSpec &flow_spec)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::QoSRequestFailed,
                    AVStreams::streamOpFailed))
 {
   if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPointA::multiconnect\n"));
-  ACE_TRY
+  try
     {
       int result = 0;
       TAO_AV_QoS qos (stream_qos);
@@ -2678,7 +2520,7 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
           // fep set for that flowconnection.
           if (this->fep_map_.find (mcast_key, flow_endpoint) == 0)
             {
-              ACE_TRY_EX (narrow)
+              try
                 {
                   AVStreams::QoS flow_qos;
                   result = qos.get_flow_qos (forward_entry->flowname (), flow_qos);
@@ -2686,34 +2528,28 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
                     if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "QoS not found for %s\n", forward_entry->flowname ()));
                   // Narrow it to FlowProducer.
                   AVStreams::FlowProducer_var producer;
-                  producer = AVStreams::FlowProducer::_narrow (flow_endpoint.in() ACE_ENV_ARG_PARAMETER);
+                  producer = AVStreams::FlowProducer::_narrow (flow_endpoint.in());
                   //
-                  ACE_TRY_CHECK_EX (narrow);
                   // Else narrow succeeeded.
                   if (!CORBA::is_nil (producer.in ()))
                     {
                       AVStreams::FlowConnection_var flow_connection;
-                      ACE_TRY_EX (flow_connection)
+                      try
                         {
                           if (CORBA::is_nil (this->streamctrl_.in ()))
                               {
                                 CORBA::Any_var streamctrl_any;
-                                streamctrl_any = this->get_property_value ("Related_StreamCtrl"
-                                                                           ACE_ENV_ARG_PARAMETER);
+                                streamctrl_any = this->get_property_value ("Related_StreamCtrl");
                                 AVStreams::StreamCtrl_ptr streamctrl;
                                 streamctrl_any.in () >>= streamctrl;
                                 this->streamctrl_ = AVStreams::StreamCtrl::_duplicate (streamctrl);
                               }
 
                           CORBA::Object_var flow_connection_obj =
-                            this->streamctrl_->get_flow_connection (forward_entry->flowname ()
-                                                                    ACE_ENV_ARG_PARAMETER);
-                          ACE_TRY_CHECK_EX (flow_connection);
-                          flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj.in ()
-                                                                                ACE_ENV_ARG_PARAMETER);
-                          ACE_TRY_CHECK_EX (flow_connection);
+                            this->streamctrl_->get_flow_connection (forward_entry->flowname ());
+                          flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj.in ());
                         }
-                      ACE_CATCHANY
+                      catch (const CORBA::Exception& ex)
                         {
                           TAO_FlowConnection *flowConnection;
                           ACE_NEW_RETURN (flowConnection,
@@ -2725,31 +2561,27 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
                           flowConnection->set_protocol (forward_entry->carrier_protocol_str ());
                           flow_connection = flowConnection->_this ();
                           this->streamctrl_->set_flow_connection (forward_entry->flowname (),
-                                                                  flow_connection.in ()
-                                                                  ACE_ENV_ARG_PARAMETER);
+                                                                  flow_connection.in ());
                         }
-                      ACE_ENDTRY;
                       if (ACE_OS::strcmp (forward_entry->flow_protocol_str (), "") != 0)
                         {
                           CORBA::Any fp_settings;
                           flow_connection->use_flow_protocol (forward_entry->flow_protocol_str (),
-                                                              fp_settings
-                                                              ACE_ENV_ARG_PARAMETER);
+                                                              fp_settings);
                         }
                       result = flow_connection->add_producer (producer.in (),
-                                                              flow_qos
-                                                              ACE_ENV_ARG_PARAMETER);
+                                                              flow_qos);
                       if (result == 0)
                         ACE_ERROR_RETURN ((LM_ERROR, "TAO_StreamEndPoint_A::multiconnect: add_producer failed\n"), 0);
                     }
                 }
-              ACE_CATCHANY
+              catch (const CORBA::Exception& ex)
                 {
                   // Narrow failed and since its not a flowproducer its an error.
-                  ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "FlowProducer::_narrow");
+                  ex._tao_print_exception (
+                    "FlowProducer::_narrow");
                   ACE_ERROR_RETURN ((LM_ERROR, "sep_a doesn't contain a flowproducer"), 0);
                 }
-              ACE_ENDTRY;
             }
           else
             {
@@ -2821,12 +2653,12 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamEndPoint_A::multiconnect");
+      ex._tao_print_exception (
+        "TAO_StreamEndPoint_A::multiconnect");
       return 0;
     }
-  ACE_ENDTRY;
   return 1;
 }
 
@@ -2834,8 +2666,7 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
 CORBA::Boolean
 TAO_StreamEndPoint_A::connect_leaf (AVStreams::StreamEndPoint_B_ptr /* the_ep */,
                                     AVStreams::streamQoS & /* the_qos */,
-                                    const AVStreams::flowSpec & /* the_flows */
-                                    ACE_ENV_ARG_DECL)
+                                    const AVStreams::flowSpec & /* the_flows */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::noSuchFlow,
@@ -2848,8 +2679,7 @@ TAO_StreamEndPoint_A::connect_leaf (AVStreams::StreamEndPoint_B_ptr /* the_ep */
 // Multicast not supported yet.
 void
 TAO_StreamEndPoint_A::disconnect_leaf (AVStreams::StreamEndPoint_B_ptr /* the_ep */,
-                                       const AVStreams::flowSpec & /* theSpec */
-                                       ACE_ENV_ARG_DECL)
+                                       const AVStreams::flowSpec & /* theSpec */)
 
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
@@ -2857,7 +2687,7 @@ TAO_StreamEndPoint_A::disconnect_leaf (AVStreams::StreamEndPoint_B_ptr /* the_ep
                    AVStreams::notSupported))
 {
 
-  ACE_THROW (AVStreams::notSupported ());
+  throw AVStreams::notSupported ();
 
 }
 
@@ -2877,8 +2707,7 @@ TAO_StreamEndPoint_B::TAO_StreamEndPoint_B (void)
 
 CORBA::Boolean
 TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos,
-                                    AVStreams::flowSpec &flow_spec
-                                    ACE_ENV_ARG_DECL)
+                                    AVStreams::flowSpec &flow_spec)
      ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::noSuchFlow,
@@ -2886,7 +2715,7 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos,
                      AVStreams::FPError))
 {
   if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint_B::multiconnect\n"));
-  ACE_TRY
+  try
     {
       int result = 0;
       TAO_AV_QoS qos (stream_qos);
@@ -2902,50 +2731,43 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos,
           if (this->fep_map_.find (mcast_key, flow_endpoint ) == 0)
             {
               AVStreams::FlowConsumer_var consumer;
-              ACE_TRY_EX (narrow)
+              try
                 {
-                  consumer = AVStreams::FlowConsumer::_narrow (flow_endpoint.in () ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK_EX (narrow);
+                  consumer = AVStreams::FlowConsumer::_narrow (flow_endpoint.in ());
                 }
-              ACE_CATCHANY
+              catch (const CORBA::Exception& ex)
                 {
-                  ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "FlowConsumer::_narrow");
+                  ex._tao_print_exception (
+                    "FlowConsumer::_narrow");
                   ACE_ERROR_RETURN ((LM_ERROR, "sep_b doesn't contain a flowconsumer"), 0);
                 }
-              ACE_ENDTRY;
               AVStreams::QoS flow_qos;
               result = qos.get_flow_qos (forward_entry->flowname (), flow_qos);
               if (result < 0)
                 if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "QoS not found for %s", forward_entry->flowname ()));
               AVStreams::FlowConnection_var flow_connection;
-              ACE_TRY_EX (flow_connection)
+              try
                 {
                   if (CORBA::is_nil (this->streamctrl_.in ()))
                     {
                       CORBA::Any_var streamctrl_any;
-                      streamctrl_any = this->get_property_value ("Related_StreamCtrl"
-                                                                 ACE_ENV_ARG_PARAMETER);
+                      streamctrl_any = this->get_property_value ("Related_StreamCtrl");
                       AVStreams::StreamCtrl_ptr streamctrl;
                       streamctrl_any.in () >>= streamctrl;
                       this->streamctrl_ = AVStreams::StreamCtrl::_duplicate (streamctrl);
                     }
                   CORBA::Object_var flow_connection_obj =
-                    this->streamctrl_->get_flow_connection (forward_entry->flowname ()
-                                                            ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK_EX (flow_connection);
-                  flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj.in ()
-                                                                        ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK_EX (flow_connection);
+                    this->streamctrl_->get_flow_connection (forward_entry->flowname ());
+                  flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj.in ());
                 }
-              ACE_CATCHANY
+              catch (const CORBA::Exception& ex)
                 {
-                  ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamEndPoint_B::multiconnect::get_flow_connection");
+                  ex._tao_print_exception (
+                    "TAO_StreamEndPoint_B::multiconnect::get_flow_connection");
                   return 0;
                 }
-              ACE_ENDTRY;
               result = flow_connection->add_consumer (consumer.in (),
-                                                      flow_qos
-                                                      ACE_ENV_ARG_PARAMETER);
+                                                      flow_qos);
               if (result == 0)
                 ACE_ERROR_RETURN ((LM_ERROR, "TAO_StreamEndPoint_B::multiconnect:add_consumer failed\n"), 0);
             }
@@ -2995,12 +2817,12 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos,
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamEndPoint_B::multiconnect");
+      ex._tao_print_exception (
+        "TAO_StreamEndPoint_B::multiconnect");
       return 0;
     }
-  ACE_ENDTRY;
   return 1;
 }
 
@@ -3024,8 +2846,7 @@ CORBA::Boolean
 TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl,
                     AVStreams::VDev_ptr the_peer_dev,
                     AVStreams::streamQoS &the_qos,
-                    const AVStreams::flowSpec &the_spec
-                    ACE_ENV_ARG_DECL)
+                    const AVStreams::flowSpec &the_spec)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::QoSRequestFailed,
@@ -3035,7 +2856,7 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl,
   ACE_UNUSED_ARG (the_spec);
 
   CORBA::Boolean result = 0;
-  ACE_TRY
+  try
     {
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG, "(%P|%t) TAO_VDev::set_peer: called\n"));
@@ -3044,35 +2865,31 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl,
       CORBA::Any anyval;
       anyval <<= the_peer_dev;
       this->define_property ("Related_VDev",
-                             anyval
-                             ACE_ENV_ARG_PARAMETER);
+                             anyval);
 
 
       this->streamctrl_ = AVStreams::StreamCtrl::_duplicate (the_ctrl);
       this->peer_ = AVStreams::VDev::_duplicate (the_peer_dev);
 
       CORBA::Any_var anyptr;
-      anyptr = this->peer_->get_property_value ("Related_MediaCtrl"
-                                                ACE_ENV_ARG_PARAMETER);
+      anyptr = this->peer_->get_property_value ("Related_MediaCtrl");
 
       CORBA::Object_ptr media_ctrl_obj = 0;
 
       anyptr.in () >>= CORBA::Any::to_object(media_ctrl_obj);
 
-      result = this->set_media_ctrl (media_ctrl_obj ACE_ENV_ARG_PARAMETER);
+      result = this->set_media_ctrl (media_ctrl_obj);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_VDev::set_peer");
+      ex._tao_print_exception ("TAO_VDev::set_peer");
       return 0;
     }
-  ACE_ENDTRY;
   return result;
 }
 
 CORBA::Boolean
-TAO_VDev::set_media_ctrl (CORBA::Object_ptr media_ctrl
-                          ACE_ENV_ARG_DECL_NOT_USED)
+TAO_VDev::set_media_ctrl (CORBA::Object_ptr media_ctrl)
 
 {
   //  since the media ctrl is not stored or used, delete it.
@@ -3087,8 +2904,7 @@ CORBA::Boolean
 TAO_VDev::set_Mcast_peer (AVStreams::StreamCtrl_ptr /* the_ctrl */,
                           AVStreams::MCastConfigIf_ptr mcast_peer,
                           AVStreams::streamQoS &/* the_qos */,
-                          const AVStreams::flowSpec &/* the_spec */
-                          ACE_ENV_ARG_DECL_NOT_USED)
+                          const AVStreams::flowSpec &/* the_spec */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::QoSRequestFailed,
@@ -3100,8 +2916,7 @@ TAO_VDev::set_Mcast_peer (AVStreams::StreamCtrl_ptr /* the_ctrl */,
 
 // applications should override this to handle configuration changes.
 void
-TAO_VDev::configure (const CosPropertyService::Property &/*the_config_mesg*/
-                     ACE_ENV_ARG_DECL_NOT_USED)
+TAO_VDev::configure (const CosPropertyService::Property &/*the_config_mesg*/)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::PropertyException,
                    AVStreams::streamOpFailed))
@@ -3111,12 +2926,11 @@ TAO_VDev::configure (const CosPropertyService::Property &/*the_config_mesg*/
 // sets the media format used for the flowname as a property.
 void
 TAO_VDev::set_format (const char *flowName,
-                      const char *format_name
-                      ACE_ENV_ARG_DECL)
+                      const char *format_name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported))
 {
-  ACE_TRY
+  try
     {
       if (flowName == 0 || format_name == 0)
         ACE_ERROR ((LM_ERROR, "TAO_VDev::set_format: flowName or format_name is null\n"));
@@ -3125,28 +2939,25 @@ TAO_VDev::set_format (const char *flowName,
       CORBA::Any format;
       format <<= format_name;
       this->define_property (format_property,
-                             format
-                             ACE_ENV_ARG_PARAMETER);
+                             format);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_VDev::set_format");
+      ex._tao_print_exception ("TAO_VDev::set_format");
       return;
     }
-  ACE_ENDTRY;
   return;
 }
 
 // sets the device parameters for the flowname as a property.
 void
 TAO_VDev::set_dev_params (const char *flowName,
-                          const CosPropertyService::Properties &new_params
-                          ACE_ENV_ARG_DECL)
+                          const CosPropertyService::Properties &new_params)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::PropertyException,
                    AVStreams::streamOpFailed))
 {
-  ACE_TRY
+  try
     {
       if (flowName == 0)
         ACE_ERROR ((LM_ERROR, "TAO_VDev::set_dev_params:flowName is null\n"));
@@ -3155,23 +2966,20 @@ TAO_VDev::set_dev_params (const char *flowName,
       CORBA::Any devParams;
       devParams <<= new_params;
       this->define_property (devParams_property,
-                             devParams
-                             ACE_ENV_ARG_PARAMETER);
+                             devParams);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_VDev::set_dev_params");
+      ex._tao_print_exception ("TAO_VDev::set_dev_params");
       return;
     }
-  ACE_ENDTRY;
   return;
 }
 
 // QoS Modification should be handled by the application currently.
 CORBA::Boolean
 TAO_VDev::modify_QoS (AVStreams::streamQoS &the_qos,
-                      const AVStreams::flowSpec &flowspec
-                      ACE_ENV_ARG_DECL)
+                      const AVStreams::flowSpec &flowspec)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::QoSRequestFailed))
@@ -3190,13 +2998,12 @@ TAO_VDev::modify_QoS (AVStreams::streamQoS &the_qos,
           AVStreams::StreamEndPoint_A_ptr sep_a;
 
           CORBA::Any_ptr streamendpoint_a_any =
-          this->get_property_value ("Related_StreamEndpoint"
-                                    ACE_ENV_ARG_PARAMETER);
+          this->get_property_value ("Related_StreamEndpoint");
 
           *streamendpoint_a_any >>= sep_a;
           if (sep_a != 0)
             {
-              sep_a->modify_QoS (the_qos, flowspec ACE_ENV_ARG_PARAMETER);
+              sep_a->modify_QoS (the_qos, flowspec);
             }
           else ACE_DEBUG ((LM_DEBUG,
                            "Stream EndPoint Not Found\n"));
@@ -3206,10 +3013,9 @@ TAO_VDev::modify_QoS (AVStreams::streamQoS &the_qos,
           AVStreams::StreamEndPoint_B_ptr sep_b;
 
           CORBA::Any_ptr streamendpoint_b_any =
-          this->get_property_value ("Related_StreamEndpoint"
-                                    ACE_ENV_ARG_PARAMETER);
+          this->get_property_value ("Related_StreamEndpoint");
           *streamendpoint_b_any >>= sep_b;
-          sep_b->modify_QoS (the_qos, flowspec ACE_ENV_ARG_PARAMETER);
+          sep_b->modify_QoS (the_qos, flowspec);
         }
   }
   return 1;
@@ -3238,15 +3044,14 @@ AVStreams::StreamCtrl_ptr
 TAO_MMDevice::bind (AVStreams::MMDevice_ptr peer_device,
                     AVStreams::streamQoS &the_qos,
                     CORBA::Boolean_out is_met,
-                    const AVStreams::flowSpec &the_spec
-                    ACE_ENV_ARG_DECL)
+                    const AVStreams::flowSpec &the_spec)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::noSuchFlow,
                    AVStreams::QoSRequestFailed))
 {
   AVStreams::StreamCtrl_ptr streamctrl (AVStreams::StreamCtrl::_nil ());
-  ACE_TRY
+  try
     {
       ACE_UNUSED_ARG (is_met);
       ACE_NEW_RETURN (this->stream_ctrl_,
@@ -3256,16 +3061,14 @@ TAO_MMDevice::bind (AVStreams::MMDevice_ptr peer_device,
       this->stream_ctrl_->bind_devs (peer_device,
                                      mmdevice.in (),
                                      the_qos,
-                                     the_spec
-                                     ACE_ENV_ARG_PARAMETER);
+                                     the_spec);
       streamctrl = this->stream_ctrl_->_this ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_MMDevice::bind");
+      ex._tao_print_exception ("TAO_MMDevice::bind");
       return streamctrl;
     }
-  ACE_ENDTRY;
   return streamctrl;
 }
 
@@ -3274,8 +3077,7 @@ AVStreams::StreamCtrl_ptr
 TAO_MMDevice::bind_mcast (AVStreams::MMDevice_ptr first_peer,
                           AVStreams::streamQoS &the_qos,
                           CORBA::Boolean_out is_met,
-                          const AVStreams::flowSpec &the_spec
-                          ACE_ENV_ARG_DECL_NOT_USED)
+                          const AVStreams::flowSpec &the_spec)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::noSuchFlow,
@@ -3296,21 +3098,19 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
                           AVStreams::streamQoS &the_qos,
                           CORBA::Boolean_out met_qos,
                           char *&/*named_vdev*/,
-                          const AVStreams::flowSpec &flow_spec
-                          ACE_ENV_ARG_DECL)
+                          const AVStreams::flowSpec &flow_spec)
 {
   AVStreams::StreamEndPoint_A_ptr sep_a (AVStreams::StreamEndPoint_A::_nil ());
   AVStreams::StreamEndPoint_B_ptr sep_b (AVStreams::StreamEndPoint_B::_nil ());
   AVStreams::StreamEndPoint_ptr sep (AVStreams::StreamEndPoint::_nil ());
-  ACE_TRY
+  try
     {
       switch (type)
         {
         case MMDEVICE_A:
           {
             if (this->endpoint_strategy_->create_A (sep_a,
-                                                    the_vdev
-                                                    ACE_ENV_ARG_PARAMETER) == -1)
+                                                    the_vdev) == -1)
               ACE_ERROR_RETURN ((LM_ERROR,
                                  "TAO_MMDevice::create_A_B (%P|%t) - "
                                  "error in create_A\n"),
@@ -3321,8 +3121,7 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
         case MMDEVICE_B:
           {
             if (this->endpoint_strategy_->create_B (sep_b,
-                                                    the_vdev
-                                                    ACE_ENV_ARG_PARAMETER) == -1)
+                                                    the_vdev) == -1)
               ACE_ERROR_RETURN ((LM_ERROR,
                                  "TAO_MMDevice::create_A_B (%P|%t) - "
                                  "error in create_B\n"),
@@ -3344,22 +3143,19 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
               ACE_CString flow_key (forward_entry.flowname ());
               AVStreams::FDev_var flow_dev;
               AVStreams::FlowConnection_var flowconnection;
-              ACE_TRY_EX (flowconnection)
+              try
                 {
                   // Get the flowconnection for this flow.
                   //static int blah = 0; if(blah == 1){blah=0; abort();}else{blah=1;}
                   CORBA::Object_var flowconnection_obj =
-                    streamctrl->get_flow_connection (forward_entry.flowname () ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK_EX (flowconnection);
+                    streamctrl->get_flow_connection (forward_entry.flowname ());
                         printf("successfully called get_flow_connection\n");
                   if (!CORBA::is_nil (flowconnection_obj.in ()))
                     {
-                      flowconnection = AVStreams::FlowConnection::_narrow (flowconnection_obj.in ()
-                                                                           ACE_ENV_ARG_PARAMETER);
-                      ACE_TRY_CHECK_EX (flowconnection);
+                      flowconnection = AVStreams::FlowConnection::_narrow (flowconnection_obj.in ());
                     }
                 }
-              ACE_CATCH(AVStreams::noSuchFlow, nsf)
+              catch (const AVStreams::noSuchFlow& nsf)
                 {
                           TAO_FlowConnection *flowConnection;
                           ACE_NEW_RETURN (flowConnection,
@@ -3367,15 +3163,14 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
                                           0);
                           flowconnection = flowConnection->_this ();
                           streamctrl->set_flow_connection (forward_entry.flowname(),
-                                                     flowconnection.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+                                                     flowconnection.in ());
                 }
-              ACE_CATCHANY
+              catch (const CORBA::Exception& ex)
                 {
                   //if (TAO_debug_level >= 0)
-                    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_MMDevice::create_a::get_flow_connection");
+                    ex._tao_print_exception (
+                      "TAO_MMDevice::create_a::get_flow_connection");
                 }
-              ACE_ENDTRY;
 
               int result = this->fdev_map_.find (flow_key, flow_dev);
               if (result < 0)
@@ -3402,8 +3197,7 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
                             flow_dev->create_producer (flowconnection.in (),
                                                        flow_qos,
                                                        met_qos,
-                                                       named_fdev.inout ()
-                                                       ACE_ENV_ARG_PARAMETER);
+                                                       named_fdev.inout ());
                         }
                         break;
                       case MMDEVICE_B:
@@ -3412,8 +3206,7 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
                             flow_dev->create_consumer (flowconnection.in (),
                                                        flow_qos,
                                                        met_qos,
-                                                       named_fdev.inout ()
-                                                       ACE_ENV_ARG_PARAMETER);
+                                                       named_fdev.inout ());
                         }
                         break;
                       }
@@ -3432,8 +3225,7 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
                             flow_dev->create_consumer (flowconnection.in (),
                                                        flow_qos,
                                                        met_qos,
-                                                       named_fdev.inout ()
-                                                       ACE_ENV_ARG_PARAMETER);
+                                                       named_fdev.inout ());
                         }
                         break;
                       case MMDEVICE_B:
@@ -3445,8 +3237,7 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
                             flow_dev->create_producer (flowconnection.in (),
                                                        flow_qos,
                                                        met_qos,
-                                                       named_fdev.inout ()
-                                                       ACE_ENV_ARG_PARAMETER);
+                                                       named_fdev.inout ());
                         }
                         break;
                       }
@@ -3457,18 +3248,16 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
                 }
               CORBA::Any flowname_any;
               flowname_any <<= forward_entry.flowname ();
-              flow_endpoint->define_property ("FlowName", flowname_any ACE_ENV_ARG_PARAMETER);
-              sep->add_fep (flow_endpoint.in ()
-                            ACE_ENV_ARG_PARAMETER);
+              flow_endpoint->define_property ("FlowName", flowname_any);
+              sep->add_fep (flow_endpoint.in ());
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_MMDevice::create_A");
+      ex._tao_print_exception ("TAO_MMDevice::create_A");
       return sep;
     }
-  ACE_ENDTRY;
   return sep;
 }
 
@@ -3478,8 +3267,7 @@ TAO_MMDevice::create_A (AVStreams::StreamCtrl_ptr streamctrl,
                         AVStreams::streamQoS &stream_qos,
                         CORBA::Boolean_out met_qos,
                         char *&named_vdev,
-                        const AVStreams::flowSpec &flow_spec
-                        ACE_ENV_ARG_DECL)
+                        const AVStreams::flowSpec &flow_spec)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::streamOpDenied,
@@ -3489,19 +3277,18 @@ TAO_MMDevice::create_A (AVStreams::StreamCtrl_ptr streamctrl,
 {
   AVStreams::StreamEndPoint_A_ptr sep_a = 0;
   AVStreams::StreamEndPoint_var sep;
-  ACE_TRY
+  try
     {
-      sep = this->create_A_B (MMDEVICE_A, streamctrl, the_vdev, stream_qos, met_qos, named_vdev, flow_spec ACE_ENV_ARG_PARAMETER);
-      sep_a = AVStreams::StreamEndPoint_A::_narrow (sep.in() ACE_ENV_ARG_PARAMETER);
+      sep = this->create_A_B (MMDEVICE_A, streamctrl, the_vdev, stream_qos, met_qos, named_vdev, flow_spec);
+      sep_a = AVStreams::StreamEndPoint_A::_narrow (sep.in());
 
       ACE_ASSERT( !CORBA::is_nil( sep_a ) );
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_MMDevice::create_A");
+      ex._tao_print_exception ("TAO_MMDevice::create_A");
       return sep_a;
     }
-  ACE_ENDTRY;
 
   return sep_a;
 }
@@ -3513,8 +3300,7 @@ TAO_MMDevice::create_B (AVStreams::StreamCtrl_ptr streamctrl,
                         AVStreams::streamQoS &stream_qos,
                         CORBA::Boolean_out met_qos,
                         char *&named_vdev,
-                        const AVStreams::flowSpec &flow_spec
-                        ACE_ENV_ARG_DECL)
+                        const AVStreams::flowSpec &flow_spec)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::streamOpDenied,
@@ -3525,19 +3311,18 @@ TAO_MMDevice::create_B (AVStreams::StreamCtrl_ptr streamctrl,
   AVStreams::StreamEndPoint_B_ptr sep_b = AVStreams::StreamEndPoint_B::_nil ();
   AVStreams::StreamEndPoint_var sep;
 
-  ACE_TRY
+  try
     {
-      sep = this->create_A_B (MMDEVICE_B, streamctrl, the_vdev, stream_qos, met_qos, named_vdev, flow_spec ACE_ENV_ARG_PARAMETER);
-      sep_b = AVStreams::StreamEndPoint_B::_narrow (sep.in() ACE_ENV_ARG_PARAMETER);
+      sep = this->create_A_B (MMDEVICE_B, streamctrl, the_vdev, stream_qos, met_qos, named_vdev, flow_spec);
+      sep_b = AVStreams::StreamEndPoint_B::_narrow (sep.in());
 
       ACE_ASSERT ( !CORBA::is_nil( sep_b ) );
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_MMDevice::create_B");
+      ex._tao_print_exception ("TAO_MMDevice::create_B");
       return sep_b;
     }
-  ACE_ENDTRY;
   return sep_b;
 }
 
@@ -3545,8 +3330,7 @@ TAO_MMDevice::create_B (AVStreams::StreamCtrl_ptr streamctrl,
 // destroys the streamendpoint and the Vdev.
 void
 TAO_MMDevice::destroy (AVStreams::StreamEndPoint_ptr /* the_ep */,
-                       const char * /* vdev_name */
-                       ACE_ENV_ARG_DECL_NOT_USED)
+                       const char * /* vdev_name */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported))
 {
@@ -3559,8 +3343,7 @@ TAO_MMDevice::destroy (AVStreams::StreamEndPoint_ptr /* the_ep */,
 }
 
 char *
-TAO_MMDevice::add_fdev_i (AVStreams::FDev_ptr fdev
-                          ACE_ENV_ARG_DECL)
+TAO_MMDevice::add_fdev_i (AVStreams::FDev_ptr fdev)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported,
                    AVStreams::streamOpFailed))
@@ -3571,57 +3354,52 @@ TAO_MMDevice::add_fdev_i (AVStreams::FDev_ptr fdev
                   0);
   CORBA::String_var flow_name = tmp;
 
-  ACE_TRY
+  try
     {
       // exception implies the flow name is not defined and is system
       // generated.
       ACE_OS::sprintf (tmp, "flow%d", flow_num_++);
       CORBA::Any flowname_any;
       flowname_any <<= flow_name.in ();
-      fdev->define_property ("Flow", flowname_any ACE_ENV_ARG_PARAMETER);
+      fdev->define_property ("Flow", flowname_any);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_MMDevice::add_fdev");
+      ex._tao_print_exception ("TAO_MMDevice::add_fdev");
       return 0;
     }
-  ACE_ENDTRY;
   return flow_name._retn ();
 }
 
 // Adds the fdev object to the MMDevice.
 char *
-TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj
-                        ACE_ENV_ARG_DECL)
+TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported,
                    AVStreams::streamOpFailed))
 {
   CORBA::String_var flow_name;
   AVStreams::FDev_var fdev;
-  ACE_TRY_EX (flow_name)
+  try
     {
       CORBA::Any_ptr flow_name_any;
-      fdev = AVStreams::FDev::_narrow (fdev_obj ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (flow_name);
+      fdev = AVStreams::FDev::_narrow (fdev_obj);
 
       if (CORBA::is_nil (fdev.in ()))
           return 0;
 
 
-      flow_name_any = fdev->get_property_value ("Flow" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (flow_name);
+      flow_name_any = fdev->get_property_value ("Flow");
 
       const char *tmp;
       *flow_name_any >>= tmp;
       flow_name = CORBA::string_dup (tmp);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       flow_name =
-        this->add_fdev_i (fdev.in () ACE_ENV_ARG_PARAMETER);
+        this->add_fdev_i (fdev.in ());
     }
-  ACE_ENDTRY;
 
 
   // Add it to the sequence of flowNames supported.
@@ -3638,26 +3416,22 @@ TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj
   // define/modify the "Flows" property.
   CORBA::Any flows_any;
   flows_any <<= this->flows_;
-  ACE_TRY_EX (flows)
+  try
     {
       this->define_property ("Flows",
-                             flows_any
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (flows);
+                             flows_any);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_MMDevice::add_fdev");
+      ex._tao_print_exception ("TAO_MMDevice::add_fdev");
       return 0;
     }
-  ACE_ENDTRY;
   return flow_name._retn ();
 }
 
 // Gets the FDev object associated with this flow.
 CORBA::Object_ptr
-TAO_MMDevice::get_fdev (const char *flow_name
-                        ACE_ENV_ARG_DECL_NOT_USED)
+TAO_MMDevice::get_fdev (const char *flow_name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported,
                    AVStreams::noSuchFlow))
@@ -3672,20 +3446,19 @@ TAO_MMDevice::get_fdev (const char *flow_name
 
 // Removes the fdev from this MMDevice.
 void
-TAO_MMDevice::remove_fdev (const char *flow_name
-                           ACE_ENV_ARG_DECL)
+TAO_MMDevice::remove_fdev (const char *flow_name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported,
                    AVStreams::noSuchFlow,
                    AVStreams::streamOpFailed))
 {
-  ACE_TRY
+  try
     {
       ACE_CString fdev_name_key (flow_name);
       AVStreams::FDev_var fdev_entry;
       // Remove the fep from the hash table.
       if (this->fdev_map_.unbind (fdev_name_key, fdev_entry)!= 0)
-        ACE_THROW (AVStreams::streamOpFailed ());
+        throw AVStreams::streamOpFailed ();
 
       AVStreams::flowSpec new_flows (this->flows_.length ());
       for (u_int i=0, j=0 ; i <this->flows_.length (); i++)
@@ -3696,14 +3469,12 @@ TAO_MMDevice::remove_fdev (const char *flow_name
       flows <<= new_flows;
       this->flows_ = new_flows;
       this->define_property ("Flows",
-                             flows
-                             ACE_ENV_ARG_PARAMETER);
+                             flows);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_MMDevice::remove_fdev");
+      ex._tao_print_exception ("TAO_MMDevice::remove_fdev");
     }
-  ACE_ENDTRY;
 }
 
 // destructor.
@@ -3750,7 +3521,7 @@ void
 TAO_FlowConnection::stop (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       FlowProducer_SetItor producer_begin = this->flow_producer_set_.begin
         ();
@@ -3769,12 +3540,11 @@ TAO_FlowConnection::stop (void)
           (*consumer_begin)->stop ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_FlowConnection::stop");
+      ex._tao_print_exception ("TAO_FlowConnection::stop");
       return;
     }
-  ACE_ENDTRY;
 }
 
 // start this flow.
@@ -3782,7 +3552,7 @@ void
 TAO_FlowConnection::start (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       FlowConsumer_SetItor consumer_begin = this->flow_consumer_set_.begin
         ();
@@ -3801,12 +3571,11 @@ TAO_FlowConnection::start (void)
           (*producer_begin)->start ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_FlowConnection::start");
+      ex._tao_print_exception ("TAO_FlowConnection::start");
       return;
     }
-  ACE_ENDTRY;
 }
 
 // destroy this flow.
@@ -3814,7 +3583,7 @@ void
 TAO_FlowConnection::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       FlowProducer_SetItor producer_begin = this->flow_producer_set_.begin
         ();
@@ -3833,12 +3602,11 @@ TAO_FlowConnection::destroy (void)
           (*consumer_begin)->destroy ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_FlowConnection::destroy");
+      ex._tao_print_exception ("TAO_FlowConnection::destroy");
       return;
     }
-  ACE_ENDTRY;
   int result = TAO_AV_Core::deactivate_servant (this);
   if (result < 0)
     if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_FlowConnection::destroy failed\n"));
@@ -3846,8 +3614,7 @@ TAO_FlowConnection::destroy (void)
 
 // modify the QoS for this flow.
 CORBA::Boolean
-TAO_FlowConnection::modify_QoS (AVStreams::QoS & new_qos
-                                ACE_ENV_ARG_DECL_NOT_USED)
+TAO_FlowConnection::modify_QoS (AVStreams::QoS & new_qos)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::QoSRequestFailed))
 {
@@ -3858,8 +3625,7 @@ TAO_FlowConnection::modify_QoS (AVStreams::QoS & new_qos
 // use the specified flow protocol for this flow.
 CORBA::Boolean
 TAO_FlowConnection::use_flow_protocol (const char * fp_name,
-                                       const CORBA::Any & fp_settings
-                                       ACE_ENV_ARG_DECL)
+                                       const CORBA::Any & fp_settings)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::FPError,
                    AVStreams::notSupported))
@@ -3873,7 +3639,7 @@ TAO_FlowConnection::use_flow_protocol (const char * fp_name,
        producer_begin != producer_end; ++producer_begin)
     {
       (*producer_begin)->use_flow_protocol
-        (fp_name, fp_settings ACE_ENV_ARG_PARAMETER);
+        (fp_name, fp_settings);
     }
   FlowConsumer_SetItor consumer_begin = this->flow_consumer_set_.begin
     ();
@@ -3882,14 +3648,13 @@ TAO_FlowConnection::use_flow_protocol (const char * fp_name,
        consumer_begin != consumer_end; ++consumer_begin)
     {
       (*consumer_begin)->use_flow_protocol
-        (fp_name, fp_settings ACE_ENV_ARG_PARAMETER);
+        (fp_name, fp_settings);
     }
   return 1;
 }
 
 void
-TAO_FlowConnection::push_event (const AVStreams::streamEvent & the_event
-                                ACE_ENV_ARG_DECL_NOT_USED)
+TAO_FlowConnection::push_event (const AVStreams::streamEvent & the_event)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG (the_event);
@@ -3898,15 +3663,14 @@ TAO_FlowConnection::push_event (const AVStreams::streamEvent & the_event
 CORBA::Boolean
 TAO_FlowConnection::connect_devs (AVStreams::FDev_ptr a_party,
                                   AVStreams::FDev_ptr b_party,
-                                  AVStreams::QoS & flow_qos
-                                  ACE_ENV_ARG_DECL)
+                                  AVStreams::QoS & flow_qos)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::streamOpDenied,
                    AVStreams::QoSRequestFailed))
 {
   CORBA::Boolean result = 0;
-  ACE_TRY
+  try
     {
       AVStreams::FlowConnection_var flowconnection = this->_this ();
       CORBA::Boolean met_qos;
@@ -3915,25 +3679,22 @@ TAO_FlowConnection::connect_devs (AVStreams::FDev_ptr a_party,
         a_party->create_producer (flowconnection.in (),
                                   flow_qos,
                                   met_qos,
-                                  named_fdev.inout ()
-                                  ACE_ENV_ARG_PARAMETER);
+                                  named_fdev.inout ());
       AVStreams::FlowConsumer_var consumer =
         b_party->create_consumer (flowconnection.in (),
                                   flow_qos,
                                   met_qos,
-                                  named_fdev.inout ()
-                                  ACE_ENV_ARG_PARAMETER);
+                                  named_fdev.inout ());
       result = this->connect (producer.in (),
                               consumer.in (),
-                              flow_qos
-                              ACE_ENV_ARG_PARAMETER);
+                              flow_qos);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_FlowConnection::connect_devs");
+      ex._tao_print_exception (
+        "TAO_FlowConnection::connect_devs");
       return 0;
     }
-  ACE_ENDTRY;
   return result;
 }
 
@@ -3941,14 +3702,13 @@ TAO_FlowConnection::connect_devs (AVStreams::FDev_ptr a_party,
 CORBA::Boolean
 TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer,
                              AVStreams::FlowConsumer_ptr consumer,
-                             AVStreams::QoS & the_qos
-                             ACE_ENV_ARG_DECL)
+                             AVStreams::QoS & the_qos)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::formatMismatch,
                    AVStreams::FEPMismatch,
                    AVStreams::alreadyConnected))
 {
-  ACE_TRY
+  try
     {
 
       AVStreams::FlowProducer_ptr flow_producer =
@@ -3963,20 +3723,17 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer,
 
       flow_producer->set_peer (flowconnection.in (),
                                flow_consumer,
-                               the_qos
-                               ACE_ENV_ARG_PARAMETER);
+                               the_qos);
 
       flow_consumer->set_peer (flowconnection.in (),
                                flow_producer,
-                               the_qos
-                               ACE_ENV_ARG_PARAMETER);
+                               the_qos);
 
       char *consumer_address =
         flow_consumer->go_to_listen (the_qos,
                                      0, // false for is_mcast
                                      flow_producer,
-                                     this->fp_name_.inout ()
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this->fp_name_.inout ());
 
       if (ACE_OS::strcmp (consumer_address, "") == 0)
         {
@@ -3984,12 +3741,10 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer,
           consumer_address = flow_producer->go_to_listen (the_qos,
                                                           0, // false for is_mcast
                                                           flow_consumer,
-                                                          this->fp_name_.inout ()
-                                                          ACE_ENV_ARG_PARAMETER);
+                                                          this->fp_name_.inout ());
           flow_consumer->connect_to_peer (the_qos,
                                           consumer_address,
-                                          this->fp_name_.inout ()
-                                          ACE_ENV_ARG_PARAMETER);
+                                          this->fp_name_.inout ());
           // @@ Naga: We have to find means to set the reverse channel for the producer.
           // Its broken in the point-to_point case for UDP.
         }
@@ -3998,15 +3753,13 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer,
           if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_FlowConnection::connect_to_peer addres: %s", consumer_address));
           flow_producer->connect_to_peer (the_qos,
                                           consumer_address,
-                                          this->fp_name_.inout ()
-                                          ACE_ENV_ARG_PARAMETER);
+                                          this->fp_name_.inout ());
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_FlowConnection::connect");
+      ex._tao_print_exception ("TAO_FlowConnection::connect");
     }
-  ACE_ENDTRY;
   return 1;
 }
 
@@ -4020,13 +3773,12 @@ TAO_FlowConnection::disconnect (void)
 
 CORBA::Boolean
 TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer,
-                                  AVStreams::QoS & the_qos
-                                  ACE_ENV_ARG_DECL)
+                                  AVStreams::QoS & the_qos)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::alreadyConnected,
                    AVStreams::notSupported))
 {
-  ACE_TRY
+  try
     {
           AVStreams::FlowProducer_ptr flow_producer =
             AVStreams::FlowProducer::_duplicate (producer);
@@ -4039,8 +3791,7 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer,
           FlowProducer_SetItor end = this->flow_producer_set_.end ();
           for (; begin != end; ++begin)
             {
-              if ((*begin)->_is_equivalent (producer
-                                            ACE_ENV_ARG_PARAMETER))
+              if ((*begin)->_is_equivalent (producer))
               // producer exists in the set, a duplicate.
               ACE_ERROR_RETURN ((LM_WARNING, "TAO_FlowConnection::add_producer: producer already exists\n"), 1);
             }
@@ -4074,8 +3825,7 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer,
           char *address = flow_producer->connect_mcast (the_qos,
                                                         met_qos,
                                                         mcast_address,
-                                                        this->fp_name_.in ()
-                                                        ACE_ENV_ARG_PARAMETER);
+                                                        this->fp_name_.in ());
 
           if (this->producer_address_.in () == 0)
             {
@@ -4102,26 +3852,24 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer,
           AVStreams::FlowConnection_var flowconnection = this->_this ();
           flow_producer->set_Mcast_peer (flowconnection.in (),
                                          this->mcastconfigif_.in (),
-                                         the_qos
-                                         ACE_ENV_ARG_PARAMETER);
+                                         the_qos);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_FlowConnection::add_producer");
+      ex._tao_print_exception (
+        "TAO_FlowConnection::add_producer");
       return 0;
     }
-  ACE_ENDTRY;
   return 1;
 }
 
 CORBA::Boolean
 TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer,
-                                  AVStreams::QoS & the_qos
-                                  ACE_ENV_ARG_DECL)
+                                  AVStreams::QoS & the_qos)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::alreadyConnected))
 {
-  ACE_TRY
+  try
     {
       AVStreams::FlowConsumer_ptr flow_consumer =
         AVStreams::FlowConsumer::_duplicate (consumer);
@@ -4129,8 +3877,7 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer,
       FlowConsumer_SetItor end = this->flow_consumer_set_.end ();
       for (; begin != end; ++begin)
         {
-          if ((*begin)->_is_equivalent (consumer
-                                        ACE_ENV_ARG_PARAMETER))
+          if ((*begin)->_is_equivalent (consumer))
             // Consumer exists in the set, a duplicate.
             ACE_ERROR_RETURN ((LM_WARNING, "TAO_FlowConnection::add_Consumer: Consumer already exists\n"), 1);
         }
@@ -4154,20 +3901,17 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer,
 
       if (!this->ip_multicast_)
         {
-          flow_consumer->set_protocol_restriction (protocols
-                                                   ACE_ENV_ARG_PARAMETER);
+          flow_consumer->set_protocol_restriction (protocols);
           char * address =
             flow_consumer->go_to_listen (the_qos,
                                          1,
                                          flow_producer,
-                                         this->fp_name_.inout ()
-                                         ACE_ENV_ARG_PARAMETER);
+                                         this->fp_name_.inout ());
           CORBA::Boolean is_met;
           flow_producer->connect_mcast (the_qos,
                                         is_met,
                                         address,
-                                        this->fp_name_.inout ()
-                                        ACE_ENV_ARG_PARAMETER);
+                                        this->fp_name_.inout ());
         }
        else
         {
@@ -4178,15 +3922,14 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer,
           // IP Multicasting.
           flow_consumer->connect_to_peer (the_qos,
                                           this->producer_address_.in (),
-                                          this->fp_name_.inout ()
-                                          ACE_ENV_ARG_PARAMETER);
+                                          this->fp_name_.inout ());
 
           //  char * address =
           //             flow_consumer->go_to_listen (the_qos,
           //                                          1,
           //                                          flow_producer,
           //                                          this->fp_name_.inout ()
-          //                                          ACE_ENV_ARG_PARAMETER);
+          //);
 
         }
       if (CORBA::is_nil (this->mcastconfigif_.in ()))
@@ -4198,21 +3941,19 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer,
       stream_qos [0] = the_qos;
       this->mcastconfigif_->set_peer (flow_consumer,
                                       stream_qos,
-                                      flow_spec
-                                      ACE_ENV_ARG_PARAMETER);
+                                      flow_spec);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_FlowConnection::add_consumer");
+      ex._tao_print_exception (
+        "TAO_FlowConnection::add_consumer");
       return 0;
     }
-  ACE_ENDTRY;
   return 1;
 }
 
 CORBA::Boolean
-TAO_FlowConnection::drop (AVStreams::FlowEndPoint_ptr target
-                          ACE_ENV_ARG_DECL_NOT_USED)
+TAO_FlowConnection::drop (AVStreams::FlowEndPoint_ptr target)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notConnected))
 {
@@ -4252,16 +3993,13 @@ TAO_FlowEndPoint::open (const char *flowname,
   this->format_ = format;
 
   if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_FlowEndPoint::open\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::Any flowname_any;
       flowname_any <<= flowname;
       this->define_property ("FlowName",
-                             flowname_any
-                             ACE_ENV_ARG_PARAMETER);
-      this->set_format (format
-                        ACE_ENV_ARG_PARAMETER);
+                             flowname_any);
+      this->set_format (format);
       this->protocol_addresses_ = protocols;
       AVStreams::protocolSpec protocol_spec (protocols.length ());
       protocol_spec.length (protocols.length ());
@@ -4276,15 +4014,13 @@ TAO_FlowEndPoint::open (const char *flowname,
                         "[%s]\n",
                         static_cast<char const*>(protocol_spec[i])));
         }
-      this->set_protocol_restriction (protocol_spec
-                                      ACE_ENV_ARG_PARAMETER);
+      this->set_protocol_restriction (protocol_spec);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_FlowEndPoint::open");
+      ex._tao_print_exception ("TAO_FlowEndPoint::open");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -4341,8 +4077,7 @@ TAO_FlowEndPoint::related_sep (void)
 }
 
 void
-TAO_FlowEndPoint::related_sep (AVStreams::StreamEndPoint_ptr related_sep
-                               ACE_ENV_ARG_DECL_NOT_USED)
+TAO_FlowEndPoint::related_sep (AVStreams::StreamEndPoint_ptr related_sep)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->related_sep_ = AVStreams::StreamEndPoint::_duplicate (related_sep);
@@ -4356,8 +4091,7 @@ TAO_FlowEndPoint::related_flow_connection (void)
 }
 
 void
-TAO_FlowEndPoint::related_flow_connection (AVStreams::FlowConnection_ptr related_flow_connection
-                                           ACE_ENV_ARG_DECL_NOT_USED)
+TAO_FlowEndPoint::related_flow_connection (AVStreams::FlowConnection_ptr related_flow_connection)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->related_flow_connection_ = AVStreams::FlowConnection::_duplicate (related_flow_connection);
@@ -4375,84 +4109,76 @@ TAO_FlowEndPoint::get_connected_fep (void)
 
 CORBA::Boolean
 TAO_FlowEndPoint::use_flow_protocol (const char * fp_name,
-                                     const CORBA::Any &
-                                     ACE_ENV_ARG_DECL)
+                                     const CORBA::Any &)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::FPError,
                    AVStreams::notSupported))
 {
-  ACE_TRY
+  try
     {
       // Define the property called FlowProtocol
       CORBA::Any flowname_property;
       flowname_property <<= fp_name;
       this->define_property ("FlowProtocol",
-                             flowname_property
-                             ACE_ENV_ARG_PARAMETER);
+                             flowname_property);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_FlowEndPoint::use_flow_protocol");
+      ex._tao_print_exception (
+        "TAO_FlowEndPoint::use_flow_protocol");
       return 0;
     }
-  ACE_ENDTRY;
   return 1;
 }
 
 void
-TAO_FlowEndPoint::set_format (const char * format
-                              ACE_ENV_ARG_DECL)
+TAO_FlowEndPoint::set_format (const char * format)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported))
 {
   this->format_ = format;
-  ACE_TRY
+  try
     {
       // make this a property so that is_fep_compatible can query this and
       // check if 2 flowendpoints are compatible.
       CORBA::Any format_val;
       format_val <<= format;
       this->define_property ("Format",
-                             format_val
-                             ACE_ENV_ARG_PARAMETER);
+                             format_val);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_FlowEndpoint::set_format");
+      ex._tao_print_exception ("TAO_FlowEndpoint::set_format");
     }
-  ACE_ENDTRY;
 }
 
 void
-TAO_FlowEndPoint::set_dev_params (const CosPropertyService::Properties & new_settings
-                                  ACE_ENV_ARG_DECL)
+TAO_FlowEndPoint::set_dev_params (const CosPropertyService::Properties & new_settings)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::PropertyException,
                    AVStreams::streamOpFailed))
 {
   this->dev_params_ = new_settings;
-  ACE_TRY
+  try
     {
       CORBA::Any DevParams_property;
       DevParams_property <<= new_settings;
       this->define_property ("DevParams",
-                             DevParams_property
-                             ACE_ENV_ARG_PARAMETER);
+                             DevParams_property);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_FlowEndPoint::set_dev_params");
+      ex._tao_print_exception (
+        "TAO_FlowEndPoint::set_dev_params");
     }
-  ACE_ENDTRY;
 }
 
 void
-TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & protocols
-                                            ACE_ENV_ARG_DECL)
+TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & protocols)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported))
 {
-  ACE_TRY
+  try
     {
       u_int i = 0;
       if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "%N:%l\n"));
@@ -4464,11 +4190,9 @@ TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & prot
       CORBA::Any AvailableProtocols_property;
       AvailableProtocols_property <<= protocols;
       this->define_property ("AvailableProtocols",
-                             AvailableProtocols_property
-                             ACE_ENV_ARG_PARAMETER);
+                             AvailableProtocols_property);
       AVStreams::protocolSpec *temp_spec;
-      CORBA::Any_var temp_any = this->get_property_value ("AvailableProtocols"
-                                                          ACE_ENV_ARG_PARAMETER);
+      CORBA::Any_var temp_any = this->get_property_value ("AvailableProtocols");
       temp_any.in () >>= temp_spec;
       if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "%N:%l\n"));
       for (i=0;i<temp_spec->length ();i++)
@@ -4478,22 +4202,21 @@ TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & prot
         }
       this->protocols_ = protocols;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_FlowEndpoint::set_protocol_restriction");
+      ex._tao_print_exception (
+        "TAO_FlowEndpoint::set_protocol_restriction");
     }
-  ACE_ENDTRY;
 }
 
 CORBA::Boolean
-TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep
-                                     ACE_ENV_ARG_DECL)
+TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::formatMismatch,
                    AVStreams::deviceQosMismatch))
 {
   const char *exception_message = "";
-  ACE_TRY
+  try
     {
       // check whether the passed flowendpoint is compatible with this flowendpoint.
       // should we check for the availableFormats and choose one format.
@@ -4502,16 +4225,14 @@ TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep
       CORBA::String_var my_format, peer_format;
 
       exception_message = "TAO_FlowEndPoint::is_fep_compatible - Format";
-      format_ptr = this->get_property_value ("Format"
-                                             ACE_ENV_ARG_PARAMETER);
+      format_ptr = this->get_property_value ("Format");
 
       const char *temp_format;
       format_ptr.in () >>= temp_format;
       my_format = CORBA::string_dup (temp_format);
       // get my peer's format value
       exception_message = "TAO_FlowEndPoint::is_fep_compatible - Format[2]";
-      format_ptr = peer_fep->get_property_value ("Format"
-                                                 ACE_ENV_ARG_PARAMETER);
+      format_ptr = peer_fep->get_property_value ("Format");
       format_ptr.in () >>= temp_format;
       peer_format = CORBA::string_dup (temp_format);
       if (ACE_OS::strcmp (my_format.in (),
@@ -4525,15 +4246,13 @@ TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep
 
       exception_message =
         "TAO_FlowEndPoint::is_fep_compatible - AvailableProtocols";
-      AvailableProtocols_ptr = this->get_property_value ("AvailableProtocols"
-                                                         ACE_ENV_ARG_PARAMETER);
+      AvailableProtocols_ptr = this->get_property_value ("AvailableProtocols");
       AvailableProtocols_ptr.in () >>= temp_protocols;
       my_protocol_spec = *temp_protocols;
 
       exception_message =
         "TAO_FlowEndPoint::is_fep_compatible - AvailableProtocols[2]";
-      AvailableProtocols_ptr = peer_fep->get_property_value ("AvailableProtocols"
-                                                             ACE_ENV_ARG_PARAMETER);
+      AvailableProtocols_ptr = peer_fep->get_property_value ("AvailableProtocols");
       AvailableProtocols_ptr.in () >>= temp_protocols;
       peer_protocol_spec = *temp_protocols;
 
@@ -4558,26 +4277,22 @@ TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep
       if (!protocol_match)
         return 0;
     }
-  ACE_CATCH (CosPropertyService::PropertyNotFound, nf)
+  catch (const CosPropertyService::PropertyNotFound& nf)
     {
-      ACE_PRINT_EXCEPTION (nf,
-                           exception_message);
+      nf._tao_print_exception (exception_message);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "TAO_FlowEndPoint::is_fep_compatible");
+      ex._tao_print_exception ("TAO_FlowEndPoint::is_fep_compatible");
       return 0;
     }
-  ACE_ENDTRY;
   return 1;
 }
 
 CORBA::Boolean
 TAO_FlowEndPoint::set_peer (AVStreams::FlowConnection_ptr /* the_fc */,
                             AVStreams::FlowEndPoint_ptr the_peer_fep,
-                            AVStreams::QoS & /* the_qos */
-                            ACE_ENV_ARG_DECL_NOT_USED)
+                            AVStreams::QoS & /* the_qos */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::QoSRequestFailed,
                    AVStreams::streamOpFailed))
@@ -4590,8 +4305,7 @@ TAO_FlowEndPoint::set_peer (AVStreams::FlowConnection_ptr /* the_fc */,
 CORBA::Boolean
 TAO_FlowEndPoint::set_Mcast_peer (AVStreams::FlowConnection_ptr /* the_fc */,
                                   AVStreams::MCastConfigIf_ptr mcast_peer,
-                                  AVStreams::QoS & /* the_qos */
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+                                  AVStreams::QoS & /* the_qos */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::QoSRequestFailed))
 {
@@ -4604,8 +4318,7 @@ TAO_FlowEndPoint::go_to_listen_i (TAO_FlowSpec_Entry::Role role,
                                   AVStreams::QoS & /*the_qos*/,
                                   CORBA::Boolean /*is_mcast*/,
                                   AVStreams::FlowEndPoint_ptr peer_fep,
-                                  char *& flowProtocol
-                                  ACE_ENV_ARG_DECL)
+                                  char *& flowProtocol)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::failedToListen,
                    AVStreams::FPError,
@@ -4626,13 +4339,11 @@ TAO_FlowEndPoint::go_to_listen_i (TAO_FlowSpec_Entry::Role role,
   AVStreams::protocolSpec my_protocol_spec, peer_protocol_spec;
   AVStreams::protocolSpec *temp_protocols;
   CORBA::Any_var AvailableProtocols_ptr =
-    peer_fep->get_property_value ("AvailableProtocols"
-                                  ACE_ENV_ARG_PARAMETER);
+    peer_fep->get_property_value ("AvailableProtocols");
   AvailableProtocols_ptr.in () >>= temp_protocols;
   peer_protocol_spec = *temp_protocols;
   AvailableProtocols_ptr =
-    this->get_property_value ("AvailableProtocols"
-                              ACE_ENV_ARG_PARAMETER);
+    this->get_property_value ("AvailableProtocols");
   AvailableProtocols_ptr.in () >>= temp_protocols;
   my_protocol_spec = *temp_protocols;
   int protocol_match = 0;
@@ -4695,8 +4406,7 @@ CORBA::Boolean
 TAO_FlowEndPoint::connect_to_peer_i (TAO_FlowSpec_Entry::Role role,
                                      AVStreams::QoS & /*the_qos*/,
                                      const char * address,
-                                     const char * use_flow_protocol
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+                                     const char * use_flow_protocol)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::failedToConnect,
                    AVStreams::FPError,
@@ -4759,8 +4469,7 @@ TAO_FlowProducer::TAO_FlowProducer (const char *flowname,
 
 // gets the reverse channel for feedback.
 char *
-TAO_FlowProducer::get_rev_channel (const char * /*pcol_name*/
-                                   ACE_ENV_ARG_DECL_NOT_USED)
+TAO_FlowProducer::get_rev_channel (const char * /*pcol_name*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
@@ -4804,8 +4513,7 @@ char *
 TAO_FlowProducer::go_to_listen (AVStreams::QoS & the_qos,
                                 CORBA::Boolean is_mcast,
                                 AVStreams::FlowEndPoint_ptr peer_fep,
-                                char *& flowProtocol
-                                ACE_ENV_ARG_DECL)
+                                char *& flowProtocol)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::failedToListen,
                    AVStreams::FPError,
@@ -4815,15 +4523,13 @@ TAO_FlowProducer::go_to_listen (AVStreams::QoS & the_qos,
                                the_qos,
                                is_mcast,
                                peer_fep,
-                               flowProtocol
-                               ACE_ENV_ARG_PARAMETER);
+                               flowProtocol);
 }
 
 CORBA::Boolean
 TAO_FlowProducer::connect_to_peer (AVStreams::QoS & the_qos,
                                    const char * address,
-                                   const char * use_flow_protocol
-                                   ACE_ENV_ARG_DECL)
+                                   const char * use_flow_protocol)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::failedToConnect,
                    AVStreams::FPError,
@@ -4832,16 +4538,14 @@ TAO_FlowProducer::connect_to_peer (AVStreams::QoS & the_qos,
   return this->connect_to_peer_i (TAO_FlowSpec_Entry::TAO_AV_PRODUCER,
                                   the_qos,
                                   address,
-                                  use_flow_protocol
-                                  ACE_ENV_ARG_PARAMETER);
+                                  use_flow_protocol);
 }
 //  Connect to a IP multicast address.
 char *
 TAO_FlowProducer::connect_mcast (AVStreams::QoS & /* the_qos */,
                                  CORBA::Boolean_out /* is_met */,
                                  const char *address,
-                                 const char * use_flow_protocol
-                                 ACE_ENV_ARG_DECL_NOT_USED)
+                                 const char * use_flow_protocol)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::failedToConnect,
                    AVStreams::notSupported,
@@ -4884,29 +4588,25 @@ TAO_FlowProducer::connect_mcast (AVStreams::QoS & /* the_qos */,
 
 // sets the key for this flow.
 void
-TAO_FlowProducer::set_key (const AVStreams::key & the_key
-                           ACE_ENV_ARG_DECL)
+TAO_FlowProducer::set_key (const AVStreams::key & the_key)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       CORBA::Any anyval;
       anyval <<= the_key;
       this->define_property ("PublicKey",
-                             anyval
-                             ACE_ENV_ARG_PARAMETER);
+                             anyval);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_FlowProducer::set_key");
+      ex._tao_print_exception ("TAO_FlowProducer::set_key");
     }
-  ACE_ENDTRY;
 }
 
 // source id to be used to distinguish this source from others.
 void
-TAO_FlowProducer::set_source_id (CORBA::Long source_id
-                                 ACE_ENV_ARG_DECL_NOT_USED)
+TAO_FlowProducer::set_source_id (CORBA::Long source_id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->source_id_ = source_id;
@@ -4956,8 +4656,7 @@ char *
 TAO_FlowConsumer::go_to_listen (AVStreams::QoS & the_qos,
                                 CORBA::Boolean is_mcast,
                                 AVStreams::FlowEndPoint_ptr peer_fep,
-                                char *& flowProtocol
-                                ACE_ENV_ARG_DECL)
+                                char *& flowProtocol)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::failedToListen,
                    AVStreams::FPError,
@@ -4967,15 +4666,13 @@ TAO_FlowConsumer::go_to_listen (AVStreams::QoS & the_qos,
                                the_qos,
                                is_mcast,
                                peer_fep,
-                               flowProtocol
-                               ACE_ENV_ARG_PARAMETER);
+                               flowProtocol);
 }
 
 CORBA::Boolean
 TAO_FlowConsumer::connect_to_peer (AVStreams::QoS & the_qos,
                                    const char * address,
-                                   const char * use_flow_protocol
-                                   ACE_ENV_ARG_DECL)
+                                   const char * use_flow_protocol)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::failedToConnect,
                    AVStreams::FPError,
@@ -4984,8 +4681,7 @@ TAO_FlowConsumer::connect_to_peer (AVStreams::QoS & the_qos,
   return this->connect_to_peer_i (TAO_FlowSpec_Entry::TAO_AV_CONSUMER,
                                   the_qos,
                                   address,
-                                  use_flow_protocol
-                                  ACE_ENV_ARG_PARAMETER);
+                                  use_flow_protocol);
 }
 
 //------------------------------------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
index 1a014abe0a4..e71d0896172 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
@@ -83,15 +83,13 @@ public:
 
   /// Stop the transfer of data of the stream
   /// Empty the_spec means apply operation to all flows
-  virtual void stop (const AVStreams::flowSpec &the_spec
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void stop (const AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow));
 
   /// Start the transfer of data in the stream.
   /// Empty the_spec means apply operation to all flows
-  virtual void start (const AVStreams::flowSpec &the_spec
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void start (const AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow));
 
@@ -100,39 +98,34 @@ public:
    * the streamendpoint and vdev associated with this stream
    * Empty the_spec means apply operation to all flows
    */
-  virtual void destroy (const AVStreams::flowSpec &the_spec
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (const AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow));
 
   /// Changes the QoS associated with the stream
   /// Empty the_spec means apply operation to all flows
   virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos,
-                                     const AVStreams::flowSpec &the_spec
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                     const AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::QoSRequestFailed));
 
   /// Used by StreamEndPoint and VDev to inform StreamCtrl of events.
   /// E.g., loss of flow, reestablishment of flow, etc..
-  virtual void push_event (const struct CosPropertyService::Property & the_event
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void push_event (const struct CosPropertyService::Property & the_event)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Used to control the flow protocol parameters.
   virtual void set_FPStatus (const AVStreams::flowSpec &the_spec,
                              const char *fp_name,
-                             const CORBA::Any &fp_settings
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                             const CORBA::Any &fp_settings)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::FPError));
 
   /// Not implemented in the light profile, will raise the notsupported
   /// exception
-  virtual CORBA::Object_ptr get_flow_connection (const char *flow_name
-                                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Object_ptr get_flow_connection (const char *flow_name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::notSupported));
@@ -140,8 +133,7 @@ public:
   /// Not implemented in the light profile, will raise the notsupported
   /// exception
   virtual void set_flow_connection (const char *flow_name,
-                                    CORBA::Object_ptr flow_connection
-                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                    CORBA::Object_ptr flow_connection)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::notSupported));
@@ -177,8 +169,7 @@ class TAO_AV_Export TAO_Negotiator
 {
 public:
   virtual CORBA::Boolean negotiate (AVStreams::Negotiator_ptr remote_negotiator,
-                                    const AVStreams::streamQoS &qos_spec
-                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                    const AVStreams::streamQoS &qos_spec)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
@@ -235,15 +226,13 @@ public:
 
   /// Stop the transfer of data of the stream
   /// Empty the_spec means apply operation to all flows
-  virtual void stop (const AVStreams::flowSpec &the_spec
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void stop (const AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow));
 
   /// Start the transfer of data in the stream.
   /// Empty the_spec means apply operation to all flows
-  virtual void start (const AVStreams::flowSpec &the_spec
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void start (const AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow));
 
@@ -252,8 +241,7 @@ public:
    * the streamendpoint and vdev associated with this stream
    * Empty the_spec means apply operation to all flows
    */
-  virtual void destroy (const AVStreams::flowSpec &the_spec
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (const AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow));
 
@@ -267,8 +255,7 @@ public:
   virtual CORBA::Boolean bind_devs (AVStreams::MMDevice_ptr a_party,
                                     AVStreams::MMDevice_ptr b_party,
                                     AVStreams::streamQoS& the_qos,
-                                    const AVStreams::flowSpec& the_flows
-                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                    const AVStreams::flowSpec& the_flows)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::noSuchFlow,
@@ -282,24 +269,21 @@ public:
   virtual CORBA::Boolean bind (AVStreams::StreamEndPoint_A_ptr a_party,
                                AVStreams::StreamEndPoint_B_ptr b_party,
                                AVStreams::streamQoS &the_qos,
-                               const AVStreams::flowSpec &the_flows
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                               const AVStreams::flowSpec &the_flows)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::noSuchFlow,
                    AVStreams::QoSRequestFailed));
 
   virtual void unbind_dev (AVStreams::MMDevice_ptr dev,
-                           const AVStreams::flowSpec & the_spec
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                           const AVStreams::flowSpec & the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::noSuchFlow));
 
   /// Unbind the_ep from the stream. Empty the_spec means apply to all flows.
   virtual void unbind_party (AVStreams::StreamEndPoint_ptr the_ep,
-                             const AVStreams::flowSpec &the_spec
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                             const AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::noSuchFlow));
@@ -310,16 +294,14 @@ public:
                      AVStreams::streamOpFailed));
 
   virtual AVStreams::VDev_ptr get_related_vdev (AVStreams::MMDevice_ptr adev,
-                                                AVStreams::StreamEndPoint_out sep
-                                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                AVStreams::StreamEndPoint_out sep)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed));
 
   /// Changes the QoS associated with the stream
   /// Empty the_spec means apply operation to all flows
   virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos,
-                                     const AVStreams::flowSpec &the_spec
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                     const AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::QoSRequestFailed));
@@ -369,29 +351,24 @@ public:
 
   virtual CORBA::Boolean set_peer (CORBA::Object_ptr peer,
                                    AVStreams::streamQoS & the_qos,
-                                   const AVStreams::flowSpec & the_spec
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                   const AVStreams::flowSpec & the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::QoSRequestFailed,
                      AVStreams::streamOpFailed));
 
-  virtual void configure (const CosPropertyService::Property & a_configuration
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void configure (const CosPropertyService::Property & a_configuration)
   ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void set_initial_configuration (const CosPropertyService::Properties & initial
-                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void set_initial_configuration (const CosPropertyService::Properties & initial)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void set_format (const char * flowName,
-                           const char * format_name
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                           const char * format_name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported));
 
   virtual void set_dev_params (const char * flowName,
-                               const CosPropertyService::Properties & new_params
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                               const CosPropertyService::Properties & new_params)
 
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::PropertyException,
@@ -477,16 +454,13 @@ public:
   virtual int handle_close (void);
 
   /// Application needs to define this
-  virtual int handle_stop (const AVStreams::flowSpec &the_spec
-                            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  virtual int handle_stop (const AVStreams::flowSpec &the_spec);
 
   /// Application needs to define this
-  virtual int handle_start (const AVStreams::flowSpec &the_spec
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  virtual int handle_start (const AVStreams::flowSpec &the_spec);
 
   /// Application needs to define this
-  virtual int handle_destroy (const AVStreams::flowSpec &the_spec
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  virtual int handle_destroy (const AVStreams::flowSpec &the_spec);
 
   /// Application needs to define this
   virtual CORBA::Boolean handle_preconnect (AVStreams::flowSpec &the_spec);
@@ -495,8 +469,7 @@ public:
   virtual CORBA::Boolean handle_postconnect (AVStreams::flowSpec &the_spec);
 
   /// Application needs to define this
-  virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec
-                                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec);
 
   virtual int get_callback (const char *flowname,
                             TAO_AV_Callback *&callback);
@@ -547,28 +520,24 @@ public:
   TAO_StreamEndPoint (void);
 
    /// Stop the stream. Empty the_spec means, for all the flows
-  virtual void stop (const AVStreams::flowSpec &the_spec
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void stop (const AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow));
 
   /// Start the stream, Empty the_spec means, for all the flows
-  virtual void start (const AVStreams::flowSpec &the_spec
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void start (const AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow));
 
   /// Destroy the stream, Empty the_spec means, for all the flows
-  virtual void destroy (const AVStreams::flowSpec &the_spec
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (const AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow));
 
   /// Called by StreamCtrl. responder is the peer to connect to
   virtual CORBA::Boolean connect (AVStreams::StreamEndPoint_ptr responder,
                                   AVStreams::streamQoS& qos_spec,
-                                  const AVStreams::flowSpec& the_spec
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                  const AVStreams::flowSpec& the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::QoSRequestFailed,
@@ -579,8 +548,7 @@ public:
   virtual CORBA::Boolean request_connection (AVStreams::StreamEndPoint_ptr initiator,
                                              CORBA::Boolean is_mcast,
                                              AVStreams::streamQoS &qos,
-                                             AVStreams::flowSpec &the_spec
-                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                             AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpDenied,
                      AVStreams::noSuchFlow,
@@ -589,24 +557,20 @@ public:
 
   /// Change the transport qos on a stream
   virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos,
-                                     const AVStreams::flowSpec &the_flows
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                     const AVStreams::flowSpec &the_flows)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::QoSRequestFailed));
 
   virtual int change_qos (AVStreams::streamQoS &new_qos,
-                          const AVStreams::flowSpec &the_flows
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                          const AVStreams::flowSpec &the_flows);
 
   /// Used to restrict the set of protocols
-  virtual CORBA::Boolean set_protocol_restriction (const AVStreams::protocolSpec &the_pspec
-                                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Boolean set_protocol_restriction (const AVStreams::protocolSpec &the_pspec)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// disconnect the flows
-  virtual void disconnect (const AVStreams::flowSpec &the_spec
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void disconnect (const AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::streamOpFailed));
@@ -614,65 +578,55 @@ public:
   /// Used to control the flow
   virtual void set_FPStatus (const AVStreams::flowSpec &the_spec,
                              const char *fp_name,
-                             const CORBA::Any &fp_settings
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                             const CORBA::Any &fp_settings)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::FPError));
 
   /// Not implemented in the light profile, throws notsupported
-  virtual CORBA::Object_ptr get_fep (const char *flow_name
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Object_ptr get_fep (const char *flow_name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::noSuchFlow));
 
   /// Not implemented in the light profile, throws notsupported
-  virtual char * add_fep (CORBA::Object_ptr the_fep
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual char * add_fep (CORBA::Object_ptr the_fep)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::streamOpFailed));
 
   /// Not implemented in the light profile, throws notsupported
-  virtual void remove_fep (const char *fep_name
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void remove_fep (const char *fep_name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::streamOpFailed));
 
   /// Used to "attach" a negotiator to the endpoint
-  virtual void set_negotiator (AVStreams::Negotiator_ptr new_negotiator
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void set_negotiator (AVStreams::Negotiator_ptr new_negotiator)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Used for public key encryption.
   virtual void set_key (const char *flow_name,
-                        const AVStreams::key & the_key
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                        const AVStreams::key & the_key)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Used to set a unique id for packets sent by this streamendpoint
-  virtual void set_source_id (CORBA::Long source_id
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void set_source_id (CORBA::Long source_id)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Destructor
   virtual ~TAO_StreamEndPoint (void);
 
   CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos,
-                               AVStreams::flowSpec &the_spec
-                               ACE_ENV_ARG_DECL);
+                               AVStreams::flowSpec &the_spec);
 
 protected:
   /// Helper methods to implement add_fep()
-  char* add_fep_i (AVStreams::FlowEndPoint_ptr fep
-                   ACE_ENV_ARG_DECL)
+  char* add_fep_i (AVStreams::FlowEndPoint_ptr fep)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::streamOpFailed));
-  char* add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep
-                                ACE_ENV_ARG_DECL)
+  char* add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::streamOpFailed));
@@ -736,8 +690,7 @@ public:
 
   /// Used for ATM-style multicast
   virtual CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos,
-                                       AVStreams::flowSpec &the_spec
-                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                       AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::QoSRequestFailed,
@@ -746,8 +699,7 @@ public:
   /// Used for ATM-style multicast
   virtual CORBA::Boolean connect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep,
                                        AVStreams::streamQoS &the_qos,
-                                       const AVStreams::flowSpec &the_flows
-                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                       const AVStreams::flowSpec &the_flows)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::noSuchFlow,
@@ -756,8 +708,7 @@ public:
 
   /// Used to remove a multicast leaf
   virtual void disconnect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep,
-                                const AVStreams::flowSpec &theSpec
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                const AVStreams::flowSpec &theSpec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::noSuchFlow,
@@ -788,8 +739,7 @@ public:
 
   /// Used for internet-style multicast
   virtual CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos,
-                                       AVStreams::flowSpec &the_spec
-                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                       AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::noSuchFlow,
@@ -818,8 +768,7 @@ public:
   virtual CORBA::Boolean set_peer (AVStreams::StreamCtrl_ptr the_ctrl,
                                    AVStreams::VDev_ptr the_peer_dev,
                                    AVStreams::streamQoS &the_qos,
-                                   const AVStreams::flowSpec &the_spec
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                   const AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::QoSRequestFailed,
@@ -829,39 +778,34 @@ public:
   virtual CORBA::Boolean set_Mcast_peer (AVStreams::StreamCtrl_ptr the_ctrl,
                                          AVStreams::MCastConfigIf_ptr a_mcastconfigif,
                                          AVStreams::streamQoS &the_qos,
-                                         const AVStreams::flowSpec &the_spec
-                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                         const AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::QoSRequestFailed,
                      AVStreams::streamOpFailed));
 
   /// Called by the peer VDev to configure the device (catch all)
-  virtual void configure (const CosPropertyService::Property &the_config_mesg
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void configure (const CosPropertyService::Property &the_config_mesg)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::PropertyException,
                      AVStreams::streamOpFailed));
 
   /// Used to set a format on a flowname
   virtual void set_format (const char *flowName,
-                           const char *format_name
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                           const char *format_name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported));
 
   /// Used to set device parameters
   virtual void set_dev_params (const char *flowName,
-                               const CosPropertyService::Properties &new_params
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                               const CosPropertyService::Properties &new_params)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::PropertyException,
                      AVStreams::streamOpFailed));
 
   /// Called to change QoS of the device
   virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &the_qos,
-                                     const AVStreams::flowSpec &the_spec
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                     const AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::QoSRequestFailed));
@@ -872,8 +816,7 @@ protected:
   virtual ~TAO_VDev (void);
 
   /// hook called after set_peer is done to set the media ctrl of the peer vdev.
-  virtual CORBA::Boolean set_media_ctrl (CORBA::Object_ptr media_ctrl
-                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  virtual CORBA::Boolean set_media_ctrl (CORBA::Object_ptr media_ctrl);
 
   /// My stream controller
   AVStreams::StreamCtrl_var streamctrl_;
@@ -908,16 +851,14 @@ public:
                                                      AVStreams::streamQoS &the_qos,
                                                      CORBA::Boolean_out met_qos,
                                                      char *&named_vdev,
-                                                     const AVStreams::flowSpec &the_spec
-                                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                                                     const AVStreams::flowSpec &the_spec);
 
   /// Can be used to request the MMDevice to create a new StreamCtrl,
   /// and call bind_devs on it
   virtual AVStreams::StreamCtrl_ptr  bind (AVStreams::MMDevice_ptr peer_device,
                                            AVStreams::streamQoS &the_qos,
                                            CORBA::Boolean_out is_met,
-                                           const AVStreams::flowSpec &the_spec
-                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                           const AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::noSuchFlow,
@@ -927,8 +868,7 @@ public:
   virtual AVStreams::StreamCtrl_ptr  bind_mcast (AVStreams::MMDevice_ptr first_peer,
                                                  AVStreams::streamQoS &the_qos,
                                                  CORBA::Boolean_out is_met,
-                                                 const AVStreams::flowSpec &the_spec
-                                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                 const AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::noSuchFlow,
@@ -940,8 +880,7 @@ public:
                                                      AVStreams::streamQoS &the_qos,
                                                      CORBA::Boolean_out met_qos,
                                                      char *&named_vdev,
-                                                     const AVStreams::flowSpec &the_spec
-                                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                     const AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::streamOpDenied,
@@ -955,8 +894,7 @@ public:
                                                      AVStreams::streamQoS &the_qos,
                                                      CORBA::Boolean_out met_qos,
                                                      char *&named_vdev,
-                                                     const AVStreams::flowSpec &the_spec
-                                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                     const AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::streamOpDenied,
@@ -966,28 +904,24 @@ public:
 
   /// Remove the StreamEndPoint and the related vdev
   virtual void destroy (AVStreams::StreamEndPoint_ptr the_ep,
-                        const char *vdev_name
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                        const char *vdev_name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported));
 
   /// Not supported in the light profile, raises notsupported
-  virtual char * add_fdev (CORBA::Object_ptr the_fdev
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual char * add_fdev (CORBA::Object_ptr the_fdev)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::streamOpFailed));
 
   /// Not supported in the light profile, raises notsupported
-  virtual CORBA::Object_ptr get_fdev (const char *flow_name
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Object_ptr get_fdev (const char *flow_name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::noSuchFlow));
 
   /// Not supported in the light profile, raises notsupported
-  virtual void remove_fdev (const char *flow_name
-                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void remove_fdev (const char *flow_name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::noSuchFlow,
@@ -998,8 +932,7 @@ public:
 
 protected:
   /// Helper method to implement add_fdev()
-  char* add_fdev_i (AVStreams::FDev_ptr fdev
-                    ACE_ENV_ARG_DECL)
+  char* add_fdev_i (AVStreams::FDev_ptr fdev)
       ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported,
                    AVStreams::streamOpFailed));
@@ -1059,30 +992,26 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// modify the QoS for this flow.
-  virtual CORBA::Boolean modify_QoS (AVStreams::QoS & new_qos
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Boolean modify_QoS (AVStreams::QoS & new_qos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::QoSRequestFailed));
 
   /// use the specified flow protocol for this flow.
   virtual CORBA::Boolean use_flow_protocol (const char * fp_name,
-                                            const CORBA::Any & fp_settings
-                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                            const CORBA::Any & fp_settings)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::FPError,
                      AVStreams::notSupported));
 
   /// pushes an event , to be handled by the application.
-  virtual void push_event (const AVStreams::streamEvent & the_event
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void push_event (const AVStreams::streamEvent & the_event)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
   /// connect 2 Flow Devices.
   virtual CORBA::Boolean connect_devs (AVStreams::FDev_ptr a_party,
                                        AVStreams::FDev_ptr b_party,
-                                       AVStreams::QoS & the_qos
-                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                       AVStreams::QoS & the_qos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::streamOpDenied,
@@ -1091,8 +1020,7 @@ public:
   /// Connect a flow producer and consumer under this flow connection.
   virtual CORBA::Boolean connect (AVStreams::FlowProducer_ptr flow_producer,
                                   AVStreams::FlowConsumer_ptr flow_consumer,
-                                  AVStreams::QoS & the_qos
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                  AVStreams::QoS & the_qos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::formatMismatch,
                      AVStreams::FEPMismatch,
@@ -1104,22 +1032,19 @@ public:
 
   /// adds the producer to this flow connection.
   virtual CORBA::Boolean add_producer (AVStreams::FlowProducer_ptr flow_producer,
-                                       AVStreams::QoS & the_qos
-                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                       AVStreams::QoS & the_qos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::alreadyConnected,
                      AVStreams::notSupported));
 
   /// adds a consumer to this flow connection.
   virtual CORBA::Boolean add_consumer (AVStreams::FlowConsumer_ptr flow_consumer,
-                                       AVStreams::QoS & the_qos
-                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                       AVStreams::QoS & the_qos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::alreadyConnected));
 
   /// drops a flow endpoint from the flow.
-  virtual CORBA::Boolean drop (AVStreams::FlowEndPoint_ptr target
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Boolean drop (AVStreams::FlowEndPoint_ptr target)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notConnected));
 
@@ -1198,8 +1123,7 @@ public:
 
   /// set method for the related streamendpoint under which this
   /// flowendpoint is.
-  virtual void related_sep (AVStreams::StreamEndPoint_ptr related_sep
-                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void related_sep (AVStreams::StreamEndPoint_ptr related_sep)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual AVStreams::FlowConnection_ptr related_flow_connection(void)
@@ -1208,8 +1132,7 @@ public:
   // accessor for the related flow connection attribute.
 
   /// set method for the related flow connection attribute.
-  virtual void related_flow_connection (AVStreams::FlowConnection_ptr related_flow_connection
-                                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void related_flow_connection (AVStreams::FlowConnection_ptr related_flow_connection)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// returns the other flowendpoint to which this is connected.
@@ -1220,34 +1143,29 @@ public:
 
   //// use the specified flow protocol.
   virtual CORBA::Boolean use_flow_protocol (const char * fp_name,
-                                            const CORBA::Any & fp_settings
-                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                            const CORBA::Any & fp_settings)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::FPError,
                      AVStreams::notSupported));
 
   /// sets the data format.
-  virtual void set_format (const char * format
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void set_format (const char * format)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported));
 
   /// sets the device parameters.
-  virtual void set_dev_params (const CosPropertyService::Properties & new_settings
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void set_dev_params (const CosPropertyService::Properties & new_settings)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::PropertyException,
                      AVStreams::streamOpFailed));
 
   /// sets the list of protocols to be used.
-  virtual void set_protocol_restriction (const AVStreams::protocolSpec & the_spec
-                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void set_protocol_restriction (const AVStreams::protocolSpec & the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported));
 
   /// checks whether the passed flowendpoint is compatible with this.
-  virtual CORBA::Boolean is_fep_compatible (AVStreams::FlowEndPoint_ptr fep
-                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Boolean is_fep_compatible (AVStreams::FlowEndPoint_ptr fep)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::formatMismatch,
                      AVStreams::deviceQosMismatch));
@@ -1255,8 +1173,7 @@ public:
   /// sets the peer flowendpoint.
   virtual CORBA::Boolean set_peer (AVStreams::FlowConnection_ptr the_fc,
                                    AVStreams::FlowEndPoint_ptr the_peer_fep,
-                                   AVStreams::QoS & the_qos
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                   AVStreams::QoS & the_qos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::QoSRequestFailed,
                      AVStreams::streamOpFailed));
@@ -1264,8 +1181,7 @@ public:
   /// sets the multicast peer flowendpoint, not implemented.
   virtual CORBA::Boolean set_Mcast_peer (AVStreams::FlowConnection_ptr the_fc,
                                          AVStreams::MCastConfigIf_ptr a_mcastconfigif,
-                                         AVStreams::QoS & the_qos
-                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                         AVStreams::QoS & the_qos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::QoSRequestFailed));
 
@@ -1277,8 +1193,7 @@ public:
    */
   virtual CORBA::Boolean connect_to_peer (AVStreams::QoS & the_qos,
                                           const char * address,
-                                          const char * use_flow_protocol
-                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                          const char * use_flow_protocol)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::failedToConnect,
                      AVStreams::FPError,
@@ -1288,8 +1203,7 @@ public:
   virtual CORBA::Boolean connect_to_peer_i (TAO_FlowSpec_Entry::Role role,
                                             AVStreams::QoS & the_qos,
                                             const char * address,
-                                            const char * use_flow_protocol
-                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                            const char * use_flow_protocol)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::failedToConnect,
                      AVStreams::FPError,
@@ -1303,8 +1217,7 @@ public:
   virtual char * go_to_listen (AVStreams::QoS & the_qos,
                                CORBA::Boolean is_mcast,
                                AVStreams::FlowEndPoint_ptr peer,
-                               char *& flowProtocol
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                               char *& flowProtocol)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::failedToListen,
                      AVStreams::FPError,
@@ -1315,8 +1228,7 @@ public:
                                  AVStreams::QoS & the_qos,
                                  CORBA::Boolean is_mcast,
                                  AVStreams::FlowEndPoint_ptr peer,
-                                 char *& flowProtocol
-                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                 char *& flowProtocol)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::failedToListen,
                      AVStreams::FPError,
@@ -1371,8 +1283,7 @@ public:
    * UDP if the producer is listening and the consumer connects (logically) then the producer needs to
    * know the reverse channel on its peer fep to send data to.
    */
-  virtual char * get_rev_channel (const char * pcol_name
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual char * get_rev_channel (const char * pcol_name)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// stop this flow, to be overridden by the application.
@@ -1386,8 +1297,7 @@ public:
   virtual char * go_to_listen (AVStreams::QoS & the_qos,
                                CORBA::Boolean is_mcast,
                                AVStreams::FlowEndPoint_ptr peer,
-                               char *& flowProtocol
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                               char *& flowProtocol)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::failedToListen,
                      AVStreams::FPError,
@@ -1395,8 +1305,7 @@ public:
 
   virtual CORBA::Boolean connect_to_peer (AVStreams::QoS & the_qos,
                                           const char * address,
-                                          const char * use_flow_protocol
-                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                          const char * use_flow_protocol)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::failedToConnect,
                      AVStreams::FPError,
@@ -1406,8 +1315,7 @@ public:
   virtual char * connect_mcast (AVStreams::QoS & the_qos,
                                 CORBA::Boolean_out is_met,
                                 const char * address,
-                                const char * use_flow_protocol
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                const char * use_flow_protocol)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::failedToConnect,
                      AVStreams::notSupported,
@@ -1417,14 +1325,12 @@ public:
 
 
   /// sets the public key  to be used for encryption of the data.
-  virtual void set_key (const AVStreams::key & the_key
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void set_key (const AVStreams::key & the_key)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// sets the source id of this flow producer so that it can be used
   /// to distinguish this producer from others in the multicast case.
-  virtual void set_source_id (CORBA::Long source_id
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void set_source_id (CORBA::Long source_id)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
@@ -1456,8 +1362,7 @@ public:
   virtual char * go_to_listen (AVStreams::QoS & the_qos,
                                CORBA::Boolean is_mcast,
                                AVStreams::FlowEndPoint_ptr peer,
-                               char *& flowProtocol
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                               char *& flowProtocol)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::failedToListen,
                      AVStreams::FPError,
@@ -1465,8 +1370,7 @@ public:
 
   virtual CORBA::Boolean connect_to_peer (AVStreams::QoS & the_qos,
                                           const char * address,
-                                          const char * use_flow_protocol
-                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                          const char * use_flow_protocol)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::failedToConnect,
                      AVStreams::FPError,
@@ -1488,34 +1392,28 @@ public:
   TAO_MediaControl (void);
 
   virtual AVStreams::Position get_media_position (AVStreams::PositionOrigin an_origin,
-                                                  AVStreams::PositionKey a_key
-                                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                  AVStreams::PositionKey a_key)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::MediaControl::PostionKeyNotSupported)) =0;
 
-  virtual void set_media_position (const AVStreams::Position & a_position
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void set_media_position (const AVStreams::Position & a_position)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::MediaControl::PostionKeyNotSupported,
                      AVStreams::InvalidPosition)) =0;
 
-  virtual void start (const AVStreams::Position & a_position
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void start (const AVStreams::Position & a_position)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::InvalidPosition)) =0;
 
-  virtual void pause (const AVStreams::Position & a_position
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pause (const AVStreams::Position & a_position)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::InvalidPosition)) =0;
 
-  virtual void resume (const AVStreams::Position & a_position
-                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void resume (const AVStreams::Position & a_position)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::InvalidPosition)) =0;
 
-  virtual void stop (const AVStreams::Position & a_position
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void stop (const AVStreams::Position & a_position)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::InvalidPosition)) =0;
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
index 01e8fb523ea..d0ae69f37e9 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
@@ -154,8 +154,7 @@ TAO_AV_Core::reactor (void)
 
 int
 TAO_AV_Core::init (CORBA::ORB_ptr orb,
-                   PortableServer::POA_ptr poa
-                   ACE_ENV_ARG_DECL_NOT_USED)
+                   PortableServer::POA_ptr poa)
 {
   if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_Core::init "));
   this->orb_ = CORBA::ORB::_duplicate (orb);
@@ -587,7 +586,7 @@ TAO_AV_Acceptor*
 TAO_AV_Core::get_acceptor (const char *flowname)
 {
 
-  ACE_TRY_NEW_ENV
+  try
     {
 
       TAO_AV_AcceptorSetItor acceptor =  this->acceptor_registry_->begin ();
@@ -601,11 +600,10 @@ TAO_AV_Core::get_acceptor (const char *flowname)
             return *acceptor;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_AV_Core::get_acceptor");
+      ex._tao_print_exception ("TAO_AV_Core::get_acceptor");
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -613,7 +611,7 @@ int
 TAO_AV_Core::remove_acceptor (const char *flowname)
 {
 
-  ACE_TRY_NEW_ENV
+  try
     {
 
       TAO_AV_AcceptorSetItor acceptor =  this->acceptor_registry_->begin ();
@@ -630,11 +628,10 @@ TAO_AV_Core::remove_acceptor (const char *flowname)
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_AV_Core::get_acceptor");
+      ex._tao_print_exception ("TAO_AV_Core::get_acceptor");
     }
-  ACE_ENDTRY;
   return -1;
 }
 
@@ -1129,23 +1126,19 @@ TAO_AV_Core::deactivate_servant (PortableServer::Servant servant)
   // the servant when all pending requests on this servant are
   // complete.
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       PortableServer::POA_var poa = servant->_default_POA ();
 
-      PortableServer::ObjectId_var id = poa->servant_to_id (servant
-                                                            ACE_ENV_ARG_PARAMETER);
+      PortableServer::ObjectId_var id = poa->servant_to_id (servant);
 
-      poa->deactivate_object (id.in ()
-                              ACE_ENV_ARG_PARAMETER);
+      poa->deactivate_object (id.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "deactivate_servant");
+      ex._tao_print_exception ("deactivate_servant");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
index 4a8f29aa137..96f0899756b 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
@@ -95,8 +95,7 @@ public:
   ~TAO_AV_Core (void);
 
   int init (CORBA::ORB_ptr orb,
-            PortableServer::POA_ptr poa
-            ACE_ENV_ARG_DECL);
+            PortableServer::POA_ptr poa);
   int run (void);
   int stop_run (void);
   int init_forward_flows (TAO_Base_StreamEndPoint *endpoint,
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
index b5435bb0b6d..97019baa2b0 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
@@ -46,8 +46,7 @@ TAO_AV_Endpoint_Strategy::~TAO_AV_Endpoint_Strategy (void)
 // and the remaining calls will fail automagically
 int
 TAO_AV_Endpoint_Strategy::create_A (AVStreams::StreamEndPoint_A_ptr & /* stream_endpoint */,
-                                    AVStreams::VDev_ptr & /* vdev */
-                                    ACE_ENV_ARG_DECL_NOT_USED)
+                                    AVStreams::VDev_ptr & /* vdev */)
 {
   ACE_ERROR_RETURN ((LM_ERROR,
                      "(%P|%t) Error creating A endpoint\n"),
@@ -60,8 +59,7 @@ TAO_AV_Endpoint_Strategy::create_A (AVStreams::StreamEndPoint_A_ptr & /* stream_
 // and the remaining calls will fail automagically
 int
 TAO_AV_Endpoint_Strategy::create_B (AVStreams::StreamEndPoint_B_ptr & /* stream_endpoint */,
-                                    AVStreams::VDev_ptr & /*vdev */
-                                    ACE_ENV_ARG_DECL_NOT_USED)
+                                    AVStreams::VDev_ptr & /*vdev */)
 {
   ACE_ERROR_RETURN ((LM_ERROR,
                      "(%P|%t) Error creating B endpoint\n"),
@@ -150,8 +148,7 @@ TAO_AV_Endpoint_Process_Strategy::activate (void)
                        "remove"),
                       -1);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Get ourselves a Naming service
       this->bind_to_naming_service ();
@@ -162,12 +159,12 @@ TAO_AV_Endpoint_Process_Strategy::activate (void)
       // Get the Vdev created by the child from the naming service
       this->get_vdev ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Endpoint_Process_Strategy::activate");
+      ex._tao_print_exception (
+        "TAO_AV_Endpoint_Process_Strategy::activate");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -175,28 +172,27 @@ TAO_AV_Endpoint_Process_Strategy::activate (void)
 int
 TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (void)
 {
-  ACE_TRY
+  try
     {
       if (CORBA::is_nil (this->naming_context_.in ()) == 0)
         return 0;
 
       CORBA::Object_var naming_obj =
-        TAO_ORB_Core_instance ()->orb ()->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
+        TAO_ORB_Core_instance ()->orb ()->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to resolve the Name Service.\n"),
                           -1);
       this->naming_context_ =
-        CosNaming::NamingContext::_narrow (naming_obj.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service");
+      ex._tao_print_exception (
+        "TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -204,7 +200,7 @@ TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (void)
 int
 TAO_AV_Endpoint_Process_Strategy::get_vdev (void)
 {
-  ACE_TRY
+  try
     {
       char vdev_name [BUFSIZ];
       ACE_OS::sprintf (vdev_name,
@@ -222,13 +218,11 @@ TAO_AV_Endpoint_Process_Strategy::get_vdev (void)
 
       // Get the CORBA::Object
       CORBA::Object_var vdev =
-        this->naming_context_->resolve (VDev_Name
-                                        ACE_ENV_ARG_PARAMETER);
+        this->naming_context_->resolve (VDev_Name);
 
       // Narrow it
       this->vdev_ =
-        AVStreams::VDev::_narrow (vdev.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+        AVStreams::VDev::_narrow (vdev.in ());
 
       // Check if valid
       if (CORBA::is_nil (this->vdev_.in() ))
@@ -236,12 +230,12 @@ TAO_AV_Endpoint_Process_Strategy::get_vdev (void)
                            " could not resolve Stream_Endpoint_B in Naming service <%s>\n"),
                           -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Endpoint_Process_Strategy::get_vdev");
+      ex._tao_print_exception (
+        "TAO_AV_Endpoint_Process_Strategy::get_vdev");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -263,8 +257,7 @@ TAO_AV_Endpoint_Process_Strategy_A::~TAO_AV_Endpoint_Process_Strategy_A (void)
 // the "A" type endpoint creator
 int
 TAO_AV_Endpoint_Process_Strategy_A::create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint,
-                                           AVStreams::VDev_ptr &vdev
-                                           ACE_ENV_ARG_DECL_NOT_USED)
+                                           AVStreams::VDev_ptr &vdev)
 {
   // use the baseclass activate
   if (this->activate () == -1)
@@ -283,7 +276,7 @@ TAO_AV_Endpoint_Process_Strategy_A::create_A (AVStreams::StreamEndPoint_A_ptr &s
 int
 TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint (void)
 {
-  ACE_TRY
+  try
     {
       char stream_endpoint_name[BUFSIZ];
       ACE_OS::sprintf (stream_endpoint_name,
@@ -302,13 +295,11 @@ TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint (void)
 
       // Get the CORBA::Object
       CORBA::Object_var stream_endpoint_a =
-        this->naming_context_->resolve (Stream_Endpoint_A_Name
-                                        ACE_ENV_ARG_PARAMETER);
+        this->naming_context_->resolve (Stream_Endpoint_A_Name);
 
       // Narrow the reference
       this->stream_endpoint_a_ =
-        AVStreams::StreamEndPoint_A::_narrow (stream_endpoint_a.in ()
-                                              ACE_ENV_ARG_PARAMETER);
+        AVStreams::StreamEndPoint_A::_narrow (stream_endpoint_a.in ());
 
       // Check for validity
       if (CORBA::is_nil (this->stream_endpoint_a_.in() ))
@@ -316,12 +307,12 @@ TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint (void)
                            " could not resolve Stream_Endpoint_A in Naming service <%s>\n"),
                           -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint");
+      ex._tao_print_exception (
+        "TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -343,10 +334,9 @@ TAO_AV_Endpoint_Process_Strategy_B::~TAO_AV_Endpoint_Process_Strategy_B (void)
 // Creates and returns a "B" type endpoint
 int
 TAO_AV_Endpoint_Process_Strategy_B::create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint,
-                                              AVStreams::VDev_ptr &vdev
-                                              ACE_ENV_ARG_DECL)
+                                              AVStreams::VDev_ptr &vdev)
 {
-  ACE_TRY
+  try
     {
     if (this->activate () == -1)
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -354,17 +344,16 @@ TAO_AV_Endpoint_Process_Strategy_B::create_B (AVStreams::StreamEndPoint_B_ptr &s
                         -1);
 
     if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Process_Strategy_B::create_B ()\n: stream_endpoint is:%s\n",
-                TAO_ORB_Core_instance ()->orb ()->object_to_string (this->stream_endpoint_b_.in()
-                                                                    ACE_ENV_ARG_PARAMETER)));
+                TAO_ORB_Core_instance ()->orb ()->object_to_string (this->stream_endpoint_b_.in())));
     stream_endpoint = AVStreams::StreamEndPoint_B::_duplicate ( this->stream_endpoint_b_.in() );
     vdev = AVStreams::VDev::_duplicate( this->vdev_.in() );
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Endpoint_Process_Strategy_B::create_B\n");
+      ex._tao_print_exception (
+        "TAO_AV_Endpoint_Process_Strategy_B::create_B\n");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -372,7 +361,7 @@ TAO_AV_Endpoint_Process_Strategy_B::create_B (AVStreams::StreamEndPoint_B_ptr &s
 int
 TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (void)
 {
-  ACE_TRY
+  try
     {
       char stream_endpoint_name[BUFSIZ];
       ACE_OS::sprintf (stream_endpoint_name,
@@ -391,13 +380,11 @@ TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (void)
 
       // Get the CORBA::Object reference
       CORBA::Object_var stream_endpoint_b =
-        this->naming_context_->resolve (Stream_Endpoint_B_Name
-                                        ACE_ENV_ARG_PARAMETER);
+        this->naming_context_->resolve (Stream_Endpoint_B_Name);
 
       // Narrow the reference
       this->stream_endpoint_b_ =
-        AVStreams::StreamEndPoint_B::_narrow (stream_endpoint_b.in ()
-                                              ACE_ENV_ARG_PARAMETER);
+        AVStreams::StreamEndPoint_B::_narrow (stream_endpoint_b.in ());
 
       // Check for validity
       if (CORBA::is_nil (this->stream_endpoint_b_.in() ))
@@ -405,12 +392,12 @@ TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (void)
                            " could not resolve Stream_Endpoint_B in Naming service <%s>\n"),
                           -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint");
+      ex._tao_print_exception (
+        "TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
index d2f1bdde465..a5c26d990a2 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
@@ -49,13 +49,11 @@ public:
 
   /// Called by the MMDevice, when it needs to create an A type endpoint
   virtual int create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint,
-                        AVStreams::VDev_ptr &vdev
-                        ACE_ENV_ARG_DECL);
+                        AVStreams::VDev_ptr &vdev);
 
   /// Called by the MMDevice, when it needs to create an B type endpoint
   virtual int create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint,
-                        AVStreams::VDev_ptr &vdev
-                        ACE_ENV_ARG_DECL);
+                        AVStreams::VDev_ptr &vdev);
 
 protected:
   /// The "A" stream endpoint
@@ -140,8 +138,7 @@ public:
 protected:
   /// Creates an "A" type stream endpoint, and a vdev
   virtual int create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint,
-                        AVStreams::VDev_ptr &vdev
-                        ACE_ENV_ARG_DECL);
+                        AVStreams::VDev_ptr &vdev);
 
   /// Gets the "A" type stream endpoint from the child process
   virtual int get_stream_endpoint (void);
@@ -168,8 +165,7 @@ public:
 protected:
   /// Creates a "B" type stream endpoint, and a vdev
   virtual int create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint,
-                        AVStreams::VDev_ptr &vdev
-                        ACE_ENV_ARG_DECL);
+                        AVStreams::VDev_ptr &vdev);
 
 
   /// Gets the object reference of the "B" type streamendpoint.
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
index c7676adf1c7..c42a41a5603 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
@@ -28,37 +28,31 @@ template <class T_StreamEndpoint, class T_VDev, class T_MediaCtrl>
 TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TAO_AV_Endpoint_Reactive_Strategy (void)
 {
   // Do not allow exceptions to escape from the destructor
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       if(this->stream_endpoint_a_servant_ )
         {
-          stream_endpoint_a_servant_->_remove_ref (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          stream_endpoint_a_servant_->_remove_ref ();
         }
 
       if(this->stream_endpoint_b_servant_)
         {
-          stream_endpoint_b_servant_->_remove_ref (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          stream_endpoint_b_servant_->_remove_ref ();
         }
 
       if(this->vdev_servant_)
         {
-          vdev_servant_->_remove_ref (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          vdev_servant_->_remove_ref ();
         }
 
       if(this->media_ctrl_servant_)
         {
-          media_ctrl_servant_->_remove_ref (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          media_ctrl_servant_->_remove_ref ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
     }
-  ACE_ENDTRY;
 
 }
 
@@ -67,8 +61,7 @@ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
 TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       this->activate_stream_endpoint ();
       if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activated stream_endpoint\n"));
@@ -79,31 +72,28 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
       this->activate_mediactrl ();
       if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activated mediactrl\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_Endpoint_Reactive_Strategy::activate");
+      ex._tao_print_exception (
+        "TAO_Endpoint_Reactive_Strategy::activate");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 char *
-TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa (PortableServer::Servant servant ACE_ENV_ARG_DECL)
+TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa (PortableServer::Servant servant)
 {
 
   PortableServer::ObjectId_var id =
-    this->poa_->activate_object (servant
-                                 ACE_ENV_ARG_PARAMETER);
+    this->poa_->activate_object (servant);
 
   CORBA::Object_var obj =
-    this->poa_->id_to_reference (id.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+    this->poa_->id_to_reference (id.in ());
 
   CORBA::String_var str =
-    this->orb_->object_to_string (obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+    this->orb_->object_to_string (obj.in ());
 
   return str._retn ();
 }
@@ -114,7 +104,7 @@ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
 TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_vdev (void)
 {
-  ACE_TRY
+  try
     {
       // Bridge pattern. Allow subclasses to override this behavior
       T_VDev *vdev = 0;
@@ -123,19 +113,19 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
 
       // Activate the object under the root poa.
 //      CORBA::String_var vdev_ior = this->activate_with_poa (vdev,
-//                                                            ACE_ENV_ARG_PARAMETER);
+//);
 //      if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activate_vdev, vdev ior is:%s\n",
 //                  vdev_ior. in ()));
 
       // Save the object reference, so that create_A can return it
       this->vdev_ = vdev->_this ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Endpoint_Reactive_Strategy::activate_vdev");
+      ex._tao_print_exception (
+        "TAO_AV_Endpoint_Reactive_Strategy::activate_vdev");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -145,7 +135,7 @@ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
 TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_mediactrl (void)
 {
-  ACE_TRY
+  try
     {
       // Bridge pattern. Subclasses can override this
       if (this->make_mediactrl ( media_ctrl_servant_ ) == -1)
@@ -160,16 +150,15 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
 
 
      this->vdev_->define_property ("Related_MediaCtrl",
-                                   anyval
-                                   ACE_ENV_ARG_PARAMETER);
+                                   anyval);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Endpoint_Reactive_Strategy::activate_mediactrl");
+      ex._tao_print_exception (
+        "TAO_AV_Endpoint_Reactive_Strategy::activate_mediactrl");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -242,7 +231,7 @@ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
 TAO_AV_Endpoint_Reactive_Strategy_A<T_StreamEndpoint, T_VDev, T_MediaCtrl>::create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint,
                                                                                       AVStreams::VDev_ptr &vdev
-                                                                                      ACE_ENV_ARG_DECL_NOT_USED/* ACE_ENV_SINGLE_ARG_PARAMETER */)
+/* ACE_ENV_SINGLE_ARG_PARAMETER */)
 {
   if (this->activate () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -260,7 +249,7 @@ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
 TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint (void)
 {
-  ACE_TRY
+  try
     {
 
       // Use the bridge method
@@ -270,12 +259,12 @@ TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::act
       // Save the object references, so that create_a can return them
       this->stream_endpoint_a_ = this->stream_endpoint_a_servant_->_this ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Endpoint_Reactive_Strategy_A::activate_stream_endpoint");
+      ex._tao_print_exception (
+        "TAO_AV_Endpoint_Reactive_Strategy_A::activate_stream_endpoint");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -311,19 +300,19 @@ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
 TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint (void)
 {
-  ACE_TRY
+  try
     {
       if (this->make_stream_endpoint ( this->stream_endpoint_b_servant_ ) == -1)
         return -1;
 
       this->stream_endpoint_b_ = this->stream_endpoint_b_servant_->_this ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Endpoint_Reactive_Strategy_B::activate_stream_endpoint");
+      ex._tao_print_exception (
+        "TAO_AV_Endpoint_Reactive_Strategy_B::activate_stream_endpoint");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -332,7 +321,7 @@ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
 TAO_AV_Endpoint_Reactive_Strategy_B<T_StreamEndpoint, T_VDev, T_MediaCtrl>::create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint,
                                                                                       AVStreams::VDev_ptr &vdev
-                                                                                      ACE_ENV_ARG_DECL_NOT_USED/* ACE_ENV_SINGLE_ARG_PARAMETER */)
+/* ACE_ENV_SINGLE_ARG_PARAMETER */)
 {
   if (this->activate () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -370,8 +359,7 @@ TAO_AV_Child_Process  <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::init (int argc,
                                                                        CORBA::ORB_ptr orb,
                                                                        PortableServer::POA_ptr poa)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       this->orb_ = orb;
 
@@ -379,8 +367,7 @@ TAO_AV_Child_Process  <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::init (int argc,
 
       // create the objects and activate them in the poa
       this->activate_objects (argc,
-                              argv
-                              ACE_ENV_ARG_PARAMETER);
+                              argv);
 
       // Get ourselves a naming_service object reference
       this->bind_to_naming_service ();
@@ -391,12 +378,11 @@ TAO_AV_Child_Process  <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::init (int argc,
       // register the stream_endpoing with the naming_service
       this->register_stream_endpoint ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_Child_Process");
+      ex._tao_print_exception ("TAO_Child_Process");
       return -1;
     }
-  ACE_ENDTRY;
 
   // release the semaphore the parent is waiting on
   if (this->release_semaphore () == -1)
@@ -409,21 +395,17 @@ TAO_AV_Child_Process  <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::init (int argc,
 
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 char *
-TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa (PortableServer::Servant servant
-                                                                                 ACE_ENV_ARG_DECL)
+TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa (PortableServer::Servant servant)
 {
 
   PortableServer::ObjectId_var id =
-    this->poa_->activate_object (servant
-                                 ACE_ENV_ARG_PARAMETER);
+    this->poa_->activate_object (servant);
 
   CORBA::Object_var obj =
-    this->poa_->id_to_reference (id.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+    this->poa_->id_to_reference (id.in ());
 
   CORBA::String_var str =
-    this->orb_->object_to_string (obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+    this->orb_->object_to_string (obj.in ());
 
   return str._retn ();
 }
@@ -432,10 +414,9 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
 TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_objects (int /*argc*/,
-                                                                                 char ** /*argv*/
-                                                                                 ACE_ENV_ARG_DECL)
+                                                                                 char ** /*argv*/)
 {
-  ACE_TRY
+  try
     {
       // bridge method to make a new stream endpoint
       if (this->make_stream_endpoint (this->stream_endpoint_) == -1)
@@ -450,31 +431,27 @@ TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_objects
         return -1;
 
       // activate the stream_endpoint
-      CORBA::String_var stream_endpoint_ior = this->activate_with_poa (this->stream_endpoint_
-                                                                       ACE_ENV_ARG_PARAMETER);
+      CORBA::String_var stream_endpoint_ior = this->activate_with_poa (this->stream_endpoint_);
       if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,
                                            "(%P|%t)TAO_AV_Child_Process::activate_objects,stream_endpoint_ior :%s\n",
                                            stream_endpoint_ior.in ()));
 
       // activate the vdev
-      CORBA::String_var vdev_ior = this->activate_with_poa (this->vdev_
-                                                            ACE_ENV_ARG_PARAMETER);
+      CORBA::String_var vdev_ior = this->activate_with_poa (this->vdev_);
       if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,
                                            "(%P|%t)TAO_AV_Child_Process::activate_objects, vdev ior is :%s\n",
                                            vdev_ior.in ()));
 
       // activate the media controller
-      CORBA::String_var media_ctrl_ior = this->activate_with_poa (this->media_ctrl_
-                                                                  ACE_ENV_ARG_PARAMETER);
+      CORBA::String_var media_ctrl_ior = this->activate_with_poa (this->media_ctrl_);
 
       if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Child_Process::activate_objects,media_ctrl_ior is: %s\n",media_ctrl_ior.in ()));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Child_Process::init ");
+      ex._tao_print_exception ("TAO_AV_Child_Process::init ");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -483,25 +460,24 @@ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
 TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::bind_to_naming_service (void)
 {
-  ACE_TRY
+  try
     {
       CORBA::Object_var naming_obj =
-        this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("NameService");
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to resolve the Name Service.\n"),
                           -1);
       //  if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) %s:%d\n", __FILE__, __LINE__));
       this->naming_context_ =
-        CosNaming::NamingContext::_narrow (naming_obj.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Child_Process::bind_to_naming_service");
+      ex._tao_print_exception (
+        "TAO_AV_Child_Process::bind_to_naming_service");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -510,7 +486,7 @@ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
 TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev (void)
 {
-  ACE_TRY
+  try
     {
       char vdev_name [BUFSIZ];
       ACE_OS::sprintf (vdev_name,
@@ -530,40 +506,36 @@ TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev (vo
         this->media_ctrl_->_this ();
 
       this->vdev_->define_property ("Related_MediaCtrl",
-                                    media_ctrl_obj_.in()
-                                    ACE_ENV_ARG_PARAMETER);
+                                    media_ctrl_obj_.in());
 
       vdev_obj_ = this->vdev_->_this ();
 
-      ACE_TRY_EX (bind)
+      try
         {
           // Register the vdev with the naming server.
           this->naming_context_->bind (this->vdev_name_,
-                                       vdev_obj_.in()
-                                       ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (bind);
+                                       vdev_obj_.in());
         }
-      ACE_CATCH (CosNaming::NamingContext::AlreadyBound,ex)
+      catch (const CosNaming::NamingContext::AlreadyBound& )
         {
           // If the object was already there, replace the older reference
           // with this one
           this->naming_context_->rebind (this->vdev_name_,
-                                         vdev_obj_.in()
-                                         ACE_ENV_ARG_PARAMETER);
+                                         vdev_obj_.in());
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Child_Process::register_vdev");
+          ex._tao_print_exception (
+            "TAO_AV_Child_Process::register_vdev");
           return -1;
         }
-      ACE_ENDTRY;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Child_Process::register_vdev");
+      ex._tao_print_exception (
+        "TAO_AV_Child_Process::register_vdev");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -572,17 +544,15 @@ template <class T_StreamEndpoint_B, class T_VDev , class T_MediaCtrl>
 int
 TAO_AV_Child_Process  <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::run (ACE_Time_Value *tv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
+      this->orb_->run (tv);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"orb.run ()");
+      ex._tao_print_exception ("orb.run ()");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -625,7 +595,7 @@ int
 TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_stream_endpoint (void)
 {
   CORBA::Object_ptr stream_endpoint_obj = CORBA::Object::_nil ();
-  ACE_TRY
+  try
     {
       stream_endpoint_obj = this->stream_endpoint_->_this ();
 
@@ -633,22 +603,20 @@ TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_stream_e
       // subclasses can define their own name for the streamendpoint
       // Register the stream endpoint object with the naming server.
       this->naming_context_->bind (this->stream_endpoint_name_,
-                                   stream_endpoint_obj
-                                   ACE_ENV_ARG_PARAMETER);
+                                   stream_endpoint_obj);
     }
-  ACE_CATCH (CosNaming::NamingContext::AlreadyBound,ex)
+  catch (const CosNaming::NamingContext::AlreadyBound& )
     {
       // if the name was already there, replace the reference with the new one
       this->naming_context_->rebind (this->stream_endpoint_name_,
-                                     stream_endpoint_obj
-                                     ACE_ENV_ARG_PARAMETER);
+                                     stream_endpoint_obj);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_Endpoint_Reactive_Strategy::activate");
+      ex._tao_print_exception (
+        "TAO_Endpoint_Reactive_Strategy::activate");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -692,23 +660,20 @@ int
 TAO_AV_Child_Process<T_StreamEndpoint, T_VDev, T_MediaCtrl>::unbind_names (void)
 {
   // Remove the names from the naming service
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       if (CORBA::is_nil (this->naming_context_.in ()) == 0)
         return 0;
-      this->naming_context_->unbind (this->stream_endpoint_name_
-                                     ACE_ENV_ARG_PARAMETER);
+      this->naming_context_->unbind (this->stream_endpoint_name_);
 
-      this->naming_context_->unbind (this->vdev_name_
-                                     ACE_ENV_ARG_PARAMETER);
+      this->naming_context_->unbind (this->vdev_name_);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_Endpoint_Process_Strategy::activate");
+      ex._tao_print_exception (
+        "TAO_Endpoint_Process_Strategy::activate");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
index 2d44463ac4d..5e8683715ba 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
@@ -62,7 +62,7 @@ protected:
   virtual int make_mediactrl (T_MediaCtrl *&media_ctrl);
 
 
-  char* activate_with_poa (PortableServer::Servant servant ACE_ENV_ARG_DECL);
+  char* activate_with_poa (PortableServer::Servant servant);
 
   CORBA::ORB_var orb_;
 
@@ -105,8 +105,7 @@ public:
 
   /// Called by the MMDevice, when it needs to create an A type endpoint
   virtual int create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint,
-                        AVStreams::VDev_ptr &vdev
-                        ACE_ENV_ARG_DECL);
+                        AVStreams::VDev_ptr &vdev);
 
 };
 
@@ -136,8 +135,7 @@ public:
 
   /// Called by the MMDevice, when it needs to create a B type endpoint
   virtual int create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint,
-                        AVStreams::VDev_ptr &vdev
-                        ACE_ENV_ARG_DECL);
+                        AVStreams::VDev_ptr &vdev);
 };
 
 // ----------------------------------------------------------------------
@@ -173,11 +171,10 @@ protected:
    * return them to the client
    */
   int activate_objects (int argc,
-                        char **argv
-                        ACE_ENV_ARG_DECL);
+                        char **argv);
 
   ///activate the servant with the poa
-  char* activate_with_poa (PortableServer::Servant servant ACE_ENV_ARG_DECL);
+  char* activate_with_poa (PortableServer::Servant servant);
 
   /// Removes the vdev and streamendpoint names from the naming service.
   int unbind_names (void);
diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp
index 6a838aed345..19c338b876f 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp
@@ -22,20 +22,17 @@ template <class T_Producer, class T_Consumer>
 TAO_FDev<T_Producer, T_Consumer>::TAO_FDev (const char *flowname)
   :flowname_ (flowname)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::Any flowname_any;
       flowname_any <<= flowname;
       this->define_property ("Flow",
-                             flowname_any
-                             ACE_ENV_ARG_PARAMETER);
+                             flowname_any);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_FDev::TAO_FDev");
+      ex._tao_print_exception ("TAO_FDev::TAO_FDev");
     }
-  ACE_ENDTRY;
 }
 
 template <class T_Producer, class T_Consumer>
@@ -55,20 +52,17 @@ template <class T_Producer, class T_Consumer>
 void
 TAO_FDev<T_Producer, T_Consumer>::flowname (const char *flow_name)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::Any flowname_any;
       flowname_any <<= flow_name;
       this->define_property ("Flow",
-                             flowname_any
-                             ACE_ENV_ARG_PARAMETER);
+                             flowname_any);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_FDev::flowname");
+      ex._tao_print_exception ("TAO_FDev::flowname");
     }
-  ACE_ENDTRY;
   this->flowname_ = flow_name;
 }
 
@@ -77,8 +71,7 @@ AVStreams::FlowProducer_ptr
 TAO_FDev<T_Producer, T_Consumer>::create_producer (AVStreams::FlowConnection_ptr the_requester,
                                                    AVStreams::QoS & the_qos,
                                                    CORBA::Boolean_out met_qos,
-                                                   char *& named_fdev
-                                                   ACE_ENV_ARG_DECL)
+                                                   char *& named_fdev)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::streamOpDenied,
@@ -89,8 +82,7 @@ TAO_FDev<T_Producer, T_Consumer>::create_producer (AVStreams::FlowConnection_ptr
   return this->make_producer (the_requester,
                               the_qos,
                               met_qos,
-                              named_fdev
-                              ACE_ENV_ARG_PARAMETER);
+                              named_fdev);
 }
 
 template <class T_Producer, class T_Consumer>
@@ -99,11 +91,10 @@ AVStreams::FlowProducer_ptr
 TAO_FDev<T_Producer, T_Consumer>::make_producer (AVStreams::FlowConnection_ptr /* the_requester */,
                                                  AVStreams::QoS & /* the_qos */,
                                                  CORBA::Boolean_out /* met_qos */,
-                                                 char *& /* named_fdev */
-                                                 ACE_ENV_ARG_DECL)
+                                                 char *& /* named_fdev */)
 {
   AVStreams::FlowProducer_ptr producer = AVStreams::FlowProducer::_nil ();
-  ACE_TRY
+  try
     {
       // Activate the producer implementation under the Root POA.
       T_Producer *producer_i;
@@ -111,12 +102,11 @@ TAO_FDev<T_Producer, T_Consumer>::make_producer (AVStreams::FlowConnection_ptr /
       this->producer_list_.insert_tail (producer_i);
       producer = producer_i->_this ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_FDev::make_producer");
+      ex._tao_print_exception ("TAO_FDev::make_producer");
       return producer;
     }
-  ACE_ENDTRY;
   return producer;
 }
 
@@ -126,11 +116,10 @@ AVStreams::FlowConsumer_ptr
 TAO_FDev<T_Producer, T_Consumer>::make_consumer (AVStreams::FlowConnection_ptr /* the_requester */,
                                                  AVStreams::QoS & /* the_qos */,
                                                  CORBA::Boolean_out /* met_qos */,
-                                                 char *& /* named_fdev */
-                                                 ACE_ENV_ARG_DECL)
+                                                 char *& /* named_fdev */)
 {
   AVStreams::FlowConsumer_ptr consumer = AVStreams::FlowConsumer::_nil ();
-  ACE_TRY
+  try
     {
       // Activate the consumer implementation under the Root POA.
       T_Consumer *consumer_i;
@@ -139,12 +128,11 @@ TAO_FDev<T_Producer, T_Consumer>::make_consumer (AVStreams::FlowConnection_ptr /
       this->consumer_list_.insert_tail (consumer_i);
       consumer = consumer_i->_this ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_FDev::make_consumer");
+      ex._tao_print_exception ("TAO_FDev::make_consumer");
       return consumer;
     }
-  ACE_ENDTRY;
   return consumer;
 }
 
@@ -153,8 +141,7 @@ AVStreams::FlowConsumer_ptr
 TAO_FDev<T_Producer, T_Consumer>::create_consumer (AVStreams::FlowConnection_ptr the_requester,
                                                    AVStreams::QoS & the_qos,
                                                    CORBA::Boolean_out met_qos,
-                                                   char *& named_fdev
-                                                   ACE_ENV_ARG_DECL)
+                                                   char *& named_fdev)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::streamOpDenied,
@@ -164,8 +151,7 @@ TAO_FDev<T_Producer, T_Consumer>::create_consumer (AVStreams::FlowConnection_ptr
   return this->make_consumer (the_requester,
                               the_qos,
                               met_qos,
-                              named_fdev
-                              ACE_ENV_ARG_PARAMETER);
+                              named_fdev);
 }
 
 template <class T_Producer, class T_Consumer>
@@ -173,8 +159,7 @@ template <class T_Producer, class T_Consumer>
 AVStreams::FlowConnection_ptr
 TAO_FDev<T_Producer, T_Consumer>::bind (AVStreams::FDev_ptr peer_device,
                                         AVStreams::QoS & the_qos,
-                                        CORBA::Boolean_out is_met
-                                        ACE_ENV_ARG_DECL)
+                                        CORBA::Boolean_out is_met)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::QoSRequestFailed))
@@ -190,8 +175,7 @@ template <class T_Producer, class T_Consumer>
 AVStreams::FlowConnection_ptr
 TAO_FDev<T_Producer, T_Consumer>::bind_mcast (AVStreams::FDev_ptr first_peer,
                                               AVStreams::QoS & the_qos,
-                                              CORBA::Boolean_out is_met
-                                              ACE_ENV_ARG_DECL)
+                                              CORBA::Boolean_out is_met)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::QoSRequestFailed))
@@ -205,8 +189,7 @@ TAO_FDev<T_Producer, T_Consumer>::bind_mcast (AVStreams::FDev_ptr first_peer,
 template <class T_Producer, class T_Consumer>
 void
 TAO_FDev<T_Producer, T_Consumer>::destroy (AVStreams::FlowEndPoint_ptr /* the_ep */,
-                                           const char * /* fdev_name */
-                                           ACE_ENV_ARG_DECL_NOT_USED)
+                                           const char * /* fdev_name */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported))
 {
diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h
index d0810ab65e1..d600e9d1a32 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h
@@ -47,8 +47,7 @@ public:
   AVStreams::FlowProducer_ptr create_producer (AVStreams::FlowConnection_ptr the_requester,
                                                        AVStreams::QoS & the_qos,
                                                        CORBA::Boolean_out met_qos,
-                                                       char *& named_fdev
-                                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                       char *& named_fdev)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::streamOpDenied,
@@ -60,15 +59,13 @@ public:
   virtual AVStreams::FlowProducer_ptr make_producer (AVStreams::FlowConnection_ptr the_requester,
                                                        AVStreams::QoS & the_qos,
                                                        CORBA::Boolean_out met_qos,
-                                                       char *& named_fdev
-                                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                                                       char *& named_fdev);
 
   /// create a flow consumer object.
   virtual AVStreams::FlowConsumer_ptr create_consumer (AVStreams::FlowConnection_ptr the_requester,
                                                        AVStreams::QoS & the_qos,
                                                        CORBA::Boolean_out met_qos,
-                                                       char *& named_fdev
-                                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                       char *& named_fdev)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::streamOpDenied,
@@ -80,14 +77,12 @@ public:
   virtual AVStreams::FlowConsumer_ptr make_consumer (AVStreams::FlowConnection_ptr the_requester,
                                                        AVStreams::QoS & the_qos,
                                                        CORBA::Boolean_out met_qos,
-                                                       char *& named_fdev
-                                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                                                       char *& named_fdev);
 
   /// bind this FDev with another FDev.
   virtual AVStreams::FlowConnection_ptr bind (AVStreams::FDev_ptr peer_device,
                                               AVStreams::QoS & the_qos,
-                                              CORBA::Boolean_out is_met
-                                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                              CORBA::Boolean_out is_met)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::QoSRequestFailed));
@@ -95,16 +90,14 @@ public:
   /// multicast bind is not implemented yet.
   virtual AVStreams::FlowConnection_ptr bind_mcast (AVStreams::FDev_ptr first_peer,
                                                     AVStreams::QoS & the_qos,
-                                                    CORBA::Boolean_out is_met
-                                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                    CORBA::Boolean_out is_met)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::QoSRequestFailed));
 
   /// destroys this FDev.
   virtual void destroy (AVStreams::FlowEndPoint_ptr the_ep,
-                        const char * fdev_name
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                        const char * fdev_name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported));
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
index 87feb7f4b9a..4d6644a6611 100644
--- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
@@ -320,7 +320,6 @@ int
 TAO_AV_UDP_QoS_Flow_Handler::handle_qos (ACE_HANDLE /*fd*/)
 {
 
-  ACE_DECLARE_NEW_CORBA_ENV;
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
                 "(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::handle_qos\n"));
@@ -376,8 +375,7 @@ TAO_AV_UDP_QoS_Flow_Handler::handle_qos (ACE_HANDLE /*fd*/)
 
                   AVStreams::Negotiator_var remote_negotiator;
                   this->negotiator_->negotiate (remote_negotiator.in (),
-                                                new_qos
-                                                ACE_ENV_ARG_PARAMETER);
+                                                new_qos);
                 }
             }
     }
@@ -888,7 +886,6 @@ TAO_AV_UDP_QoS_Acceptor::open_default (TAO_Base_StreamEndPoint *endpoint,
 int
 TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
   int result = 0;
 
   //  TAO_AV_Callback *callback = 0;
@@ -1033,22 +1030,19 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr)
 
   AVStreams::Negotiator_ptr negotiator;
 
-  ACE_TRY_EX (negotiator)
+  try
     {
       CORBA::Any_ptr negotiator_any =
-        this->endpoint_->get_property_value ("Negotiator"
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (negotiator);
+        this->endpoint_->get_property_value ("Negotiator");
 
       *negotiator_any >>= negotiator;
       handler->negotiator (negotiator);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "(%N,%l) Negotiator Not Found \n"));
     }
-  ACE_ENDTRY;
 
   this->endpoint_->set_flow_handler (this->flowname_.c_str (),flow_handler);
   this->entry_->protocol_object (object);
@@ -1167,7 +1161,6 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry,
 {
   ACE_UNUSED_ARG (flow_comp);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
   int result = 0;
   this->entry_ = entry;
   this->flowname_ = entry->flowname ();
@@ -1323,23 +1316,20 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry,
 
   AVStreams::Negotiator_ptr negotiator;
 
-  ACE_TRY_EX (negotiator)
+  try
     {
       CORBA::Any_ptr negotiator_any =
-        this->endpoint_->get_property_value ("Negotiator"
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (negotiator);
+        this->endpoint_->get_property_value ("Negotiator");
 
       *negotiator_any >>= negotiator;
       handler->negotiator (negotiator);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Negotiator not found for flow %s\n",
                   this->entry_->flowname ()));
     }
-  ACE_ENDTRY;
 
   flow_handler->protocol_object (object);
 
diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
index e0ca8fa3ba6..2185c7146c7 100644
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
@@ -12,16 +12,14 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class TARGET> void
-ACE_PushConsumer_Adapter<TARGET>::push (const RtecEventComm::EventSet& events
-                                        ACE_ENV_ARG_DECL)
+ACE_PushConsumer_Adapter<TARGET>::push (const RtecEventComm::EventSet& events)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  target_->push (events ACE_ENV_ARG_PARAMETER);
+  target_->push (events);
 }
 
 template<class TARGET> void
-ACE_PushConsumer_Adapter<TARGET>::disconnect_push_consumer (
-    ACE_ENV_SINGLE_ARG_DECL)
+ACE_PushConsumer_Adapter<TARGET>::disconnect_push_consumer ()
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -29,8 +27,7 @@ ACE_PushConsumer_Adapter<TARGET>::disconnect_push_consumer (
 }
 
 template<class TARGET> void
-ACE_PushSupplier_Adapter<TARGET>::disconnect_push_supplier (
-    ACE_ENV_SINGLE_ARG_DECL)
+ACE_PushSupplier_Adapter<TARGET>::disconnect_push_supplier ()
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   target_->disconnect_push_supplier ();
diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
index c63e0db6595..5f5a0b217ae 100644
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
+++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
@@ -45,8 +45,7 @@ public:
   ACE_PushConsumer_Adapter (TARGET *target);
 
   /// Forwards to target_.
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void push (const RtecEventComm::EventSet& events)
       ACE_THROW_SPEC (( CORBA::SystemException));
 
   /// Forwards to target_.
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
index 3afb449d168..b1c0dc9822a 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
@@ -91,12 +91,12 @@ CC_Lock::unlock (void)
   ACE_DEBUG ((LM_DEBUG,
               "CC_Lock::unlock\n"));
   if (lock_held_ == 0)
-    ACE_THROW (CosConcurrencyControl::LockNotHeld ());
+    throw CosConcurrencyControl::LockNotHeld ();
 
   int success = 0; //semaphore_.release ();
 
   if (success == -1)
-    ACE_THROW (CORBA::INTERNAL ());
+    throw CORBA::INTERNAL ();
 
   lock_held_--;
 
@@ -106,8 +106,7 @@ CC_Lock::unlock (void)
 }
 
 void
-CC_Lock::change_mode (CosConcurrencyControl::lock_mode new_mode
-                      ACE_ENV_ARG_DECL)
+CC_Lock::change_mode (CosConcurrencyControl::lock_mode new_mode)
 {
   ACE_DEBUG ((LM_DEBUG,
               "CC_Lock::change_mode\n"));
@@ -117,7 +116,7 @@ CC_Lock::change_mode (CosConcurrencyControl::lock_mode new_mode
   // write lock
 
   if (lock_held_ == 0)
-    ACE_THROW (CosConcurrencyControl::LockNotHeld ());
+    throw CosConcurrencyControl::LockNotHeld ();
 
   this->mode_ = new_mode;
 }
@@ -222,9 +221,9 @@ void CC_LockModeIterator::Next (void)
       current_ = CosConcurrencyControl::write;
       break;
     case CosConcurrencyControl::write:
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     default:
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h
index d4a5d529f6e..1972caff85f 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h
@@ -70,8 +70,7 @@ public:
   void unlock (void);
 
   /// Changes the mode of this lock.
-  void change_mode (CosConcurrencyControl::lock_mode new_mode
-                   ACE_ENV_ARG_DECL);
+  void change_mode (CosConcurrencyControl::lock_mode new_mode);
 
   /// Sets the mode_ of the lock. Used in initialization
   void set_mode (CosConcurrencyControl::lock_mode mode);
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
index e1c22fdf270..54cbbfb999b 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
@@ -27,16 +27,15 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 CC_LockSet::CC_LockSet (void)
   : related_lockset_ (0)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       this->Init ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            "CC_LockSet::CC_LockSet (void)");
     }
-  ACE_ENDTRY;
 }
 
 // Constructor used to create related lock sets.
@@ -44,16 +43,15 @@ CC_LockSet::CC_LockSet (void)
 CC_LockSet::CC_LockSet (CosConcurrencyControl::LockSet_ptr related)
   : related_lockset_ (related)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       this->Init ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            "CC_LockSet::CC_LockSet (...)");
     }
-  ACE_ENDTRY;
 }
 
 // Initialization.
@@ -70,7 +68,7 @@ CC_LockSet::Init (void)
 
   // Acquire the semaphore in order to be able to put requests on hold
   if (semaphore_.acquire () == -1)
-    ACE_THROW (CORBA::INTERNAL ());
+    throw CORBA::INTERNAL ();
 }
 
 // Destructor
@@ -95,8 +93,7 @@ CORBA::Boolean CC_LockSet::compatible (CC_LockModeEnum mr)
 // Locks the lock in the desired mode. Blocks until success.
 
 void
-CC_LockSet::lock (CosConcurrencyControl::lock_mode mode
-                  ACE_ENV_ARG_DECL)
+CC_LockSet::lock (CosConcurrencyControl::lock_mode mode)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "CC_LockSet::lock\n"));
@@ -110,14 +107,13 @@ CC_LockSet::lock (CosConcurrencyControl::lock_mode mode
   // the FIFO properties of ACE_Token!
   if (this->lock_i (lm) == 1)
     if (semaphore_.acquire () == -1)
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
 }
 
 // Tries to lock. If it is not possible false is returned.
 
 CORBA::Boolean
-CC_LockSet::try_lock (CosConcurrencyControl::lock_mode mode
-                      ACE_ENV_ARG_DECL_NOT_USED)
+CC_LockSet::try_lock (CosConcurrencyControl::lock_mode mode)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CC_LockModeEnum lm = lmconvert (mode);
@@ -157,8 +153,7 @@ CC_LockSet::lmconvert (CosConcurrencyControl::lock_mode mode)
 // Unlock the lock
 
 void
-CC_LockSet::unlock (CosConcurrencyControl::lock_mode mode
-                    ACE_ENV_ARG_DECL)
+CC_LockSet::unlock (CosConcurrencyControl::lock_mode mode)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosConcurrencyControl::LockNotHeld))
 {
@@ -170,7 +165,7 @@ CC_LockSet::unlock (CosConcurrencyControl::lock_mode mode
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mlock_);
 
   if (lock_[lm] == 0) // This lock is not held.
-    ACE_THROW (CosConcurrencyControl::LockNotHeld());
+    throw CosConcurrencyControl::LockNotHeld();
   else
     lock_[lm]--;
 
@@ -186,7 +181,7 @@ CC_LockSet::unlock (CosConcurrencyControl::lock_mode mode
       if (compatible (lock_on_queue) == 1)
         {
           if (semaphore_.release () == -1)
-            ACE_THROW (CORBA::INTERNAL ());
+            throw CORBA::INTERNAL ();
           lock_[lock_on_queue]++;
         }
       else
@@ -202,8 +197,7 @@ CC_LockSet::unlock (CosConcurrencyControl::lock_mode mode
 
 void
 CC_LockSet::change_mode (CosConcurrencyControl::lock_mode held_mode,
-                         CosConcurrencyControl::lock_mode new_mode
-                         ACE_ENV_ARG_DECL)
+                         CosConcurrencyControl::lock_mode new_mode)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosConcurrencyControl::LockNotHeld))
 {
@@ -213,13 +207,13 @@ CC_LockSet::change_mode (CosConcurrencyControl::lock_mode held_mode,
   CC_LockModeEnum lm_new = lmconvert (new_mode);
 
   if (this->lock_held (lm_held) == 0) // This lock is not held
-    ACE_THROW (CosConcurrencyControl::LockNotHeld());
+    throw CosConcurrencyControl::LockNotHeld();
   else if (this->change_mode_i (lm_held, lm_new)==1)
     {
-      this->unlock (held_mode ACE_ENV_ARG_PARAMETER);
+      this->unlock (held_mode);
 
       if (semaphore_.acquire () == -1)
-        ACE_THROW (CORBA::INTERNAL ());
+        throw CORBA::INTERNAL ();
     }
   //  this->dump ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
index 40056dc46bf..b38884f9ae8 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
@@ -92,26 +92,22 @@ public:
 
   // = CosConcurrencyControl methods
   /// Acquires this lock. Blocks until lock is obtained
-  virtual void lock (CosConcurrencyControl::lock_mode mode
-                     ACE_ENV_ARG_DECL)
+  virtual void lock (CosConcurrencyControl::lock_mode mode)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Tries to acquire this lock. If it is not possible to acquire the
   /// lock, false is returned
-  virtual CORBA::Boolean try_lock (CosConcurrencyControl::lock_mode mode
-                                   ACE_ENV_ARG_DECL)
+  virtual CORBA::Boolean try_lock (CosConcurrencyControl::lock_mode mode)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Releases this lock.
-  virtual void unlock (CosConcurrencyControl::lock_mode mode
-                       ACE_ENV_ARG_DECL)
+  virtual void unlock (CosConcurrencyControl::lock_mode mode)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosConcurrencyControl::LockNotHeld));
 
   /// Changes the mode of this lock.
   virtual void change_mode (CosConcurrencyControl::lock_mode held_mode,
-                            CosConcurrencyControl::lock_mode new_mode
-                            ACE_ENV_ARG_DECL)
+                            CosConcurrencyControl::lock_mode new_mode)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosConcurrencyControl::LockNotHeld));
 
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
index 0bb2a79f3e3..092216de5ef 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
@@ -42,8 +42,7 @@ CC_LockSetFactory::create (void)
 }
 
 CosConcurrencyControl::LockSet_ptr
-CC_LockSetFactory::create_related (CosConcurrencyControl::LockSet_ptr which
-                                   ACE_ENV_ARG_DECL)
+CC_LockSetFactory::create_related (CosConcurrencyControl::LockSet_ptr which)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CC_LockSet *ls = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
index 6a02b8ed68d..a1d1fbd238a 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
@@ -35,7 +35,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * file for detailed descriptions apart from the comments in
  * this file.
  */
-class TAO_Concurrency_Serv_Export CC_LockSetFactory 
+class TAO_Concurrency_Serv_Export CC_LockSetFactory
   : public POA_CosConcurrencyControl::LockSetFactory
 {
 public:
@@ -47,13 +47,11 @@ public:
   /// Destructor.
   ~CC_LockSetFactory (void);
 
-  virtual CosConcurrencyControl::LockSet_ptr create (
-      ACE_ENV_SINGLE_ARG_DECL)
+  virtual CosConcurrencyControl::LockSet_ptr create ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CosConcurrencyControl::LockSet_ptr create_related (
-      CosConcurrencyControl::LockSet_ptr which
-      ACE_ENV_ARG_DECL)
+      CosConcurrencyControl::LockSet_ptr which)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
index 5364af0b881..9c6320ee2ee 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
@@ -31,23 +31,21 @@ TAO_Concurrency_Loader::~TAO_Concurrency_Loader (void)
 int
 TAO_Concurrency_Loader::init (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, 0);
 
       // This function call initializes the Concurrency Service
       CORBA::Object_var object =
-        this->create_object (orb.in (), argc, argv ACE_ENV_ARG_PARAMETER);
+        this->create_object (orb.in (), argc, argv);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // @@ Should we log this???
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -62,14 +60,13 @@ TAO_Concurrency_Loader::fini (void)
 CORBA::Object_ptr
 TAO_Concurrency_Loader::create_object (CORBA::ORB_ptr orb,
                                        int /* argc */,
-                                       char * /* argv */ []
-                                       ACE_ENV_ARG_DECL)
+                                       char * /* argv */ [])
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_var object =
-    orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+    orb->resolve_initial_references ("RootPOA");
   PortableServer::POA_var poa =
-    PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (object.in ());
   PortableServer::POAManager_var poa_manager =
     poa->the_POAManager ();
   poa_manager->activate ();
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
index b49ae60f6f8..56d900178d1 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
@@ -50,8 +50,7 @@ public:
   /// This function call initializes the Concurrency Service given a
   /// reference to the ORB and the command line parameters.
   CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
-                                   int argc, char *argv[]
-                                   ACE_ENV_ARG_DECL)
+                                   int argc, char *argv[])
      ACE_THROW_SPEC ((CORBA::SystemException));
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp
index cc5e240ab3a..dcf671e5fcb 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp
@@ -40,7 +40,7 @@ TAO_Concurrency_Server::init (CORBA::ORB_ptr orb,
 {
   CORBA::Object_var obj;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       // @@ Huh?!?
 
@@ -52,31 +52,27 @@ TAO_Concurrency_Server::init (CORBA::ORB_ptr orb,
         PortableServer::string_to_ObjectId ("ConcurrencyService");
 
       poa->activate_object_with_id (id.in (),
-                                    &this->lock_set_factory_
-                                    ACE_ENV_ARG_PARAMETER);
+                                    &this->lock_set_factory_);
 
       // Stringify the objref we'll be implementing, and print it to
       // stdout.  Someone will take that string and give it to a
       // client.  Then release the object.
       obj =
-        poa->id_to_reference (id.in ()
-                              ACE_ENV_ARG_PARAMETER);
+        poa->id_to_reference (id.in ());
 
       CORBA::String_var str =
-        orb->object_to_string (obj.in ()
-                               ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (obj.in ());
 
       ACE_DEBUG ((LM_DEBUG,
                   "listening as object <%s>\n",
                   str.in ()));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            "Concurrency Service");
       return CORBA::Object::_nil ();
     }
-  ACE_ENDTRY;
 
   return obj._retn ();
 }
@@ -84,26 +80,23 @@ TAO_Concurrency_Server::init (CORBA::ORB_ptr orb,
 int
 TAO_Concurrency_Server::fini (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       PortableServer::ObjectId_var id =
         this->poa_->servant_to_id (&this->lock_set_factory_);
 
-      this->poa_->deactivate_object (id.in ()
-                                     ACE_ENV_ARG_PARAMETER);
+      this->poa_->deactivate_object (id.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       if (TAO_debug_level > 0)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+          ACE_PRINT_EXCEPTION (ex,
                                ACE_TEXT ("TAO_Concurrency_Server"));
         }
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
index f04f3f1beb7..02f47b5c48b 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
@@ -32,60 +32,51 @@ TAO_CEC_ConsumerAdmin::~TAO_CEC_ConsumerAdmin (void)
 }
 
 void
-TAO_CEC_ConsumerAdmin::push (const CORBA::Any &event
-                             ACE_ENV_ARG_DECL)
+TAO_CEC_ConsumerAdmin::push (const CORBA::Any &event)
 {
   TAO_CEC_Propagate_Event_Push push_worker (event);
 
-  this->push_admin_.for_each (&push_worker
-                              ACE_ENV_ARG_PARAMETER);
+  this->push_admin_.for_each (&push_worker);
 
   TAO_CEC_Propagate_Event_Pull pull_worker (event);
 
-  this->pull_admin_.for_each (&pull_worker
-                              ACE_ENV_ARG_PARAMETER);
+  this->pull_admin_.for_each (&pull_worker);
 }
 
 void
-TAO_CEC_ConsumerAdmin::connected (TAO_CEC_ProxyPushSupplier *supplier
-                                  ACE_ENV_ARG_DECL)
+TAO_CEC_ConsumerAdmin::connected (TAO_CEC_ProxyPushSupplier *supplier)
 {
-  this->push_admin_.connected (supplier ACE_ENV_ARG_PARAMETER);
+  this->push_admin_.connected (supplier);
 }
 
 void
-TAO_CEC_ConsumerAdmin::reconnected (TAO_CEC_ProxyPushSupplier *supplier
-                                    ACE_ENV_ARG_DECL)
+TAO_CEC_ConsumerAdmin::reconnected (TAO_CEC_ProxyPushSupplier *supplier)
 {
-  this->push_admin_.reconnected (supplier ACE_ENV_ARG_PARAMETER);
+  this->push_admin_.reconnected (supplier);
 }
 
 void
-TAO_CEC_ConsumerAdmin::disconnected (TAO_CEC_ProxyPushSupplier *supplier
-                                     ACE_ENV_ARG_DECL)
+TAO_CEC_ConsumerAdmin::disconnected (TAO_CEC_ProxyPushSupplier *supplier)
 {
-  this->push_admin_.disconnected (supplier ACE_ENV_ARG_PARAMETER);
+  this->push_admin_.disconnected (supplier);
 }
 
 void
-TAO_CEC_ConsumerAdmin::connected (TAO_CEC_ProxyPullSupplier *supplier
-                                  ACE_ENV_ARG_DECL)
+TAO_CEC_ConsumerAdmin::connected (TAO_CEC_ProxyPullSupplier *supplier)
 {
-  this->pull_admin_.connected (supplier ACE_ENV_ARG_PARAMETER);
+  this->pull_admin_.connected (supplier);
 }
 
 void
-TAO_CEC_ConsumerAdmin::reconnected (TAO_CEC_ProxyPullSupplier *supplier
-                                   ACE_ENV_ARG_DECL)
+TAO_CEC_ConsumerAdmin::reconnected (TAO_CEC_ProxyPullSupplier *supplier)
 {
-  this->pull_admin_.reconnected (supplier ACE_ENV_ARG_PARAMETER);
+  this->pull_admin_.reconnected (supplier);
 }
 
 void
-TAO_CEC_ConsumerAdmin::disconnected (TAO_CEC_ProxyPullSupplier *supplier
-                                    ACE_ENV_ARG_DECL)
+TAO_CEC_ConsumerAdmin::disconnected (TAO_CEC_ProxyPullSupplier *supplier)
 {
-  this->pull_admin_.disconnected (supplier ACE_ENV_ARG_PARAMETER);
+  this->pull_admin_.disconnected (supplier);
 }
 
 void
@@ -119,19 +110,17 @@ TAO_CEC_ConsumerAdmin::_default_POA (void)
 // ****************************************************************
 
 void
-TAO_CEC_Propagate_Event_Push::work (TAO_CEC_ProxyPushSupplier *supplier
-                                    ACE_ENV_ARG_DECL)
+TAO_CEC_Propagate_Event_Push::work (TAO_CEC_ProxyPushSupplier *supplier)
 {
-  supplier->push (this->event_ ACE_ENV_ARG_PARAMETER);
+  supplier->push (this->event_);
 }
 
 // ****************************************************************
 
 void
-TAO_CEC_Propagate_Event_Pull::work (TAO_CEC_ProxyPullSupplier *supplier
-                                    ACE_ENV_ARG_DECL)
+TAO_CEC_Propagate_Event_Pull::work (TAO_CEC_ProxyPullSupplier *supplier)
 {
-  supplier->push (this->event_ ACE_ENV_ARG_PARAMETER);
+  supplier->push (this->event_);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
index c75e0c9a4bd..3f85a431cb5 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
@@ -62,29 +62,20 @@ public:
   virtual ~TAO_CEC_ConsumerAdmin (void);
 
   /// For each elements call <worker->work()>.
-  void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker
-                 ACE_ENV_ARG_DECL);
-  void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullSupplier> *worker
-                 ACE_ENV_ARG_DECL);
+  void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker);
+  void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullSupplier> *worker);
 
   /// Push the event to all the consumers
-  void push (const CORBA::Any &event
-             ACE_ENV_ARG_DECL);
+  void push (const CORBA::Any &event);
 
   /// Used to inform the EC that a Supplier has connected or
   /// disconnected from it.
-  virtual void connected (TAO_CEC_ProxyPushSupplier*
-                          ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void reconnected (TAO_CEC_ProxyPushSupplier*
-                            ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void disconnected (TAO_CEC_ProxyPushSupplier*
-                             ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void connected (TAO_CEC_ProxyPullSupplier*
-                          ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void reconnected (TAO_CEC_ProxyPullSupplier*
-                            ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void disconnected (TAO_CEC_ProxyPullSupplier*
-                             ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void connected (TAO_CEC_ProxyPushSupplier*);
+  virtual void reconnected (TAO_CEC_ProxyPushSupplier*);
+  virtual void disconnected (TAO_CEC_ProxyPushSupplier*);
+  virtual void connected (TAO_CEC_ProxyPullSupplier*);
+  virtual void reconnected (TAO_CEC_ProxyPullSupplier*);
+  virtual void disconnected (TAO_CEC_ProxyPullSupplier*);
 
   /// The event channel is shutting down, inform all the consumers of
   /// this
@@ -123,8 +114,7 @@ class TAO_CEC_Propagate_Event_Push : public TAO_ESF_Worker<TAO_CEC_ProxyPushSupp
 public:
   TAO_CEC_Propagate_Event_Push (const CORBA::Any& event);
 
-  void work (TAO_CEC_ProxyPushSupplier *supplier
-             ACE_ENV_ARG_DECL);
+  void work (TAO_CEC_ProxyPushSupplier *supplier);
 
 private:
   /// The event
@@ -138,8 +128,7 @@ class TAO_CEC_Propagate_Event_Pull : public TAO_ESF_Worker<TAO_CEC_ProxyPullSupp
 public:
   TAO_CEC_Propagate_Event_Pull (const CORBA::Any& event);
 
-  void work (TAO_CEC_ProxyPullSupplier *supplier
-             ACE_ENV_ARG_DECL);
+  void work (TAO_CEC_ProxyPullSupplier *supplier);
 
 private:
   /// The event
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.inl
index d7761a1f51d..e98ce75077c 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.inl
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.inl
@@ -6,18 +6,16 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE void
 TAO_CEC_ConsumerAdmin::
-    for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker
-              ACE_ENV_ARG_DECL)
+    for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker)
 {
-  this->push_admin_.for_each (worker ACE_ENV_ARG_PARAMETER);
+  this->push_admin_.for_each (worker);
 }
 
 ACE_INLINE void
 TAO_CEC_ConsumerAdmin::
-    for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullSupplier> *worker
-              ACE_ENV_ARG_DECL)
+    for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullSupplier> *worker)
 {
-  this->pull_admin_.for_each (worker ACE_ENV_ARG_PARAMETER);
+  this->pull_admin_.for_each (worker);
 }
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp
index 5c0068aa874..570fe05a684 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp
@@ -30,21 +30,18 @@ TAO_CEC_ConsumerControl::shutdown (void)
 }
 
 void
-TAO_CEC_ConsumerControl::consumer_not_exist (TAO_CEC_ProxyPushSupplier *
-                                             ACE_ENV_ARG_DECL_NOT_USED)
+TAO_CEC_ConsumerControl::consumer_not_exist (TAO_CEC_ProxyPushSupplier *)
 {
 }
 
 void
-TAO_CEC_ConsumerControl::consumer_not_exist (TAO_CEC_ProxyPullSupplier *
-                                             ACE_ENV_ARG_DECL_NOT_USED)
+TAO_CEC_ConsumerControl::consumer_not_exist (TAO_CEC_ProxyPullSupplier *)
 {
 }
 
 void
 TAO_CEC_ConsumerControl::system_exception (TAO_CEC_ProxyPushSupplier *,
-                                           CORBA::SystemException &
-                                           ACE_ENV_ARG_DECL_NOT_USED)
+                                           CORBA::SystemException &)
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
index b0c0f22ceaa..6cfc3961cfe 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
@@ -67,21 +67,18 @@ public:
    * has been destroyed.  The strategy has to (at the very least),
    * reclaim all the resources attached to that object.
    */
-  virtual void consumer_not_exist (TAO_CEC_ProxyPushSupplier *proxy
-                                   ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void consumer_not_exist (TAO_CEC_ProxyPushSupplier *proxy);
 
   /**
    * Invoked by helper classes when they detect that a consumer no
    * longer exists (i.e. _non_existent() returns true and/or the
    * CORBA::OBJECT_NOT_EXIST exception has been raised).
    */
-  virtual void consumer_not_exist (TAO_CEC_ProxyPullSupplier *proxy
-                                   ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void consumer_not_exist (TAO_CEC_ProxyPullSupplier *proxy);
 
   /// Some system exception was rasied while trying to push an event.
   virtual void system_exception (TAO_CEC_ProxyPushSupplier *proxy,
-                                 CORBA::SystemException &
-                                 ACE_ENV_ARG_DECL_NOT_USED);
+                                 CORBA::SystemException &);
 
   /// Do we need to disconnect this supplier?  The parameter type for
   /// proxy is PortableServer::ServantBase* due to the fact that this
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp
index 14c6d6c21ca..9b671f519f2 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp
@@ -29,35 +29,31 @@ TAO_CEC_Reactive_Dispatching::shutdown (void)
 
 void
 TAO_CEC_Reactive_Dispatching::push (TAO_CEC_ProxyPushSupplier* proxy,
-                                    const CORBA::Any& event
-                                    ACE_ENV_ARG_DECL)
+                                    const CORBA::Any& event)
 {
-  proxy->reactive_push_to_consumer (event ACE_ENV_ARG_PARAMETER);
+  proxy->reactive_push_to_consumer (event);
 }
 
 void
 TAO_CEC_Reactive_Dispatching::push_nocopy (TAO_CEC_ProxyPushSupplier* proxy,
-                                           CORBA::Any& event
-                                           ACE_ENV_ARG_DECL)
+                                           CORBA::Any& event)
 {
-  proxy->reactive_push_to_consumer (event ACE_ENV_ARG_PARAMETER);
+  proxy->reactive_push_to_consumer (event);
 }
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
 void
 TAO_CEC_Reactive_Dispatching::invoke (TAO_CEC_ProxyPushSupplier* proxy,
-                                      const TAO_CEC_TypedEvent& typed_event
-                                      ACE_ENV_ARG_DECL)
+                                      const TAO_CEC_TypedEvent& typed_event)
 {
-  proxy->reactive_invoke_to_consumer (typed_event ACE_ENV_ARG_PARAMETER);
+  proxy->reactive_invoke_to_consumer (typed_event);
 }
 
 void
 TAO_CEC_Reactive_Dispatching::invoke_nocopy (TAO_CEC_ProxyPushSupplier* proxy,
-                                             TAO_CEC_TypedEvent& typed_event
-                                             ACE_ENV_ARG_DECL)
+                                             TAO_CEC_TypedEvent& typed_event)
 {
-  proxy->reactive_invoke_to_consumer (typed_event ACE_ENV_ARG_PARAMETER);
+  proxy->reactive_invoke_to_consumer (typed_event);
 }
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h
index 48806cdafba..02086605a55 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h
@@ -61,18 +61,14 @@ public:
 
   /// The consumer represented by <proxy> should receive <event>.
   virtual void push (TAO_CEC_ProxyPushSupplier *proxy,
-                     const CORBA::Any &event
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
+                     const CORBA::Any &event) = 0;
   virtual void push_nocopy (TAO_CEC_ProxyPushSupplier *proxy,
-                            CORBA::Any &event
-                            ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
+                            CORBA::Any &event) = 0;
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
   virtual void invoke (TAO_CEC_ProxyPushSupplier *proxy,
-                       const TAO_CEC_TypedEvent &typed_event
-                       ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
+                       const TAO_CEC_TypedEvent &typed_event) = 0;
   virtual void invoke_nocopy (TAO_CEC_ProxyPushSupplier *proxy,
-                              TAO_CEC_TypedEvent &typed_event
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
+                              TAO_CEC_TypedEvent &typed_event) = 0;
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 };
 
@@ -97,18 +93,14 @@ public:
   virtual void activate (void);
   virtual void shutdown (void);
   virtual void push (TAO_CEC_ProxyPushSupplier *proxy,
-                     const CORBA::Any &event
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                     const CORBA::Any &event);
   virtual void push_nocopy (TAO_CEC_ProxyPushSupplier *proxy,
-                            CORBA::Any &event
-                            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                            CORBA::Any &event);
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
   virtual void invoke (TAO_CEC_ProxyPushSupplier *proxy,
-                       const TAO_CEC_TypedEvent &typed_event
-                       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                       const TAO_CEC_TypedEvent &typed_event);
   virtual void invoke_nocopy (TAO_CEC_ProxyPushSupplier *proxy,
-                              TAO_CEC_TypedEvent &typed_event
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                              TAO_CEC_TypedEvent &typed_event);
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
index 8db5cf88fa2..fdb8a9f003d 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
@@ -24,7 +24,7 @@ TAO_CEC_Dispatching_Task::svc (void)
   int done = 0;
   while (!done)
     {
-      ACE_TRY_NEW_ENV
+      try
         {
           ACE_Message_Block *mb;
           if (this->getq (mb) == -1)
@@ -50,20 +50,17 @@ TAO_CEC_Dispatching_Task::svc (void)
           if (result == -1)
             done = 1;
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "EC (%P|%t) exception in dispatching queue");
+          ex._tao_print_exception ("EC (%P|%t) exception in dispatching queue");
         }
-      ACE_ENDTRY;
     }
   return 0;
 }
 
 void
 TAO_CEC_Dispatching_Task::push (TAO_CEC_ProxyPushSupplier *proxy,
-                                CORBA::Any& event
-                                ACE_ENV_ARG_DECL)
+                                CORBA::Any& event)
 {
   if (this->allocator_ == 0)
     this->allocator_ = ACE_Allocator::instance ();
@@ -71,8 +68,7 @@ TAO_CEC_Dispatching_Task::push (TAO_CEC_ProxyPushSupplier *proxy,
   void* buf = this->allocator_->malloc (sizeof (TAO_CEC_Push_Command));
 
   if (buf == 0)
-    ACE_THROW (CORBA::NO_MEMORY (TAO::VMCID,
-                                 CORBA::COMPLETED_NO));
+    throw CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO);
 
   ACE_Message_Block *mb =
     new (buf) TAO_CEC_Push_Command (proxy,
@@ -85,8 +81,7 @@ TAO_CEC_Dispatching_Task::push (TAO_CEC_ProxyPushSupplier *proxy,
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
 void
 TAO_CEC_Dispatching_Task::invoke (TAO_CEC_ProxyPushSupplier *proxy,
-                                  TAO_CEC_TypedEvent& typed_event
-                                  ACE_ENV_ARG_DECL)
+                                  TAO_CEC_TypedEvent& typed_event)
 {
   if (this->allocator_ == 0)
     this->allocator_ = ACE_Allocator::instance ();
@@ -94,8 +89,7 @@ TAO_CEC_Dispatching_Task::invoke (TAO_CEC_ProxyPushSupplier *proxy,
   void* buf = this->allocator_->malloc (sizeof (TAO_CEC_Invoke_Command));
 
   if (buf == 0)
-    ACE_THROW (CORBA::NO_MEMORY (TAO::VMCID,
-                                 CORBA::COMPLETED_NO));
+    throw CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO);
 
   ACE_Message_Block *mb =
     new (buf) TAO_CEC_Invoke_Command (proxy,
@@ -130,7 +124,7 @@ TAO_CEC_Push_Command::~TAO_CEC_Push_Command (void)
 int
 TAO_CEC_Push_Command::execute (void)
 {
-  this->proxy_->push_to_consumer (this->event_ ACE_ENV_ARG_PARAMETER);
+  this->proxy_->push_to_consumer (this->event_);
   return 0;
 }
 
@@ -145,7 +139,7 @@ TAO_CEC_Invoke_Command::~TAO_CEC_Invoke_Command (void)
 int
 TAO_CEC_Invoke_Command::execute (void)
 {
-  this->proxy_->invoke_to_consumer (this->typed_event_ ACE_ENV_ARG_PARAMETER);
+  this->proxy_->invoke_to_consumer (this->typed_event_);
   return 0;
 }
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
index 7d987927f44..a17ed20d9d1 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
@@ -54,13 +54,11 @@ public:
   virtual int svc (void);
 
   virtual void push (TAO_CEC_ProxyPushSupplier *proxy,
-                     CORBA::Any& event
-                     ACE_ENV_ARG_DECL);
+                     CORBA::Any& event);
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
   virtual void invoke (TAO_CEC_ProxyPushSupplier *proxy,
-                       TAO_CEC_TypedEvent& typed_event
-                       ACE_ENV_ARG_DECL);
+                       TAO_CEC_TypedEvent& typed_event);
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp
index 810d90abe5f..f5ae3599809 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp
@@ -21,14 +21,13 @@ TAO_CEC_DynamicImplementationServer::~TAO_CEC_DynamicImplementationServer (void)
 
 // The DSI invoke request
 void
-TAO_CEC_DynamicImplementationServer::invoke (CORBA::ServerRequest_ptr request
-                                             ACE_ENV_ARG_DECL)
+TAO_CEC_DynamicImplementationServer::invoke (CORBA::ServerRequest_ptr request)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Trap the _is_a request
   if (ACE_OS::strcmp ("_is_a", request->operation () ) == 0)
     {
-      this->is_a (request ACE_ENV_ARG_PARAMETER);
+      this->is_a (request);
     }
   else
     {
@@ -46,30 +45,28 @@ TAO_CEC_DynamicImplementationServer::invoke (CORBA::ServerRequest_ptr request
                           ACE_TEXT ("***** Operation not found in IFR cache *****\n")));
             }
 
-          this->typed_event_channel_->create_list (0, list ACE_ENV_ARG_PARAMETER);
+          this->typed_event_channel_->create_list (0, list);
         }
       else
         {
           // Populate the NVList from the parameter information.
-          this->typed_event_channel_->create_operation_list (oper_params, list
-                                                             ACE_ENV_ARG_PARAMETER);
+          this->typed_event_channel_->create_operation_list (oper_params, list);
 
           // Get the operation arguments. This ahould demarshal correctly.
-          request->arguments (list ACE_ENV_ARG_PARAMETER);
+          request->arguments (list);
 
           // Populate the TypedEvent with the list and operation name.
           TAO_CEC_TypedEvent typed_event (list, request->operation () );
 
           // Pass the TypedEvent to the TypedProxyPushConsumer
-          this->typed_pp_consumer_->invoke (typed_event ACE_ENV_ARG_PARAMETER);
+          this->typed_pp_consumer_->invoke (typed_event);
         }
     }
 }
 
 CORBA::RepositoryId
 TAO_CEC_DynamicImplementationServer::_primary_interface (const PortableServer::ObjectId &,
-                                                         PortableServer::POA_ptr
-                                                         ACE_ENV_ARG_DECL_NOT_USED)
+                                                         PortableServer::POA_ptr)
   ACE_THROW_SPEC (())
 {
   return CORBA::string_dup (repository_id_);
@@ -82,25 +79,22 @@ TAO_CEC_DynamicImplementationServer::_default_POA (void)
 }
 
 void
-TAO_CEC_DynamicImplementationServer::is_a (CORBA::ServerRequest_ptr request
-                                           ACE_ENV_ARG_DECL)
+TAO_CEC_DynamicImplementationServer::is_a (CORBA::ServerRequest_ptr request)
 {
   CORBA::NVList_ptr list;
 
-  this->typed_event_channel_->create_list (0, list ACE_ENV_ARG_PARAMETER);
+  this->typed_event_channel_->create_list (0, list);
 
   CORBA::Any any_1;
   any_1._tao_set_typecode(CORBA::_tc_string);
 
   list->add_value ("value",
                    any_1,
-                   CORBA::ARG_IN
-                   ACE_ENV_ARG_PARAMETER);
+                   CORBA::ARG_IN);
 
-  request->arguments (list
-                      ACE_ENV_ARG_PARAMETER);
+  request->arguments (list);
 
-  CORBA::NamedValue_ptr nv = list->item (0 ACE_ENV_ARG_PARAMETER);
+  CORBA::NamedValue_ptr nv = list->item (0);
 
   CORBA::Any_ptr ap = nv->value ();
   const char *value;
@@ -162,7 +156,7 @@ TAO_CEC_DynamicImplementationServer::is_a (CORBA::ServerRequest_ptr request
   CORBA::Any::from_boolean from_boolean (result);
   result_any <<= from_boolean;
 
-  request->set_result (result_any ACE_ENV_ARG_PARAMETER);
+  request->set_result (result_any);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h
index 80d065c6c83..dbaf7a259b7 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h
@@ -38,28 +38,24 @@ public:
                                        TAO_CEC_TypedProxyPushConsumer *typed_pp_consumer,
                                        TAO_CEC_TypedEventChannel *typed_event_channel);
 
-  //Destructor 
+  //Destructor
   virtual ~TAO_CEC_DynamicImplementationServer (void);
 
   // = The DynamicImplementation methods.
-  virtual void invoke (CORBA::ServerRequest_ptr request
-                       ACE_ENV_ARG_DECL)
+  virtual void invoke (CORBA::ServerRequest_ptr request)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::RepositoryId _primary_interface (
       const PortableServer::ObjectId &oid,
       PortableServer::POA_ptr poa
-      ACE_ENV_ARG_DECL
     )
       ACE_THROW_SPEC (());
 
   virtual PortableServer::POA_ptr _default_POA (
-      ACE_ENV_SINGLE_ARG_DECL
     );
 
   // Handles the _is_a call
-  virtual void is_a (CORBA::ServerRequest_ptr request
-                     ACE_ENV_ARG_DECL);
+  virtual void is_a (CORBA::ServerRequest_ptr request);
 
 private:
   // The POA
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
index 6101bf34738..3decba50304 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
@@ -93,14 +93,14 @@ TAO_CEC_EventChannel::shutdown (void)
   PortableServer::POA_var consumer_poa =
     this->consumer_admin_->_default_POA ();
   PortableServer::ObjectId_var consumer_id =
-    consumer_poa->servant_to_id (this->consumer_admin_ ACE_ENV_ARG_PARAMETER);
-  consumer_poa->deactivate_object (consumer_id.in () ACE_ENV_ARG_PARAMETER);
+    consumer_poa->servant_to_id (this->consumer_admin_);
+  consumer_poa->deactivate_object (consumer_id.in ());
 
   PortableServer::POA_var supplier_poa =
     this->supplier_admin_->_default_POA ();
   PortableServer::ObjectId_var supplier_id =
-    supplier_poa->servant_to_id (this->supplier_admin_ ACE_ENV_ARG_PARAMETER);
-  supplier_poa->deactivate_object (supplier_id.in () ACE_ENV_ARG_PARAMETER);
+    supplier_poa->servant_to_id (this->supplier_admin_);
+  supplier_poa->deactivate_object (supplier_id.in ());
 
   this->supplier_admin_->shutdown ();
 
@@ -108,87 +108,75 @@ TAO_CEC_EventChannel::shutdown (void)
 }
 
 void
-TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPushConsumer* consumer
-                                 ACE_ENV_ARG_DECL)
+TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPushConsumer* consumer)
 {
-  this->supplier_admin_->connected (consumer ACE_ENV_ARG_PARAMETER);
+  this->supplier_admin_->connected (consumer);
 }
 
 void
-TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPushConsumer* consumer
-                                   ACE_ENV_ARG_DECL)
+TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPushConsumer* consumer)
 {
-  this->supplier_admin_->reconnected (consumer ACE_ENV_ARG_PARAMETER);
+  this->supplier_admin_->reconnected (consumer);
 }
 
 void
-TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPushConsumer* consumer
-                                    ACE_ENV_ARG_DECL)
+TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPushConsumer* consumer)
 {
-  this->supplier_admin_->disconnected (consumer ACE_ENV_ARG_PARAMETER);
+  this->supplier_admin_->disconnected (consumer);
 }
 
 void
-TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPullConsumer* consumer
-                                 ACE_ENV_ARG_DECL)
+TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPullConsumer* consumer)
 {
-  this->supplier_admin_->connected (consumer ACE_ENV_ARG_PARAMETER);
+  this->supplier_admin_->connected (consumer);
 }
 
 void
-TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPullConsumer* consumer
-                                   ACE_ENV_ARG_DECL)
+TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPullConsumer* consumer)
 {
-  this->supplier_admin_->reconnected (consumer ACE_ENV_ARG_PARAMETER);
+  this->supplier_admin_->reconnected (consumer);
 }
 
 void
-TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPullConsumer* consumer
-                                    ACE_ENV_ARG_DECL)
+TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPullConsumer* consumer)
 {
-  this->supplier_admin_->disconnected (consumer ACE_ENV_ARG_PARAMETER);
+  this->supplier_admin_->disconnected (consumer);
 }
 
 void
-TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPushSupplier* supplier
-                                 ACE_ENV_ARG_DECL)
+TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPushSupplier* supplier)
 {
-  this->consumer_admin_->connected (supplier ACE_ENV_ARG_PARAMETER);
+  this->consumer_admin_->connected (supplier);
 }
 
 void
-TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPushSupplier* supplier
-                                   ACE_ENV_ARG_DECL)
+TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPushSupplier* supplier)
 {
-  this->consumer_admin_->reconnected (supplier ACE_ENV_ARG_PARAMETER);
+  this->consumer_admin_->reconnected (supplier);
 }
 
 void
-TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPushSupplier* supplier
-                                    ACE_ENV_ARG_DECL)
+TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPushSupplier* supplier)
 {
-  this->consumer_admin_->disconnected (supplier ACE_ENV_ARG_PARAMETER);
+  this->consumer_admin_->disconnected (supplier);
 }
 
 void
-TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPullSupplier* supplier
-                                 ACE_ENV_ARG_DECL)
+TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPullSupplier* supplier)
 {
-  this->consumer_admin_->connected (supplier ACE_ENV_ARG_PARAMETER);
+  this->consumer_admin_->connected (supplier);
 }
 
 void
-TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPullSupplier* supplier
-                                   ACE_ENV_ARG_DECL)
+TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPullSupplier* supplier)
 {
-  this->consumer_admin_->reconnected (supplier ACE_ENV_ARG_PARAMETER);
+  this->consumer_admin_->reconnected (supplier);
 }
 
 void
-TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPullSupplier* supplier
-                                    ACE_ENV_ARG_DECL)
+TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPullSupplier* supplier)
 {
-  this->consumer_admin_->disconnected (supplier ACE_ENV_ARG_PARAMETER);
+  this->consumer_admin_->disconnected (supplier);
 }
 
 CosEventChannelAdmin::ConsumerAdmin_ptr
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
index 81afadc878c..d26f2731cea 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
@@ -198,33 +198,21 @@ public:
 
   /// Used to inform the EC that a Consumer has connected or
   /// disconnected from it.
-  virtual void connected (TAO_CEC_ProxyPushConsumer*
-                          ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void reconnected (TAO_CEC_ProxyPushConsumer*
-                            ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void disconnected (TAO_CEC_ProxyPushConsumer*
-                             ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void connected (TAO_CEC_ProxyPullConsumer*
-                          ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void reconnected (TAO_CEC_ProxyPullConsumer*
-                            ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void disconnected (TAO_CEC_ProxyPullConsumer*
-                             ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void connected (TAO_CEC_ProxyPushConsumer*);
+  virtual void reconnected (TAO_CEC_ProxyPushConsumer*);
+  virtual void disconnected (TAO_CEC_ProxyPushConsumer*);
+  virtual void connected (TAO_CEC_ProxyPullConsumer*);
+  virtual void reconnected (TAO_CEC_ProxyPullConsumer*);
+  virtual void disconnected (TAO_CEC_ProxyPullConsumer*);
 
   /// Used to inform the EC that a Supplier has connected or
   /// disconnected from it.
-  virtual void connected (TAO_CEC_ProxyPushSupplier*
-                          ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void reconnected (TAO_CEC_ProxyPushSupplier*
-                            ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void disconnected (TAO_CEC_ProxyPushSupplier*
-                             ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void connected (TAO_CEC_ProxyPullSupplier*
-                          ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void reconnected (TAO_CEC_ProxyPullSupplier*
-                            ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void disconnected (TAO_CEC_ProxyPullSupplier*
-                             ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void connected (TAO_CEC_ProxyPushSupplier*);
+  virtual void reconnected (TAO_CEC_ProxyPushSupplier*);
+  virtual void disconnected (TAO_CEC_ProxyPushSupplier*);
+  virtual void connected (TAO_CEC_ProxyPullSupplier*);
+  virtual void reconnected (TAO_CEC_ProxyPullSupplier*);
+  virtual void disconnected (TAO_CEC_ProxyPullSupplier*);
 
   // Simple flags to control the EC behavior, set by the application
   // at construction time.
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
index 202b473face..4f413374782 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
@@ -54,28 +54,26 @@ TAO_CEC_Event_Loader::~TAO_CEC_Event_Loader (void)
 int
 TAO_CEC_Event_Loader::init (int argc, ACE_TCHAR *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Copy command line parameter.
       ACE_Argv_Type_Converter command_line(argc, argv);
 
       // ORB initialization boiler plate...
       this->orb_=
-        CORBA::ORB_init (command_line.get_argc(), command_line.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (command_line.get_argc(), command_line.get_ASCII_argv(), 0);
 
       CORBA::Object_var obj =
-        this->create_object (this->orb_.in (), command_line.get_argc(), command_line.get_TCHAR_argv() ACE_ENV_ARG_PARAMETER);
+        this->create_object (this->orb_.in (), command_line.get_argc(), command_line.get_TCHAR_argv());
 
       if (CORBA::is_nil (obj.in() ))
         return -1;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, argv[0]);
+      ex._tao_print_exception (argv[0]);
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -83,11 +81,10 @@ TAO_CEC_Event_Loader::init (int argc, ACE_TCHAR *argv[])
 CORBA::Object_ptr
 TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
                                      int argc,
-                                     ACE_TCHAR *argv[]
-                                     ACE_ENV_ARG_DECL)
+                                     ACE_TCHAR *argv[])
    ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       // ****************************************************************
 
@@ -190,9 +187,9 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
 
       // POA initialization and activation ...
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
         poa->the_POAManager ();
       poa_manager->activate ();
@@ -228,7 +225,7 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
       if (ior_file != 0)
         {
           CORBA::String_var ior =
-            orb->object_to_string (event_channel.in () ACE_ENV_ARG_PARAMETER);
+            orb->object_to_string (event_channel.in ());
 
           FILE *iorf = ACE_OS::fopen (ior_file, ACE_TEXT("w"));
           if (iorf != 0)
@@ -257,12 +254,10 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
       if (this->bind_to_naming_service_)
         {
           CORBA::Object_var obj =
-            orb->resolve_initial_references ("NameService"
-                                             ACE_ENV_ARG_PARAMETER);
+            orb->resolve_initial_references ("NameService");
 
           this->naming_context_ =
-            CosNaming::NamingContext::_narrow (obj.in ()
-                                               ACE_ENV_ARG_PARAMETER);
+            CosNaming::NamingContext::_narrow (obj.in ());
 
           this->channel_name_.length (1);
           this->channel_name_[0].id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR(service_name));
@@ -270,14 +265,12 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
           if (use_rebind)
             {
               this->naming_context_->rebind (this->channel_name_,
-                                      event_channel.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+                                      event_channel.in ());
             }
           else
             {
               this->naming_context_->bind (this->channel_name_,
-                                    event_channel.in ()
-                                    ACE_ENV_ARG_PARAMETER);
+                                    event_channel.in ());
             }
         }
           return CosEventChannelAdmin::EventChannel::_duplicate (event_channel.in () );
@@ -299,7 +292,7 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
           CORBA::Repository_var interface_repository;
 
           CORBA::Object_var ifr_obj_var =
-            orb->resolve_initial_references ("InterfaceRepository" ACE_ENV_ARG_PARAMETER);
+            orb->resolve_initial_references ("InterfaceRepository");
 
           if (CORBA::is_nil(ifr_obj_var.in () ))
             {
@@ -312,8 +305,7 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
             }
           else
             {
-              interface_repository = CORBA::Repository::_narrow(ifr_obj_var.in ()
-                                                                ACE_ENV_ARG_PARAMETER);
+              interface_repository = CORBA::Repository::_narrow(ifr_obj_var.in ());
 
               if (CORBA::is_nil(interface_repository.in () ))
                 {
@@ -360,7 +352,7 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
           if (ior_file != 0)
             {
               CORBA::String_var ior =
-                orb->object_to_string (event_channel.in () ACE_ENV_ARG_PARAMETER);
+                orb->object_to_string (event_channel.in ());
 
               FILE *iorf = ACE_OS::fopen (ior_file, ACE_TEXT("w"));
               if (iorf != 0)
@@ -389,12 +381,10 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
           if (this->bind_to_naming_service_)
             {
               CORBA::Object_var obj =
-                orb->resolve_initial_references ("NameService"
-                                                 ACE_ENV_ARG_PARAMETER);
+                orb->resolve_initial_references ("NameService");
 
               this->naming_context_ =
-                CosNaming::NamingContext::_narrow (obj.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
+                CosNaming::NamingContext::_narrow (obj.in ());
 
               this->channel_name_.length (1);
               this->channel_name_[0].id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR(service_name));
@@ -402,14 +392,12 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
               if (use_rebind)
                 {
                   this->naming_context_->rebind (this->channel_name_,
-                                                 event_channel.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
+                                                 event_channel.in ());
                 }
               else
                 {
                   this->naming_context_->bind (this->channel_name_,
-                                               event_channel.in ()
-                                               ACE_ENV_ARG_PARAMETER);
+                                               event_channel.in ());
                 }
             }
           return CosTypedEventChannelAdmin::TypedEventChannel::_duplicate (event_channel.in () );
@@ -418,12 +406,11 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
 
       // ****************************************************************
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, argv[0]);
+      ex._tao_print_exception (argv[0]);
       return CORBA::Object::_nil ();
     }
-  ACE_ENDTRY;
 }
 
 int
@@ -432,8 +419,7 @@ TAO_CEC_Event_Loader::fini (void)
   //   + Since it was activated with _this() you have to do the
   //   canonical:
   //     get_object_id
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
       if(this->typed_ec_impl_)
@@ -447,9 +433,9 @@ TAO_CEC_Event_Loader::fini (void)
           this->typed_ec_impl_->_default_POA ();
 
           PortableServer::ObjectId_var t_id =
-          t_poa->servant_to_id (this->typed_ec_impl_ ACE_ENV_ARG_PARAMETER);
+          t_poa->servant_to_id (this->typed_ec_impl_);
 
-          t_poa->deactivate_object (t_id.in () ACE_ENV_ARG_PARAMETER);
+          t_poa->deactivate_object (t_id.in ());
         }
 #else
       // Release the resources of the Event Channel
@@ -460,25 +446,22 @@ TAO_CEC_Event_Loader::fini (void)
         this->ec_impl_->_default_POA ();
 
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this->ec_impl_ ACE_ENV_ARG_PARAMETER);
+        poa->servant_to_id (this->ec_impl_);
 
-      poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
+      poa->deactivate_object (id.in ());
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Do Nothing
     }
-  ACE_ENDTRY;
 
-  ACE_TRY_EX (foo)
+  try
     {
       // Unbind the Naming Service
       if (this->bind_to_naming_service_)
         {
-          this->naming_context_->unbind (this->channel_name_
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (foo);
+          this->naming_context_->unbind (this->channel_name_);
         }
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
@@ -489,12 +472,11 @@ TAO_CEC_Event_Loader::fini (void)
       delete this->attributes_;
       delete this->ec_impl_;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Do Nothing
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
index 28bfe57bad7..4af10142439 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
@@ -59,8 +59,7 @@ public:
    */
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
-                                           ACE_TCHAR *argv[]
-                                           ACE_ENV_ARG_DECL)
+                                           ACE_TCHAR *argv[])
      ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp
index 41f29d8a59e..487c4079285 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp
@@ -63,45 +63,41 @@ TAO_CEC_MT_Dispatching::shutdown (void)
 
 void
 TAO_CEC_MT_Dispatching::push (TAO_CEC_ProxyPushSupplier* proxy,
-                              const CORBA::Any& event
-                              ACE_ENV_ARG_DECL)
+                              const CORBA::Any& event)
 {
   CORBA::Any event_copy = event;
-  this->push_nocopy (proxy, event_copy ACE_ENV_ARG_PARAMETER);
+  this->push_nocopy (proxy, event_copy);
 }
 
 void
 TAO_CEC_MT_Dispatching::push_nocopy (TAO_CEC_ProxyPushSupplier* proxy,
-                                     CORBA::Any& event
-                                     ACE_ENV_ARG_DECL)
+                                     CORBA::Any& event)
 {
   // Double checked locking....
   if (this->active_ == 0)
     this->activate ();
 
-  this->task_.push (proxy, event ACE_ENV_ARG_PARAMETER);
+  this->task_.push (proxy, event);
 }
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
 void
 TAO_CEC_MT_Dispatching::invoke (TAO_CEC_ProxyPushSupplier* proxy,
-                                const TAO_CEC_TypedEvent& typed_event
-                                ACE_ENV_ARG_DECL)
+                                const TAO_CEC_TypedEvent& typed_event)
 {
   TAO_CEC_TypedEvent typed_event_copy = typed_event;
-  this->invoke_nocopy (proxy, typed_event_copy ACE_ENV_ARG_PARAMETER);
+  this->invoke_nocopy (proxy, typed_event_copy);
 }
 
 void
 TAO_CEC_MT_Dispatching::invoke_nocopy (TAO_CEC_ProxyPushSupplier* proxy,
-                                       TAO_CEC_TypedEvent& typed_event
-                                       ACE_ENV_ARG_DECL)
+                                       TAO_CEC_TypedEvent& typed_event)
 {
   // Double checked locking....
   if (this->active_ == 0)
     this->activate ();
 
-  this->task_.invoke (proxy, typed_event ACE_ENV_ARG_PARAMETER);
+  this->task_.invoke (proxy, typed_event);
 }
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h
index 458110cad9a..1d393773576 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h
@@ -51,18 +51,14 @@ public:
   virtual void activate (void);
   virtual void shutdown (void);
   virtual void push (TAO_CEC_ProxyPushSupplier* proxy,
-                     const CORBA::Any & event
-                     ACE_ENV_ARG_DECL);
+                     const CORBA::Any & event);
   virtual void push_nocopy (TAO_CEC_ProxyPushSupplier* proxy,
-                            CORBA::Any& event
-                            ACE_ENV_ARG_DECL);
+                            CORBA::Any& event);
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
   virtual void invoke (TAO_CEC_ProxyPushSupplier *proxy,
-                       const TAO_CEC_TypedEvent & typed_event
-                       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                       const TAO_CEC_TypedEvent & typed_event);
   virtual void invoke_nocopy (TAO_CEC_ProxyPushSupplier *proxy,
-                              TAO_CEC_TypedEvent & typed_event
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                              TAO_CEC_TypedEvent & typed_event);
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
index b119e82f692..d97e3fab171 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
@@ -44,20 +44,18 @@ TAO_CEC_ProxyPullConsumer::~TAO_CEC_ProxyPullConsumer (void)
 
 void
 TAO_CEC_ProxyPullConsumer::activate (
-    CosEventChannelAdmin::ProxyPullConsumer_ptr &activated_proxy
-    ACE_ENV_ARG_DECL)
+    CosEventChannelAdmin::ProxyPullConsumer_ptr &activated_proxy)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventChannelAdmin::ProxyPullConsumer_var result;
-  ACE_TRY
+  try
     {
       result = this->_this ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       result = CosEventChannelAdmin::ProxyPullConsumer::_nil ();
     }
-  ACE_ENDTRY;
   activated_proxy = result._retn ();
 }
 
@@ -65,22 +63,21 @@ void
 TAO_CEC_ProxyPullConsumer::deactivate (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       PortableServer::POA_var poa =
         this->_default_POA ();
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-      poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
+        poa->servant_to_id (this);
+      poa->deactivate_object (id.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Exceptions here should not be propagated.  They usually
       // indicate that an object is beign disconnected twice, or some
       // race condition, but not a fault that the user needs to know
       // about.
     }
-  ACE_ENDTRY;
 }
 
 // NOTE: There is some amount of duplicated code here, but it is
@@ -90,8 +87,7 @@ TAO_CEC_ProxyPullConsumer::deactivate (void)
 
 CORBA::Any*
 TAO_CEC_ProxyPullConsumer::try_pull_from_supplier (
-    CORBA::Boolean_out has_event
-    ACE_ENV_ARG_DECL)
+    CORBA::Boolean_out has_event)
 {
   has_event = 0;
   CosEventComm::PullSupplier_var supplier;
@@ -115,34 +111,31 @@ TAO_CEC_ProxyPullConsumer::try_pull_from_supplier (
   TAO_CEC_SupplierControl *control =
                  this->event_channel_->supplier_control ();
 
-  ACE_TRY
+  try
     {
-      any = supplier->try_pull (has_event ACE_ENV_ARG_PARAMETER);
+      any = supplier->try_pull (has_event);
 
       // Inform the control that we got something from the supplier
       control->successful_transmission(this);
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+  catch (const CORBA::OBJECT_NOT_EXIST& ex)
     {
-      control->supplier_not_exist (this ACE_ENV_ARG_PARAMETER);
+      control->supplier_not_exist (this);
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (CORBA::SystemException& sysex)
     {
       control->system_exception (this,
-                                 sysex
-                                 ACE_ENV_ARG_PARAMETER);
+                                 sysex);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // @@ Should not happen
     }
-  ACE_ENDTRY;
   return any._retn ();
 }
 
 CORBA::Any*
-TAO_CEC_ProxyPullConsumer::pull_from_supplier (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ProxyPullConsumer::pull_from_supplier ()
 {
   CosEventComm::PullSupplier_var supplier;
   {
@@ -162,23 +155,21 @@ TAO_CEC_ProxyPullConsumer::pull_from_supplier (
   }
 
   CORBA::Any_var any;
-  ACE_TRY
+  try
     {
       any = supplier->pull ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // @@ This is where the policies for misbehaving suppliers
       //    should kick in.... for the moment just ignore them.
     }
-  ACE_ENDTRY;
   return any._retn ();
 }
 
 CORBA::Boolean
 TAO_CEC_ProxyPullConsumer::supplier_non_existent (
-      CORBA::Boolean_out disconnected
-      ACE_ENV_ARG_DECL)
+      CORBA::Boolean_out disconnected)
 {
   CORBA::Object_var supplier;
   {
@@ -225,16 +216,15 @@ TAO_CEC_ProxyPullConsumer::shutdown (void)
   if (CORBA::is_nil (supplier.in ()))
     return;
 
-  ACE_TRY
+  try
     {
       supplier->disconnect_pull_supplier ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore exceptions, we must isolate other clients from
       // failures on this one.
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -268,14 +258,13 @@ TAO_CEC_ProxyPullConsumer::_decr_refcnt (void)
 
 void
 TAO_CEC_ProxyPullConsumer::connect_pull_supplier (
-      CosEventComm::PullSupplier_ptr pull_supplier
-      ACE_ENV_ARG_DECL)
+      CosEventComm::PullSupplier_ptr pull_supplier)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventChannelAdmin::AlreadyConnected))
 {
   // Nil PullSuppliers are illegal
   if (CORBA::is_nil (pull_supplier))
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   {
     ACE_GUARD_THROW_EX (
@@ -286,7 +275,7 @@ TAO_CEC_ProxyPullConsumer::connect_pull_supplier (
     if (this->is_connected_i ())
       {
         if (this->event_channel_->supplier_reconnect () == 0)
-          ACE_THROW (CosEventChannelAdmin::AlreadyConnected ());
+          throw CosEventChannelAdmin::AlreadyConnected ();
 
         // Re-connections are allowed, go ahead and disconnect the
         // consumer...
@@ -302,7 +291,7 @@ TAO_CEC_ProxyPullConsumer::connect_pull_supplier (
               CORBA::INTERNAL ());
           // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
 
-          this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
+          this->event_channel_->disconnected (this);
         }
 
         // What if a second thread connected us after this?
@@ -313,7 +302,7 @@ TAO_CEC_ProxyPullConsumer::connect_pull_supplier (
   }
 
   // Notify the event channel...
-  this->event_channel_->connected (this ACE_ENV_ARG_PARAMETER);
+  this->event_channel_->connected (this);
 }
 
 CosEventComm::PullSupplier_ptr
@@ -344,8 +333,7 @@ TAO_CEC_ProxyPullConsumer::apply_policy (CosEventComm::PullSupplier_ptr pre)
 }
 
 void
-TAO_CEC_ProxyPullConsumer::disconnect_pull_consumer (
-      ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ProxyPullConsumer::disconnect_pull_consumer ()
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventComm::PullSupplier_var supplier;
@@ -357,7 +345,7 @@ TAO_CEC_ProxyPullConsumer::disconnect_pull_consumer (
     // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
 
     if (this->is_connected_i () == 0)
-      ACE_THROW (CORBA::BAD_INV_ORDER ()); // @@ add user exception?
+      throw CORBA::BAD_INV_ORDER (); // @@ add user exception?
 
     supplier = this->supplier_._retn ();
 
@@ -365,20 +353,19 @@ TAO_CEC_ProxyPullConsumer::disconnect_pull_consumer (
   }
 
   // Notify the event channel...
-  this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
+  this->event_channel_->disconnected (this);
 
   if (this->event_channel_->disconnect_callbacks ())
     {
-      ACE_TRY
+      try
         {
           supplier->disconnect_pull_supplier ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           // Ignore exceptions, we must isolate other clients from
           // failures on this one.
         }
-      ACE_ENDTRY;
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
index 9ce0be748d9..4ef91c2091b 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
@@ -58,8 +58,7 @@ public:
 
   /// Activate in the POA
   virtual void  activate (
-      CosEventChannelAdmin::ProxyPullConsumer_ptr &activated_proxy
-      ACE_ENV_ARG_DECL)
+      CosEventChannelAdmin::ProxyPullConsumer_ptr &activated_proxy)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Deactivate from the POA
@@ -74,8 +73,7 @@ public:
   CosEventComm::PullSupplier_ptr supplier (void) const;
 
   /// Pulls from the supplier, verifies that it is connected.
-  CORBA::Any* try_pull_from_supplier (CORBA::Boolean_out has_event
-                                      ACE_ENV_ARG_DECL);
+  CORBA::Any* try_pull_from_supplier (CORBA::Boolean_out has_event);
   CORBA::Any* pull_from_supplier (void);
 
   /**
@@ -83,8 +81,7 @@ public:
    * it is disconnected then it returns true and sets the
    * <disconnected> flag.
    */
-  CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected
-                                        ACE_ENV_ARG_DECL);
+  CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected);
 
   /// The event channel is shutting down
   virtual void shutdown (void);
@@ -95,8 +92,7 @@ public:
 
   // = The CosEventChannelAdmin::ProxyPullConsumer methods...
   virtual void connect_pull_supplier (
-                CosEventComm::PullSupplier_ptr pull_supplier
-                ACE_ENV_ARG_DECL_NOT_USED)
+                CosEventComm::PullSupplier_ptr pull_supplier)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosEventChannelAdmin::AlreadyConnected));
   virtual void disconnect_pull_consumer (void)
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
index cbbdc1c51d7..26231b016af 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
@@ -43,20 +43,18 @@ TAO_CEC_ProxyPullSupplier::~TAO_CEC_ProxyPullSupplier (void)
 
 void
 TAO_CEC_ProxyPullSupplier::activate (
-    CosEventChannelAdmin::ProxyPullSupplier_ptr &activated_proxy
-    ACE_ENV_ARG_DECL)
+    CosEventChannelAdmin::ProxyPullSupplier_ptr &activated_proxy)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventChannelAdmin::ProxyPullSupplier_var result;
-  ACE_TRY
+  try
     {
       result = this->_this ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       result = CosEventChannelAdmin::ProxyPullSupplier::_nil ();
     }
-  ACE_ENDTRY;
   activated_proxy = result._retn ();
 }
 
@@ -64,22 +62,21 @@ void
 TAO_CEC_ProxyPullSupplier::deactivate (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       PortableServer::POA_var poa =
         this->_default_POA ();
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-      poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
+        poa->servant_to_id (this);
+      poa->deactivate_object (id.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Exceptions here should not be propagated.  They usually
       // indicate that an object is beign disconnected twice, or some
       // race condition, but not a fault that the user needs to know
       // about.
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -103,22 +100,20 @@ TAO_CEC_ProxyPullSupplier::shutdown (void)
   if (CORBA::is_nil (consumer.in ()))
     return;
 
-  ACE_TRY
+  try
     {
       consumer->disconnect_pull_consumer ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore exceptions, we must isolate other clients from
       // problems on this one.
     }
-  ACE_ENDTRY;
 }
 
 CORBA::Boolean
 TAO_CEC_ProxyPullSupplier::consumer_non_existent (
-      CORBA::Boolean_out disconnected
-      ACE_ENV_ARG_DECL)
+      CORBA::Boolean_out disconnected)
 {
   CORBA::Object_var consumer;
   {
@@ -147,8 +142,7 @@ TAO_CEC_ProxyPullSupplier::consumer_non_existent (
 }
 
 void
-TAO_CEC_ProxyPullSupplier::push (const CORBA::Any &event
-                                 ACE_ENV_ARG_DECL_NOT_USED)
+TAO_CEC_ProxyPullSupplier::push (const CORBA::Any &event)
 {
   if (this->is_connected () == 0)
     return;
@@ -183,8 +177,7 @@ TAO_CEC_ProxyPullSupplier::pull (void)
 }
 
 CORBA::Any *
-TAO_CEC_ProxyPullSupplier::try_pull (CORBA::Boolean_out has_event
-                                     ACE_ENV_ARG_DECL)
+TAO_CEC_ProxyPullSupplier::try_pull (CORBA::Boolean_out has_event)
       ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected))
 {
   has_event = 0;
@@ -239,8 +232,7 @@ TAO_CEC_ProxyPullSupplier::_decr_refcnt (void)
 
 void
 TAO_CEC_ProxyPullSupplier::connect_pull_consumer (
-      CosEventComm::PullConsumer_ptr pull_consumer
-      ACE_ENV_ARG_DECL)
+      CosEventComm::PullConsumer_ptr pull_consumer)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventChannelAdmin::AlreadyConnected))
 {
@@ -253,7 +245,7 @@ TAO_CEC_ProxyPullSupplier::connect_pull_consumer (
     if (this->is_connected_i ())
       {
         if (this->event_channel_->consumer_reconnect () == 0)
-          ACE_THROW (CosEventChannelAdmin::AlreadyConnected ());
+          throw CosEventChannelAdmin::AlreadyConnected ();
 
         // Re-connections are allowed....
         this->cleanup_i ();
@@ -269,7 +261,7 @@ TAO_CEC_ProxyPullSupplier::connect_pull_consumer (
               CORBA::INTERNAL ());
           // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
 
-          this->event_channel_->reconnected (this ACE_ENV_ARG_PARAMETER);
+          this->event_channel_->reconnected (this);
         }
         return;
       }
@@ -279,7 +271,7 @@ TAO_CEC_ProxyPullSupplier::connect_pull_consumer (
   }
 
   // Notify the event channel...
-  this->event_channel_->connected (this ACE_ENV_ARG_PARAMETER);
+  this->event_channel_->connected (this);
 }
 
 CosEventComm::PullConsumer_ptr
@@ -311,8 +303,7 @@ TAO_CEC_ProxyPullSupplier::apply_policy (CosEventComm::PullConsumer_ptr pre)
 }
 
 void
-TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier (
-      ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier ()
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventComm::PullConsumer_var consumer;
@@ -324,7 +315,7 @@ TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier (
     // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
 
     if (this->is_connected_i () == 0)
-      ACE_THROW (CORBA::BAD_INV_ORDER ());
+      throw CORBA::BAD_INV_ORDER ();
 
     consumer = this->consumer_._retn ();
 
@@ -332,25 +323,24 @@ TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier (
   }
 
   // Notify the event channel....
-  this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
+  this->event_channel_->disconnected (this);
 
   if (CORBA::is_nil (consumer.in ()))
     return;
 
   if (this->event_channel_->disconnect_callbacks ())
     {
-      ACE_TRY
+      try
         {
           consumer->disconnect_pull_consumer ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           // Ignore exceptions, we must isolate other clients from
           // problems on this one.
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+          ACE_PRINT_EXCEPTION (ex,
                                "ProxySupplier::disconnect_pull_supplier");
         }
-      ACE_ENDTRY;
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
index 949afe498b7..534549e1859 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
@@ -65,8 +65,7 @@ public:
 
   /// Activate in the POA
   virtual void activate (
-      CosEventChannelAdmin::ProxyPullSupplier_ptr &activated_proxy
-      ACE_ENV_ARG_DECL)
+      CosEventChannelAdmin::ProxyPullSupplier_ptr &activated_proxy)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Deactivate from the POA
@@ -92,23 +91,19 @@ public:
    * it is disconnected then it returns true and sets the
    * <disconnected> flag.
    */
-  CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected
-                                        ACE_ENV_ARG_DECL);
+  CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected);
 
   /// Push an event into the queue.
-  void push (const CORBA::Any &event
-             ACE_ENV_ARG_DECL);
+  void push (const CORBA::Any &event);
 
   // = The CosEventChannelAdmin::ProxyPullSupplier methods...
   virtual void connect_pull_consumer (
-                CosEventComm::PullConsumer_ptr pull_consumer
-                ACE_ENV_ARG_DECL_NOT_USED)
+                CosEventComm::PullConsumer_ptr pull_consumer)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosEventChannelAdmin::AlreadyConnected));
   virtual CORBA::Any * pull (void)
       ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected));
-  virtual CORBA::Any * try_pull (CORBA::Boolean_out has_event
-                                 ACE_ENV_ARG_DECL_NOT_USED)
+  virtual CORBA::Any * try_pull (CORBA::Boolean_out has_event)
       ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected));
   virtual void disconnect_pull_supplier (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
index b909b4b423c..dafbccb8787 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
@@ -44,20 +44,18 @@ TAO_CEC_ProxyPushConsumer::~TAO_CEC_ProxyPushConsumer (void)
 
 void
 TAO_CEC_ProxyPushConsumer::activate (
-    CosEventChannelAdmin::ProxyPushConsumer_ptr &activated_proxy
-    ACE_ENV_ARG_DECL)
+    CosEventChannelAdmin::ProxyPushConsumer_ptr &activated_proxy)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventChannelAdmin::ProxyPushConsumer_var result;
-  ACE_TRY
+  try
     {
       result = this->_this ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       result  =  CosEventChannelAdmin::ProxyPushConsumer::_nil ();
     }
-  ACE_ENDTRY;
   activated_proxy =  result._retn ();
 }
 
@@ -65,28 +63,26 @@ void
 TAO_CEC_ProxyPushConsumer::deactivate (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       PortableServer::POA_var poa =
         this->_default_POA ();
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-      poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
+        poa->servant_to_id (this);
+      poa->deactivate_object (id.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Exceptions here should not be propagated.  They usually
       // indicate that an object is beign disconnected twice, or some
       // race condition, but not a fault that the user needs to know
       // about.
     }
-  ACE_ENDTRY;
 }
 
 CORBA::Boolean
 TAO_CEC_ProxyPushConsumer::supplier_non_existent (
-      CORBA::Boolean_out disconnected
-      ACE_ENV_ARG_DECL)
+      CORBA::Boolean_out disconnected)
 {
   CORBA::Object_var supplier;
   {
@@ -134,16 +130,15 @@ TAO_CEC_ProxyPushConsumer::shutdown (void)
   if (CORBA::is_nil (supplier.in ()))
     return;
 
-  ACE_TRY
+  try
     {
       supplier->disconnect_push_supplier ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore exceptions, we must isolate other clients from
       // failures on this one.
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -178,8 +173,7 @@ TAO_CEC_ProxyPushConsumer::_decr_refcnt (void)
 
 void
 TAO_CEC_ProxyPushConsumer::connect_push_supplier (
-      CosEventComm::PushSupplier_ptr push_supplier
-      ACE_ENV_ARG_DECL)
+      CosEventComm::PushSupplier_ptr push_supplier)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventChannelAdmin::AlreadyConnected))
 {
@@ -192,7 +186,7 @@ TAO_CEC_ProxyPushConsumer::connect_push_supplier (
     if (this->is_connected_i ())
       {
         if (this->event_channel_->supplier_reconnect () == 0)
-          ACE_THROW (CosEventChannelAdmin::AlreadyConnected ());
+          throw CosEventChannelAdmin::AlreadyConnected ();
 
         // Re-connections are allowed, go ahead and disconnect the
         // consumer...
@@ -208,7 +202,7 @@ TAO_CEC_ProxyPushConsumer::connect_push_supplier (
               CORBA::INTERNAL ());
           // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
 
-          this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
+          this->event_channel_->disconnected (this);
         }
 
         // What if a second thread connected us after this?
@@ -220,7 +214,7 @@ TAO_CEC_ProxyPushConsumer::connect_push_supplier (
   }
 
   // Notify the event channel...
-  this->event_channel_->connected (this ACE_ENV_ARG_PARAMETER);
+  this->event_channel_->connected (this);
 }
 
 CosEventComm::PushSupplier_ptr
@@ -252,8 +246,7 @@ TAO_CEC_ProxyPushConsumer::apply_policy (CosEventComm::PushSupplier_ptr pre)
 }
 
 void
-TAO_CEC_ProxyPushConsumer::push (const CORBA::Any& event
-                                 ACE_ENV_ARG_DECL)
+TAO_CEC_ProxyPushConsumer::push (const CORBA::Any& event)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_CEC_ProxyPushConsumer_Guard ace_mon (this->lock_,
@@ -263,13 +256,11 @@ TAO_CEC_ProxyPushConsumer::push (const CORBA::Any& event
   if (!ace_mon.locked ())
     return;
 
-  this->event_channel_->consumer_admin ()->push (event
-                                                 ACE_ENV_ARG_PARAMETER);
+  this->event_channel_->consumer_admin ()->push (event);
 }
 
 void
-TAO_CEC_ProxyPushConsumer::disconnect_push_consumer (
-      ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ProxyPushConsumer::disconnect_push_consumer ()
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventComm::PushSupplier_var supplier;
@@ -281,7 +272,7 @@ TAO_CEC_ProxyPushConsumer::disconnect_push_consumer (
     // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
 
     if (!this->is_connected_i ())
-      ACE_THROW (CORBA::BAD_INV_ORDER ()); // @@ add user exception?
+      throw CORBA::BAD_INV_ORDER (); // @@ add user exception?
 
     supplier = this->supplier_._retn ();
 
@@ -289,23 +280,22 @@ TAO_CEC_ProxyPushConsumer::disconnect_push_consumer (
   }
 
   // Notify the event channel...
-  this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
+  this->event_channel_->disconnected (this);
 
   if (CORBA::is_nil (supplier.in ()))
     return;
 
   if (this->event_channel_->disconnect_callbacks ())
     {
-      ACE_TRY
+      try
         {
           supplier->disconnect_push_supplier ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           // Ignore exceptions, we must isolate other clients from
           // failures on this one.
         }
-      ACE_ENDTRY;
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
index 6057f466c8b..9ea04838f5d 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
@@ -60,8 +60,7 @@ public:
 
   /// Activate in the POA
   virtual void activate (
-      CosEventChannelAdmin::ProxyPushConsumer_ptr &activated_proxy
-      ACE_ENV_ARG_DECL)
+      CosEventChannelAdmin::ProxyPushConsumer_ptr &activated_proxy)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Deactivate from the POA
@@ -80,8 +79,7 @@ public:
    * it is disconnected then it returns true and sets the
    * <disconnected> flag.
    */
-  CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected
-                                        ACE_ENV_ARG_DECL);
+  CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected);
 
   /// The event channel is shutting down
   virtual void shutdown (void);
@@ -92,12 +90,10 @@ public:
 
   // = The CosEventChannelAdmin::ProxyPushConsumer methods...
   virtual void connect_push_supplier (
-                CosEventComm::PushSupplier_ptr push_supplier
-                ACE_ENV_ARG_DECL_NOT_USED)
+                CosEventComm::PushSupplier_ptr push_supplier)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosEventChannelAdmin::AlreadyConnected));
-  virtual void push (const CORBA::Any& event
-                     ACE_ENV_ARG_DECL_NOT_USED)
+  virtual void push (const CORBA::Any& event)
       ACE_THROW_SPEC ((CORBA::SystemException));
   virtual void disconnect_push_consumer (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
index 139f413d2a0..ace061825bd 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
@@ -97,20 +97,18 @@ TAO_CEC_ProxyPushSupplier::~TAO_CEC_ProxyPushSupplier (void)
 
 void
 TAO_CEC_ProxyPushSupplier::activate (
-    CosEventChannelAdmin::ProxyPushSupplier_ptr &activated_proxy
-    ACE_ENV_ARG_DECL)
+    CosEventChannelAdmin::ProxyPushSupplier_ptr &activated_proxy)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventChannelAdmin::ProxyPushSupplier_var result;
-  ACE_TRY
+  try
     {
       result = this->_this ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       result = CosEventChannelAdmin::ProxyPushSupplier::_nil ();
     }
-  ACE_ENDTRY;
   activated_proxy = result._retn ();
 }
 
@@ -118,22 +116,21 @@ void
 TAO_CEC_ProxyPushSupplier::deactivate (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       PortableServer::POA_var poa =
         this->_default_POA ();
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-      poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
+        poa->servant_to_id (this);
+      poa->deactivate_object (id.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Exceptions here should not be propagated.  They usually
       // indicate that an object is beign disconnected twice, or some
       // race condition, but not a fault that the user needs to know
       // about.
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -159,17 +156,15 @@ TAO_CEC_ProxyPushSupplier::shutdown (void)
       if (CORBA::is_nil (typed_consumer.in ()))
         return;
 
-      ACE_TRY_EX (typed)
+      try
         {
           typed_consumer->disconnect_push_consumer ();
-          ACE_TRY_CHECK_EX (typed);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           // Ignore exceptions, we must isolate other clients from
           // problems on this one.
         }
-      ACE_ENDTRY;
     } /* this->is_typed_ec */
   else
     {
@@ -193,16 +188,15 @@ TAO_CEC_ProxyPushSupplier::shutdown (void)
   if (CORBA::is_nil (consumer.in ()))
     return;
 
-  ACE_TRY
+  try
     {
       consumer->disconnect_push_consumer ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore exceptions, we must isolate other clients from
       // problems on this one.
     }
-  ACE_ENDTRY;
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
     } /* ! this->is_typed_ec */
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
@@ -211,8 +205,7 @@ TAO_CEC_ProxyPushSupplier::shutdown (void)
 typedef TAO_ESF_Proxy_RefCount_Guard<TAO_CEC_EventChannel,TAO_CEC_ProxyPushSupplier> Destroy_Guard;
 
 void
-TAO_CEC_ProxyPushSupplier::push (const CORBA::Any &event
-                                 ACE_ENV_ARG_DECL)
+TAO_CEC_ProxyPushSupplier::push (const CORBA::Any &event)
 {
   Destroy_Guard auto_destroy (this->refcount_,
                               this->event_channel_,
@@ -231,8 +224,7 @@ TAO_CEC_ProxyPushSupplier::push (const CORBA::Any &event
 
       ACE_GUARD (TAO_CEC_Unlock, ace_mon, reverse_lock);
       this->event_channel_->dispatching ()->push (this,
-                                                  event
-                                                  ACE_ENV_ARG_PARAMETER);
+                                                  event);
     }
   }
 }
@@ -241,8 +233,7 @@ TAO_CEC_ProxyPushSupplier::push (const CORBA::Any &event
 typedef TAO_ESF_Proxy_RefCount_Guard<TAO_CEC_TypedEventChannel,TAO_CEC_ProxyPushSupplier> Destroy_Guard_Typed;
 
 void
-TAO_CEC_ProxyPushSupplier::invoke (const TAO_CEC_TypedEvent& typed_event
-                                   ACE_ENV_ARG_DECL)
+TAO_CEC_ProxyPushSupplier::invoke (const TAO_CEC_TypedEvent& typed_event)
 {
   Destroy_Guard_Typed auto_destroy (this->refcount_,
                                     this->typed_event_channel_,
@@ -261,16 +252,14 @@ TAO_CEC_ProxyPushSupplier::invoke (const TAO_CEC_TypedEvent& typed_event
 
       ACE_GUARD (TAO_CEC_Unlock, ace_mon, reverse_lock);
       this->typed_event_channel_->dispatching ()->invoke (this,
-                                                          typed_event
-                                                          ACE_ENV_ARG_PARAMETER);
+                                                          typed_event);
     }
   }
 }
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
 void
-TAO_CEC_ProxyPushSupplier::push_nocopy (CORBA::Any &event
-                                        ACE_ENV_ARG_DECL)
+TAO_CEC_ProxyPushSupplier::push_nocopy (CORBA::Any &event)
 {
   Destroy_Guard auto_destroy (this->refcount_,
                               this->event_channel_,
@@ -289,8 +278,7 @@ TAO_CEC_ProxyPushSupplier::push_nocopy (CORBA::Any &event
 
       ACE_GUARD (TAO_CEC_Unlock, ace_mon, reverse_lock);
       this->event_channel_->dispatching ()->push_nocopy (this,
-                                                         event
-                                                         ACE_ENV_ARG_PARAMETER);
+                                                         event);
     }
   }
 }
@@ -341,15 +329,14 @@ TAO_CEC_ProxyPushSupplier::_decr_refcnt (void)
 
 void
 TAO_CEC_ProxyPushSupplier::connect_push_consumer (
-      CosEventComm::PushConsumer_ptr push_consumer
-      ACE_ENV_ARG_DECL)
+      CosEventComm::PushConsumer_ptr push_consumer)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventChannelAdmin::AlreadyConnected,
                      CosEventChannelAdmin::TypeError))
 {
   // Nil PushConsumers are illegal
   if (CORBA::is_nil (push_consumer))
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   {
 
@@ -369,13 +356,11 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer (
         // _is_a (during _narrow) and get_typed_consumer invocations.
         // They are eventually assigned onto this object inside the Guard.
         CosTypedEventComm::TypedPushConsumer_var local_typed_consumer =
-          CosTypedEventComm::TypedPushConsumer::_narrow (push_consumer
-                                                         ACE_ENV_ARG_PARAMETER);
+          CosTypedEventComm::TypedPushConsumer::_narrow (push_consumer);
 
         // Obtain the typed object interface from the consumer
         CORBA::Object_var local_typed_consumer_obj =
-          CORBA::Object::_duplicate (local_typed_consumer->get_typed_consumer (
-                                             ACE_ENV_SINGLE_ARG_PARAMETER) );
+          CORBA::Object::_duplicate (local_typed_consumer->get_typed_consumer () );
 
         {
           ACE_GUARD_THROW_EX (
@@ -386,7 +371,7 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer (
           if (this->is_connected_i ())
             {
               if (this->typed_event_channel_->consumer_reconnect () == 0)
-                ACE_THROW (CosEventChannelAdmin::AlreadyConnected ());
+                throw CosEventChannelAdmin::AlreadyConnected ();
 
               // Re-connections are allowed....
               this->cleanup_i ();
@@ -401,7 +386,7 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer (
                     CORBA::INTERNAL ());
                 // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
 
-                this->typed_event_channel_->reconnected (this ACE_ENV_ARG_PARAMETER);
+                this->typed_event_channel_->reconnected (this);
               }
               return;
 
@@ -415,7 +400,7 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer (
         }
 
         // Notify the event channel...
-        this->typed_event_channel_->connected (this ACE_ENV_ARG_PARAMETER);
+        this->typed_event_channel_->connected (this);
 
       } /* this->is_typed_ec */
     else
@@ -439,7 +424,7 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer (
     if (this->is_connected_i ())
       {
         if (this->event_channel_->consumer_reconnect () == 0)
-          ACE_THROW (CosEventChannelAdmin::AlreadyConnected ());
+          throw CosEventChannelAdmin::AlreadyConnected ();
 
         // Re-connections are allowed....
         this->cleanup_i ();
@@ -454,7 +439,7 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer (
               CORBA::INTERNAL ());
           // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
 
-          this->event_channel_->reconnected (this ACE_ENV_ARG_PARAMETER);
+          this->event_channel_->reconnected (this);
         }
         return;
       }
@@ -463,7 +448,7 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer (
   }
 
   // Notify the event channel...
-  this->event_channel_->connected (this ACE_ENV_ARG_PARAMETER);
+  this->event_channel_->connected (this);
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
       } /* ! this->is_typed_ec */
@@ -526,8 +511,7 @@ TAO_CEC_ProxyPushSupplier::apply_policy
 #endif
 
 void
-TAO_CEC_ProxyPushSupplier::disconnect_push_supplier (
-      ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ProxyPushSupplier::disconnect_push_supplier ()
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventComm::PushConsumer_var consumer;
@@ -542,7 +526,7 @@ TAO_CEC_ProxyPushSupplier::disconnect_push_supplier (
     // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
 
     if (this->is_connected_i () == 0)
-      ACE_THROW (CORBA::BAD_INV_ORDER ());
+      throw CORBA::BAD_INV_ORDER ();
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
     if (this->is_typed_ec () )
@@ -564,14 +548,14 @@ TAO_CEC_ProxyPushSupplier::disconnect_push_supplier (
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
   if (this->is_typed_ec () )
     {
-      this->typed_event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
+      this->typed_event_channel_->disconnected (this);
     }
   else
     {
-      this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
+      this->event_channel_->disconnected (this);
     }
 #else
-  this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
+  this->event_channel_->disconnected (this);
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
   // Disconnect callbacks
@@ -580,19 +564,17 @@ TAO_CEC_ProxyPushSupplier::disconnect_push_supplier (
     {
       if (this->typed_event_channel_->disconnect_callbacks ())
         {
-          ACE_TRY_EX (typed)
+          try
             {
               typed_consumer->disconnect_push_consumer ();
-              ACE_TRY_CHECK_EX (typed);
             }
-          ACE_CATCHANY
+          catch (const CORBA::Exception& ex)
             {
               // Ignore exceptions, we must isolate other clients from
               // problems on this one.
-              ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                   "ProxySupplier::disconnect_push_supplier");
+              ex._tao_print_exception (
+                "ProxySupplier::disconnect_push_supplier");
             }
-          ACE_ENDTRY;
         }
     } /* this->is_typed_ec */
   else
@@ -601,18 +583,16 @@ TAO_CEC_ProxyPushSupplier::disconnect_push_supplier (
 
   if (this->event_channel_->disconnect_callbacks ())
     {
-      ACE_TRY
+      try
         {
           consumer->disconnect_push_consumer ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           // Ignore exceptions, we must isolate other clients from
           // problems on this one.
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "ProxySupplier::disconnect_push_supplier");
+          ex._tao_print_exception ("ProxySupplier::disconnect_push_supplier");
         }
-      ACE_ENDTRY;
     }
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
@@ -621,8 +601,7 @@ TAO_CEC_ProxyPushSupplier::disconnect_push_supplier (
 }
 
 void
-TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event
-                                             ACE_ENV_ARG_DECL)
+TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event)
 {
   CosEventComm::PushConsumer_var consumer;
   {
@@ -640,34 +619,31 @@ TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event
 
   TAO_CEC_ConsumerControl *control =
                this->event_channel_->consumer_control ();
-  ACE_TRY
+  try
     {
-      consumer->push (event ACE_ENV_ARG_PARAMETER);
+      consumer->push (event);
 
       // Inform the control that we were able to push something
       control->successful_transmission(this);
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used)
+  catch (const CORBA::OBJECT_NOT_EXIST& not_used)
     {
-      control->consumer_not_exist (this ACE_ENV_ARG_PARAMETER);
+      control->consumer_not_exist (this);
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (CORBA::SystemException& sysex)
     {
       control->system_exception (this,
-                                 sysex
-                                 ACE_ENV_ARG_PARAMETER);
+                                 sysex);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Shouldn't happen, but does not hurt
     }
-  ACE_ENDTRY;
 }
 
 void
 TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer (
-    const CORBA::Any& event
-    ACE_ENV_ARG_DECL)
+    const CORBA::Any& event)
 {
   CosEventComm::PushConsumer_var consumer;
   {
@@ -682,43 +658,42 @@ TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer (
   TAO_CEC_ConsumerControl *control =
                   this->event_channel_->consumer_control ();
 
-  ACE_TRY
+  try
     {
-      consumer->push (event ACE_ENV_ARG_PARAMETER);
+      consumer->push (event);
 
       // Inform the control that we were able to push something
       control->successful_transmission(this);
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used)
+  catch (const CORBA::OBJECT_NOT_EXIST& not_used)
     {
        if (TAO_debug_level >= 4)
         {
-          ACE_PRINT_EXCEPTION (not_used, "during TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer");
+          not_used._tao_print_exception (
+            "during TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer");
         }
-     control->consumer_not_exist (this ACE_ENV_ARG_PARAMETER);
+     control->consumer_not_exist (this);
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (CORBA::SystemException& sysex)
     {
       if (TAO_debug_level >= 4)
         {
-          ACE_PRINT_EXCEPTION (sysex, "during TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer");
+          sysex._tao_print_exception (
+            "during TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer");
         }
 
       control->system_exception (this,
-                                 sysex
-                                 ACE_ENV_ARG_PARAMETER);
+                                 sysex);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Shouldn't happen, but does not hurt
     }
-  ACE_ENDTRY;
 }
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
 void
-TAO_CEC_ProxyPushSupplier::invoke_to_consumer (const TAO_CEC_TypedEvent &typed_event
-                                               ACE_ENV_ARG_DECL)
+TAO_CEC_ProxyPushSupplier::invoke_to_consumer (const TAO_CEC_TypedEvent &typed_event)
 {
   CORBA::Object_var typed_consumer_obj;
 
@@ -742,7 +717,7 @@ TAO_CEC_ProxyPushSupplier::invoke_to_consumer (const TAO_CEC_TypedEvent &typed_e
                this->typed_event_channel_->consumer_control ();
 
   // Create the DII request
-  ACE_TRY
+  try
     {
       typed_consumer_obj_->_create_request (0, // ctx
                                             typed_event.operation_,
@@ -751,8 +726,7 @@ TAO_CEC_ProxyPushSupplier::invoke_to_consumer (const TAO_CEC_TypedEvent &typed_e
                                             0, // exception_list,
                                             0, // context_list,
                                             target_request.inout(),
-                                            0
-                                            ACE_ENV_ARG_PARAMETER);
+                                            0);
 
       // Call the DII invoke for the operation on the target object
       target_request->invoke ();
@@ -760,40 +734,39 @@ TAO_CEC_ProxyPushSupplier::invoke_to_consumer (const TAO_CEC_TypedEvent &typed_e
       // Inform the control that we were able to invoke something
       control->successful_transmission(this);
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used)
+  catch (const CORBA::OBJECT_NOT_EXIST& not_used)
     {
       if (TAO_debug_level >= 4)
         {
-          ACE_PRINT_EXCEPTION (not_used, "during TAO_CEC_ProxyPushSupplier::invoke_to_consumer");
+          not_used._tao_print_exception (
+            "during TAO_CEC_ProxyPushSupplier::invoke_to_consumer");
         }
-      control->consumer_not_exist (this ACE_ENV_ARG_PARAMETER);
+      control->consumer_not_exist (this);
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (CORBA::SystemException& sysex)
     {
       if (TAO_debug_level >= 4)
         {
-          ACE_PRINT_EXCEPTION (sysex, "during TAO_CEC_ProxyPushSupplier::invoke_to_consumer");
+          sysex._tao_print_exception (
+            "during TAO_CEC_ProxyPushSupplier::invoke_to_consumer");
         }
       control->system_exception (this,
-                                 sysex
-                                 ACE_ENV_ARG_PARAMETER);
+                                 sysex);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Shouldn't happen, but does not hurt
       if (TAO_debug_level >= 4)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "ACE_ANY_EXCEPTION raised during TAO_CEC_ProxyPushSupplier::invoke_to_consumer");
+          ex._tao_print_exception (
+            "ex raised during TAO_CEC_ProxyPushSupplier::invoke_to_consumer");
         }
     }
-  ACE_ENDTRY;
 }
 
 void
 TAO_CEC_ProxyPushSupplier::reactive_invoke_to_consumer (
-    const TAO_CEC_TypedEvent& typed_event
-    ACE_ENV_ARG_DECL)
+    const TAO_CEC_TypedEvent& typed_event)
 {
   CORBA::Object_var typed_consumer_obj;
 
@@ -819,7 +792,7 @@ TAO_CEC_ProxyPushSupplier::reactive_invoke_to_consumer (
                   this->typed_event_channel_->consumer_control ();
 
   // Create the DII request
-  ACE_TRY
+  try
     {
       typed_consumer_obj_->_create_request (0, // ctx
                                             typed_event.operation_,
@@ -828,8 +801,7 @@ TAO_CEC_ProxyPushSupplier::reactive_invoke_to_consumer (
                                             0, // exception_list,
                                             0, // context_list,
                                             target_request.inout(),
-                                            0
-                                            ACE_ENV_ARG_PARAMETER);
+                                            0);
 
       // Call the DII invoke for the operation on the target object
       target_request->invoke ();
@@ -837,40 +809,39 @@ TAO_CEC_ProxyPushSupplier::reactive_invoke_to_consumer (
       // Inform the control that we were able to invoke something
       control->successful_transmission(this);
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used)
+  catch (const CORBA::OBJECT_NOT_EXIST& not_used)
     {
       if (TAO_debug_level >= 4)
         {
-          ACE_PRINT_EXCEPTION (not_used, "during TAO_CEC_ProxyPushSupplier::reactive_invoke_to_consumer");
+          not_used._tao_print_exception (
+            "during TAO_CEC_ProxyPushSupplier::reactive_invoke_to_consumer");
         }
-      control->consumer_not_exist (this ACE_ENV_ARG_PARAMETER);
+      control->consumer_not_exist (this);
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (CORBA::SystemException& sysex)
     {
       if (TAO_debug_level >= 4)
         {
-          ACE_PRINT_EXCEPTION (sysex, "during TAO_CEC_ProxyPushSupplier::reactive_invoke_to_consumer");
+          sysex._tao_print_exception (
+            "during TAO_CEC_ProxyPushSupplier::reactive_invoke_to_consumer");
         }
       control->system_exception (this,
-                                 sysex
-                                 ACE_ENV_ARG_PARAMETER);
+                                 sysex);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       if (TAO_debug_level >= 4)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "ACE_ANY_EXCEPTION raised during TAO_CEC_ProxyPushSupplier::reactive_invoke_to_consumer");
+          ex._tao_print_exception (
+            "ex raised during TAO_CEC_ProxyPushSupplier::reactive_invoke_to_consumer");
         }
     }
-  ACE_ENDTRY;
 }
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
 CORBA::Boolean
 TAO_CEC_ProxyPushSupplier::consumer_non_existent (
-      CORBA::Boolean_out disconnected
-      ACE_ENV_ARG_DECL)
+      CORBA::Boolean_out disconnected)
 {
   CORBA::Object_var consumer;
   {
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
index c712ca1aae3..a5f7531a37b 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
@@ -76,8 +76,7 @@ public:
 
   /// Activate in the POA
   virtual void activate (
-      CosEventChannelAdmin::ProxyPushSupplier_ptr &
-      ACE_ENV_ARG_DECL)
+      CosEventChannelAdmin::ProxyPushSupplier_ptr &)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Deactivate from the POA
@@ -99,26 +98,19 @@ public:
   virtual void shutdown (void);
 
   /// Internal methods to push an event to each consumer.
-  virtual void push (const CORBA::Any &event
-                     ACE_ENV_ARG_DECL);
-  virtual void push_nocopy (CORBA::Any &event
-                            ACE_ENV_ARG_DECL);
+  virtual void push (const CORBA::Any &event);
+  virtual void push_nocopy (CORBA::Any &event);
   /// Internal methods to invoke a typed event to each consumer.
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
-  virtual void invoke (const TAO_CEC_TypedEvent& typed_event
-                       ACE_ENV_ARG_DECL);
+  virtual void invoke (const TAO_CEC_TypedEvent& typed_event);
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
   /// Pushes to the consumer, verifies that it is connected.
-  void push_to_consumer (const CORBA::Any &event
-                         ACE_ENV_ARG_DECL);
-  void reactive_push_to_consumer (const CORBA::Any &event
-                                  ACE_ENV_ARG_DECL);
+  void push_to_consumer (const CORBA::Any &event);
+  void reactive_push_to_consumer (const CORBA::Any &event);
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
-  void invoke_to_consumer (const TAO_CEC_TypedEvent &typed_event
-                           ACE_ENV_ARG_DECL);
-  void reactive_invoke_to_consumer (const TAO_CEC_TypedEvent &typed_event
-                                    ACE_ENV_ARG_DECL);
+  void invoke_to_consumer (const TAO_CEC_TypedEvent &typed_event);
+  void reactive_invoke_to_consumer (const TAO_CEC_TypedEvent &typed_event);
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
   /**
@@ -126,13 +118,11 @@ public:
    * it is disconnected then it returns true and sets the
    * <disconnected> flag.
    */
-  CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected
-                                        ACE_ENV_ARG_DECL);
+  CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected);
 
   // = The CosEventChannelAdmin::ProxyPushSupplier methods...
   virtual void connect_push_consumer (
-                CosEventComm::PushConsumer_ptr push_consumer
-                ACE_ENV_ARG_DECL_NOT_USED)
+                CosEventComm::PushConsumer_ptr push_consumer)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosEventChannelAdmin::AlreadyConnected,
                        CosEventChannelAdmin::TypeError));
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h
index 791dda5c1d2..8c1fd3efb1a 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h
@@ -56,12 +56,9 @@ public:
 
 #if 0
   /// Some strategies may want to keep track of connected consumers.
-  virtual void connected (TAO_CEC_ProxyPullConsumer *
-                          ACE_ENV_ARG_DECL_NOT_USED) = 0;
-  virtual void reconnected (TAO_CEC_ProxyPullConsumer *
-                            ACE_ENV_ARG_DECL_NOT_USED) = 0;
-  virtual void diconnected (TAO_CEC_ProxyPullConsumer *
-                            ACE_ENV_ARG_DECL_NOT_USED) = 0;
+  virtual void connected (TAO_CEC_ProxyPullConsumer *) = 0;
+  virtual void reconnected (TAO_CEC_ProxyPullConsumer *) = 0;
+  virtual void diconnected (TAO_CEC_ProxyPullConsumer *) = 0;
 #endif /* 0 */
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
index 5e49263fc21..cebad334dce 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
@@ -93,8 +93,7 @@ TAO_CEC_Reactive_ConsumerControl::~TAO_CEC_Reactive_ConsumerControl (void)
 }
 
 void
-TAO_CEC_Reactive_ConsumerControl::query_consumers (
-      ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_Reactive_ConsumerControl::query_consumers ()
 {
   TAO_CEC_Ping_Push_Consumer push_worker (this);
 
@@ -102,20 +101,17 @@ TAO_CEC_Reactive_ConsumerControl::query_consumers (
   if (this->typed_event_channel_)
     {
       // Typed EC
-      this->typed_event_channel_->typed_consumer_admin ()->for_each (&push_worker
-                                                                     ACE_ENV_ARG_PARAMETER);
+      this->typed_event_channel_->typed_consumer_admin ()->for_each (&push_worker);
     }
   else
     {
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
   // Un-typed EC
-  this->event_channel_->consumer_admin ()->for_each (&push_worker
-                                                     ACE_ENV_ARG_PARAMETER);
+  this->event_channel_->consumer_admin ()->for_each (&push_worker);
 
   TAO_CEC_Ping_Pull_Consumer pull_worker (this);
-  this->event_channel_->consumer_admin ()->for_each (&pull_worker
-                                                     ACE_ENV_ARG_PARAMETER);
+  this->event_channel_->consumer_admin ()->for_each (&pull_worker);
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
     }
@@ -205,61 +201,53 @@ TAO_CEC_Reactive_ConsumerControl::handle_timeout (
       const ACE_Time_Value &,
       const void *)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Query the state of the Current object *before* we initiate
       // the iteration...
       CORBA::PolicyTypeSeq types;
       CORBA::PolicyList_var policies =
-        this->policy_current_->get_policy_overrides (types
-                                                     ACE_ENV_ARG_PARAMETER);
+        this->policy_current_->get_policy_overrides (types);
 
       // Change the timeout
       this->policy_current_->set_policy_overrides (this->policy_list_,
-                                                   CORBA::ADD_OVERRIDE
-                                                   ACE_ENV_ARG_PARAMETER);
+                                                   CORBA::ADD_OVERRIDE);
 
-      ACE_TRY_EX (query)
+      try
         {
           // Query the state of the consumers...
           this->query_consumers ();
-          ACE_TRY_CHECK_EX (query);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           // Ignore all exceptions
         }
-      ACE_ENDTRY;
 
       this->policy_current_->set_policy_overrides (policies.in (),
-                                                   CORBA::SET_OVERRIDE
-                                                   ACE_ENV_ARG_PARAMETER);
+                                                   CORBA::SET_OVERRIDE);
       for (CORBA::ULong i = 0; i != policies->length (); ++i)
         {
           policies[i]->destroy ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore all exceptions
     }
-  ACE_ENDTRY;
 }
 
 int
 TAO_CEC_Reactive_ConsumerControl::activate (void)
 {
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-  ACE_TRY_NEW_ENV
+  try
     {
       // Get the PolicyCurrent object
       CORBA::Object_var tmp =
-        this->orb_->resolve_initial_references ("PolicyCurrent"
-                                                ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("PolicyCurrent");
 
       this->policy_current_ =
-        CORBA::PolicyCurrent::_narrow (tmp.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+        CORBA::PolicyCurrent::_narrow (tmp.in ());
 
       // Pre-compute the policy list to the set the right timeout
       // value...
@@ -274,8 +262,7 @@ TAO_CEC_Reactive_ConsumerControl::activate (void)
       this->policy_list_[0] =
         this->orb_->create_policy (
                Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-               any
-               ACE_ENV_ARG_PARAMETER);
+               any);
 
       // Only schedule the timer, when the rate is not zero
       if (this->rate_ != ACE_Time_Value::zero)
@@ -291,11 +278,10 @@ TAO_CEC_Reactive_ConsumerControl::activate (void)
          return -1;
       }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       return -1;
     }
-  ACE_ENDTRY;
 #endif /* TAO_HAS_CORBA_MESSAGING */
 
   return 0;
@@ -315,10 +301,9 @@ TAO_CEC_Reactive_ConsumerControl::shutdown (void)
 
 void
 TAO_CEC_Reactive_ConsumerControl::consumer_not_exist (
-      TAO_CEC_ProxyPushSupplier *proxy
-      ACE_ENV_ARG_DECL)
+      TAO_CEC_ProxyPushSupplier *proxy)
 {
-  ACE_TRY
+  try
     {
       proxy->disconnect_push_supplier ();
 
@@ -328,40 +313,36 @@ TAO_CEC_Reactive_ConsumerControl::consumer_not_exist (
                       ACE_TEXT ("ProxyPushSupplier disconnected due to consumer_not_exist\n")));
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            ACE_TEXT ("Reactive_ConsumerControl::consumer_not_exist"));
       // Ignore all exceptions..
     }
-  ACE_ENDTRY;
 }
 
 void
 TAO_CEC_Reactive_ConsumerControl::consumer_not_exist (
-      TAO_CEC_ProxyPullSupplier *proxy
-      ACE_ENV_ARG_DECL)
+      TAO_CEC_ProxyPullSupplier *proxy)
 {
-  ACE_TRY
+  try
     {
       proxy->disconnect_pull_supplier ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            ACE_TEXT ("Reactive_ConsumerControl::consumer_not_exist"));
       // Ignore all exceptions..
     }
-  ACE_ENDTRY;
 }
 
 void
 TAO_CEC_Reactive_ConsumerControl::system_exception (
       TAO_CEC_ProxyPushSupplier *proxy,
-      CORBA::SystemException & /* exception */
-      ACE_ENV_ARG_DECL)
+      CORBA::SystemException & /* exception */)
 {
-  ACE_TRY
+  try
     {
       if (this->need_to_disconnect (proxy))
         {
@@ -374,11 +355,10 @@ TAO_CEC_Reactive_ConsumerControl::system_exception (
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore all exceptions..
     }
-  ACE_ENDTRY;
 }
 
 // ****************************************************************
@@ -401,71 +381,65 @@ TAO_CEC_ConsumerControl_Adapter::handle_timeout (
 // ****************************************************************
 
 void
-TAO_CEC_Ping_Push_Consumer::work (TAO_CEC_ProxyPushSupplier *supplier
-                                  ACE_ENV_ARG_DECL)
+TAO_CEC_Ping_Push_Consumer::work (TAO_CEC_ProxyPushSupplier *supplier)
 {
-  ACE_TRY
+  try
     {
       CORBA::Boolean disconnected;
       CORBA::Boolean non_existent =
-        supplier->consumer_non_existent (disconnected
-                                         ACE_ENV_ARG_PARAMETER);
+        supplier->consumer_non_existent (disconnected);
       if (non_existent && !disconnected)
         {
-          this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER);
+          this->control_->consumer_not_exist (supplier);
         }
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+  catch (const CORBA::OBJECT_NOT_EXIST& )
     {
-      this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER);
+      this->control_->consumer_not_exist (supplier);
     }
-  ACE_CATCH (CORBA::TRANSIENT, transient)
+  catch (const CORBA::TRANSIENT& )
     {
       if (this->control_->need_to_disconnect (supplier))
         {
-          this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER);
+          this->control_->consumer_not_exist (supplier);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore all exceptions
     }
-  ACE_ENDTRY;
 }
 
 // ****************************************************************
 
 void
-TAO_CEC_Ping_Pull_Consumer::work (TAO_CEC_ProxyPullSupplier *supplier
-                                  ACE_ENV_ARG_DECL)
+TAO_CEC_Ping_Pull_Consumer::work (TAO_CEC_ProxyPullSupplier *supplier)
 {
-  ACE_TRY
+  try
     {
       CORBA::Boolean disconnected;
       CORBA::Boolean non_existent =
-        supplier->consumer_non_existent (disconnected
-                                         ACE_ENV_ARG_PARAMETER);
+        supplier->consumer_non_existent (disconnected);
       if (non_existent && !disconnected)
         {
-          this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER);
+          this->control_->consumer_not_exist (supplier);
         }
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+  catch (const CORBA::OBJECT_NOT_EXIST& )
     {
-      this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER);
+      this->control_->consumer_not_exist (supplier);
     }
-  ACE_CATCH (CORBA::TRANSIENT, transient)
+  catch (const CORBA::TRANSIENT& )
     {
       if (this->control_->need_to_disconnect (supplier))
         {
-          this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER);
+          this->control_->consumer_not_exist (supplier);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore all exceptions
     }
-  ACE_ENDTRY;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
index 2f136c4f597..2b185f00534 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
@@ -111,13 +111,10 @@ public:
   // = Documented in TAO_CEC_ConsumerControl
   virtual int activate (void);
   virtual int shutdown (void);
-  virtual void consumer_not_exist (TAO_CEC_ProxyPushSupplier *proxy
-                                   ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void consumer_not_exist (TAO_CEC_ProxyPullSupplier *proxy
-                                   ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void consumer_not_exist (TAO_CEC_ProxyPushSupplier *proxy);
+  virtual void consumer_not_exist (TAO_CEC_ProxyPullSupplier *proxy);
   virtual void system_exception (TAO_CEC_ProxyPushSupplier *proxy,
-                                 CORBA::SystemException &
-                                 ACE_ENV_ARG_DECL_NOT_USED);
+                                 CORBA::SystemException &);
 
   /// Do we need to disconnect this supplier?  The parameter type for
   /// proxy is PortableServer::ServantBase* due to the fact that this
@@ -180,8 +177,7 @@ class TAO_CEC_Ping_Push_Consumer
 public:
   TAO_CEC_Ping_Push_Consumer (TAO_CEC_ConsumerControl *control);
 
-  virtual void work (TAO_CEC_ProxyPushSupplier *supplier
-                     ACE_ENV_ARG_DECL);
+  virtual void work (TAO_CEC_ProxyPushSupplier *supplier);
 
 private:
   TAO_CEC_ConsumerControl *control_;
@@ -195,8 +191,7 @@ class TAO_CEC_Ping_Pull_Consumer
 public:
   TAO_CEC_Ping_Pull_Consumer (TAO_CEC_ConsumerControl *control);
 
-  virtual void work (TAO_CEC_ProxyPullSupplier *supplier
-                     ACE_ENV_ARG_DECL);
+  virtual void work (TAO_CEC_ProxyPullSupplier *supplier);
 
 private:
   TAO_CEC_ConsumerControl *control_;
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
index 955464c9fb7..f0443b52cca 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
@@ -50,48 +50,41 @@ TAO_CEC_Reactive_Pulling_Strategy::handle_timeout (
       const ACE_Time_Value &,
       const void *)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Query the state of the Current object *before* we initiate
       // the iteration...
       CORBA::PolicyTypeSeq types;
       CORBA::PolicyList_var policies =
-        this->policy_current_->get_policy_overrides (types
-                                                     ACE_ENV_ARG_PARAMETER);
+        this->policy_current_->get_policy_overrides (types);
 
       // Change the timeout
       this->policy_current_->set_policy_overrides (this->policy_list_,
-                                                   CORBA::ADD_OVERRIDE
-                                                   ACE_ENV_ARG_PARAMETER);
+                                                   CORBA::ADD_OVERRIDE);
 
-      ACE_TRY_EX (query)
+      try
         {
           TAO_CEC_Pull_Event worker (this->event_channel_->consumer_admin (),
                                      this->event_channel_->supplier_control ());
 
-          this->event_channel_->supplier_admin ()->for_each (&worker
-                                                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (query);
+          this->event_channel_->supplier_admin ()->for_each (&worker);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           // Ignore all exceptions
         }
-      ACE_ENDTRY;
 
       this->policy_current_->set_policy_overrides (policies.in (),
-                                                   CORBA::SET_OVERRIDE
-                                                   ACE_ENV_ARG_PARAMETER);
+                                                   CORBA::SET_OVERRIDE);
       for (CORBA::ULong i = 0; i != policies->length (); ++i)
         {
           policies[i]->destroy ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore all exceptions
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -105,16 +98,14 @@ TAO_CEC_Reactive_Pulling_Strategy::activate (void)
   if (timer_id_ == -1)
     return;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       // Get the PolicyCurrent object
       CORBA::Object_var tmp =
-        this->orb_->resolve_initial_references ("PolicyCurrent"
-                                                ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("PolicyCurrent");
 
       this->policy_current_ =
-        CORBA::PolicyCurrent::_narrow (tmp.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+        CORBA::PolicyCurrent::_narrow (tmp.in ());
 
       // Pre-compute the policy list to the set the right timeout
       // value...
@@ -129,13 +120,11 @@ TAO_CEC_Reactive_Pulling_Strategy::activate (void)
       this->policy_list_[0] =
         this->orb_->create_policy (
                Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-               any
-               ACE_ENV_ARG_PARAMETER);
+               any);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
     }
-  ACE_ENDTRY;
 #endif /* TAO_HAS_CORBA_MESSAGING */
 }
 
@@ -168,27 +157,24 @@ TAO_CEC_Pulling_Strategy_Adapter::handle_timeout (
 // ****************************************************************
 
 void
-TAO_CEC_Pull_Event::work (TAO_CEC_ProxyPullConsumer *consumer
-                          ACE_ENV_ARG_DECL)
+TAO_CEC_Pull_Event::work (TAO_CEC_ProxyPullConsumer *consumer)
 {
   CORBA::Boolean has_event = 0;
   CORBA::Any_var any;
 
-  ACE_TRY
+  try
     {
-      any = consumer->try_pull_from_supplier (has_event
-                                              ACE_ENV_ARG_PARAMETER);
+      any = consumer->try_pull_from_supplier (has_event);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore all exceptions
       return;
     }
-  ACE_ENDTRY;
 
   if (has_event)
     {
-      this->consumer_admin_->push (any.in () ACE_ENV_ARG_PARAMETER);
+      this->consumer_admin_->push (any.in ());
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
index 43a8735e82b..feba800d772 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
@@ -129,8 +129,7 @@ public:
   TAO_CEC_Pull_Event (TAO_CEC_ConsumerAdmin *consumer_admin,
                       TAO_CEC_SupplierControl *control);
 
-  virtual void work (TAO_CEC_ProxyPullConsumer *consumer
-                     ACE_ENV_ARG_DECL);
+  virtual void work (TAO_CEC_ProxyPullConsumer *consumer);
 
 private:
   /// Used to propagate the events.
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
index b56792be72b..8f1f5945182 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
@@ -94,8 +94,7 @@ TAO_CEC_Reactive_SupplierControl::~TAO_CEC_Reactive_SupplierControl (void)
 }
 
 void
-TAO_CEC_Reactive_SupplierControl::query_suppliers (
-      ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_Reactive_SupplierControl::query_suppliers ()
 {
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
   if (this->typed_event_channel_)
@@ -103,8 +102,7 @@ TAO_CEC_Reactive_SupplierControl::query_suppliers (
       // Typed EC
       TAO_CEC_Ping_Typed_Push_Supplier push_worker (this);
 
-      this->typed_event_channel_->typed_supplier_admin ()->for_each (&push_worker
-                                                                     ACE_ENV_ARG_PARAMETER);
+      this->typed_event_channel_->typed_supplier_admin ()->for_each (&push_worker);
     }
   else
     {
@@ -112,12 +110,10 @@ TAO_CEC_Reactive_SupplierControl::query_suppliers (
 
   // Un-typed EC
   TAO_CEC_Ping_Push_Supplier push_worker (this);
-  this->event_channel_->supplier_admin ()->for_each (&push_worker
-                                                     ACE_ENV_ARG_PARAMETER);
+  this->event_channel_->supplier_admin ()->for_each (&push_worker);
 
   TAO_CEC_Ping_Pull_Supplier pull_worker (this);
-  this->event_channel_->supplier_admin ()->for_each (&pull_worker
-                                                     ACE_ENV_ARG_PARAMETER);
+  this->event_channel_->supplier_admin ()->for_each (&pull_worker);
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
     }
@@ -206,61 +202,53 @@ TAO_CEC_Reactive_SupplierControl::handle_timeout (
       const ACE_Time_Value &,
       const void *)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Query the state of the Current object *before* we initiate
       // the iteration...
       CORBA::PolicyTypeSeq types;
       CORBA::PolicyList_var policies =
-        this->policy_current_->get_policy_overrides (types
-                                                     ACE_ENV_ARG_PARAMETER);
+        this->policy_current_->get_policy_overrides (types);
 
       // Change the timeout
       this->policy_current_->set_policy_overrides (this->policy_list_,
-                                                   CORBA::ADD_OVERRIDE
-                                                   ACE_ENV_ARG_PARAMETER);
+                                                   CORBA::ADD_OVERRIDE);
 
-      ACE_TRY_EX (query)
+      try
         {
           // Query the state of the suppliers...
           this->query_suppliers ();
-          ACE_TRY_CHECK_EX (query);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           // Ignore all exceptions
         }
-      ACE_ENDTRY;
 
       this->policy_current_->set_policy_overrides (policies.in (),
-                                                   CORBA::SET_OVERRIDE
-                                                   ACE_ENV_ARG_PARAMETER);
+                                                   CORBA::SET_OVERRIDE);
       for (CORBA::ULong i = 0; i != policies->length (); ++i)
         {
           policies[i]->destroy ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore all exceptions
     }
-  ACE_ENDTRY;
 }
 
 int
 TAO_CEC_Reactive_SupplierControl::activate (void)
 {
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-  ACE_TRY_NEW_ENV
+  try
     {
       // Get the PolicyCurrent object
       CORBA::Object_var tmp =
-        this->orb_->resolve_initial_references ("PolicyCurrent"
-                                                ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("PolicyCurrent");
 
       this->policy_current_ =
-        CORBA::PolicyCurrent::_narrow (tmp.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+        CORBA::PolicyCurrent::_narrow (tmp.in ());
 
       // Pre-compute the policy list to the set the right timeout
       // value...
@@ -275,8 +263,7 @@ TAO_CEC_Reactive_SupplierControl::activate (void)
       this->policy_list_[0] =
         this->orb_->create_policy (
                Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-               any
-               ACE_ENV_ARG_PARAMETER);
+               any);
 
       // Only schedule the timer, when the rate is not zero
       if (this->rate_ != ACE_Time_Value::zero)
@@ -292,11 +279,10 @@ TAO_CEC_Reactive_SupplierControl::activate (void)
           return -1;
       }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       return -1;
     }
-  ACE_ENDTRY;
 #endif /* TAO_HAS_CORBA_MESSAGING */
 
   return 0;
@@ -316,72 +302,64 @@ TAO_CEC_Reactive_SupplierControl::shutdown (void)
 
 void
 TAO_CEC_Reactive_SupplierControl::supplier_not_exist (
-      TAO_CEC_ProxyPushConsumer *proxy
-      ACE_ENV_ARG_DECL)
+      TAO_CEC_ProxyPushConsumer *proxy)
 {
-  ACE_TRY
+  try
     {
       proxy->disconnect_push_consumer ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore all exceptions..
     }
-  ACE_ENDTRY;
 }
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
 void
 TAO_CEC_Reactive_SupplierControl::supplier_not_exist (
-      TAO_CEC_TypedProxyPushConsumer *proxy
-      ACE_ENV_ARG_DECL)
+      TAO_CEC_TypedProxyPushConsumer *proxy)
 {
-  ACE_TRY
+  try
     {
       proxy->disconnect_push_consumer ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore all exceptions..
     }
-  ACE_ENDTRY;
 }
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
 void
 TAO_CEC_Reactive_SupplierControl::supplier_not_exist (
-      TAO_CEC_ProxyPullConsumer *proxy
-      ACE_ENV_ARG_DECL)
+      TAO_CEC_ProxyPullConsumer *proxy)
 {
-  ACE_TRY
+  try
     {
       proxy->disconnect_pull_consumer ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore all exceptions..
     }
-  ACE_ENDTRY;
 }
 
 void
 TAO_CEC_Reactive_SupplierControl::system_exception (
       TAO_CEC_ProxyPullConsumer *proxy,
-      CORBA::SystemException & /* exception */
-      ACE_ENV_ARG_DECL)
+      CORBA::SystemException & /* exception */)
 {
-  ACE_TRY
+  try
     {
       if (this->need_to_disconnect (proxy))
         {
           proxy->disconnect_pull_consumer ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore all exceptions..
     }
-  ACE_ENDTRY;
 }
 
 // ****************************************************************
@@ -404,108 +382,99 @@ TAO_CEC_SupplierControl_Adapter::handle_timeout (
 // ****************************************************************
 
 void
-TAO_CEC_Ping_Push_Supplier::work (TAO_CEC_ProxyPushConsumer *consumer
-                                  ACE_ENV_ARG_DECL)
+TAO_CEC_Ping_Push_Supplier::work (TAO_CEC_ProxyPushConsumer *consumer)
 {
-  ACE_TRY
+  try
     {
       CORBA::Boolean disconnected;
       CORBA::Boolean non_existent =
-        consumer->supplier_non_existent (disconnected
-                                         ACE_ENV_ARG_PARAMETER);
+        consumer->supplier_non_existent (disconnected);
       if (non_existent && !disconnected)
         {
-          this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER);
+          this->control_->supplier_not_exist (consumer);
         }
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+  catch (const CORBA::OBJECT_NOT_EXIST& )
     {
-      this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER);
+      this->control_->supplier_not_exist (consumer);
     }
-  ACE_CATCH (CORBA::TRANSIENT, transient)
+  catch (const CORBA::TRANSIENT& )
     {
       if (this->control_->need_to_disconnect (consumer))
         {
-          this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER);
+          this->control_->supplier_not_exist (consumer);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore all exceptions
     }
-  ACE_ENDTRY;
 }
 
 // ****************************************************************
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
 void
-TAO_CEC_Ping_Typed_Push_Supplier::work (TAO_CEC_TypedProxyPushConsumer *consumer
-                                        ACE_ENV_ARG_DECL)
+TAO_CEC_Ping_Typed_Push_Supplier::work (TAO_CEC_TypedProxyPushConsumer *consumer)
 {
-  ACE_TRY
+  try
     {
       CORBA::Boolean disconnected;
       CORBA::Boolean non_existent =
-        consumer->supplier_non_existent (disconnected
-                                         ACE_ENV_ARG_PARAMETER);
+        consumer->supplier_non_existent (disconnected);
       if (non_existent && !disconnected)
         {
-          this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER);
+          this->control_->supplier_not_exist (consumer);
         }
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+  catch (const CORBA::OBJECT_NOT_EXIST& )
     {
-      this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER);
+      this->control_->supplier_not_exist (consumer);
     }
-  ACE_CATCH (CORBA::TRANSIENT, transient)
+  catch (const CORBA::TRANSIENT& )
     {
       if (this->control_->need_to_disconnect (consumer))
         {
-          this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER);
+          this->control_->supplier_not_exist (consumer);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore all exceptions
     }
-  ACE_ENDTRY;
 }
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
 // ****************************************************************
 
 void
-TAO_CEC_Ping_Pull_Supplier::work (TAO_CEC_ProxyPullConsumer *consumer
-                                  ACE_ENV_ARG_DECL)
+TAO_CEC_Ping_Pull_Supplier::work (TAO_CEC_ProxyPullConsumer *consumer)
 {
-  ACE_TRY
+  try
     {
       CORBA::Boolean disconnected;
       CORBA::Boolean non_existent =
-        consumer->supplier_non_existent (disconnected
-                                         ACE_ENV_ARG_PARAMETER);
+        consumer->supplier_non_existent (disconnected);
       if (non_existent && !disconnected)
         {
-          this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER);
+          this->control_->supplier_not_exist (consumer);
         }
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+  catch (const CORBA::OBJECT_NOT_EXIST& )
     {
-      this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER);
+      this->control_->supplier_not_exist (consumer);
     }
-  ACE_CATCH (CORBA::TRANSIENT, transient)
+  catch (const CORBA::TRANSIENT& )
     {
       if (this->control_->need_to_disconnect (consumer))
         {
-          this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER);
+          this->control_->supplier_not_exist (consumer);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore all exceptions
     }
-  ACE_ENDTRY;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
index 680925267fb..09960543375 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
@@ -109,17 +109,13 @@ public:
   // = Documented in TAO_CEC_SupplierControl
   virtual int activate (void);
   virtual int shutdown (void);
-  virtual void supplier_not_exist (TAO_CEC_ProxyPushConsumer *proxy
-                                   ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void supplier_not_exist (TAO_CEC_ProxyPushConsumer *proxy);
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
-  virtual void supplier_not_exist (TAO_CEC_TypedProxyPushConsumer *proxy
-                                   ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void supplier_not_exist (TAO_CEC_TypedProxyPushConsumer *proxy);
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
-  virtual void supplier_not_exist (TAO_CEC_ProxyPullConsumer *proxy
-                                   ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void supplier_not_exist (TAO_CEC_ProxyPullConsumer *proxy);
   virtual void system_exception (TAO_CEC_ProxyPullConsumer *proxy,
-                                 CORBA::SystemException &
-                                 ACE_ENV_ARG_DECL_NOT_USED);
+                                 CORBA::SystemException &);
 
   /// Do we need to disconnect this supplier?  The parameter type for
   /// proxy is PortableServer::ServantBase* due to the fact that this
@@ -181,8 +177,7 @@ class TAO_CEC_Ping_Push_Supplier : public TAO_ESF_Worker<TAO_CEC_ProxyPushConsum
 public:
   TAO_CEC_Ping_Push_Supplier (TAO_CEC_SupplierControl *control);
 
-  virtual void work (TAO_CEC_ProxyPushConsumer *consumer
-                     ACE_ENV_ARG_DECL);
+  virtual void work (TAO_CEC_ProxyPushConsumer *consumer);
 
 private:
   TAO_CEC_SupplierControl *control_;
@@ -196,8 +191,7 @@ class TAO_CEC_Ping_Typed_Push_Supplier : public TAO_ESF_Worker<TAO_CEC_TypedProx
 public:
   TAO_CEC_Ping_Typed_Push_Supplier (TAO_CEC_SupplierControl *control);
 
-  virtual void work (TAO_CEC_TypedProxyPushConsumer *consumer
-                     ACE_ENV_ARG_DECL);
+  virtual void work (TAO_CEC_TypedProxyPushConsumer *consumer);
 
 private:
   TAO_CEC_SupplierControl *control_;
@@ -211,8 +205,7 @@ class TAO_CEC_Ping_Pull_Supplier : public TAO_ESF_Worker<TAO_CEC_ProxyPullConsum
 public:
   TAO_CEC_Ping_Pull_Supplier (TAO_CEC_SupplierControl *control);
 
-  virtual void work (TAO_CEC_ProxyPullConsumer *consumer
-                     ACE_ENV_ARG_DECL);
+  virtual void work (TAO_CEC_ProxyPullConsumer *consumer);
 
 private:
   TAO_CEC_SupplierControl *control_;
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
index a7b094610c1..a0c900ff46a 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
@@ -37,45 +37,39 @@ TAO_CEC_SupplierAdmin::_default_POA (void)
 }
 
 void
-TAO_CEC_SupplierAdmin::connected (TAO_CEC_ProxyPushConsumer *consumer
-                                  ACE_ENV_ARG_DECL)
+TAO_CEC_SupplierAdmin::connected (TAO_CEC_ProxyPushConsumer *consumer)
 {
-  this->push_admin_.connected (consumer ACE_ENV_ARG_PARAMETER);
+  this->push_admin_.connected (consumer);
 }
 
 void
-TAO_CEC_SupplierAdmin::reconnected (TAO_CEC_ProxyPushConsumer *consumer
-                                    ACE_ENV_ARG_DECL)
+TAO_CEC_SupplierAdmin::reconnected (TAO_CEC_ProxyPushConsumer *consumer)
 {
-  this->push_admin_.reconnected (consumer ACE_ENV_ARG_PARAMETER);
+  this->push_admin_.reconnected (consumer);
 }
 
 void
-TAO_CEC_SupplierAdmin::disconnected (TAO_CEC_ProxyPushConsumer *consumer
-                                     ACE_ENV_ARG_DECL)
+TAO_CEC_SupplierAdmin::disconnected (TAO_CEC_ProxyPushConsumer *consumer)
 {
-  this->push_admin_.disconnected (consumer ACE_ENV_ARG_PARAMETER);
+  this->push_admin_.disconnected (consumer);
 }
 
 void
-TAO_CEC_SupplierAdmin::connected (TAO_CEC_ProxyPullConsumer *consumer
-                                  ACE_ENV_ARG_DECL)
+TAO_CEC_SupplierAdmin::connected (TAO_CEC_ProxyPullConsumer *consumer)
 {
-  this->pull_admin_.connected (consumer ACE_ENV_ARG_PARAMETER);
+  this->pull_admin_.connected (consumer);
 }
 
 void
-TAO_CEC_SupplierAdmin::reconnected (TAO_CEC_ProxyPullConsumer *consumer
-                                    ACE_ENV_ARG_DECL)
+TAO_CEC_SupplierAdmin::reconnected (TAO_CEC_ProxyPullConsumer *consumer)
 {
-  this->pull_admin_.reconnected (consumer ACE_ENV_ARG_PARAMETER);
+  this->pull_admin_.reconnected (consumer);
 }
 
 void
-TAO_CEC_SupplierAdmin::disconnected (TAO_CEC_ProxyPullConsumer *consumer
-                                     ACE_ENV_ARG_DECL)
+TAO_CEC_SupplierAdmin::disconnected (TAO_CEC_ProxyPullConsumer *consumer)
 {
-  this->pull_admin_.disconnected (consumer ACE_ENV_ARG_PARAMETER);
+  this->pull_admin_.disconnected (consumer);
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
index 9880032ad37..8712301644f 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
@@ -62,26 +62,18 @@ public:
   virtual ~TAO_CEC_SupplierAdmin (void);
 
   /// For each elements call <worker->work()>.
-  void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushConsumer> *worker
-                 ACE_ENV_ARG_DECL);
+  void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushConsumer> *worker);
 
   /// For each elements call <worker->work()>.
-  void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullConsumer> *worker
-                 ACE_ENV_ARG_DECL);
+  void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullConsumer> *worker);
 
   /// Keep track of connected consumers.
-  virtual void connected (TAO_CEC_ProxyPushConsumer*
-                          ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void reconnected (TAO_CEC_ProxyPushConsumer*
-                            ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void disconnected (TAO_CEC_ProxyPushConsumer*
-                             ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void connected (TAO_CEC_ProxyPullConsumer*
-                          ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void reconnected (TAO_CEC_ProxyPullConsumer*
-                            ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void disconnected (TAO_CEC_ProxyPullConsumer*
-                             ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void connected (TAO_CEC_ProxyPushConsumer*);
+  virtual void reconnected (TAO_CEC_ProxyPushConsumer*);
+  virtual void disconnected (TAO_CEC_ProxyPushConsumer*);
+  virtual void connected (TAO_CEC_ProxyPullConsumer*);
+  virtual void reconnected (TAO_CEC_ProxyPullConsumer*);
+  virtual void disconnected (TAO_CEC_ProxyPullConsumer*);
 
   /// The event channel is shutting down, inform all the consumers of
   /// this
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.inl
index ec420d2c576..991386a0370 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.inl
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.inl
@@ -6,18 +6,16 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE void
 TAO_CEC_SupplierAdmin::
-    for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushConsumer> *worker
-              ACE_ENV_ARG_DECL)
+    for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushConsumer> *worker)
 {
-  this->push_admin_.for_each (worker ACE_ENV_ARG_PARAMETER);
+  this->push_admin_.for_each (worker);
 }
 
 ACE_INLINE void
 TAO_CEC_SupplierAdmin::
-    for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullConsumer> *worker
-              ACE_ENV_ARG_DECL)
+    for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullConsumer> *worker)
 {
-  this->pull_admin_.for_each (worker ACE_ENV_ARG_PARAMETER);
+  this->pull_admin_.for_each (worker);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp
index e9b79b992cd..114603f9913 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp
@@ -27,29 +27,25 @@ TAO_CEC_SupplierControl::shutdown (void)
 }
 
 void
-TAO_CEC_SupplierControl::supplier_not_exist (TAO_CEC_ProxyPushConsumer *
-                                             ACE_ENV_ARG_DECL_NOT_USED)
+TAO_CEC_SupplierControl::supplier_not_exist (TAO_CEC_ProxyPushConsumer *)
 {
 }
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
 void
-TAO_CEC_SupplierControl::supplier_not_exist (TAO_CEC_TypedProxyPushConsumer *
-                                             ACE_ENV_ARG_DECL_NOT_USED)
+TAO_CEC_SupplierControl::supplier_not_exist (TAO_CEC_TypedProxyPushConsumer *)
 {
 }
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
 void
-TAO_CEC_SupplierControl::supplier_not_exist (TAO_CEC_ProxyPullConsumer *
-                                             ACE_ENV_ARG_DECL_NOT_USED)
+TAO_CEC_SupplierControl::supplier_not_exist (TAO_CEC_ProxyPullConsumer *)
 {
 }
 
 void
 TAO_CEC_SupplierControl::system_exception (TAO_CEC_ProxyPullConsumer *,
-                                           CORBA::SystemException &
-                                           ACE_ENV_ARG_DECL_NOT_USED)
+                                           CORBA::SystemException &)
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
index 4de8fc0c3f6..8d7be499bd8 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
@@ -75,12 +75,10 @@ public:
    * not exists (i.e. _non_existent() returns true and/or the
    * CORBA::OBJECT_NOT_EXIST exception has been raised).
    */
-  virtual void supplier_not_exist (TAO_CEC_ProxyPushConsumer *proxy
-                                   ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void supplier_not_exist (TAO_CEC_ProxyPushConsumer *proxy);
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
-  virtual void supplier_not_exist (TAO_CEC_TypedProxyPushConsumer *proxy
-                                   ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void supplier_not_exist (TAO_CEC_TypedProxyPushConsumer *proxy);
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
   /**
@@ -88,13 +86,11 @@ public:
    * not exists (i.e. _non_existent() returns true and/or the
    * CORBA::OBJECT_NOT_EXIST exception has been raised).
    */
-  virtual void supplier_not_exist (TAO_CEC_ProxyPullConsumer *proxy
-                                   ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void supplier_not_exist (TAO_CEC_ProxyPullConsumer *proxy);
 
   /// Some system exception was rasied while trying to push an event.
   virtual void system_exception (TAO_CEC_ProxyPullConsumer *proxy,
-                                 CORBA::SystemException &
-                                 ACE_ENV_ARG_DECL_NOT_USED);
+                                 CORBA::SystemException &);
 
   /// Do we need to disconnect this supplier?  The parameter type for
   /// proxy is PortableServer::ServantBase* due to the fact that this
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp
index 08b01c76972..1b369165694 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp
@@ -28,35 +28,30 @@ TAO_CEC_TypedConsumerAdmin::~TAO_CEC_TypedConsumerAdmin (void)
 }
 
 void
-TAO_CEC_TypedConsumerAdmin::invoke (const TAO_CEC_TypedEvent& typed_event
-                                    ACE_ENV_ARG_DECL)
+TAO_CEC_TypedConsumerAdmin::invoke (const TAO_CEC_TypedEvent& typed_event)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_CEC_Propagate_Typed_Event typed_event_worker (typed_event, this->typed_event_channel_);
 
-  this->typed_push_admin_.for_each (&typed_event_worker
-                                    ACE_ENV_ARG_PARAMETER);
+  this->typed_push_admin_.for_each (&typed_event_worker);
 }
 
 void
-TAO_CEC_TypedConsumerAdmin::connected (TAO_CEC_ProxyPushSupplier *supplier
-                                       ACE_ENV_ARG_DECL)
+TAO_CEC_TypedConsumerAdmin::connected (TAO_CEC_ProxyPushSupplier *supplier)
 {
-  this->typed_push_admin_.connected (supplier ACE_ENV_ARG_PARAMETER);
+  this->typed_push_admin_.connected (supplier);
 }
 
 void
-TAO_CEC_TypedConsumerAdmin::reconnected (TAO_CEC_ProxyPushSupplier *supplier
-                                         ACE_ENV_ARG_DECL)
+TAO_CEC_TypedConsumerAdmin::reconnected (TAO_CEC_ProxyPushSupplier *supplier)
 {
-  this->typed_push_admin_.reconnected (supplier ACE_ENV_ARG_PARAMETER);
+  this->typed_push_admin_.reconnected (supplier);
 }
 
 void
-TAO_CEC_TypedConsumerAdmin::disconnected (TAO_CEC_ProxyPushSupplier *supplier
-                                          ACE_ENV_ARG_DECL)
+TAO_CEC_TypedConsumerAdmin::disconnected (TAO_CEC_ProxyPushSupplier *supplier)
 {
-  this->typed_push_admin_.disconnected (supplier ACE_ENV_ARG_PARAMETER);
+  this->typed_push_admin_.disconnected (supplier);
 }
 
 void
@@ -68,7 +63,6 @@ TAO_CEC_TypedConsumerAdmin::shutdown (void)
 CosTypedEventChannelAdmin::TypedProxyPullSupplier_ptr
 TAO_CEC_TypedConsumerAdmin::obtain_typed_pull_supplier (
     const char * /*supported_interface*/
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -81,7 +75,6 @@ TAO_CEC_TypedConsumerAdmin::obtain_typed_pull_supplier (
 CosEventChannelAdmin::ProxyPushSupplier_ptr
 TAO_CEC_TypedConsumerAdmin::obtain_typed_push_supplier (
     const char * uses_interface
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -90,7 +83,7 @@ TAO_CEC_TypedConsumerAdmin::obtain_typed_push_supplier (
 
 {
   // Register the consumer uses_interface with the EC
-  int result = this->typed_event_channel_->consumer_register_uses_interace (uses_interface ACE_ENV_ARG_PARAMETER);
+  int result = this->typed_event_channel_->consumer_register_uses_interace (uses_interface);
 
   if (result == -1)
     {
@@ -123,10 +116,9 @@ TAO_CEC_TypedConsumerAdmin::_default_POA (void)
 // ****************************************************************
 
 void
-TAO_CEC_Propagate_Typed_Event::work (TAO_CEC_ProxyPushSupplier *supplier
-                                     ACE_ENV_ARG_DECL)
+TAO_CEC_Propagate_Typed_Event::work (TAO_CEC_ProxyPushSupplier *supplier)
 {
-  supplier->invoke (this->typed_event_ ACE_ENV_ARG_PARAMETER);
+  supplier->invoke (this->typed_event_);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
index f5fe7cc752d..45b8002f12b 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
@@ -46,22 +46,17 @@ public:
   virtual ~TAO_CEC_TypedConsumerAdmin (void);
 
   /// For each elements call <worker->work()>.
-  void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker
-                 ACE_ENV_ARG_DECL);
+  void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker);
 
   /// Invoke the typed event on all the consumers
-  virtual void invoke (const TAO_CEC_TypedEvent& typed_event
-                       ACE_ENV_ARG_DECL)
+  virtual void invoke (const TAO_CEC_TypedEvent& typed_event)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Used to inform the EC that a Supplier has connected or
   /// disconnected from it.
-  virtual void connected (TAO_CEC_ProxyPushSupplier*
-                          ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void reconnected (TAO_CEC_ProxyPushSupplier*
-                            ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void disconnected (TAO_CEC_ProxyPushSupplier*
-                             ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void connected (TAO_CEC_ProxyPushSupplier*);
+  virtual void reconnected (TAO_CEC_ProxyPushSupplier*);
+  virtual void disconnected (TAO_CEC_ProxyPushSupplier*);
 
   /// The typed event channel is shutting down, inform all the consumers of
   /// this
@@ -69,11 +64,11 @@ public:
 
   // = The CosTypedEventChannelAdmin::TypedConsumerAdmin methods...
   virtual CosEventChannelAdmin::ProxyPushSupplier_ptr
-    obtain_typed_push_supplier (const char * uses_interface ACE_ENV_ARG_DECL)
+    obtain_typed_push_supplier (const char * uses_interface)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosTypedEventChannelAdmin::NoSuchImplementation));
   virtual CosTypedEventChannelAdmin::TypedProxyPullSupplier_ptr
-    obtain_typed_pull_supplier (const char * supported_interface ACE_ENV_ARG_DECL)
+    obtain_typed_pull_supplier (const char * supported_interface)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosTypedEventChannelAdmin::InterfaceNotSupported));
 
@@ -108,8 +103,7 @@ public:
   TAO_CEC_Propagate_Typed_Event (const TAO_CEC_TypedEvent& typed_event,
                                  TAO_CEC_TypedEventChannel* typed_event_channel);
 
-  void work (TAO_CEC_ProxyPushSupplier *supplier
-             ACE_ENV_ARG_DECL);
+  void work (TAO_CEC_ProxyPushSupplier *supplier);
 
 private:
   /// The typed event
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.inl
index 37a0dd30d28..95f43d05ee6 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.inl
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.inl
@@ -6,10 +6,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE void
 TAO_CEC_TypedConsumerAdmin::
-    for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker
-              ACE_ENV_ARG_DECL)
+    for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker)
 {
-  this->typed_push_admin_.for_each (worker ACE_ENV_ARG_PARAMETER);
+  this->typed_push_admin_.for_each (worker);
 }
 
 ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
index 238ff2bb8b9..aa0da5850e8 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
@@ -110,14 +110,14 @@ TAO_CEC_TypedEventChannel::shutdown (void)
   PortableServer::POA_var typed_consumer_poa =
     this->typed_consumer_admin_->_default_POA ();
   PortableServer::ObjectId_var typed_consumer_id =
-    typed_consumer_poa->servant_to_id (this->typed_consumer_admin_ ACE_ENV_ARG_PARAMETER);
-  typed_consumer_poa->deactivate_object (typed_consumer_id.in () ACE_ENV_ARG_PARAMETER);
+    typed_consumer_poa->servant_to_id (this->typed_consumer_admin_);
+  typed_consumer_poa->deactivate_object (typed_consumer_id.in ());
 
   PortableServer::POA_var typed_supplier_poa =
     this->typed_supplier_admin_->_default_POA ();
   PortableServer::ObjectId_var typed_supplier_id =
-    typed_supplier_poa->servant_to_id (this->typed_supplier_admin_ ACE_ENV_ARG_PARAMETER);
-  typed_supplier_poa->deactivate_object (typed_supplier_id.in () ACE_ENV_ARG_PARAMETER);
+    typed_supplier_poa->servant_to_id (this->typed_supplier_admin_);
+  typed_supplier_poa->deactivate_object (typed_supplier_id.in ());
 
   this->typed_supplier_admin_->shutdown ();
 
@@ -130,9 +130,9 @@ TAO_CEC_TypedEventChannel::shutdown (void)
         this->_default_POA ();
 
       PortableServer::ObjectId_var t_id =
-        t_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
+        t_poa->servant_to_id (this);
 
-      t_poa->deactivate_object (t_id.in () ACE_ENV_ARG_PARAMETER);
+      t_poa->deactivate_object (t_id.in ());
 
       ACE_Event_Handler *timer;
       ACE_NEW (timer, ShutdownHandler (this->orb_.in ()));
@@ -142,45 +142,39 @@ TAO_CEC_TypedEventChannel::shutdown (void)
 }
 
 void
-TAO_CEC_TypedEventChannel::connected (TAO_CEC_TypedProxyPushConsumer* consumer
-                                      ACE_ENV_ARG_DECL)
+TAO_CEC_TypedEventChannel::connected (TAO_CEC_TypedProxyPushConsumer* consumer)
 {
-  this->typed_supplier_admin_->connected (consumer ACE_ENV_ARG_PARAMETER);
+  this->typed_supplier_admin_->connected (consumer);
 }
 
 void
-TAO_CEC_TypedEventChannel::reconnected (TAO_CEC_TypedProxyPushConsumer* consumer
-                                        ACE_ENV_ARG_DECL)
+TAO_CEC_TypedEventChannel::reconnected (TAO_CEC_TypedProxyPushConsumer* consumer)
 {
-  this->typed_supplier_admin_->reconnected (consumer ACE_ENV_ARG_PARAMETER);
+  this->typed_supplier_admin_->reconnected (consumer);
 }
 
 void
-TAO_CEC_TypedEventChannel::disconnected (TAO_CEC_TypedProxyPushConsumer* consumer
-                                         ACE_ENV_ARG_DECL)
+TAO_CEC_TypedEventChannel::disconnected (TAO_CEC_TypedProxyPushConsumer* consumer)
 {
-  this->typed_supplier_admin_->disconnected (consumer ACE_ENV_ARG_PARAMETER);
+  this->typed_supplier_admin_->disconnected (consumer);
 }
 
 void
-TAO_CEC_TypedEventChannel::connected (TAO_CEC_ProxyPushSupplier* supplier
-                                      ACE_ENV_ARG_DECL)
+TAO_CEC_TypedEventChannel::connected (TAO_CEC_ProxyPushSupplier* supplier)
 {
-  this->typed_consumer_admin_->connected (supplier ACE_ENV_ARG_PARAMETER);
+  this->typed_consumer_admin_->connected (supplier);
 }
 
 void
-TAO_CEC_TypedEventChannel::reconnected (TAO_CEC_ProxyPushSupplier* supplier
-                                        ACE_ENV_ARG_DECL)
+TAO_CEC_TypedEventChannel::reconnected (TAO_CEC_ProxyPushSupplier* supplier)
 {
-  this->typed_consumer_admin_->reconnected (supplier ACE_ENV_ARG_PARAMETER);
+  this->typed_consumer_admin_->reconnected (supplier);
 }
 
 void
-TAO_CEC_TypedEventChannel::disconnected (TAO_CEC_ProxyPushSupplier* supplier
-                                         ACE_ENV_ARG_DECL)
+TAO_CEC_TypedEventChannel::disconnected (TAO_CEC_ProxyPushSupplier* supplier)
 {
-  this->typed_consumer_admin_->disconnected (supplier ACE_ENV_ARG_PARAMETER);
+  this->typed_consumer_admin_->disconnected (supplier);
 }
 
 // Find from the ifr cache the operation and return the parameter array pointer.
@@ -254,18 +248,17 @@ TAO_CEC_TypedEventChannel::clear_ifr_cache (void)
 // All the operations and their parameters are then inserted in the ifr cache.
 // Function returns 0 if successful or -1 on a failure.
 int
-TAO_CEC_TypedEventChannel::cache_interface_description (const char *interface_
-                                                        ACE_ENV_ARG_DECL)
+TAO_CEC_TypedEventChannel::cache_interface_description (const char *interface_)
 {
-  ACE_TRY
+  try
     {
       // Lookup the Interface Name in the IFR
       CORBA::Contained_var contained =
-        this->interface_repository_->lookup_id (interface_ ACE_ENV_ARG_PARAMETER);
+        this->interface_repository_->lookup_id (interface_);
 
       // Narrow the interface
       CORBA::InterfaceDef_var interface =
-        CORBA::InterfaceDef::_narrow (contained.in () ACE_ENV_ARG_PARAMETER);
+        CORBA::InterfaceDef::_narrow (contained.in ());
 
       if (CORBA::is_nil (interface.in () ))
         {
@@ -358,24 +351,24 @@ TAO_CEC_TypedEventChannel::cache_interface_description (const char *interface_
             }
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
       if (TAO_debug_level >= 4)
         {
-          ACE_PRINT_EXCEPTION (sysex, "during TAO_CEC_TypedEventChannel::cache_interface_description");
+          sysex._tao_print_exception (
+            "during TAO_CEC_TypedEventChannel::cache_interface_description");
         }
       return -1;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       if (TAO_debug_level >= 4)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "ACE_ANY_EXCEPTION raised during TAO_CEC_TypedEventChannel::cache_interface_description");
+          ex._tao_print_exception (
+            "ex raised during TAO_CEC_TypedEventChannel::cache_interface_description");
         }
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -388,8 +381,7 @@ TAO_CEC_TypedEventChannel::cache_interface_description (const char *interface_
 // If neither a consumer nor a supplier has registered an interface,
 // the function calls cache_interface_description and returns 0 if successful.
 int
-TAO_CEC_TypedEventChannel::consumer_register_uses_interace (const char *uses_interface
-                                                            ACE_ENV_ARG_DECL)
+TAO_CEC_TypedEventChannel::consumer_register_uses_interace (const char *uses_interface)
 {
   // Check if a consumer has already registered an interface with the typed EC
   if (this->uses_interface_.length() > 0)
@@ -432,7 +424,7 @@ TAO_CEC_TypedEventChannel::consumer_register_uses_interace (const char *uses_int
   else
     {
       // Neither a consumer nor a supplier has connected yet
-      int result = cache_interface_description (uses_interface ACE_ENV_ARG_PARAMETER);
+      int result = cache_interface_description (uses_interface);
 
       if (result == 0)
         {
@@ -451,8 +443,7 @@ TAO_CEC_TypedEventChannel::consumer_register_uses_interace (const char *uses_int
 // If neither a consumer nor a supplier has registered an interface,
 // the function calls cache_interface_description and returns 0 if successful.
 int
-TAO_CEC_TypedEventChannel::supplier_register_supported_interface (const char *supported_interface
-                                                                  ACE_ENV_ARG_DECL)
+TAO_CEC_TypedEventChannel::supplier_register_supported_interface (const char *supported_interface)
 {
   // Check if a supplier has already registered an interface with the typed EC
   if (this->supported_interface_.length() > 0)
@@ -495,7 +486,7 @@ TAO_CEC_TypedEventChannel::supplier_register_supported_interface (const char *su
   else
     {
       // Neither a consumer nor a supplier has connected yet
-      int result = cache_interface_description (supported_interface ACE_ENV_ARG_PARAMETER);
+      int result = cache_interface_description (supported_interface);
 
       if (result == 0)
         {
@@ -508,10 +499,9 @@ TAO_CEC_TypedEventChannel::supplier_register_supported_interface (const char *su
 // Function creates a NVList and populates it from the parameter information.
 void
 TAO_CEC_TypedEventChannel::create_operation_list (TAO_CEC_Operation_Params *oper_params,
-                                                  CORBA::NVList_out new_list
-                                                  ACE_ENV_ARG_DECL)
+                                                  CORBA::NVList_out new_list)
 {
-  this->orb_->create_list (0, new_list ACE_ENV_ARG_PARAMETER);
+  this->orb_->create_list (0, new_list);
 
   for (CORBA::ULong param=0; param<oper_params->num_params_; param++)
     {
@@ -521,18 +511,16 @@ TAO_CEC_TypedEventChannel::create_operation_list (TAO_CEC_Operation_Params *oper
 
       new_list->add_value (oper_params->parameters_[param].name_. in (),
                            any_1,
-                           oper_params->parameters_[param].direction_
-                           ACE_ENV_ARG_PARAMETER);
+                           oper_params->parameters_[param].direction_);
     }
 }
 
 // Function creates an empty NVList.
 void
 TAO_CEC_TypedEventChannel::create_list (CORBA::Long count,
-                                        CORBA::NVList_out new_list
-                                        ACE_ENV_ARG_DECL)
+                                        CORBA::NVList_out new_list)
 {
-  this->orb_->create_list (count, new_list ACE_ENV_ARG_PARAMETER);
+  this->orb_->create_list (count, new_list);
 }
 
 // The CosTypedEventChannelAdmin::TypedEventChannel methods...
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
index 9765591afde..10cf213a0fd 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
@@ -195,21 +195,15 @@ public:
 
   /// Used to inform the EC that a Consumer has connected or
   /// disconnected from it.
-  virtual void connected (TAO_CEC_TypedProxyPushConsumer*
-                          ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void reconnected (TAO_CEC_TypedProxyPushConsumer*
-                            ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void disconnected (TAO_CEC_TypedProxyPushConsumer*
-                             ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void connected (TAO_CEC_TypedProxyPushConsumer*);
+  virtual void reconnected (TAO_CEC_TypedProxyPushConsumer*);
+  virtual void disconnected (TAO_CEC_TypedProxyPushConsumer*);
 
   /// Used to inform the EC that a Supplier has connected or
   /// disconnected from it.
-  virtual void connected (TAO_CEC_ProxyPushSupplier*
-                          ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void reconnected (TAO_CEC_ProxyPushSupplier*
-                            ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void disconnected (TAO_CEC_ProxyPushSupplier*
-                             ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void connected (TAO_CEC_ProxyPushSupplier*);
+  virtual void reconnected (TAO_CEC_ProxyPushSupplier*);
+  virtual void disconnected (TAO_CEC_ProxyPushSupplier*);
 
   /// Can the consumers reconnect to the EC?
   int consumer_reconnect (void) const;
@@ -229,10 +223,10 @@ public:
   TAO_CEC_Operation_Params * find_from_ifr_cache (const char *operation);
 
   /// Function allows consumer admin to register the uses interface
-  int consumer_register_uses_interace (const char *uses_interface ACE_ENV_ARG_DECL);
+  int consumer_register_uses_interace (const char *uses_interface);
 
   /// Function allows supplier admin to register the supported interface
-  int supplier_register_supported_interface (const char *supported_interface ACE_ENV_ARG_DECL);
+  int supplier_register_supported_interface (const char *supported_interface);
 
   /// Function to return the supported_interface_
   const char * supported_interface (void) const;
@@ -245,13 +239,11 @@ public:
 
   /// Function populates the NVList from the provide param information
   virtual void create_operation_list (TAO_CEC_Operation_Params *oper_params,
-                                      CORBA::NVList_out new_list
-                                      ACE_ENV_ARG_DECL);
+                                      CORBA::NVList_out new_list);
 
   /// Function creates an empty NVList
   virtual void create_list (CORBA::Long count,
-                            CORBA::NVList_out new_list
-                            ACE_ENV_ARG_DECL);
+                            CORBA::NVList_out new_list);
 
   // = The CosTypedEventChannelAdmin::TypedEventChannel methods...
   virtual ::CosTypedEventChannelAdmin::TypedConsumerAdmin_ptr
@@ -273,7 +265,7 @@ public:
 
 protected:
   /// Function caches the full interface description from the IFR
-  int cache_interface_description (const char *interface ACE_ENV_ARG_DECL);
+  int cache_interface_description (const char *interface);
 
   /// Insert a operation/parameter into the IFR cache
   int insert_into_ifr_cache (const char *operation, TAO_CEC_Operation_Params *parameters);
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
index 418a36b24a5..28c0d699606 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
@@ -46,28 +46,24 @@ TAO_CEC_TypedProxyPushConsumer::TAO_CEC_TypedProxyPushConsumer
                                          this,
                                          this->typed_event_channel_);
 
-  ACE_TRY_NEW_ENV {
+  try{
     // tempporary fix, should put this into some init function.
 
     this->oid_ =
-      this->default_POA_->activate_object (this->dsi_impl_
-                                         ACE_ENV_ARG_PARAMETER);
+      this->default_POA_->activate_object (this->dsi_impl_);
   }
-  ACE_CATCHALL {
+  catch (...){
   }
-  ACE_ENDTRY;
 }
 
 // Implementation skeleton destructor
 TAO_CEC_TypedProxyPushConsumer::~TAO_CEC_TypedProxyPushConsumer (void)
 {
-  ACE_TRY_NEW_ENV {
-    this->default_POA_->deactivate_object (this->oid_.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+  try{
+    this->default_POA_->deactivate_object (this->oid_.in ());
   }
-  ACE_CATCHALL {
+  catch (...){
   }
-  ACE_ENDTRY;
 
   delete dsi_impl_;
 
@@ -77,20 +73,18 @@ TAO_CEC_TypedProxyPushConsumer::~TAO_CEC_TypedProxyPushConsumer (void)
 
 void
 TAO_CEC_TypedProxyPushConsumer::activate (
-    CosTypedEventChannelAdmin::TypedProxyPushConsumer_ptr &activated_proxy
-    ACE_ENV_ARG_DECL)
+    CosTypedEventChannelAdmin::TypedProxyPushConsumer_ptr &activated_proxy)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosTypedEventChannelAdmin::TypedProxyPushConsumer_var result;
-  ACE_TRY
+  try
     {
       result = this->_this ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       result = CosTypedEventChannelAdmin::TypedProxyPushConsumer::_nil ();
     }
-  ACE_ENDTRY;
   activated_proxy = result._retn ();
 }
 
@@ -98,28 +92,26 @@ void
 TAO_CEC_TypedProxyPushConsumer::deactivate (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       PortableServer::POA_var poa =
         this->_default_POA ();
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-      poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
+        poa->servant_to_id (this);
+      poa->deactivate_object (id.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Exceptions here should not be propagated.  They usually
       // indicate that an object is beign disconnected twice, or some
       // race condition, but not a fault that the user needs to know
       // about.
     }
-  ACE_ENDTRY;
 }
 
 CORBA::Boolean
 TAO_CEC_TypedProxyPushConsumer::supplier_non_existent (
-      CORBA::Boolean_out disconnected
-      ACE_ENV_ARG_DECL)
+      CORBA::Boolean_out disconnected)
 {
   CORBA::Object_var supplier;
   {
@@ -168,16 +160,15 @@ TAO_CEC_TypedProxyPushConsumer::shutdown (void)
   if (CORBA::is_nil (supplier.in ()))
     return;
 
-  ACE_TRY
+  try
     {
       supplier->disconnect_push_supplier ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore exceptions, we must isolate other clients from
       // failures on this one.
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -212,8 +203,7 @@ TAO_CEC_TypedProxyPushConsumer::_decr_refcnt (void)
 
 void
 TAO_CEC_TypedProxyPushConsumer::connect_push_supplier (
-      CosEventComm::PushSupplier_ptr push_supplier
-      ACE_ENV_ARG_DECL)
+      CosEventComm::PushSupplier_ptr push_supplier)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventChannelAdmin::AlreadyConnected))
 {
@@ -226,7 +216,7 @@ TAO_CEC_TypedProxyPushConsumer::connect_push_supplier (
     if (this->is_connected_i ())
       {
         if (this->typed_event_channel_->supplier_reconnect () == 0)
-          ACE_THROW (CosEventChannelAdmin::AlreadyConnected ());
+          throw CosEventChannelAdmin::AlreadyConnected ();
 
         // Re-connections are allowed, go ahead and disconnect the
         // consumer...
@@ -242,7 +232,7 @@ TAO_CEC_TypedProxyPushConsumer::connect_push_supplier (
               CORBA::INTERNAL ());
           // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
 
-          this->typed_event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
+          this->typed_event_channel_->disconnected (this);
         }
 
         // What if a second thread connected us after this?
@@ -254,7 +244,7 @@ TAO_CEC_TypedProxyPushConsumer::connect_push_supplier (
   }
 
   // Notify the event channel...
-  this->typed_event_channel_->connected (this ACE_ENV_ARG_PARAMETER);
+  this->typed_event_channel_->connected (this);
 }
 
 CosEventComm::PushSupplier_ptr
@@ -284,16 +274,14 @@ TAO_CEC_TypedProxyPushConsumer::apply_policy
 }
 
 void
-TAO_CEC_TypedProxyPushConsumer::push (const CORBA::Any& /* event */
-                                      ACE_ENV_ARG_DECL)
+TAO_CEC_TypedProxyPushConsumer::push (const CORBA::Any& /* event */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 void
-TAO_CEC_TypedProxyPushConsumer::disconnect_push_consumer (
-      ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_TypedProxyPushConsumer::disconnect_push_consumer ()
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventComm::PushSupplier_var supplier;
@@ -305,7 +293,7 @@ TAO_CEC_TypedProxyPushConsumer::disconnect_push_consumer (
     // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
 
     if (this->is_connected_i () == 0)
-      ACE_THROW (CORBA::BAD_INV_ORDER ()); // @@ add user exception?
+      throw CORBA::BAD_INV_ORDER (); // @@ add user exception?
 
     supplier = this->typed_supplier_._retn ();
 
@@ -313,22 +301,21 @@ TAO_CEC_TypedProxyPushConsumer::disconnect_push_consumer (
   }
 
   // Notify the event channel...
-  this->typed_event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
+  this->typed_event_channel_->disconnected (this);
 
   if (!CORBA::is_nil (supplier.in ()))
     {
       if (this->typed_event_channel_->disconnect_callbacks ())
         {
-          ACE_TRY
+          try
             {
               supplier->disconnect_push_supplier ();
             }
-          ACE_CATCHANY
+          catch (const CORBA::Exception& ex)
             {
               // Ignore exceptions, we must isolate other clients from
               // failures on this one.
             }
-          ACE_ENDTRY;
         }
     }
 }
@@ -357,15 +344,13 @@ TAO_CEC_TypedProxyPushConsumer::get_typed_consumer (void)
 
 {
   CORBA::Object_var server =
-         default_POA_->id_to_reference (this->oid_.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+         default_POA_->id_to_reference (this->oid_.in ());
 
   return CORBA::Object::_duplicate (server.in());
 }
 
 void
-TAO_CEC_TypedProxyPushConsumer::invoke (const TAO_CEC_TypedEvent& typed_event
-                                        ACE_ENV_ARG_DECL)
+TAO_CEC_TypedProxyPushConsumer::invoke (const TAO_CEC_TypedEvent& typed_event)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_CEC_TypedProxyPushConsumer_Guard ace_mon (this->lock_,
@@ -375,8 +360,7 @@ TAO_CEC_TypedProxyPushConsumer::invoke (const TAO_CEC_TypedEvent& typed_event
   if (!ace_mon.locked ())
     return;
 
-  this->typed_event_channel_->typed_consumer_admin ()->invoke (typed_event
-                                                               ACE_ENV_ARG_PARAMETER);
+  this->typed_event_channel_->typed_consumer_admin ()->invoke (typed_event);
 }
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
index a2c2365d2eb..6f8b2e53b07 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
@@ -51,8 +51,7 @@ public:
 
   /// Activate in the POA
   virtual void activate (
-      CosTypedEventChannelAdmin::TypedProxyPushConsumer_ptr &activated_proxy
-      ACE_ENV_ARG_DECL)
+      CosTypedEventChannelAdmin::TypedProxyPushConsumer_ptr &activated_proxy)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Deactivate from the POA
@@ -64,8 +63,7 @@ public:
    * it is disconnected then it returns true and sets the
    * <disconnected> flag.
    */
-  CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected
-                                        ACE_ENV_ARG_DECL);
+  CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected);
 
   /// The event channel is shutting down
   virtual void shutdown (void);
@@ -76,17 +74,14 @@ public:
 
   // = The CosEventChannelAdmin::ProxyPushConsumer methods (abstract overloads)...
   virtual void connect_push_supplier (
-                CosEventComm::PushSupplier_ptr push_supplier
-                ACE_ENV_ARG_DECL_NOT_USED)
+                CosEventComm::PushSupplier_ptr push_supplier)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosEventChannelAdmin::AlreadyConnected));
 
-  virtual void push (const CORBA::Any& event
-                     ACE_ENV_ARG_DECL_NOT_USED)
+  virtual void push (const CORBA::Any& event)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void invoke (const TAO_CEC_TypedEvent& typed_event
-                       ACE_ENV_ARG_DECL)
+  virtual void invoke (const TAO_CEC_TypedEvent& typed_event)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void disconnect_push_consumer (void)
@@ -94,7 +89,6 @@ public:
 
   // = The CosTypedEventComm::TypedPushConsumer methods (abstract overloads)...
   virtual CORBA::Object_ptr get_typed_consumer (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED
     )
       ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
index a282e7d3995..d1e7bd34c1a 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
@@ -31,24 +31,21 @@ TAO_CEC_TypedSupplierAdmin::_default_POA (void)
 }
 
 void
-TAO_CEC_TypedSupplierAdmin::connected (TAO_CEC_TypedProxyPushConsumer *consumer
-                                       ACE_ENV_ARG_DECL)
+TAO_CEC_TypedSupplierAdmin::connected (TAO_CEC_TypedProxyPushConsumer *consumer)
 {
-  this->typed_push_admin_.connected (consumer ACE_ENV_ARG_PARAMETER);
+  this->typed_push_admin_.connected (consumer);
 }
 
 void
-TAO_CEC_TypedSupplierAdmin::reconnected (TAO_CEC_TypedProxyPushConsumer *consumer
-                                         ACE_ENV_ARG_DECL)
+TAO_CEC_TypedSupplierAdmin::reconnected (TAO_CEC_TypedProxyPushConsumer *consumer)
 {
-  this->typed_push_admin_.reconnected (consumer ACE_ENV_ARG_PARAMETER);
+  this->typed_push_admin_.reconnected (consumer);
 }
 
 void
-TAO_CEC_TypedSupplierAdmin::disconnected (TAO_CEC_TypedProxyPushConsumer *consumer
-                                          ACE_ENV_ARG_DECL)
+TAO_CEC_TypedSupplierAdmin::disconnected (TAO_CEC_TypedProxyPushConsumer *consumer)
 {
-  this->typed_push_admin_.disconnected (consumer ACE_ENV_ARG_PARAMETER);
+  this->typed_push_admin_.disconnected (consumer);
 }
 
 void
@@ -60,7 +57,6 @@ TAO_CEC_TypedSupplierAdmin::shutdown (void)
 CosTypedEventChannelAdmin::TypedProxyPushConsumer_ptr
 TAO_CEC_TypedSupplierAdmin::obtain_typed_push_consumer (
     const char * supported_interface
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -68,7 +64,7 @@ TAO_CEC_TypedSupplierAdmin::obtain_typed_push_consumer (
   ))
 
 {
-  int result = this->typed_event_channel_->supplier_register_supported_interface (supported_interface ACE_ENV_ARG_PARAMETER);
+  int result = this->typed_event_channel_->supplier_register_supported_interface (supported_interface);
 
   if (result == -1)
     {
@@ -81,7 +77,6 @@ TAO_CEC_TypedSupplierAdmin::obtain_typed_push_consumer (
 CosEventChannelAdmin::ProxyPullConsumer_ptr
 TAO_CEC_TypedSupplierAdmin::obtain_typed_pull_consumer (
     const char * /* uses_interface */
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h
index 4d6bfa36941..a804e384981 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h
@@ -44,16 +44,12 @@ public:
   virtual ~TAO_CEC_TypedSupplierAdmin (void);
 
   /// For each elements call <worker->work()>.
-  void for_each (TAO_ESF_Worker<TAO_CEC_TypedProxyPushConsumer> *worker
-                 ACE_ENV_ARG_DECL);
+  void for_each (TAO_ESF_Worker<TAO_CEC_TypedProxyPushConsumer> *worker);
 
   /// Keep track of connected consumers.
-  virtual void connected (TAO_CEC_TypedProxyPushConsumer*
-                          ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void reconnected (TAO_CEC_TypedProxyPushConsumer*
-                            ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void disconnected (TAO_CEC_TypedProxyPushConsumer*
-                             ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void connected (TAO_CEC_TypedProxyPushConsumer*);
+  virtual void reconnected (TAO_CEC_TypedProxyPushConsumer*);
+  virtual void disconnected (TAO_CEC_TypedProxyPushConsumer*);
 
   /// The typed event channel is shutting down, inform all the consumers of
   /// this
@@ -61,14 +57,12 @@ public:
 
   // = The CosTypedEventChannelAdmin::TypedSupplierAdmin methods...
   virtual CosTypedEventChannelAdmin::TypedProxyPushConsumer_ptr
-    obtain_typed_push_consumer (const char * supported_interface
-                                ACE_ENV_ARG_DECL)
+    obtain_typed_push_consumer (const char * supported_interface)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosTypedEventChannelAdmin::InterfaceNotSupported));
 
   virtual CosEventChannelAdmin::ProxyPullConsumer_ptr
-    obtain_typed_pull_consumer (const char * uses_interface
-                                ACE_ENV_ARG_DECL)
+    obtain_typed_pull_consumer (const char * uses_interface)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosTypedEventChannelAdmin::NoSuchImplementation));
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.inl
index 4a3111bc176..0ef62fc3cfa 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.inl
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.inl
@@ -6,10 +6,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE void
 TAO_CEC_TypedSupplierAdmin::
-    for_each (TAO_ESF_Worker<TAO_CEC_TypedProxyPushConsumer> *worker
-              ACE_ENV_ARG_DECL)
+    for_each (TAO_ESF_Worker<TAO_CEC_TypedProxyPushConsumer> *worker)
 {
-  this->typed_push_admin_.for_each (worker ACE_ENV_ARG_PARAMETER);
+  this->typed_push_admin_.for_each (worker);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp
index fc6a0584a54..e34c508e783 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp
@@ -23,13 +23,12 @@ TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
-    for_each (TAO_ESF_Worker<PROXY> *worker
-              ACE_ENV_ARG_DECL)
+    for_each (TAO_ESF_Worker<PROXY> *worker)
 {
   // @@ Use an allocator for this memory...
   PROXY **proxies = 0;
   size_t size = 0;
-  ACE_TRY
+  try
     {
       {
         ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
@@ -54,12 +53,12 @@ TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
       worker->set_size(size);
       for (PROXY **j = proxies; j != proxies + size; ++j)
         {
-          worker->work (*j ACE_ENV_ARG_PARAMETER);
+          worker->work (*j);
           (*j)->_decr_refcnt ();
         }
       delete[] proxies;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       for (PROXY **j = proxies; j != proxies + size; ++j)
         {
@@ -68,41 +67,37 @@ TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
         }
       delete[] proxies;
 
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
-    connected (PROXY *proxy
-               ACE_ENV_ARG_DECL)
+    connected (PROXY *proxy)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
   proxy->_incr_refcnt ();
-  this->collection_.connected (proxy ACE_ENV_ARG_PARAMETER);
+  this->collection_.connected (proxy);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
-    reconnected (PROXY *proxy
-                 ACE_ENV_ARG_DECL)
+    reconnected (PROXY *proxy)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
   proxy->_incr_refcnt ();
-  this->collection_.reconnected (proxy ACE_ENV_ARG_PARAMETER);
+  this->collection_.reconnected (proxy);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
-    disconnected (PROXY *proxy
-                  ACE_ENV_ARG_DECL)
+    disconnected (PROXY *proxy)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
-  this->collection_.disconnected (proxy ACE_ENV_ARG_PARAMETER);
+  this->collection_.disconnected (proxy);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h
index 5a761792bcd..d2c8b254260 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h
@@ -43,14 +43,10 @@ public:
   TAO_ESF_Copy_On_Read (const COLLECTION &collection);
 
   // = The TAO_ESF_Proxy_Collection methods
-  virtual void for_each (TAO_ESF_Worker<PROXY> *worker
-                         ACE_ENV_ARG_DECL);
-  virtual void connected (PROXY *proxy
-                          ACE_ENV_ARG_DECL);
-  virtual void reconnected (PROXY *proxy
-                            ACE_ENV_ARG_DECL);
-  virtual void disconnected (PROXY *proxy
-                             ACE_ENV_ARG_DECL);
+  virtual void for_each (TAO_ESF_Worker<PROXY> *worker);
+  virtual void connected (PROXY *proxy);
+  virtual void reconnected (PROXY *proxy);
+  virtual void disconnected (PROXY *proxy);
   virtual void shutdown (void);
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
index e0fdc79c247..a51b175716f 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
@@ -67,8 +67,7 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> void
 TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    for_each (TAO_ESF_Worker<PROXY> *worker
-              ACE_ENV_ARG_DECL)
+    for_each (TAO_ESF_Worker<PROXY> *worker)
 {
   Read_Guard ace_mon (this->mutex_,
                       this->collection_);
@@ -77,14 +76,13 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
   ITERATOR end = ace_mon.collection->collection.end ();
   for (ITERATOR i = ace_mon.collection->collection.begin (); i != end; ++i)
     {
-      worker->work (*i ACE_ENV_ARG_PARAMETER);
+      worker->work (*i);
     }
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> void
 TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    connected (PROXY *proxy
-               ACE_ENV_ARG_DECL)
+    connected (PROXY *proxy)
 {
   Write_Guard ace_mon (this->mutex_,
                        this->cond_,
@@ -93,13 +91,12 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
                        this->collection_);
 
   proxy->_incr_refcnt ();
-  ace_mon.copy->collection.connected (proxy ACE_ENV_ARG_PARAMETER);
+  ace_mon.copy->collection.connected (proxy);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> void
 TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    reconnected (PROXY *proxy
-                 ACE_ENV_ARG_DECL)
+    reconnected (PROXY *proxy)
 {
   Write_Guard ace_mon (this->mutex_,
                        this->cond_,
@@ -108,13 +105,12 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
                        this->collection_);
 
   proxy->_incr_refcnt ();
-  ace_mon.copy->collection.reconnected (proxy ACE_ENV_ARG_PARAMETER);
+  ace_mon.copy->collection.reconnected (proxy);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> void
 TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    disconnected (PROXY *proxy
-                  ACE_ENV_ARG_DECL)
+    disconnected (PROXY *proxy)
 {
   Write_Guard ace_mon (this->mutex_,
                        this->cond_,
@@ -122,7 +118,7 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
                        this->writing_,
                        this->collection_);
 
-  ace_mon.copy->collection.disconnected (proxy ACE_ENV_ARG_PARAMETER);
+  ace_mon.copy->collection.disconnected (proxy);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> void
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h
index e162b5f7c78..0d5f9e32001 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h
@@ -132,14 +132,10 @@ public:
   ~TAO_ESF_Copy_On_Write (void);
 
   // = The TAO_ESF_Proxy methods
-  virtual void for_each (TAO_ESF_Worker<PROXY> *worker
-                         ACE_ENV_ARG_DECL);
-  virtual void connected (PROXY *proxy
-                          ACE_ENV_ARG_DECL);
-  virtual void reconnected (PROXY *proxy
-                            ACE_ENV_ARG_DECL);
-  virtual void disconnected (PROXY *proxy
-                             ACE_ENV_ARG_DECL);
+  virtual void for_each (TAO_ESF_Worker<PROXY> *worker);
+  virtual void connected (PROXY *proxy);
+  virtual void reconnected (PROXY *proxy);
+  virtual void disconnected (PROXY *proxy);
   virtual void shutdown (void);
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
index a1bcf09b8df..9388b45d74c 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
@@ -46,8 +46,7 @@ TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    for_each (TAO_ESF_Worker<PROXY> *worker
-              ACE_ENV_ARG_DECL)
+    for_each (TAO_ESF_Worker<PROXY> *worker)
 {
   ACE_GUARD (Busy_Lock, ace_mon, this->lock_);
 
@@ -55,7 +54,7 @@ TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
   ITERATOR end = this->collection_.end ();
   for (ITERATOR i = this->collection_.begin (); i != end; ++i)
     {
-      worker->work (*i ACE_ENV_ARG_PARAMETER);
+      worker->work (*i);
 
   }
 }
@@ -108,8 +107,7 @@ TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
 
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
-    connected (PROXY *proxy
-               ACE_ENV_ARG_DECL)
+    connected (PROXY *proxy)
 {
   ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_,
       CORBA::INTERNAL ());
@@ -118,7 +116,7 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
   if (this->busy_count_ == 0)
     {
       // We can add the object immediately
-      this->connected_i (proxy ACE_ENV_ARG_PARAMETER);
+      this->connected_i (proxy);
     }
   else
     {
@@ -133,8 +131,7 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
 
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
-    reconnected (PROXY *proxy
-                 ACE_ENV_ARG_DECL)
+    reconnected (PROXY *proxy)
 {
   ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_,
       CORBA::INTERNAL ());
@@ -143,7 +140,7 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
   if (this->busy_count_ == 0)
     {
       // We can reconnect the object immediately
-      this->reconnected_i (proxy ACE_ENV_ARG_PARAMETER);
+      this->reconnected_i (proxy);
     }
   else
     {
@@ -158,8 +155,7 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
 
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
-    disconnected (PROXY *proxy
-                  ACE_ENV_ARG_DECL)
+    disconnected (PROXY *proxy)
 {
   ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_,
       CORBA::INTERNAL ());
@@ -167,7 +163,7 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
   if (this->busy_count_ == 0)
     {
       // We can remove the object immediately
-      this->disconnected_i (proxy ACE_ENV_ARG_PARAMETER);
+      this->disconnected_i (proxy);
     }
   else
     {
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h
index ae0b28f92c3..36742c93d80 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h
@@ -95,12 +95,9 @@ public:
   int idle (void);
   int execute_delayed_operations (void);
 
-  void connected_i (PROXY *proxy
-                    ACE_ENV_ARG_DECL);
-  void reconnected_i (PROXY *proxy
-                    ACE_ENV_ARG_DECL);
-  void disconnected_i (PROXY *proxy
-                     ACE_ENV_ARG_DECL);
+  void connected_i (PROXY *proxy);
+  void reconnected_i (PROXY *proxy);
+  void disconnected_i (PROXY *proxy);
   void shutdown_i (void);
 
   typedef TAO_ESF_Connected_Command<TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>,PROXY> Connected_Command;
@@ -109,14 +106,10 @@ public:
   typedef TAO_ESF_Shutdown_Command<TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE> > Shutdown_Command;
 
   // = The TAO_ESF_Proxy methods
-  virtual void for_each (TAO_ESF_Worker<PROXY> *worker
-                         ACE_ENV_ARG_DECL);
-  virtual void connected (PROXY *proxy
-                          ACE_ENV_ARG_DECL);
-  virtual void reconnected (PROXY *proxy
-                            ACE_ENV_ARG_DECL);
-  virtual void disconnected (PROXY *proxy
-                             ACE_ENV_ARG_DECL);
+  virtual void for_each (TAO_ESF_Worker<PROXY> *worker);
+  virtual void connected (PROXY *proxy);
+  virtual void reconnected (PROXY *proxy);
+  virtual void disconnected (PROXY *proxy);
   virtual void shutdown (void);
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.inl
index bf723bce96e..c042ea793c5 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.inl
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.inl
@@ -6,26 +6,23 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
-    connected_i (PROXY *proxy
-               ACE_ENV_ARG_DECL)
+    connected_i (PROXY *proxy)
 {
-  this->collection_.connected (proxy ACE_ENV_ARG_PARAMETER);
+  this->collection_.connected (proxy);
 }
 
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
-    reconnected_i (PROXY *proxy
-                 ACE_ENV_ARG_DECL)
+    reconnected_i (PROXY *proxy)
 {
-  this->collection_.reconnected (proxy ACE_ENV_ARG_PARAMETER);
+  this->collection_.reconnected (proxy);
 }
 
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
-    disconnected_i (PROXY *proxy
-                  ACE_ENV_ARG_DECL)
+    disconnected_i (PROXY *proxy)
 {
-  this->collection_.disconnected (proxy ACE_ENV_ARG_PARAMETER);
+  this->collection_.disconnected (proxy);
 }
 
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
index 1ef85a18da8..96b47940659 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
@@ -18,14 +18,12 @@ TAO_ESF_Connected_Command<Target,Object>::execute (void* arg)
     {
       ACE_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV =
                             *static_cast<CORBA::Environment*> (arg));
-      this->target_->connected_i (this->object_
-                                  ACE_ENV_ARG_PARAMETER);
+      this->target_->connected_i (this->object_);
     }
   else
     {
       ACE_ENV_EMIT_CODE (ACE_DECLARE_NEW_CORBA_ENV);
-      this->target_->connected_i (this->object_
-                                  ACE_ENV_ARG_PARAMETER);
+      this->target_->connected_i (this->object_);
     }
 
   return 0;
@@ -40,14 +38,12 @@ TAO_ESF_Reconnected_Command<Target,Object>::execute (void* arg)
     {
       ACE_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV =
                              *static_cast<CORBA::Environment*> (arg));
-      this->target_->reconnected_i (this->object_
-                                    ACE_ENV_ARG_PARAMETER);
+      this->target_->reconnected_i (this->object_);
     }
   else
     {
       ACE_ENV_EMIT_CODE (ACE_DECLARE_NEW_CORBA_ENV);
-      this->target_->reconnected_i (this->object_
-                                    ACE_ENV_ARG_PARAMETER);
+      this->target_->reconnected_i (this->object_);
     }
   return 0;
 }
@@ -61,14 +57,12 @@ TAO_ESF_Disconnected_Command<Target,Object>::execute (void* arg)
     {
       ACE_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV =
                              *static_cast<CORBA::Environment*> (arg));
-      this->target_->disconnected_i (this->object_
-                                     ACE_ENV_ARG_PARAMETER);
+      this->target_->disconnected_i (this->object_);
     }
   else
     {
       ACE_ENV_EMIT_CODE (ACE_DECLARE_NEW_CORBA_ENV);
-      this->target_->disconnected_i (this->object_
-                                     ACE_ENV_ARG_PARAMETER);
+      this->target_->disconnected_i (this->object_);
     }
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp
index 5fbe626a794..fc265f99772 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp
@@ -30,8 +30,7 @@ TAO_ESF_Immediate_Changes<PROXY,C,ITERATOR,ACE_LOCK>::
 
 template<class PROXY, class C, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Immediate_Changes<PROXY,C,ITERATOR,ACE_LOCK>::
-    for_each (TAO_ESF_Worker<PROXY> *worker
-              ACE_ENV_ARG_DECL)
+    for_each (TAO_ESF_Worker<PROXY> *worker)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
@@ -39,7 +38,7 @@ TAO_ESF_Immediate_Changes<PROXY,C,ITERATOR,ACE_LOCK>::
   ITERATOR end = this->collection_.end ();
   for (ITERATOR i = this->collection_.begin (); i != end; ++i)
     {
-      worker->work ((*i) ACE_ENV_ARG_PARAMETER);
+      worker->work ((*i));
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h
index c8eb2a844fd..6d3c084f8d8 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h
@@ -34,14 +34,10 @@ public:
   TAO_ESF_Immediate_Changes (const COLLECTION &collection);
 
   // = The TAO_ESF_Proxy methods
-  virtual void for_each (TAO_ESF_Worker<PROXY> *worker
-                         ACE_ENV_ARG_DECL);
-  virtual void connected (PROXY *proxy
-                          ACE_ENV_ARG_DECL);
-  virtual void reconnected (PROXY *proxy
-                            ACE_ENV_ARG_DECL);
-  virtual void disconnected (PROXY *proxy
-                             ACE_ENV_ARG_DECL);
+  virtual void for_each (TAO_ESF_Worker<PROXY> *worker);
+  virtual void connected (PROXY *proxy);
+  virtual void reconnected (PROXY *proxy);
+  virtual void disconnected (PROXY *proxy);
   virtual void shutdown (void);
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl
index 849b2827a91..68de9828bbb 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl
@@ -6,34 +6,31 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
-    connected (PROXY *proxy
-               ACE_ENV_ARG_DECL)
+    connected (PROXY *proxy)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
   proxy->_incr_refcnt ();
-  this->collection_.connected (proxy ACE_ENV_ARG_PARAMETER);
+  this->collection_.connected (proxy);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
-    reconnected (PROXY *proxy
-                 ACE_ENV_ARG_DECL)
+    reconnected (PROXY *proxy)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
   proxy->_incr_refcnt ();
-  this->collection_.reconnected (proxy ACE_ENV_ARG_PARAMETER);
+  this->collection_.reconnected (proxy);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
-    disconnected (PROXY *proxy
-                  ACE_ENV_ARG_DECL)
+    disconnected (PROXY *proxy)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
-  this->collection_.disconnected (proxy ACE_ENV_ARG_PARAMETER);
+  this->collection_.disconnected (proxy);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
index 40afd8d452f..474ccde8989 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
@@ -22,35 +22,32 @@ TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>::
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE, class PEER> void
 TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>::
-    peer_connected (PEER *peer
-                    ACE_ENV_ARG_DECL)
+    peer_connected (PEER *peer)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ESF_Peer_Connected<PROXY,PEER> worker (peer);
 
-  this->for_each (&worker ACE_ENV_ARG_PARAMETER);
+  this->for_each (&worker);
 }
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE, class PEER> void
 TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>::
-    peer_reconnected (PEER *peer
-                      ACE_ENV_ARG_DECL)
+    peer_reconnected (PEER *peer)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ESF_Peer_Reconnected<PROXY,PEER> worker (peer);
 
-  this->for_each (&worker ACE_ENV_ARG_PARAMETER);
+  this->for_each (&worker);
 }
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE, class PEER> void
 TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>::
-    peer_disconnected (PEER *peer
-                       ACE_ENV_ARG_DECL)
+    peer_disconnected (PEER *peer)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ESF_Peer_Disconnected<PROXY,PEER> worker (peer);
 
-  this->for_each (&worker ACE_ENV_ARG_PARAMETER);
+  this->for_each (&worker);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
index 95a188cf661..5e1c81f3194 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
@@ -41,17 +41,17 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * the PROXY interface must implement:
  *
  * @verbatim
- * void connected (PEER *peer ACE_ENV_ARG_DECL_NOT_USED) throw ();
- * void reconnected (PEER *peer ACE_ENV_ARG_DECL_NOT_USED) throw ();
- * void disconnected (PEER *peer ACE_ENV_ARG_DECL_NOT_USED) throw ();
+ * void connected (PEER *peer) throw ();
+ * void reconnected (PEER *peer) throw ();
+ * void disconnected (PEER *peer) throw ();
  * @endverbatim
  *
  * Similarly, the PEER interface must implement:
  *
  * @verbatim
- * void connected (PROXY *proxy ACE_ENV_ARG_DECL_NOT_USED) throw ();
- * void reconnected (PROXY *proxy ACE_ENV_ARG_DECL_NOT_USED) throw ();
- * void disconnected (PROXY *proxy ACE_ENV_ARG_DECL_NOT_USED) throw ();
+ * void connected (PROXY *proxy) throw ();
+ * void reconnected (PROXY *proxy) throw ();
+ * void disconnected (PROXY *proxy) throw ();
  * @endverbatim
  */
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE, class PEER>
@@ -69,8 +69,7 @@ public:
    * has invoked the connect_xxx_yyy() method.
    * The default implementation is a no-op.
    */
-  virtual void peer_connected (PEER *peer
-                               ACE_ENV_ARG_DECL)
+  virtual void peer_connected (PEER *peer)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -79,8 +78,7 @@ public:
    * The default implementation delegates on the collection
    * <reconnected> method
    */
-  virtual void peer_reconnected (PEER *peer
-                                 ACE_ENV_ARG_DECL)
+  virtual void peer_reconnected (PEER *peer)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -88,8 +86,7 @@ public:
    * removes the object from the collection and deactivates the
    * proxy.
    */
-  virtual void peer_disconnected (PEER *peer
-                                  ACE_ENV_ARG_DECL)
+  virtual void peer_disconnected (PEER *peer)
       ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp
index b57ad33fed6..ad5c499c685 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp
@@ -12,39 +12,36 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class P, class R> void
-TAO_ESF_Peer_Connected<P,R>::work (P *proxy
-                                   ACE_ENV_ARG_DECL)
+TAO_ESF_Peer_Connected<P,R>::work (P *proxy)
 {
-  proxy->connected (this->peer_ ACE_ENV_ARG_PARAMETER);
+  proxy->connected (this->peer_);
 // Shouldn't happen, just following the discipline
 
-  this->peer_->connected (proxy ACE_ENV_ARG_PARAMETER);
+  this->peer_->connected (proxy);
 // Shouldn't happen, just following the discipline
 }
 
 // ****************************************************************
 
 template<class P, class R> void
-TAO_ESF_Peer_Reconnected<P,R>::work (P *proxy
-                                     ACE_ENV_ARG_DECL)
+TAO_ESF_Peer_Reconnected<P,R>::work (P *proxy)
 {
-  proxy->reconnected (this->peer_ ACE_ENV_ARG_PARAMETER);
+  proxy->reconnected (this->peer_);
 // Shouldn't happen, just following the discipline
 
-  this->peer_->reconnected (proxy ACE_ENV_ARG_PARAMETER);
+  this->peer_->reconnected (proxy);
 // Shouldn't happen, just following the discipline
 }
 
 // ****************************************************************
 
 template<class P, class R> void
-TAO_ESF_Peer_Disconnected<P,R>::work (P *proxy
-                                      ACE_ENV_ARG_DECL)
+TAO_ESF_Peer_Disconnected<P,R>::work (P *proxy)
 {
-  proxy->disconnected (this->peer_ ACE_ENV_ARG_PARAMETER);
+  proxy->disconnected (this->peer_);
 // Shouldn't happen, just following the discipline
 
-  this->peer_->disconnected (proxy ACE_ENV_ARG_PARAMETER);
+  this->peer_->disconnected (proxy);
 // Shouldn't happen, just following the discipline
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h
index 913a3403549..9f38e791afe 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h
@@ -35,8 +35,7 @@ class TAO_ESF_Peer_Connected : public TAO_ESF_Worker<PROXY>
 public:
   TAO_ESF_Peer_Connected (PEER *peer);
 
-  void work (PROXY *proxy
-             ACE_ENV_ARG_DECL);
+  void work (PROXY *proxy);
 
 private:
   PEER* peer_;
@@ -58,8 +57,7 @@ class TAO_ESF_Peer_Reconnected : public TAO_ESF_Worker<PROXY>
 public:
   TAO_ESF_Peer_Reconnected (PEER *peer);
 
-  void work (PROXY *proxy
-             ACE_ENV_ARG_DECL);
+  void work (PROXY *proxy);
 
 private:
   PEER* peer_;
@@ -81,8 +79,7 @@ class TAO_ESF_Peer_Disconnected : public TAO_ESF_Worker<PROXY>
 public:
   TAO_ESF_Peer_Disconnected (PEER *peer);
 
-  void work (PROXY *proxy
-             ACE_ENV_ARG_DECL);
+  void work (PROXY *proxy);
 
 private:
   PEER* peer_;
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
index 5ea8f3bc1b6..dca8d5da939 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
@@ -37,11 +37,11 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
   TAO_ESF_RefCountedRef<PROXY> holder (proxy);
 
   ACE_TYPENAME PROXY::_ptr_type r;
-  proxy->activate (r ACE_ENV_ARG_PARAMETER);
+  proxy->activate (r);
 
   ACE_TYPENAME PROXY::_var_type result = r;
 
-  this->collection_->connected (proxy ACE_ENV_ARG_PARAMETER);
+  this->collection_->connected (proxy);
 
   return result._retn ();
 }
@@ -53,7 +53,7 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
 {
   TAO_ESF_Shutdown_Proxy<PROXY> worker;
 
-  this->collection_->for_each (&worker ACE_ENV_ARG_PARAMETER);
+  this->collection_->for_each (&worker);
 // Cannot happen, just following the discipline.
 
   this->collection_->shutdown ();
@@ -61,35 +61,32 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void
 TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
-    connected (PROXY *
-               ACE_ENV_ARG_DECL_NOT_USED)
+    connected (PROXY *)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void
 TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
-    reconnected (PROXY *proxy
-                 ACE_ENV_ARG_DECL)
+    reconnected (PROXY *proxy)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->collection_->reconnected (proxy ACE_ENV_ARG_PARAMETER);
+  this->collection_->reconnected (proxy);
 }
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void
 TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
-    disconnected (PROXY *proxy
-                  ACE_ENV_ARG_DECL)
+    disconnected (PROXY *proxy)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   proxy->deactivate ();
 // Cannot happen, just following the discipline.
 
-  ACE_TRY
+  try
     {
-      this->collection_->disconnected (proxy ACE_ENV_ARG_PARAMETER);
+      this->collection_->disconnected (proxy);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // @@ In the future the collections may raise exceptions to
       // report errors (such as out of memory or things like that).
@@ -99,7 +96,6 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
       // resources" or something similar, and i've never seen a spec
       // that has an exception for "could not acquire a mutex".
     }
-  ACE_ENDTRY;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
index 0833c214e0f..e16e340bb1c 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
@@ -72,8 +72,7 @@ public:
   virtual ~TAO_ESF_Proxy_Admin (void);
 
   /// Iterate over its internal collection.
-  void for_each (TAO_ESF_Worker<PROXY> *worker
-                 ACE_ENV_ARG_DECL)
+  void for_each (TAO_ESF_Worker<PROXY> *worker)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   // @todo We should use INTERFACE::_ptr_type or PROXY::_ptr_type, but
@@ -99,8 +98,7 @@ public:
    * has invoked the connect_xxx_yyy() method.
    * The default implementation is a no-op.
    */
-  virtual void connected (PROXY *proxy
-                          ACE_ENV_ARG_DECL)
+  virtual void connected (PROXY *proxy)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -109,8 +107,7 @@ public:
    * The default implementation delegates on the collection
    * <reconnected> method
    */
-  virtual void reconnected (PROXY *proxy
-                            ACE_ENV_ARG_DECL)
+  virtual void reconnected (PROXY *proxy)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -118,8 +115,7 @@ public:
    * removes the object from the collection and deactivates the
    * proxy.
    */
-  virtual void disconnected (PROXY *proxy
-                             ACE_ENV_ARG_DECL)
+  virtual void disconnected (PROXY *proxy)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.inl
index 882e6c9c056..dfb7f2a7429 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.inl
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.inl
@@ -6,11 +6,10 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class EC,class P,class I> ACE_INLINE void
 TAO_ESF_Proxy_Admin<EC,P,I>::
-    for_each (TAO_ESF_Worker<P> *worker
-              ACE_ENV_ARG_DECL)
+    for_each (TAO_ESF_Worker<P> *worker)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->collection_->for_each (worker ACE_ENV_ARG_PARAMETER);
+  this->collection_->for_each (worker);
 }
 
 template <class C>
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h
index 61beba4d15b..86ed4f5bf86 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h
@@ -132,13 +132,11 @@ public:
    * member of the collection.
    * This encapsulates
    */
-  virtual void for_each (TAO_ESF_Worker<PROXY> *worker
-                         ACE_ENV_ARG_DECL) = 0;
+  virtual void for_each (TAO_ESF_Worker<PROXY> *worker) = 0;
 
   /// Insert a new element into the collection.  The collection assumes
   /// ownership of the element.
-  virtual void connected (PROXY *proxy
-                          ACE_ENV_ARG_DECL) = 0;
+  virtual void connected (PROXY *proxy) = 0;
 
   /**
    * Insert an element into the collection.  No errors can be raised
@@ -147,12 +145,10 @@ public:
    * <proxy->_decr_refcnt()> if the element is already present in the
    * collection.
    */
-  virtual void reconnected (PROXY *proxy
-                            ACE_ENV_ARG_DECL) = 0;
+  virtual void reconnected (PROXY *proxy) = 0;
 
   /// Remove an element from the collection.
-  virtual void disconnected (PROXY *proxy
-                             ACE_ENV_ARG_DECL) = 0;
+  virtual void disconnected (PROXY *proxy) = 0;
 
   /// The EC is shutting down, must release all the elements.
   virtual void shutdown (void) = 0;
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
index fe6d5c67822..39d0c271894 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
@@ -17,8 +17,7 @@ TAO_ESF_Proxy_List<PROXY>::TAO_ESF_Proxy_List (void)
 }
 
 template<class PROXY> void
-TAO_ESF_Proxy_List<PROXY>::connected (PROXY *proxy
-                                      ACE_ENV_ARG_DECL_NOT_USED)
+TAO_ESF_Proxy_List<PROXY>::connected (PROXY *proxy)
 {
   int r = this->impl_.insert (proxy);
   if (r == 0)
@@ -38,8 +37,7 @@ TAO_ESF_Proxy_List<PROXY>::connected (PROXY *proxy
 }
 
 template<class PROXY> void
-TAO_ESF_Proxy_List<PROXY>::reconnected (PROXY *proxy
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+TAO_ESF_Proxy_List<PROXY>::reconnected (PROXY *proxy)
 {
   int r = this->impl_.insert (proxy);
   if (r == 0)
@@ -63,8 +61,7 @@ TAO_ESF_Proxy_List<PROXY>::reconnected (PROXY *proxy
 }
 
 template<class PROXY> void
-TAO_ESF_Proxy_List<PROXY>::disconnected (PROXY *proxy
-                                         ACE_ENV_ARG_DECL_NOT_USED)
+TAO_ESF_Proxy_List<PROXY>::disconnected (PROXY *proxy)
 {
   int r = this->impl_.remove (proxy);
   if (r != 0)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h
index e3e03ba24e4..3fb57afd60d 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h
@@ -51,16 +51,13 @@ public:
   size_t size (void) const;
 
   /// Insert a new element to the collection
-  void connected (PROXY *
-                  ACE_ENV_ARG_DECL_NOT_USED);
+  void connected (PROXY *);
 
   /// Insert a new element that could be there already.
-  void reconnected (PROXY *
-                    ACE_ENV_ARG_DECL_NOT_USED);
+  void reconnected (PROXY *);
 
   /// Remove an element from the collection
-  void disconnected (PROXY *
-                     ACE_ENV_ARG_DECL_NOT_USED);
+  void disconnected (PROXY *);
 
   /// Shutdown the collection, i.e. remove all elements and release
   /// resources
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp
index bd765ad36bd..3afe6bbc7e3 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp
@@ -17,8 +17,7 @@ TAO_ESF_Proxy_RB_Tree<PROXY>::TAO_ESF_Proxy_RB_Tree (void)
 }
 
 template<class PROXY> void
-TAO_ESF_Proxy_RB_Tree<PROXY>::connected (PROXY *proxy
-                                         ACE_ENV_ARG_DECL_NOT_USED)
+TAO_ESF_Proxy_RB_Tree<PROXY>::connected (PROXY *proxy)
 {
   int r = this->impl_.bind (proxy, 1);
   if (r == 0)
@@ -38,8 +37,7 @@ TAO_ESF_Proxy_RB_Tree<PROXY>::connected (PROXY *proxy
 }
 
 template<class PROXY> void
-TAO_ESF_Proxy_RB_Tree<PROXY>::reconnected (PROXY *proxy
-                                           ACE_ENV_ARG_DECL_NOT_USED)
+TAO_ESF_Proxy_RB_Tree<PROXY>::reconnected (PROXY *proxy)
 {
   int r = this->impl_.rebind (proxy, 1);
   if (r == 0)
@@ -61,8 +59,7 @@ TAO_ESF_Proxy_RB_Tree<PROXY>::reconnected (PROXY *proxy
 }
 
 template<class PROXY> void
-TAO_ESF_Proxy_RB_Tree<PROXY>::disconnected (PROXY *proxy
-                                            ACE_ENV_ARG_DECL_NOT_USED)
+TAO_ESF_Proxy_RB_Tree<PROXY>::disconnected (PROXY *proxy)
 {
   int r = this->impl_.unbind (proxy);
   if (r != 0)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h
index 92eba90b814..489defef7c1 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h
@@ -78,15 +78,12 @@ public:
   size_t size (void) const;
 
   /// Insert a new element to the collection
-  void connected (PROXY *
-                  ACE_ENV_ARG_DECL_NOT_USED);
+  void connected (PROXY *);
 
   /// Insert a new element that could be there already.
-  void reconnected (PROXY *
-                    ACE_ENV_ARG_DECL_NOT_USED);
+  void reconnected (PROXY *);
   /// Remove an element from the collection
-  void disconnected (PROXY *
-                     ACE_ENV_ARG_DECL_NOT_USED);
+  void disconnected (PROXY *);
 
   /// Shutdown the collection, i.e. remove all elements and release
   /// resources
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp
index 884bddb37ca..dab2799e297 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp
@@ -13,18 +13,16 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class PROXY> void
-TAO_ESF_Shutdown_Proxy<PROXY>::work (PROXY *proxy
-                                     ACE_ENV_ARG_DECL)
+TAO_ESF_Shutdown_Proxy<PROXY>::work (PROXY *proxy)
 {
-  ACE_TRY
+  try
     {
       proxy->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Do not propagate any exceptions
     }
-  ACE_ENDTRY;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h
index 6f9af5a6705..40a0dd6ec9c 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h
@@ -29,8 +29,7 @@ class TAO_ESF_Shutdown_Proxy : public TAO_ESF_Worker<PROXY>
 public:
   TAO_ESF_Shutdown_Proxy (void);
 
-  void work (PROXY *proxy
-             ACE_ENV_ARG_DECL);
+  void work (PROXY *proxy);
 };
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h
index 94041cc6555..d623ac6643c 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h
@@ -50,8 +50,7 @@ public:
   virtual void set_size(size_t size);
 
   /// Callback interface.
-  virtual void work (Object *object
-                     ACE_ENV_ARG_DECL) = 0;
+  virtual void work (Object *object) = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
index 018a572fab2..685a0b96f47 100644
--- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
+++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
@@ -46,17 +46,16 @@ TAO_ETCL_Literal_Constraint::TAO_ETCL_Literal_Constraint (CORBA::Any * any)
   CORBA::TypeCode_var type = any_ref.type ();
   CORBA::TCKind corba_type = CORBA::tk_null;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       corba_type = type->kind ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // @@ Seth: Don't know what else to do. Make sure we can tell
       // when this constructor fails.
       return;
     }
-  ACE_ENDTRY;
 
   this->type_ =
     TAO_ETCL_Literal_Constraint::comparable_type (type.in ());
@@ -328,7 +327,7 @@ TAO_ETCL_Literal_Constraint::comparable_type (CORBA::TypeCode_ptr type)
   TAO_Literal_Type return_value = TAO_UNKNOWN;
   CORBA::TCKind kind = CORBA::tk_null;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       kind = type->kind ();
 
@@ -341,11 +340,10 @@ TAO_ETCL_Literal_Constraint::comparable_type (CORBA::TypeCode_ptr type)
           kind = tmp->kind ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       return return_value;
     }
-  ACE_ENDTRY;
   // Since this is a "top level try block, no need to check again.
 
   switch (kind)
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h
index 8c79e6415f6..676d9b62b71 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h
@@ -66,8 +66,7 @@ public:
   virtual int handle_input (ACE_SOCK_Dgram& dgram) = 0;
 
   virtual void get_addr (const RtecEventComm::EventHeader& header,
-                         RtecUDPAdmin::UDP_Addr_out addr
-                         ACE_ENV_ARG_DECL) = 0;
+                         RtecUDPAdmin::UDP_Addr_out addr) = 0;
 };
 
 typedef ACE_Refcounted_Auto_Ptr<TAO_ECG_Handler_Shutdown,
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
index e6d4dc1ef33..6a9b79ce970 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
@@ -16,8 +16,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 TAO_ECG_CDR_Message_Sender::init (
-      TAO_ECG_Refcounted_Endpoint endpoint_rptr
-      ACE_ENV_ARG_DECL)
+      TAO_ECG_Refcounted_Endpoint endpoint_rptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (endpoint_rptr.get () == 0
@@ -25,7 +24,7 @@ TAO_ECG_CDR_Message_Sender::init (
     {
       ACE_ERROR ((LM_ERROR, "TAO_ECG_CDR_Message_Sender::init(): "
                             "nil or unitialized endpoint argument.\n"));
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   this->endpoint_rptr_ = endpoint_rptr;
@@ -33,15 +32,14 @@ TAO_ECG_CDR_Message_Sender::init (
 
 void
 TAO_ECG_CDR_Message_Sender::send_message  (const TAO_OutputCDR &cdr,
-                                           const ACE_INET_Addr &addr
-                                           ACE_ENV_ARG_DECL)
+                                           const ACE_INET_Addr &addr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->endpoint_rptr_.get () == 0)
     {
       ACE_ERROR ((LM_ERROR, "Attempt to invoke send_message() "
                             "on non-initialized sender object.\n"));
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   CORBA::ULong max_fragment_payload = this->mtu () -
@@ -99,8 +97,7 @@ TAO_ECG_CDR_Message_Sender::send_message  (const TAO_OutputCDR &cdr,
                                fragment_id,
                                fragment_count,
                                iov,
-                               iovcnt
-                               ACE_ENV_ARG_PARAMETER);
+                               iovcnt);
           ++fragment_id;
           fragment_offset += max_fragment_payload;
 
@@ -126,8 +123,7 @@ TAO_ECG_CDR_Message_Sender::send_message  (const TAO_OutputCDR &cdr,
                                fragment_id,
                                fragment_count,
                                iov,
-                               iovcnt
-                               ACE_ENV_ARG_PARAMETER);
+                               iovcnt);
           ++fragment_id;
           fragment_offset += max_fragment_payload;
 
@@ -146,8 +142,7 @@ TAO_ECG_CDR_Message_Sender::send_message  (const TAO_OutputCDR &cdr,
                                fragment_id,
                                fragment_count,
                                iov,
-                               iovcnt
-                               ACE_ENV_ARG_PARAMETER);
+                               iovcnt);
           ++fragment_id;
           fragment_offset += fragment_size;
 
@@ -169,8 +164,7 @@ TAO_ECG_CDR_Message_Sender::send_message  (const TAO_OutputCDR &cdr,
                            fragment_id,
                            fragment_count,
                            iov,
-                           iovcnt
-                           ACE_ENV_ARG_PARAMETER);
+                           iovcnt);
       ++fragment_id;
       fragment_offset += fragment_size;
 
@@ -193,8 +187,7 @@ TAO_ECG_CDR_Message_Sender::send_fragment (const ACE_INET_Addr &addr,
                                            CORBA::ULong fragment_id,
                                            CORBA::ULong fragment_count,
                                            iovec iov[],
-                                           int iovcnt
-                                           ACE_ENV_ARG_DECL)
+                                           int iovcnt)
 {
   CORBA::ULong header[TAO_ECG_CDR_Message_Sender::ECG_HEADER_SIZE
                      / sizeof(CORBA::ULong)
@@ -265,7 +258,7 @@ TAO_ECG_CDR_Message_Sender::send_fragment (const ACE_INET_Addr &addr,
         {
           ACE_ERROR ((LM_ERROR, "Send of mcast fragment failed (%m).\n"));
           // @@ TODO Use a Event Channel specific exception
-          ACE_THROW (CORBA::COMM_FAILURE ());
+          throw CORBA::COMM_FAILURE ();
         }
       else
         {
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h
index 140195dbe5e..1faa1eb22bd 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h
@@ -94,8 +94,7 @@ public:
    * sender is no longer needed.  If shutdown () is not called by the
    * user, cleanup activities will be performed by the destructor.
    */
-  void init (TAO_ECG_Refcounted_Endpoint endpoint_rptr
-             ACE_ENV_ARG_DECL)
+  void init (TAO_ECG_Refcounted_Endpoint endpoint_rptr)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Shutdown this component.  Frees up the endpoint.
@@ -132,8 +131,7 @@ public:
    * to send later via the reactor.
    */
   void send_message (const TAO_OutputCDR &cdr,
-                     const ACE_INET_Addr &addr
-                     ACE_ENV_ARG_DECL)
+                     const ACE_INET_Addr &addr)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -153,8 +151,7 @@ private:
                       CORBA::ULong fragment_id,
                       CORBA::ULong fragment_count,
                       iovec iov[],
-                      int iovcnt
-                      ACE_ENV_ARG_DECL);
+                      int iovcnt);
 
   /**
    * Count the number of fragments that will be required to send the
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp
index ad383d44565..5dcd07128ac 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp
@@ -124,8 +124,7 @@ TAO_ECG_Complex_Address_Server::add_entry (const char * key,
 void
 TAO_ECG_Complex_Address_Server::get_addr (
                          const RtecEventComm::EventHeader& header,
-                         RtecUDPAdmin::UDP_Addr_out addr
-                         ACE_ENV_ARG_DECL_NOT_USED)
+                         RtecUDPAdmin::UDP_Addr_out addr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Long key;
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
index 28e2277a04d..286aa5fe160 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
@@ -70,8 +70,7 @@ public:
 
   // = The RtecUDPAdmin::AddrServer methods
   virtual void get_addr (const RtecEventComm::EventHeader& header,
-                         RtecUDPAdmin::UDP_Addr_out addr
-                         ACE_ENV_ARG_DECL)
+                         RtecUDPAdmin::UDP_Addr_out addr)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Prints out complete content of the address server. Useful for
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp
index b5b65cc294b..c093e008c15 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp
@@ -27,15 +27,13 @@ TAO_ECG_ConsumerEC_Control::shutdown (void)
 }
 
 void
-TAO_ECG_ConsumerEC_Control::event_channel_not_exist (TAO_EC_Gateway_IIOP *
-                                                     ACE_ENV_ARG_DECL_NOT_USED)
+TAO_ECG_ConsumerEC_Control::event_channel_not_exist (TAO_EC_Gateway_IIOP *)
 {
 }
 
 void
 TAO_ECG_ConsumerEC_Control::system_exception (TAO_EC_Gateway_IIOP *,
-                                              CORBA::SystemException &
-                                              ACE_ENV_ARG_DECL_NOT_USED)
+                                              CORBA::SystemException &)
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h
index a8141829787..8e7e6478408 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h
@@ -66,14 +66,12 @@ public:
    * has been destroyed.  The strategy has to (at the very least),
    * reclaim all the resources attached to that object.
    */
-  virtual void event_channel_not_exist (TAO_EC_Gateway_IIOP * gateway
-                                        ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void event_channel_not_exist (TAO_EC_Gateway_IIOP * gateway);
 
   /// Some system exception was raised while trying to contact the
   /// event channel
   virtual void system_exception (TAO_EC_Gateway_IIOP * gateway,
-                                 CORBA::SystemException &
-                                 ACE_ENV_ARG_DECL_NOT_USED);
+                                 CORBA::SystemException &);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
index c2126149284..6200c868e9b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
@@ -36,20 +36,19 @@ TAO_ECG_Mcast_EH::~TAO_ECG_Mcast_EH (void)
 }
 
 void
-TAO_ECG_Mcast_EH::open (RtecEventChannelAdmin::EventChannel_ptr ec
-                        ACE_ENV_ARG_DECL)
+TAO_ECG_Mcast_EH::open (RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   if (!this->receiver_)
     {
       // We are shut down.
-      ACE_THROW (CORBA::INTERNAL());
+      throw CORBA::INTERNAL();
     }
 
   if (CORBA::is_nil (ec))
     {
       ACE_ERROR ((LM_ERROR,  "TAO_ECG_Mcast_EH::open(): "
                              "nil ec argument"));
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   // Create and activate Event Channel Observer.
@@ -58,7 +57,7 @@ TAO_ECG_Mcast_EH::open (RtecEventChannelAdmin::EventChannel_ptr ec
 
   if (!this->observer_.in ())
     {
-      ACE_THROW (CORBA::NO_MEMORY ());
+      throw CORBA::NO_MEMORY ();
     }
 
   TAO_EC_Object_Deactivator observer_deactivator;
@@ -69,12 +68,10 @@ TAO_ECG_Mcast_EH::open (RtecEventChannelAdmin::EventChannel_ptr ec
   activate (observer_ref,
             poa.in (),
             this->observer_.in (),
-            observer_deactivator
-            ACE_ENV_ARG_PARAMETER);
+            observer_deactivator);
 
   RtecEventChannelAdmin::Observer_Handle handle =
-    ec->append_observer (observer_ref.in ()
-                         ACE_ENV_ARG_PARAMETER);
+    ec->append_observer (observer_ref.in ());
 
   this->observer_->set_deactivator (observer_deactivator);
   this->auto_observer_disconnect_.set_command
@@ -133,15 +130,13 @@ TAO_ECG_Mcast_EH::handle_input (ACE_HANDLE fd)
 
 void
 TAO_ECG_Mcast_EH::update_consumer (
-         const RtecEventChannelAdmin::ConsumerQOS& sub
-    ACE_ENV_ARG_DECL)
+         const RtecEventChannelAdmin::ConsumerQOS& sub)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Address_Set multicast_addresses;
 
   this->compute_required_subscriptions (sub,
-                                        multicast_addresses
-                                        ACE_ENV_ARG_PARAMETER);
+                                        multicast_addresses);
 
   this->delete_unwanted_subscriptions (multicast_addresses);
 
@@ -151,8 +146,7 @@ TAO_ECG_Mcast_EH::update_consumer (
 void
 TAO_ECG_Mcast_EH::compute_required_subscriptions (
     const RtecEventChannelAdmin::ConsumerQOS& sub,
-    Address_Set& multicast_addresses
-    ACE_ENV_ARG_DECL)
+    Address_Set& multicast_addresses)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong count = sub.dependencies.length ();
@@ -166,7 +160,7 @@ TAO_ECG_Mcast_EH::compute_required_subscriptions (
         }
       RtecUDPAdmin::UDP_Addr addr;
 
-      this->receiver_->get_addr (header, addr ACE_ENV_ARG_PARAMETER);
+      this->receiver_->get_addr (header, addr);
 
       ACE_INET_Addr inet_addr (addr.port, addr.ipaddr);
       // Ignore errors, if the element is in the set we simply ignore
@@ -272,18 +266,16 @@ TAO_ECG_Mcast_EH::Observer::Observer (TAO_ECG_Mcast_EH* eh)
 
 void
 TAO_ECG_Mcast_EH::Observer::update_consumer (
-    const RtecEventChannelAdmin::ConsumerQOS& sub
-    ACE_ENV_ARG_DECL)
+    const RtecEventChannelAdmin::ConsumerQOS& sub)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->eh_)
-    this->eh_->update_consumer (sub ACE_ENV_ARG_PARAMETER);
+    this->eh_->update_consumer (sub);
 }
 
 void
 TAO_ECG_Mcast_EH::Observer::update_supplier (
-    const RtecEventChannelAdmin::SupplierQOS&
-    ACE_ENV_ARG_DECL_NOT_USED)
+    const RtecEventChannelAdmin::SupplierQOS&)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
index d28b3419ee5..968a7d4fb07 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
@@ -84,8 +84,7 @@ public:
    * the user MUST call shutdown () when handler is no longer needed
    * (and its reactor still exists).
    */
-  void open (RtecEventChannelAdmin::EventChannel_ptr ec
-             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  void open (RtecEventChannelAdmin::EventChannel_ptr ec);
 
   /// TAO_ECG_Handler_Shutdown method.
   /**
@@ -124,12 +123,10 @@ private:
     /// Event Channel Observer methods
     //@{
     virtual void update_consumer (
-        const RtecEventChannelAdmin::ConsumerQOS& sub
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        const RtecEventChannelAdmin::ConsumerQOS& sub)
       ACE_THROW_SPEC ((CORBA::SystemException));
     virtual void update_supplier (
-        const RtecEventChannelAdmin::SupplierQOS& pub
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        const RtecEventChannelAdmin::SupplierQOS& pub)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   private:
@@ -147,8 +144,7 @@ private:
 
   /// The Observer method.  Subscribe/unsubscribe to multicast groups
   /// according to changes in consumer subscriptions.
-  void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub
-                        ACE_ENV_ARG_DECL)
+  void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -173,8 +169,7 @@ private:
    */
   void compute_required_subscriptions (
         const RtecEventChannelAdmin::ConsumerQOS& sub,
-              Address_Set& multicast_addresses
-              ACE_ENV_ARG_DECL)
+              Address_Set& multicast_addresses)
               ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Unsubscribe from any multicast addresses we are currently
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.inl
index 2964653c55d..109d5104934 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.inl
@@ -54,7 +54,7 @@ Observer_Disconnect_Command::execute (void)
   RtecEventChannelAdmin::EventChannel_var release_ec =
     this->ec_._retn ();
 
-  release_ec->remove_observer (this->handle_ ACE_ENV_ARG_PARAMETER);
+  release_ec->remove_observer (this->handle_);
 }
 
 //***************************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
index a599a828479..f99eea7758d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
@@ -416,8 +416,7 @@ TAO_ECG_Mcast_Gateway::init_address_server (void)
 TAO_ECG_Refcounted_Handler
 TAO_ECG_Mcast_Gateway::init_handler (TAO_ECG_Dgram_Handler *receiver,
                                      RtecEventChannelAdmin::EventChannel_ptr ec,
-                                     ACE_Reactor *reactor
-                                     ACE_ENV_ARG_DECL)
+                                     ACE_Reactor *reactor)
 {
   TAO_ECG_Refcounted_Handler handler;
 
@@ -450,7 +449,7 @@ TAO_ECG_Mcast_Gateway::init_handler (TAO_ECG_Dgram_Handler *receiver,
 
       h->reactor (reactor);
 
-      h->open (ec ACE_ENV_ARG_PARAMETER);
+      h->open (ec);
     }
 
   else if (this->handler_type_ == ECG_HANDLER_UDP)
@@ -489,8 +488,7 @@ TAO_EC_Servant_Var<TAO_ECG_UDP_Sender>
 TAO_ECG_Mcast_Gateway::init_sender (
                                RtecEventChannelAdmin::EventChannel_ptr ec,
                                RtecUDPAdmin::AddrServer_ptr address_server,
-                               TAO_ECG_Refcounted_Endpoint endpoint_rptr
-                               ACE_ENV_ARG_DECL)
+                               TAO_ECG_Refcounted_Endpoint endpoint_rptr)
 {
   TAO_EC_Servant_Var<TAO_ECG_UDP_Sender>
     sender (TAO_ECG_UDP_Sender::create ());
@@ -499,8 +497,7 @@ TAO_ECG_Mcast_Gateway::init_sender (
 
   sender->init (ec,
                 address_server,
-                endpoint_rptr
-                ACE_ENV_ARG_PARAMETER);
+                endpoint_rptr);
 
   TAO_EC_Auto_Command<UDP_Sender_Shutdown> sender_shutdown;
   sender_shutdown.set_command (UDP_Sender_Shutdown (sender));
@@ -509,7 +506,7 @@ TAO_ECG_Mcast_Gateway::init_sender (
     {
       // Client supplied consumer qos.  Use it.
       this->consumer_qos_.is_gateway = 1;
-      sender->connect (this->consumer_qos_ ACE_ENV_ARG_PARAMETER);
+      sender->connect (this->consumer_qos_);
     }
   else
     {
@@ -523,7 +520,7 @@ TAO_ECG_Mcast_Gateway::init_sender (
         const_cast<RtecEventChannelAdmin::ConsumerQOS &> (consumer_qos_factory.get_ConsumerQOS ());
       qos.is_gateway = 1;
 
-      sender->connect (qos ACE_ENV_ARG_PARAMETER);
+      sender->connect (qos);
     }
 
   sender_shutdown.disallow_command ();
@@ -534,8 +531,7 @@ TAO_EC_Servant_Var<TAO_ECG_UDP_Receiver>
 TAO_ECG_Mcast_Gateway::init_receiver (
                                RtecEventChannelAdmin::EventChannel_ptr ec,
                                RtecUDPAdmin::AddrServer_ptr address_server,
-                               TAO_ECG_Refcounted_Endpoint endpoint_rptr
-                               ACE_ENV_ARG_DECL)
+                               TAO_ECG_Refcounted_Endpoint endpoint_rptr)
 {
   TAO_EC_Servant_Var<TAO_ECG_UDP_Receiver>
     receiver (TAO_ECG_UDP_Receiver::create ());
@@ -544,8 +540,7 @@ TAO_ECG_Mcast_Gateway::init_receiver (
 
   receiver->init (ec,
                   endpoint_rptr,
-                  address_server
-                  ACE_ENV_ARG_PARAMETER);
+                  address_server);
 
   TAO_EC_Auto_Command<UDP_Receiver_Shutdown> receiver_shutdown;
   receiver_shutdown.set_command (UDP_Receiver_Shutdown (receiver));
@@ -558,7 +553,7 @@ TAO_ECG_Mcast_Gateway::init_receiver (
     const_cast<RtecEventChannelAdmin::SupplierQOS &> (supplier_qos_factory.get_SupplierQOS ());
   qos.is_gateway = 1;
 
-  receiver->connect (qos ACE_ENV_ARG_PARAMETER);
+  receiver->connect (qos);
 
   receiver_shutdown.disallow_command ();
   return receiver;
@@ -566,32 +561,30 @@ TAO_ECG_Mcast_Gateway::init_receiver (
 
 void
 TAO_ECG_Mcast_Gateway::verify_args (CORBA::ORB_ptr orb,
-                                    RtecEventChannelAdmin::EventChannel_ptr ec
-                                    ACE_ENV_ARG_DECL)
+                                    RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   if (CORBA::is_nil (ec))
     {
       ACE_ERROR ((LM_ERROR,
                   "Nil event channel argument passed to "
                   "TAO_ECG_Mcast_Gateway::run().\n"));
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
   if (CORBA::is_nil (orb))
     {
       ACE_ERROR ((LM_ERROR,
                   "Nil orb argument passed to "
                   "TAO_ECG_Mcast_Gateway::run().\n"));
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 }
 
 void
 TAO_ECG_Mcast_Gateway::run (CORBA::ORB_ptr orb,
-                            RtecEventChannelAdmin::EventChannel_ptr ec
-                            ACE_ENV_ARG_DECL)
+                            RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   // Verify args.
-  this->verify_args (orb, ec ACE_ENV_ARG_PARAMETER);
+  this->verify_args (orb, ec);
 
   // Auto-cleanup objects.
   TAO_EC_Object_Deactivator address_server_deactivator;
@@ -605,7 +598,7 @@ TAO_ECG_Mcast_Gateway::run (CORBA::ORB_ptr orb,
     {
       ACE_DEBUG ((LM_ERROR,
                   "Unable to create address server.\n"));
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   RtecUDPAdmin::AddrServer_var address_server;
@@ -616,8 +609,7 @@ TAO_ECG_Mcast_Gateway::run (CORBA::ORB_ptr orb,
   activate (address_server,
             poa.in (),
             address_server_servant.in (),
-            address_server_deactivator
-            ACE_ENV_ARG_PARAMETER);
+            address_server_deactivator);
 
   TAO_ECG_Refcounted_Endpoint endpoint_rptr;
   TAO_EC_Servant_Var<TAO_ECG_UDP_Sender> sender;
@@ -629,16 +621,15 @@ TAO_ECG_Mcast_Gateway::run (CORBA::ORB_ptr orb,
       endpoint_rptr = this->init_endpoint ();
       if (endpoint_rptr.get () == 0)
         {
-          ACE_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
 
       sender = this->init_sender (ec,
                                   address_server.in (),
-                                  endpoint_rptr
-                                  ACE_ENV_ARG_PARAMETER);
+                                  endpoint_rptr);
       if (!sender.in ())
         {
-          ACE_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
 
       sender_shutdown.set_command (UDP_Sender_Shutdown (sender));
@@ -653,11 +644,10 @@ TAO_ECG_Mcast_Gateway::run (CORBA::ORB_ptr orb,
 
       receiver = this->init_receiver (ec,
                                       address_server.in (),
-                                      endpoint_rptr
-                                      ACE_ENV_ARG_PARAMETER);
+                                      endpoint_rptr);
       if (!receiver.in ())
         {
-          ACE_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
 
       receiver_shutdown.set_command (UDP_Receiver_Shutdown (receiver));
@@ -665,11 +655,10 @@ TAO_ECG_Mcast_Gateway::run (CORBA::ORB_ptr orb,
       TAO_ECG_Refcounted_Handler
         handler_rptr (this->init_handler (receiver.in (),
                                           ec,
-                                          reactor
-                                          ACE_ENV_ARG_PARAMETER));
+                                          reactor));
       if (handler_rptr.get () == 0)
         {
-          ACE_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
       receiver->set_handler_shutdown (handler_rptr);
     }
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h
index d25df608dec..b8bc1797d1b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h
@@ -220,8 +220,7 @@ public:
   /// The main method - create, configure and run federation
   /// components according to the specified configuration.
   void run (CORBA::ORB_ptr orb,
-            RtecEventChannelAdmin::EventChannel_ptr ec
-            ACE_ENV_ARG_DECL);
+            RtecEventChannelAdmin::EventChannel_ptr ec);
 
 private:
 
@@ -229,8 +228,7 @@ private:
   //@{
   /// Check that arguments to run() are not nil.
   void verify_args (CORBA::ORB_ptr orb,
-                    RtecEventChannelAdmin::EventChannel_ptr ec
-                    ACE_ENV_ARG_DECL);
+                    RtecEventChannelAdmin::EventChannel_ptr ec);
 
   /// Verifies configuration values specified through init() make sense.
   int validate_configuration (void);
@@ -244,22 +242,19 @@ private:
   TAO_EC_Servant_Var<TAO_ECG_UDP_Sender>
         init_sender (RtecEventChannelAdmin::EventChannel_ptr ec,
                      RtecUDPAdmin::AddrServer_ptr address_server,
-                     TAO_ECG_Refcounted_Endpoint endpoint_rptr
-                     ACE_ENV_ARG_DECL);
+                     TAO_ECG_Refcounted_Endpoint endpoint_rptr);
 
   TAO_EC_Servant_Var<TAO_ECG_UDP_Receiver>
         init_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
                        RtecUDPAdmin::AddrServer_ptr address_server,
-                       TAO_ECG_Refcounted_Endpoint endpoint_rptr
-                       ACE_ENV_ARG_DECL);
+                       TAO_ECG_Refcounted_Endpoint endpoint_rptr);
 
   TAO_ECG_Refcounted_Endpoint init_endpoint (void);
 
   TAO_ECG_Refcounted_Handler
         init_handler (TAO_ECG_Dgram_Handler *recv,
                       RtecEventChannelAdmin::EventChannel_ptr ec,
-                      ACE_Reactor * reactor
-                      ACE_ENV_ARG_DECL);
+                      ACE_Reactor * reactor);
   //@}
 
   /// Flags controlling configuration.
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp
index 36c4bd1f7cd..1afd6de48ae 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp
@@ -34,36 +34,33 @@ TAO_ECG_Reactive_ConsumerEC_Control::~TAO_ECG_Reactive_ConsumerEC_Control (void)
 }
 
 void
-TAO_ECG_Reactive_ConsumerEC_Control::query_eventchannel (
-      ACE_ENV_SINGLE_ARG_DECL)
+TAO_ECG_Reactive_ConsumerEC_Control::query_eventchannel ()
 {
-  ACE_TRY
+  try
     {
       CORBA::Boolean disconnected;
       CORBA::Boolean non_existent =
-        gateway_->consumer_ec_non_existent (disconnected
-                                            ACE_ENV_ARG_PARAMETER);
+        gateway_->consumer_ec_non_existent (disconnected);
       if (non_existent && !disconnected)
         {
-          this->event_channel_not_exist (gateway_ ACE_ENV_ARG_PARAMETER);
+          this->event_channel_not_exist (gateway_);
         }
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+  catch (const CORBA::OBJECT_NOT_EXIST& ex)
     {
-      this->event_channel_not_exist (gateway_ ACE_ENV_ARG_PARAMETER);
+      this->event_channel_not_exist (gateway_);
     }
-  ACE_CATCH (CORBA::TRANSIENT, transient)
+  catch (const CORBA::TRANSIENT& transient)
     {
       // This is TAO's minor code for a failed connection, we may
       // want to be more lenient in the future..
       // if (transient.minor () == 0x54410085)
-      this->event_channel_not_exist (gateway_ ACE_ENV_ARG_PARAMETER);
+      this->event_channel_not_exist (gateway_);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore all exceptions
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -79,52 +76,46 @@ TAO_ECG_Reactive_ConsumerEC_Control::handle_timeout (
   // RELATIVE_RT_TIMEOUT_POLICY set here in effect.
 
   // @@ TODO: should use Guard to set and reset policies.
-  ACE_TRY_NEW_ENV
+  try
     {
       // Query the state of the Current object *before* we initiate
       // the iteration...
       CORBA::PolicyTypeSeq types;
       CORBA::PolicyList_var policies =
-        this->policy_current_->get_policy_overrides (types
-                                                      ACE_ENV_ARG_PARAMETER);
+        this->policy_current_->get_policy_overrides (types);
 
       // Change the timeout
       this->policy_current_->set_policy_overrides (this->policy_list_,
-                                                   CORBA::ADD_OVERRIDE
-                                                    ACE_ENV_ARG_PARAMETER);
+                                                   CORBA::ADD_OVERRIDE);
 
       // Query the state of the consumers...
       this->query_eventchannel ();
 
       this->policy_current_->set_policy_overrides (policies.in (),
-                                                   CORBA::SET_OVERRIDE
-                                                    ACE_ENV_ARG_PARAMETER);
+                                                   CORBA::SET_OVERRIDE);
       for (CORBA::ULong i = 0; i != policies->length (); ++i)
         {
           policies[i]->destroy ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore all exceptions
     }
-  ACE_ENDTRY;
 }
 
 int
 TAO_ECG_Reactive_ConsumerEC_Control::activate (void)
 {
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-  ACE_TRY_NEW_ENV
+  try
     {
       // Get the PolicyCurrent object
       CORBA::Object_var tmp =
-        this->orb_->resolve_initial_references ("PolicyCurrent"
-                                                 ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("PolicyCurrent");
 
       this->policy_current_ =
-        CORBA::PolicyCurrent::_narrow (tmp.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+        CORBA::PolicyCurrent::_narrow (tmp.in ());
 
       // Timeout for polling state (default = 10 msec)
       TimeBase::TimeT timeout = timeout_.usec() * 10;
@@ -135,8 +126,7 @@ TAO_ECG_Reactive_ConsumerEC_Control::activate (void)
       this->policy_list_[0] =
         this->orb_->create_policy (
                Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-               any
-               ACE_ENV_ARG_PARAMETER);
+               any);
 
       // Only schedule the timer, when the rate is not zero
       if (this->rate_ != ACE_Time_Value::zero)
@@ -152,11 +142,10 @@ TAO_ECG_Reactive_ConsumerEC_Control::activate (void)
           return -1;
       }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       return -1;
     }
-  ACE_ENDTRY;
 #endif /* TAO_HAS_CORBA_MESSAGING */
 
   return 0;
@@ -177,10 +166,9 @@ TAO_ECG_Reactive_ConsumerEC_Control::shutdown (void)
 
 void
 TAO_ECG_Reactive_ConsumerEC_Control::event_channel_not_exist (
-      TAO_EC_Gateway_IIOP* gateway
-      ACE_ENV_ARG_DECL)
+      TAO_EC_Gateway_IIOP* gateway)
 {
-  ACE_TRY
+  try
     {
       ACE_DEBUG ((LM_DEBUG,
                   "EC_Reactive_ConsumerControl(%P|%t) - "
@@ -190,33 +178,30 @@ TAO_ECG_Reactive_ConsumerEC_Control::event_channel_not_exist (
       gateway->cleanup_consumer_proxies ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "TAO_EC_Reactive_ConsumerControl::event_channel_not_exist");
+      ex._tao_print_exception (
+        "TAO_EC_Reactive_ConsumerControl::event_channel_not_exist");
       // Ignore all exceptions..
     }
-  ACE_ENDTRY;
 }
 
 void
 TAO_ECG_Reactive_ConsumerEC_Control::system_exception (
       TAO_EC_Gateway_IIOP* gateway,
-      CORBA::SystemException & /* exception */
-      ACE_ENV_ARG_DECL)
+      CORBA::SystemException & /* exception */)
 {
-  ACE_TRY
+  try
     {
       gateway->cleanup_consumer_ec ();
 
       gateway->cleanup_consumer_proxies ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore all exceptions..
     }
-  ACE_ENDTRY;
 }
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h
index 06a75e2f5a5..c8ff19af961 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h
@@ -84,11 +84,9 @@ public:
   // = Documented in TAO_EC_ConsumerControl
   virtual int activate (void);
   virtual int shutdown (void);
-  virtual void event_channel_not_exist (TAO_EC_Gateway_IIOP *gateway
-                                        ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void event_channel_not_exist (TAO_EC_Gateway_IIOP *gateway);
   virtual void system_exception (TAO_EC_Gateway_IIOP *gateway,
-                                 CORBA::SystemException &
-                                 ACE_ENV_ARG_DECL_NOT_USED);
+                                 CORBA::SystemException &);
 
 private:
   /// Check if the consumers still exists.  It is a helper method for
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp
index 6a995f35dc5..15498ffc444 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp
@@ -34,59 +34,52 @@ TAO_ECG_Reconnect_ConsumerEC_Control::~TAO_ECG_Reconnect_ConsumerEC_Control (voi
 }
 
 void
-TAO_ECG_Reconnect_ConsumerEC_Control::try_reconnect (
-      ACE_ENV_SINGLE_ARG_DECL)
+TAO_ECG_Reconnect_ConsumerEC_Control::try_reconnect ()
 {
-  ACE_TRY
+  try
     {
       CORBA::Boolean disconnected;
       CORBA::Boolean non_existent =
-      gateway_->consumer_ec_non_existent (disconnected
-                                           ACE_ENV_ARG_PARAMETER);
+      gateway_->consumer_ec_non_existent (disconnected);
       if (!non_existent)
         {
           this->reconnect();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore all exceptions
     }
-  ACE_ENDTRY;
 }
 
 void
-TAO_ECG_Reconnect_ConsumerEC_Control::reconnect (
-      ACE_ENV_SINGLE_ARG_DECL)
+TAO_ECG_Reconnect_ConsumerEC_Control::reconnect ()
 {
-  ACE_TRY
+  try
     {
       is_consumer_ec_connected_ = 1;
 
       gateway_->reconnect_consumer_ec();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore all exceptions
     }
-  ACE_ENDTRY;
 }
 
 void
-TAO_ECG_Reconnect_ConsumerEC_Control::query_eventchannel (
-      ACE_ENV_SINGLE_ARG_DECL)
+TAO_ECG_Reconnect_ConsumerEC_Control::query_eventchannel ()
 {
-  ACE_TRY
+  try
     {
       if (is_consumer_ec_connected_ == 1)
         {
           CORBA::Boolean disconnected;
           CORBA::Boolean non_existent =
-            gateway_->consumer_ec_non_existent (disconnected
-                                                ACE_ENV_ARG_PARAMETER);
+            gateway_->consumer_ec_non_existent (disconnected);
           if (non_existent && !disconnected)
             {
-              this->event_channel_not_exist (gateway_ ACE_ENV_ARG_PARAMETER);
+              this->event_channel_not_exist (gateway_);
             }
         }
       else
@@ -94,22 +87,21 @@ TAO_ECG_Reconnect_ConsumerEC_Control::query_eventchannel (
            this->try_reconnect();
         }
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+  catch (const CORBA::OBJECT_NOT_EXIST& ex)
     {
-      this->event_channel_not_exist (gateway_ ACE_ENV_ARG_PARAMETER);
+      this->event_channel_not_exist (gateway_);
     }
-  ACE_CATCH (CORBA::TRANSIENT, transient)
+  catch (const CORBA::TRANSIENT& transient)
     {
       // This is TAO's minor code for a failed connection, we may
       // want to be more lenient in the future..
       // if (transient.minor () == 0x54410085)
-      this->event_channel_not_exist (gateway_ ACE_ENV_ARG_PARAMETER);
+      this->event_channel_not_exist (gateway_);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore all exceptions
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -124,52 +116,46 @@ TAO_ECG_Reconnect_ConsumerEC_Control::handle_timeout (
   // remote calls will be carried out with with
   // RELATIVE_RT_TIMEOUT_POLICY set here in effect.
   // @@ TODO: should use Guard to set and reset policies.
-  ACE_TRY_NEW_ENV
+  try
     {
       // Query the state of the Current object *before* we initiate
       // the iteration...
       CORBA::PolicyTypeSeq types;
       CORBA::PolicyList_var policies =
-        this->policy_current_->get_policy_overrides (types
-                                                      ACE_ENV_ARG_PARAMETER);
+        this->policy_current_->get_policy_overrides (types);
 
       // Change the timeout
       this->policy_current_->set_policy_overrides (this->policy_list_,
-                                                   CORBA::ADD_OVERRIDE
-                                                    ACE_ENV_ARG_PARAMETER);
+                                                   CORBA::ADD_OVERRIDE);
 
       // Query the state of the consumers...
       this->query_eventchannel ();
 
       this->policy_current_->set_policy_overrides (policies.in (),
-                                                   CORBA::SET_OVERRIDE
-                                                    ACE_ENV_ARG_PARAMETER);
+                                                   CORBA::SET_OVERRIDE);
       for (CORBA::ULong i = 0; i != policies->length (); ++i)
         {
           policies[i]->destroy ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore all exceptions
     }
-  ACE_ENDTRY;
 }
 
 int
 TAO_ECG_Reconnect_ConsumerEC_Control::activate (void)
 {
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-  ACE_TRY_NEW_ENV
+  try
     {
       // Get the PolicyCurrent object
       CORBA::Object_var tmp =
-        this->orb_->resolve_initial_references ("PolicyCurrent"
-                                                 ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("PolicyCurrent");
 
       this->policy_current_ =
-        CORBA::PolicyCurrent::_narrow (tmp.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+        CORBA::PolicyCurrent::_narrow (tmp.in ());
 
       // Timeout for polling state (default = 10 msec)
       TimeBase::TimeT timeout = timeout_.usec() * 10;
@@ -180,8 +166,7 @@ TAO_ECG_Reconnect_ConsumerEC_Control::activate (void)
       this->policy_list_[0] =
         this->orb_->create_policy (
                Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-               any
-               ACE_ENV_ARG_PARAMETER);
+               any);
 
       // Only schedule the timer, when the rate is not zero
       if (this->rate_ != ACE_Time_Value::zero)
@@ -197,11 +182,10 @@ TAO_ECG_Reconnect_ConsumerEC_Control::activate (void)
           return -1;
       }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       return -1;
     }
-  ACE_ENDTRY;
 #endif /* TAO_HAS_CORBA_MESSAGING */
 
   return 0;
@@ -222,10 +206,9 @@ TAO_ECG_Reconnect_ConsumerEC_Control::shutdown (void)
 
 void
 TAO_ECG_Reconnect_ConsumerEC_Control::event_channel_not_exist (
-      TAO_EC_Gateway_IIOP* gateway
-      ACE_ENV_ARG_DECL)
+      TAO_EC_Gateway_IIOP* gateway)
 {
-  ACE_TRY
+  try
     {
       //ACE_DEBUG ((LM_DEBUG,
       //            "ECG_Reconnect_ConsumerControl(%P|%t) - "
@@ -236,22 +219,20 @@ TAO_ECG_Reconnect_ConsumerEC_Control::event_channel_not_exist (
 
       gateway->cleanup_consumer_proxies ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "TAO_EC_Reconnect_ConsumerControl::event_channel_not_exist");
+      ex._tao_print_exception (
+        "TAO_EC_Reconnect_ConsumerControl::event_channel_not_exist");
       // Ignore all exceptions..
     }
-  ACE_ENDTRY;
 }
 
 void
 TAO_ECG_Reconnect_ConsumerEC_Control::system_exception (
       TAO_EC_Gateway_IIOP* gateway,
-      CORBA::SystemException & /* exception */
-      ACE_ENV_ARG_DECL)
+      CORBA::SystemException & /* exception */)
 {
-  ACE_TRY
+  try
     {
       // The current implementation is very strict, and kicks out a
       // client on the first system exception. We may
@@ -272,11 +253,10 @@ TAO_ECG_Reconnect_ConsumerEC_Control::system_exception (
 
       gateway->cleanup_consumer_proxies ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore all exceptions..
     }
-  ACE_ENDTRY;
 }
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h
index 1bb9a0bef76..710a20fcb3b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h
@@ -89,11 +89,9 @@ public:
   // = Documented in TAO_EC_ConsumerControl
   virtual int activate (void);
   virtual int shutdown (void);
-  virtual void event_channel_not_exist (TAO_EC_Gateway_IIOP *gateway
-                                        ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void event_channel_not_exist (TAO_EC_Gateway_IIOP *gateway);
   virtual void system_exception (TAO_EC_Gateway_IIOP *gateway,
-                                 CORBA::SystemException &
-                                 ACE_ENV_ARG_DECL_NOT_USED);
+                                 CORBA::SystemException &);
 
 private:
   /// Check if the consumers still exists.  It is a helper method for
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp
index 25d111d0a07..a115866b93a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp
@@ -25,8 +25,7 @@ TAO_ECG_Simple_Address_Server::init (const char *mcast_addr)
 void
 TAO_ECG_Simple_Address_Server::get_addr (
     const RtecEventComm::EventHeader& /*header*/,
-    RtecUDPAdmin::UDP_Addr_out addr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    RtecUDPAdmin::UDP_Addr_out addr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // unsigned long
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
index 482661168e0..8ff36c72745 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
@@ -44,8 +44,7 @@ public:
 
   // = The RtecUDPAdmin::AddrServer methods
   virtual void get_addr (const RtecEventComm::EventHeader& header,
-                         RtecUDPAdmin::UDP_Addr_out addr
-                         ACE_ENV_ARG_DECL)
+                         RtecUDPAdmin::UDP_Addr_out addr)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
index 8148250d41e..4c7871f5e89 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
@@ -29,8 +29,7 @@ TAO_ECG_UDP_Receiver::~TAO_ECG_UDP_Receiver (void)
 void
 TAO_ECG_UDP_Receiver::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
                             TAO_ECG_Refcounted_Endpoint ignore_from,
-                            RtecUDPAdmin::AddrServer_ptr addr_server
-                            ACE_ENV_ARG_DECL)
+                            RtecUDPAdmin::AddrServer_ptr addr_server)
 {
   // Verify arguments.
   // <addr_server> is allowed to be nil.  But then, if get_addr () method
@@ -40,7 +39,7 @@ TAO_ECG_UDP_Receiver::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
       ACE_ERROR ((LM_ERROR,
                   "TAO_ECG_UDP_Receiver::init(): "
                   "<lcl_ec> argument is nil.\n"));
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   this->cdr_receiver_.init (ignore_from);
@@ -53,15 +52,14 @@ TAO_ECG_UDP_Receiver::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
 }
 
 void
-TAO_ECG_UDP_Receiver::connect (const RtecEventChannelAdmin::SupplierQOS& pub
-                               ACE_ENV_ARG_DECL)
+TAO_ECG_UDP_Receiver::connect (const RtecEventChannelAdmin::SupplierQOS& pub)
 {
   if (CORBA::is_nil (this->lcl_ec_.in ()))
     {
       ACE_ERROR ((LM_ERROR,
                   "Error initializing TAO_ECG_UDP_Receiver: "
                   "init() hasn't been called before connect().\n"));
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   if (pub.publications.length () == 0)
@@ -69,22 +67,21 @@ TAO_ECG_UDP_Receiver::connect (const RtecEventChannelAdmin::SupplierQOS& pub
       ACE_ERROR ((LM_ERROR,
                   "TAO_ECG_UDP_Receiver::connect(): "
                   "0-length publications argument.\n"));
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     {
-      this->new_connect (pub ACE_ENV_ARG_PARAMETER);
+      this->new_connect (pub);
     }
   else
     {
-      this->reconnect (pub ACE_ENV_ARG_PARAMETER);
+      this->reconnect (pub);
     }
 }
 
 void
-TAO_ECG_UDP_Receiver::new_connect (const RtecEventChannelAdmin::SupplierQOS& pub
-                                   ACE_ENV_ARG_DECL)
+TAO_ECG_UDP_Receiver::new_connect (const RtecEventChannelAdmin::SupplierQOS& pub)
 {
   // Activate with poa.
   RtecEventComm::PushSupplier_var supplier_ref;
@@ -94,8 +91,7 @@ TAO_ECG_UDP_Receiver::new_connect (const RtecEventChannelAdmin::SupplierQOS& pub
   activate (supplier_ref,
             poa.in (),
             this,
-            deactivator
-            ACE_ENV_ARG_PARAMETER);
+            deactivator);
 
   // Connect as a supplier to the local EC.
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
@@ -106,8 +102,7 @@ TAO_ECG_UDP_Receiver::new_connect (const RtecEventChannelAdmin::SupplierQOS& pub
   ECG_Receiver_Auto_Proxy_Disconnect new_proxy_disconnect (proxy.in ());
 
   proxy->connect_push_supplier (supplier_ref.in (),
-                                pub
-                                ACE_ENV_ARG_PARAMETER);
+                                pub);
 
   // Update resource managers.
   this->consumer_proxy_ = proxy._retn ();
@@ -116,26 +111,24 @@ TAO_ECG_UDP_Receiver::new_connect (const RtecEventChannelAdmin::SupplierQOS& pub
 }
 
 void
-TAO_ECG_UDP_Receiver::reconnect (const RtecEventChannelAdmin::SupplierQOS& pub
-                                 ACE_ENV_ARG_DECL)
+TAO_ECG_UDP_Receiver::reconnect (const RtecEventChannelAdmin::SupplierQOS& pub)
 {
   // Obtain our object reference from the POA.
   RtecEventComm::PushSupplier_var supplier_ref;
   PortableServer::POA_var poa = this->_default_POA ();
 
-  CORBA::Object_var obj = poa->servant_to_reference (this ACE_ENV_ARG_PARAMETER);
+  CORBA::Object_var obj = poa->servant_to_reference (this);
   supplier_ref =
-    RtecEventComm::PushSupplier::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+    RtecEventComm::PushSupplier::_narrow (obj.in ());
 
   if (CORBA::is_nil (supplier_ref.in ()))
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   // Reconnect.
   this->consumer_proxy_->connect_push_supplier (supplier_ref.in (),
-                                                pub
-                                                ACE_ENV_ARG_PARAMETER);
+                                                pub);
 }
 
 void
@@ -190,8 +183,7 @@ TAO_ECG_Event_CDR_Decoder::decode (TAO_InputCDR &cdr)
 int
 TAO_ECG_UDP_Receiver::handle_input (ACE_SOCK_Dgram& dgram)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Make sure we are connected to the Event Channel before proceeding
       // any further.
@@ -222,17 +214,16 @@ TAO_ECG_UDP_Receiver::handle_input (ACE_SOCK_Dgram& dgram)
                             0);
         }
 
-      this->consumer_proxy_->push (cdr_decoder.events ACE_ENV_ARG_PARAMETER);
+      this->consumer_proxy_->push (cdr_decoder.events);
     }
 
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_ERROR ((LM_ERROR,
                   "Caught and swallowed EXCEPTION in "
                   "ECG_UDP_Receiver::handle_input: %s\n",
-                  ACE_ANY_EXCEPTION._info ().c_str ()));
+                  ex._info ().c_str ()));
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
index 29909831f89..34c19e3eeaa 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
@@ -136,8 +136,7 @@ public:
    */
   void init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
              TAO_ECG_Refcounted_Endpoint ignore_from,
-             RtecUDPAdmin::AddrServer_ptr addr_server
-             ACE_ENV_ARG_DECL);
+             RtecUDPAdmin::AddrServer_ptr addr_server);
 
   /// Connect or reconnect to the EC with the given publications.
   /**
@@ -145,8 +144,7 @@ public:
    * necessary, the EC must have reconnects enabled in order for this
    * method to succeed.
    */
-  void connect (const RtecEventChannelAdmin::SupplierQOS& pub
-                ACE_ENV_ARG_DECL);
+  void connect (const RtecEventChannelAdmin::SupplierQOS& pub);
 
   /// Set the handler we must notify when shutdown occurs.  (This is
   /// the handler that alerts us when data is available on udp/mcast socket.)
@@ -168,8 +166,7 @@ public:
   /// Call the RtecUDPAdmin::AddrServer::get_addr.  Throws exception
   /// if nill Address Server was specified in init ().
   void get_addr (const RtecEventComm::EventHeader& header,
-                 RtecUDPAdmin::UDP_Addr_out addr
-                 ACE_ENV_ARG_DECL);
+                 RtecUDPAdmin::UDP_Addr_out addr);
 
   /// The PushSupplier idl method.
   /// Invokes shutdown (), which may result in the object being deleted, if
@@ -197,12 +194,10 @@ private:
   /// Helpers for the connect() method.
   //@{
   // Establishes connection to the Event Channel for the first time.
-  void new_connect (const RtecEventChannelAdmin::SupplierQOS& pub
-                    ACE_ENV_ARG_DECL);
+  void new_connect (const RtecEventChannelAdmin::SupplierQOS& pub);
 
   // Updates existing connection to the Event Channel.
-  void reconnect (const RtecEventChannelAdmin::SupplierQOS& pub
-                  ACE_ENV_ARG_DECL);
+  void reconnect (const RtecEventChannelAdmin::SupplierQOS& pub);
   //@}
 
   /// Event Channel to which we act as a supplier.
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl
index 5b11edc393c..8c0ab413f76 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl
@@ -85,8 +85,7 @@ TAO_ECG_UDP_Receiver::set_handler_shutdown (
 
 ACE_INLINE void
 TAO_ECG_UDP_Receiver::get_addr (const RtecEventComm::EventHeader& header,
-                                RtecUDPAdmin::UDP_Addr_out addr
-                                ACE_ENV_ARG_DECL)
+                                RtecUDPAdmin::UDP_Addr_out addr)
 {
   if (CORBA::is_nil (this->addr_server_.in ()))
     {
@@ -95,11 +94,10 @@ TAO_ECG_UDP_Receiver::get_addr (const RtecEventComm::EventHeader& header,
                   "nil Address Server was supplied during "
                   "initialization through init().\n"));
 
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
-  this->addr_server_->get_addr (header, addr
-                                ACE_ENV_ARG_PARAMETER);
+  this->addr_server_->get_addr (header, addr);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
index 2db287e18af..f3c26bba399 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
@@ -32,24 +32,23 @@ TAO_ECG_UDP_Sender::~TAO_ECG_UDP_Sender (void)
 void
 TAO_ECG_UDP_Sender::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
                           RtecUDPAdmin::AddrServer_ptr addr_server,
-                          TAO_ECG_Refcounted_Endpoint endpoint_rptr
-                          ACE_ENV_ARG_DECL)
+                          TAO_ECG_Refcounted_Endpoint endpoint_rptr)
 {
   if (CORBA::is_nil (lcl_ec))
     {
       ACE_ERROR ((LM_ERROR, "TAO_ECG_UDP_Sender::init(): "
                             "<lcl_ec> argument is nil."));
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   if (CORBA::is_nil (addr_server))
     {
       ACE_ERROR ((LM_ERROR, "TAO_ECG_UDP_Sender::init(): "
                             "address server argument is nil."));
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
-  this->cdr_sender_.init (endpoint_rptr ACE_ENV_ARG_PARAMETER);
+  this->cdr_sender_.init (endpoint_rptr);
 
   this->lcl_ec_ =
     RtecEventChannelAdmin::EventChannel::_duplicate (lcl_ec);
@@ -59,36 +58,34 @@ TAO_ECG_UDP_Sender::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
 }
 
 void
-TAO_ECG_UDP_Sender::connect (const RtecEventChannelAdmin::ConsumerQOS& sub
-                             ACE_ENV_ARG_DECL)
+TAO_ECG_UDP_Sender::connect (const RtecEventChannelAdmin::ConsumerQOS& sub)
 {
   if (CORBA::is_nil (this->lcl_ec_.in ()))
     {
       ACE_ERROR ((LM_ERROR, "Error initializing TAO_ECG_UDP_Sender: "
                             "init() has not been called before connect()."));
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   if (sub.dependencies.length () == 0)
     {
       ACE_ERROR ((LM_ERROR, "TAO_ECG_UDP_Sender::connect(): "
                             "0-length subscriptions argument."));
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     {
-      this->new_connect (sub ACE_ENV_ARG_PARAMETER);
+      this->new_connect (sub);
     }
   else
     {
-      this->reconnect (sub ACE_ENV_ARG_PARAMETER);
+      this->reconnect (sub);
     }
 }
 
 void
-TAO_ECG_UDP_Sender::new_connect (const RtecEventChannelAdmin::ConsumerQOS& sub
-                                 ACE_ENV_ARG_DECL)
+TAO_ECG_UDP_Sender::new_connect (const RtecEventChannelAdmin::ConsumerQOS& sub)
 {
   // Activate with poa.
   RtecEventComm::PushConsumer_var consumer_ref;
@@ -98,8 +95,7 @@ TAO_ECG_UDP_Sender::new_connect (const RtecEventChannelAdmin::ConsumerQOS& sub
   activate (consumer_ref,
             poa.in (),
             this,
-            deactivator
-            ACE_ENV_ARG_PARAMETER);
+            deactivator);
 
   // Connect as a consumer to the local EC.
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
@@ -110,8 +106,7 @@ TAO_ECG_UDP_Sender::new_connect (const RtecEventChannelAdmin::ConsumerQOS& sub
   ECG_Sender_Auto_Proxy_Disconnect new_proxy_disconnect (proxy.in ());
 
   proxy->connect_push_consumer (consumer_ref.in (),
-                                sub
-                                ACE_ENV_ARG_PARAMETER);
+                                sub);
 
   // Update resource managers.
   this->supplier_proxy_ = proxy._retn ();
@@ -120,26 +115,24 @@ TAO_ECG_UDP_Sender::new_connect (const RtecEventChannelAdmin::ConsumerQOS& sub
 }
 
 void
-TAO_ECG_UDP_Sender::reconnect (const RtecEventChannelAdmin::ConsumerQOS& sub
-                               ACE_ENV_ARG_DECL)
+TAO_ECG_UDP_Sender::reconnect (const RtecEventChannelAdmin::ConsumerQOS& sub)
 {
   // Obtain our object reference from the POA.
   RtecEventComm::PushConsumer_var consumer_ref;
   PortableServer::POA_var poa = this->_default_POA ();
 
-  CORBA::Object_var obj = poa->servant_to_reference (this ACE_ENV_ARG_PARAMETER);
+  CORBA::Object_var obj = poa->servant_to_reference (this);
   consumer_ref =
-    RtecEventComm::PushConsumer::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+    RtecEventComm::PushConsumer::_narrow (obj.in ());
 
   if (CORBA::is_nil (consumer_ref.in ()))
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   // Reconnect.
   this->supplier_proxy_->connect_push_consumer (consumer_ref.in (),
-                                                sub
-                                                ACE_ENV_ARG_PARAMETER);
+                                                sub);
 }
 
 void
@@ -168,8 +161,7 @@ TAO_ECG_UDP_Sender::shutdown (void)
 }
 
 void
-TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events
-                          ACE_ENV_ARG_DECL)
+TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
@@ -207,16 +199,16 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events
       cdr.write_ulong (1);
       if (!(cdr << header)
           || !(cdr << e.data))
-        ACE_THROW (CORBA::MARSHAL ());
+        throw CORBA::MARSHAL ();
 
       // Grab the right mcast group for this event...
       RtecUDPAdmin::UDP_Addr udp_addr;
-      this->addr_server_->get_addr (header, udp_addr ACE_ENV_ARG_PARAMETER);
+      this->addr_server_->get_addr (header, udp_addr);
 
       ACE_INET_Addr inet_addr (udp_addr.port,
                                udp_addr.ipaddr);
 
-      this->cdr_sender_.send_message (cdr, inet_addr ACE_ENV_ARG_PARAMETER);
+      this->cdr_sender_.send_message (cdr, inet_addr);
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
index 6ad39c52b89..29b7306ab74 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
@@ -136,8 +136,7 @@ public:
    */
   void init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
              RtecUDPAdmin::AddrServer_ptr addr_server,
-             TAO_ECG_Refcounted_Endpoint endpoint_rptr
-             ACE_ENV_ARG_DECL);
+             TAO_ECG_Refcounted_Endpoint endpoint_rptr);
 
   /// Connect or reconnect to the EC with the given subscriptions.
   /**
@@ -145,8 +144,7 @@ public:
    * necessary, the EC must have reconnects enabled in order for this
    * method to succeed.
    */
-  void connect (const RtecEventChannelAdmin::ConsumerQOS &sub
-                ACE_ENV_ARG_DECL);
+  void connect (const RtecEventChannelAdmin::ConsumerQOS &sub);
 
   /// Deactivate from POA and disconnect from EC, if necessary.  Shut
   /// down all sender components.
@@ -178,8 +176,7 @@ public:
   /// refcounting is used to manage its lifetime.
   virtual void disconnect_push_consumer (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void push (const RtecEventComm::EventSet &events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet &events)
       ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
@@ -194,12 +191,10 @@ private:
   /// Helpers for the connect() method.
   //@{
   // Establishes connection to the Event Channel for the first time.
-  void new_connect (const RtecEventChannelAdmin::ConsumerQOS& sub
-                    ACE_ENV_ARG_DECL);
+  void new_connect (const RtecEventChannelAdmin::ConsumerQOS& sub);
 
   // Updates existing connection to the Event Channel.
-  void reconnect (const RtecEventChannelAdmin::ConsumerQOS& sub
-                  ACE_ENV_ARG_DECL);
+  void reconnect (const RtecEventChannelAdmin::ConsumerQOS& sub);
   //@}
 
   /// Proxy used to receive events from the Event Channel.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
index 7a01d634e15..335f20b9854 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
@@ -55,13 +55,12 @@ TAO_EC_And_Filter::size (void) const
 
 int
 TAO_EC_And_Filter::filter (const RtecEventComm::EventSet& event,
-                           TAO_EC_QOS_Info& qos_info
-                           ACE_ENV_ARG_DECL)
+                           TAO_EC_QOS_Info& qos_info)
 {
   ChildrenIterator end = this->end ();
   for (ChildrenIterator i = this->begin (); i != end; ++i)
     {
-      int n = (*i)->filter (event, qos_info ACE_ENV_ARG_PARAMETER);
+      int n = (*i)->filter (event, qos_info);
       if (n == 0)
         return 0;
     }
@@ -69,7 +68,7 @@ TAO_EC_And_Filter::filter (const RtecEventComm::EventSet& event,
   // All children accepted the event, push up...
   if (this->parent () != 0)
     {
-      this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER);
+      this->parent ()->push (event, qos_info);
     }
 
   return 1;
@@ -77,13 +76,12 @@ TAO_EC_And_Filter::filter (const RtecEventComm::EventSet& event,
 
 int
 TAO_EC_And_Filter::filter_nocopy (RtecEventComm::EventSet& event,
-                                  TAO_EC_QOS_Info& qos_info
-                                  ACE_ENV_ARG_DECL)
+                                  TAO_EC_QOS_Info& qos_info)
 {
   ChildrenIterator end = this->end ();
   for (ChildrenIterator i = this->begin (); i != end; ++i)
     {
-      int n = (*i)->filter_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
+      int n = (*i)->filter_nocopy (event, qos_info);
       if (n == 0)
         return 0;
     }
@@ -91,7 +89,7 @@ TAO_EC_And_Filter::filter_nocopy (RtecEventComm::EventSet& event,
   // All children accepted the event, push up...
   if (this->parent () != 0)
     {
-      this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER);
+      this->parent ()->push (event, qos_info);
     }
 
   return 1;
@@ -99,15 +97,13 @@ TAO_EC_And_Filter::filter_nocopy (RtecEventComm::EventSet& event,
 
 void
 TAO_EC_And_Filter::push (const RtecEventComm::EventSet&,
-                         TAO_EC_QOS_Info&
-                         ACE_ENV_ARG_DECL_NOT_USED)
+                         TAO_EC_QOS_Info&)
 {
 }
 
 void
 TAO_EC_And_Filter::push_nocopy (RtecEventComm::EventSet&,
-                                TAO_EC_QOS_Info&
-                                ACE_ENV_ARG_DECL_NOT_USED)
+                                TAO_EC_QOS_Info&)
 {
 }
 
@@ -157,8 +153,7 @@ TAO_EC_And_Filter::can_match (
 int
 TAO_EC_And_Filter::add_dependencies (
       const RtecEventComm::EventHeader&,
-      const TAO_EC_QOS_Info&
-      ACE_ENV_ARG_DECL_NOT_USED)
+      const TAO_EC_QOS_Info&)
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h
index 67c9614af70..64279931341 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h
@@ -53,23 +53,18 @@ public:
   virtual ChildrenIterator end (void) const;
   virtual int size (void) const;
   virtual int filter (const RtecEventComm::EventSet& event,
-                      TAO_EC_QOS_Info& qos_info
-                      ACE_ENV_ARG_DECL);
+                      TAO_EC_QOS_Info& qos_info);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL);
+                             TAO_EC_QOS_Info& qos_info);
   virtual void push (const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info
-                     ACE_ENV_ARG_DECL);
+                     TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info
-                            ACE_ENV_ARG_DECL);
+                            TAO_EC_QOS_Info& qos_info);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info &qos_info
-                                ACE_ENV_ARG_DECL);
+                                const TAO_EC_QOS_Info &qos_info);
 
 private:
   TAO_EC_And_Filter (const TAO_EC_And_Filter&);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
index 26f4df71ff0..fc231d2186d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
@@ -27,8 +27,7 @@ TAO_EC_Basic_Filter_Builder::~TAO_EC_Basic_Filter_Builder (void)
 TAO_EC_Filter*
 TAO_EC_Basic_Filter_Builder::build (
     TAO_EC_ProxyPushSupplier *supplier,
-    RtecEventChannelAdmin::ConsumerQOS& qos
-    ACE_ENV_ARG_DECL_NOT_USED) const
+    RtecEventChannelAdmin::ConsumerQOS& qos) const
 {
   CORBA::ULong pos = 0;
   return this->recursive_build (supplier, qos, pos);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
index 91e4c61105f..1c6815b3695 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
@@ -51,8 +51,7 @@ public:
 
   // = The TAO_EC_Filter_Builder methods...
   TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier,
-                        RtecEventChannelAdmin::ConsumerQOS& qos
-                        ACE_ENV_ARG_DECL) const;
+                        RtecEventChannelAdmin::ConsumerQOS& qos) const;
 
 private:
   /// Recursively build the filter tree.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp
index 7701ba4d1d1..5a2c20f3083 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp
@@ -41,8 +41,7 @@ TAO_EC_Bitmask_Filter::size (void) const
 
 int
 TAO_EC_Bitmask_Filter::filter (const RtecEventComm::EventSet& event,
-                                TAO_EC_QOS_Info& qos_info
-                                ACE_ENV_ARG_DECL)
+                                TAO_EC_QOS_Info& qos_info)
 {
   if (event.length () != 1)
     return 0;
@@ -51,13 +50,12 @@ TAO_EC_Bitmask_Filter::filter (const RtecEventComm::EventSet& event,
       || (event[0].header.source & this->source_mask_) == 0)
     return 0;
 
-  return this->child_->filter (event, qos_info ACE_ENV_ARG_PARAMETER);
+  return this->child_->filter (event, qos_info);
 }
 
 int
 TAO_EC_Bitmask_Filter::filter_nocopy (RtecEventComm::EventSet& event,
-                                   TAO_EC_QOS_Info& qos_info
-                                   ACE_ENV_ARG_DECL)
+                                   TAO_EC_QOS_Info& qos_info)
 {
   if (event.length () != 1)
     return 0;
@@ -66,25 +64,23 @@ TAO_EC_Bitmask_Filter::filter_nocopy (RtecEventComm::EventSet& event,
       || (event[0].header.source & this->source_mask_) == 0)
     return 0;
 
-  return this->child_->filter_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
+  return this->child_->filter_nocopy (event, qos_info);
 }
 
 void
 TAO_EC_Bitmask_Filter::push (const RtecEventComm::EventSet &event,
-                             TAO_EC_QOS_Info &qos_info
-                             ACE_ENV_ARG_DECL)
+                             TAO_EC_QOS_Info &qos_info)
 {
   if (this->parent () != 0)
-    this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER);
+    this->parent ()->push (event, qos_info);
 }
 
 void
 TAO_EC_Bitmask_Filter::push_nocopy (RtecEventComm::EventSet &event,
-                                    TAO_EC_QOS_Info &qos_info
-                                    ACE_ENV_ARG_DECL)
+                                    TAO_EC_QOS_Info &qos_info)
 {
   if (this->parent () != 0)
-    this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
+    this->parent ()->push_nocopy (event, qos_info);
 }
 
 void
@@ -113,8 +109,7 @@ TAO_EC_Bitmask_Filter::can_match (
 int
 TAO_EC_Bitmask_Filter::add_dependencies (
       const RtecEventComm::EventHeader&,
-      const TAO_EC_QOS_Info &
-      ACE_ENV_ARG_DECL_NOT_USED)
+      const TAO_EC_QOS_Info &)
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h
index bc2a3469d00..6a0ff879165 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h
@@ -70,23 +70,18 @@ public:
   virtual ChildrenIterator end (void) const;
   virtual int size (void) const;
   virtual int filter (const RtecEventComm::EventSet& event,
-                      TAO_EC_QOS_Info& qos_info
-                      ACE_ENV_ARG_DECL);
+                      TAO_EC_QOS_Info& qos_info);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL);
+                             TAO_EC_QOS_Info& qos_info);
   virtual void push (const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info
-                     ACE_ENV_ARG_DECL);
+                     TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info
-                            ACE_ENV_ARG_DECL);
+                            TAO_EC_QOS_Info& qos_info);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info &qos_info
-                                ACE_ENV_ARG_DECL);
+                                const TAO_EC_QOS_Info &qos_info);
 
 private:
   TAO_EC_Bitmask_Filter (const TAO_EC_Bitmask_Filter&);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp
index cdceb92356d..81912d74e57 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp
@@ -15,15 +15,13 @@ TAO_EC_Channel_Destroyer_Functor::operator() (
                            TAO_EC_Event_Channel_Base * event_channel)
   ACE_THROW_SPEC (())
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       event_channel->destroy ();
     }
-  ACE_CATCHALL
+  catch (...)
     {
     }
-  ACE_ENDTRY;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
index 22412e08276..ff6f91ecd91 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
@@ -80,15 +80,14 @@ TAO_EC_Conjunction_Filter::size (void) const
 
 int
 TAO_EC_Conjunction_Filter::filter (const RtecEventComm::EventSet& event,
-                                   TAO_EC_QOS_Info& qos_info
-                                   ACE_ENV_ARG_DECL)
+                                   TAO_EC_QOS_Info& qos_info)
 {
   ChildrenIterator end = this->end ();
   for (this->current_child_ = this->begin ();
        this->current_child_ != end;
        ++this->current_child_)
     {
-      int n = (*this->current_child_)->filter (event, qos_info ACE_ENV_ARG_PARAMETER);
+      int n = (*this->current_child_)->filter (event, qos_info);
       if (n != 0)
         return n;
     }
@@ -97,15 +96,14 @@ TAO_EC_Conjunction_Filter::filter (const RtecEventComm::EventSet& event,
 
 int
 TAO_EC_Conjunction_Filter::filter_nocopy (RtecEventComm::EventSet& event,
-                                          TAO_EC_QOS_Info& qos_info
-                                          ACE_ENV_ARG_DECL)
+                                          TAO_EC_QOS_Info& qos_info)
 {
   ChildrenIterator end = this->end ();
   for (ChildrenIterator i = this->begin ();
        i != end;
        ++i)
     {
-      int n = (*i)->filter_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
+      int n = (*i)->filter_nocopy (event, qos_info);
       if (n != 0)
         return n;
     }
@@ -114,8 +112,7 @@ TAO_EC_Conjunction_Filter::filter_nocopy (RtecEventComm::EventSet& event,
 
 void
 TAO_EC_Conjunction_Filter::push (const RtecEventComm::EventSet& event,
-                                 TAO_EC_QOS_Info& qos_info
-                                 ACE_ENV_ARG_DECL)
+                                 TAO_EC_QOS_Info& qos_info)
 {
   CORBA::Long pos = this->current_child_ - this->begin ();
   int w = pos / bits_per_word;
@@ -131,15 +128,14 @@ TAO_EC_Conjunction_Filter::push (const RtecEventComm::EventSet& event,
       this->event_[l + i] = event[i];
     }
   if (this->all_received () && this->parent () != 0)
-    this->parent ()->push_nocopy (this->event_, qos_info ACE_ENV_ARG_PARAMETER);
+    this->parent ()->push_nocopy (this->event_, qos_info);
 }
 
 void
 TAO_EC_Conjunction_Filter::push_nocopy (RtecEventComm::EventSet& event,
-                                        TAO_EC_QOS_Info& qos_info
-                                        ACE_ENV_ARG_DECL)
+                                        TAO_EC_QOS_Info& qos_info)
 {
-  this->push (event, qos_info ACE_ENV_ARG_PARAMETER);
+  this->push (event, qos_info);
 }
 
 void
@@ -198,8 +194,7 @@ TAO_EC_Conjunction_Filter::can_match (
 int
 TAO_EC_Conjunction_Filter::add_dependencies (
       const RtecEventComm::EventHeader&,
-      const TAO_EC_QOS_Info&
-      ACE_ENV_ARG_DECL_NOT_USED)
+      const TAO_EC_QOS_Info&)
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
index e50d6b37867..830e5f49ef3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
@@ -55,23 +55,18 @@ public:
   virtual ChildrenIterator end (void) const;
   virtual int size (void) const;
   virtual int filter (const RtecEventComm::EventSet& event,
-                      TAO_EC_QOS_Info& qos_info
-                      ACE_ENV_ARG_DECL);
+                      TAO_EC_QOS_Info& qos_info);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL);
+                             TAO_EC_QOS_Info& qos_info);
   virtual void push (const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info
-                     ACE_ENV_ARG_DECL);
+                     TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info
-                            ACE_ENV_ARG_DECL);
+                            TAO_EC_QOS_Info& qos_info);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info &qos_info
-                                ACE_ENV_ARG_DECL);
+                                const TAO_EC_QOS_Info &qos_info);
 
   typedef unsigned int Word;
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
index 007d90bd404..f037ca17b53 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
@@ -27,15 +27,13 @@ TAO_EC_ConsumerControl::shutdown (void)
 }
 
 void
-TAO_EC_ConsumerControl::consumer_not_exist (TAO_EC_ProxyPushSupplier *
-                                            ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_ConsumerControl::consumer_not_exist (TAO_EC_ProxyPushSupplier *)
 {
 }
 
 void
 TAO_EC_ConsumerControl::system_exception (TAO_EC_ProxyPushSupplier *,
-                                          CORBA::SystemException &
-                                          ACE_ENV_ARG_DECL_NOT_USED)
+                                          CORBA::SystemException &)
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h
index 281fe09f0d3..91ae370d1d7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h
@@ -66,14 +66,12 @@ public:
    * has been destroyed.  The strategy has to (at the very least),
    * reclaim all the resources attached to that object.
    */
-  virtual void consumer_not_exist (TAO_EC_ProxyPushSupplier *proxy
-                                   ACE_ENV_ARG_DECL);
+  virtual void consumer_not_exist (TAO_EC_ProxyPushSupplier *proxy);
 
   /// Some system exception was raised while trying to contact the
   /// consumer
   virtual void system_exception (TAO_EC_ProxyPushSupplier *proxy,
-                                 CORBA::SystemException &
-                                 ACE_ENV_ARG_DECL);
+                                 CORBA::SystemException &);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp
index 01b3cd76bdb..4b7326eb36d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp
@@ -25,8 +25,7 @@ TAO_EC_Default_ProxyPushConsumer::~TAO_EC_Default_ProxyPushConsumer (void)
 void
 TAO_EC_Default_ProxyPushConsumer::connect_push_supplier (
       RtecEventComm::PushSupplier_ptr push_supplier,
-      const RtecEventChannelAdmin::SupplierQOS& qos
-      ACE_ENV_ARG_DECL)
+      const RtecEventChannelAdmin::SupplierQOS& qos)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RtecEventChannelAdmin::AlreadyConnected))
 {
@@ -39,7 +38,7 @@ TAO_EC_Default_ProxyPushConsumer::connect_push_supplier (
     if (this->is_connected_i ())
       {
         if (this->event_channel_->supplier_reconnect () == 0)
-          ACE_THROW (RtecEventChannelAdmin::AlreadyConnected ());
+          throw RtecEventChannelAdmin::AlreadyConnected ();
 
         // Re-connections are allowed, go ahead and disconnect the
         // consumer...
@@ -55,7 +54,7 @@ TAO_EC_Default_ProxyPushConsumer::connect_push_supplier (
               CORBA::INTERNAL ());
           // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
 
-          this->event_channel_->reconnected (this ACE_ENV_ARG_PARAMETER);
+          this->event_channel_->reconnected (this);
         }
 
         // A separate thread could have connected siomultaneously,
@@ -81,12 +80,11 @@ TAO_EC_Default_ProxyPushConsumer::connect_push_supplier (
   }
 
   // Notify the event channel...
-  this->event_channel_->connected (this ACE_ENV_ARG_PARAMETER);
+  this->event_channel_->connected (this);
 }
 
 void
-TAO_EC_Default_ProxyPushConsumer::push (const RtecEventComm::EventSet& event
-                                        ACE_ENV_ARG_DECL)
+TAO_EC_Default_ProxyPushConsumer::push (const RtecEventComm::EventSet& event)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_EC_ProxyPushConsumer_Guard ace_mon (this->lock_,
@@ -96,13 +94,11 @@ TAO_EC_Default_ProxyPushConsumer::push (const RtecEventComm::EventSet& event
   if (!ace_mon.locked ())
     return;
 
-  ace_mon.filter->push (event, this
-                        ACE_ENV_ARG_PARAMETER);
+  ace_mon.filter->push (event, this);
 }
 
 void
-TAO_EC_Default_ProxyPushConsumer::disconnect_push_consumer (
-      ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Default_ProxyPushConsumer::disconnect_push_consumer ()
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecEventComm::PushSupplier_var supplier;
@@ -123,7 +119,7 @@ TAO_EC_Default_ProxyPushConsumer::disconnect_push_consumer (
   }
 
   // Notify the event channel...
-  this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
+  this->event_channel_->disconnected (this);
 
   if (CORBA::is_nil (supplier.in ()))
     {
@@ -132,16 +128,15 @@ TAO_EC_Default_ProxyPushConsumer::disconnect_push_consumer (
 
   if (this->event_channel_->disconnect_callbacks ())
     {
-      ACE_TRY
+      try
         {
           supplier->disconnect_push_supplier ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           // Ignore exceptions, we must isolate other clients from
           // failures on this one.
         }
-      ACE_ENDTRY;
     }
 }
 
@@ -165,8 +160,7 @@ TAO_EC_Default_ProxyPushConsumer::_remove_ref (void)
 
 void
 TAO_EC_Default_ProxyPushConsumer::activate (
-   RtecEventChannelAdmin::ProxyPushConsumer_ptr &proxy
-   ACE_ENV_ARG_DECL)
+   RtecEventChannelAdmin::ProxyPushConsumer_ptr &proxy)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   proxy = this->_this ();
@@ -177,7 +171,7 @@ TAO_EC_Default_ProxyPushConsumer::object_id (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ObjectId_var result =
-    this->default_POA_->servant_to_id (this ACE_ENV_ARG_PARAMETER);
+    this->default_POA_->servant_to_id (this);
   return result.in ();
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
index 2afe9080b4f..5e518a211bf 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
@@ -49,19 +49,16 @@ public:
   virtual ~TAO_EC_Default_ProxyPushConsumer (void);
 
  virtual void activate (
-     RtecEventChannelAdmin::ProxyPushConsumer_ptr &proxy
-     ACE_ENV_ARG_DECL)
+     RtecEventChannelAdmin::ProxyPushConsumer_ptr &proxy)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = The RtecEventChannelAdmin::ProxyPushConsumer methods...
   virtual void connect_push_supplier (
                 RtecEventComm::PushSupplier_ptr push_supplier,
-                const RtecEventChannelAdmin::SupplierQOS& qos
-                ACE_ENV_ARG_DECL)
+                const RtecEventChannelAdmin::SupplierQOS& qos)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecEventChannelAdmin::AlreadyConnected));
-  virtual void push (const RtecEventComm::EventSet& event
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet& event)
       ACE_THROW_SPEC ((CORBA::SystemException));
   virtual void disconnect_push_consumer (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp
index 04fe2aee46b..5b2b612d69c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp
@@ -28,15 +28,14 @@ TAO_EC_Default_ProxyPushSupplier::~TAO_EC_Default_ProxyPushSupplier (void)
 void
 TAO_EC_Default_ProxyPushSupplier::connect_push_consumer (
       RtecEventComm::PushConsumer_ptr push_consumer,
-      const RtecEventChannelAdmin::ConsumerQOS& qos
-      ACE_ENV_ARG_DECL)
+      const RtecEventChannelAdmin::ConsumerQOS& qos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecEventChannelAdmin::AlreadyConnected,
                      RtecEventChannelAdmin::TypeError))
 {
   // Nil PushConsumers are illegal
   if (CORBA::is_nil (push_consumer))
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   {
     ACE_GUARD_THROW_EX (
@@ -47,7 +46,7 @@ TAO_EC_Default_ProxyPushSupplier::connect_push_consumer (
     if (this->is_connected_i ())
       {
         if (this->event_channel_->consumer_reconnect () == 0)
-          ACE_THROW (RtecEventChannelAdmin::AlreadyConnected ());
+          throw RtecEventChannelAdmin::AlreadyConnected ();
 
         // Re-connections are allowed....
         this->cleanup_i ();
@@ -57,8 +56,7 @@ TAO_EC_Default_ProxyPushSupplier::connect_push_consumer (
         this->qos_ = qos;
         this->child_ =
           this->event_channel_->filter_builder ()->build (this,
-                                                          this->qos_
-                                                          ACE_ENV_ARG_PARAMETER);
+                                                          this->qos_);
 
         this->adopt_child (this->child_);
 
@@ -70,7 +68,7 @@ TAO_EC_Default_ProxyPushSupplier::connect_push_consumer (
               CORBA::INTERNAL ());
           // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
 
-          this->event_channel_->reconnected (this ACE_ENV_ARG_PARAMETER);
+          this->event_channel_->reconnected (this);
         }
 
         // A separate thread could have connected simultaneously,
@@ -85,8 +83,7 @@ TAO_EC_Default_ProxyPushSupplier::connect_push_consumer (
       {
         // Validate connection during connect.
         CORBA::PolicyList_var unused;
-        int status = push_consumer->_validate_connection (unused
-                                                          ACE_ENV_ARG_PARAMETER);
+        int status = push_consumer->_validate_connection (unused);
 #if TAO_EC_ENABLE_DEBUG_MESSAGES
         ACE_DEBUG ((LM_DEBUG, "Validated connection to PushConsumer on connect. Status[%d]\n", status));
 #else
@@ -106,19 +103,17 @@ TAO_EC_Default_ProxyPushSupplier::connect_push_consumer (
 #endif /* TAO_EC_ENABLED_DEBUG_MESSAGES */
     this->child_ =
       this->event_channel_->filter_builder ()->build (this,
-                                                      this->qos_
-                                                      ACE_ENV_ARG_PARAMETER);
+                                                      this->qos_);
 
     this->adopt_child (this->child_);
   }
 
   // Notify the event channel...
-  this->event_channel_->connected (this ACE_ENV_ARG_PARAMETER);
+  this->event_channel_->connected (this);
 }
 
 void
-TAO_EC_Default_ProxyPushSupplier::disconnect_push_supplier (
-      ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Default_ProxyPushSupplier::disconnect_push_supplier ()
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecEventComm::PushConsumer_var consumer;
@@ -138,7 +133,7 @@ TAO_EC_Default_ProxyPushSupplier::disconnect_push_supplier (
   }
 
   // Notify the event channel....
-  this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
+  this->event_channel_->disconnected (this);
 
   if (!connected)
     {
@@ -147,18 +142,16 @@ TAO_EC_Default_ProxyPushSupplier::disconnect_push_supplier (
 
   if (this->event_channel_->disconnect_callbacks ())
     {
-      ACE_TRY
+      try
         {
           consumer->disconnect_push_consumer ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           // Ignore exceptions, we must isolate other clients from
           // problems on this one.
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "ProxySupplier::disconnect_push_supplier");
+          ex._tao_print_exception ("ProxySupplier::disconnect_push_supplier");
         }
-      ACE_ENDTRY;
     }
 }
 
@@ -196,8 +189,7 @@ TAO_EC_Default_ProxyPushSupplier::_remove_ref (void)
 
 void
 TAO_EC_Default_ProxyPushSupplier::activate (
-   RtecEventChannelAdmin::ProxyPushSupplier_ptr &proxy
-   ACE_ENV_ARG_DECL)
+   RtecEventChannelAdmin::ProxyPushSupplier_ptr &proxy)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   proxy = this->_this ();
@@ -208,7 +200,7 @@ TAO_EC_Default_ProxyPushSupplier::object_id (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ObjectId_var result =
-    this->default_POA_->servant_to_id (this ACE_ENV_ARG_PARAMETER);
+    this->default_POA_->servant_to_id (this);
 
   return result.in ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
index 5bdcc4453b4..d577085e134 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
@@ -44,15 +44,13 @@ public:
   virtual ~TAO_EC_Default_ProxyPushSupplier (void);
 
   void activate (
-     RtecEventChannelAdmin::ProxyPushSupplier_ptr &proxy
-     ACE_ENV_ARG_DECL)
+     RtecEventChannelAdmin::ProxyPushSupplier_ptr &proxy)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// IDL methods.
   virtual void connect_push_consumer (
                 RtecEventComm::PushConsumer_ptr push_consumer,
-                const RtecEventChannelAdmin::ConsumerQOS &qos
-                ACE_ENV_ARG_DECL)
+                const RtecEventChannelAdmin::ConsumerQOS &qos)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        RtecEventChannelAdmin::AlreadyConnected,
                        RtecEventChannelAdmin::TypeError));
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
index 82ae4e97f2b..51b47cc607c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
@@ -56,15 +56,14 @@ TAO_EC_Disjunction_Filter::size (void) const
 
 int
 TAO_EC_Disjunction_Filter::filter (const RtecEventComm::EventSet& event,
-                                   TAO_EC_QOS_Info& qos_info
-                                   ACE_ENV_ARG_DECL)
+                                   TAO_EC_QOS_Info& qos_info)
 {
   ChildrenIterator end = this->end ();
   for (ChildrenIterator i = this->begin ();
        i != end;
        ++i)
     {
-      int n = (*i)->filter (event, qos_info ACE_ENV_ARG_PARAMETER);
+      int n = (*i)->filter (event, qos_info);
       if (n != 0)
         return n;
     }
@@ -73,15 +72,14 @@ TAO_EC_Disjunction_Filter::filter (const RtecEventComm::EventSet& event,
 
 int
 TAO_EC_Disjunction_Filter::filter_nocopy (RtecEventComm::EventSet& event,
-                                   TAO_EC_QOS_Info& qos_info
-                                   ACE_ENV_ARG_DECL)
+                                   TAO_EC_QOS_Info& qos_info)
 {
   ChildrenIterator end = this->end ();
   for (ChildrenIterator i = this->begin ();
        i != end;
        ++i)
     {
-      int n = (*i)->filter (event, qos_info ACE_ENV_ARG_PARAMETER);
+      int n = (*i)->filter (event, qos_info);
       if (n != 0)
         return n;
     }
@@ -90,20 +88,18 @@ TAO_EC_Disjunction_Filter::filter_nocopy (RtecEventComm::EventSet& event,
 
 void
 TAO_EC_Disjunction_Filter::push (const RtecEventComm::EventSet& event,
-                                 TAO_EC_QOS_Info& qos_info
-                                 ACE_ENV_ARG_DECL)
+                                 TAO_EC_QOS_Info& qos_info)
 {
   if (this->parent () != 0)
-    this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER);
+    this->parent ()->push (event, qos_info);
 }
 
 void
 TAO_EC_Disjunction_Filter::push_nocopy (RtecEventComm::EventSet& event,
-                                 TAO_EC_QOS_Info& qos_info
-                                 ACE_ENV_ARG_DECL)
+                                 TAO_EC_QOS_Info& qos_info)
 {
   if (this->parent () != 0)
-    this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
+    this->parent ()->push_nocopy (event, qos_info);
 }
 
 void
@@ -152,8 +148,7 @@ TAO_EC_Disjunction_Filter::can_match (
 int
 TAO_EC_Disjunction_Filter::add_dependencies (
       const RtecEventComm::EventHeader&,
-      const TAO_EC_QOS_Info &
-      ACE_ENV_ARG_DECL_NOT_USED)
+      const TAO_EC_QOS_Info &)
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
index 06585acb46d..7c95f0a32d6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
@@ -54,23 +54,18 @@ public:
   virtual ChildrenIterator end (void) const;
   virtual int size (void) const;
   virtual int filter (const RtecEventComm::EventSet& event,
-                      TAO_EC_QOS_Info& qos_info
-                      ACE_ENV_ARG_DECL);
+                      TAO_EC_QOS_Info& qos_info);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL);
+                             TAO_EC_QOS_Info& qos_info);
   virtual void push (const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info
-                     ACE_ENV_ARG_DECL);
+                     TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info
-                            ACE_ENV_ARG_DECL);
+                            TAO_EC_QOS_Info& qos_info);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info &qos_info
-                                ACE_ENV_ARG_DECL);
+                                const TAO_EC_QOS_Info &qos_info);
 
 private:
   TAO_EC_Disjunction_Filter (const TAO_EC_Disjunction_Filter&);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
index 14fc0cc7860..3c1561a5cfe 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
@@ -68,13 +68,11 @@ public:
   virtual void push (TAO_EC_ProxyPushSupplier *proxy,
                      RtecEventComm::PushConsumer_ptr consumer,
                      const RtecEventComm::EventSet &event,
-                     TAO_EC_QOS_Info &qos_info
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
+                     TAO_EC_QOS_Info &qos_info) = 0;
   virtual void push_nocopy (TAO_EC_ProxyPushSupplier *proxy,
                             RtecEventComm::PushConsumer_ptr consumer,
                             RtecEventComm::EventSet &event,
-                            TAO_EC_QOS_Info &qos_info
-                            ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
+                            TAO_EC_QOS_Info &qos_info) = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
index f06a5e0cfe1..a691cefb1d0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
@@ -71,8 +71,7 @@ int
 TAO_EC_Simple_Queue_Full_Action::queue_full_action (TAO_EC_Dispatching_Task * /*task*/,
                                                     TAO_EC_ProxyPushSupplier * /*proxy*/,
                                                     RtecEventComm::PushConsumer_ptr /*consumer*/,
-                                                    RtecEventComm::EventSet& /*event*/
-                                                    ACE_ENV_ARG_DECL_NOT_USED)
+                                                    RtecEventComm::EventSet& /*event*/)
 {
   return this->queue_full_action_return_value_;
 }
@@ -103,7 +102,7 @@ TAO_EC_Dispatching_Task::svc (void)
   int done = 0;
   while (!done)
     {
-      ACE_TRY_NEW_ENV
+      try
         {
           ACE_Message_Block *mb = 0;
           if (this->getq (mb) == -1)
@@ -129,12 +128,10 @@ TAO_EC_Dispatching_Task::svc (void)
           if (result == -1)
             done = 1;
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "EC (%P|%t) exception in dispatching queue");
+          ex._tao_print_exception ("EC (%P|%t) exception in dispatching queue");
         }
-      ACE_ENDTRY;
     }
   return 0;
 }
@@ -142,15 +139,13 @@ TAO_EC_Dispatching_Task::svc (void)
 void
 TAO_EC_Dispatching_Task::push (TAO_EC_ProxyPushSupplier *proxy,
                                RtecEventComm::PushConsumer_ptr consumer,
-                               RtecEventComm::EventSet& event
-                               ACE_ENV_ARG_DECL)
+                               RtecEventComm::EventSet& event)
 {
   if (this->msg_queue()->is_full ())
     {
       int action =
         this->queue_full_service_object_->queue_full_action (this, proxy,
-                                                             consumer, event
-                                                             ACE_ENV_ARG_PARAMETER);
+                                                             consumer, event);
 
       if (action == TAO_EC_Queue_Full_Service_Object::SILENTLY_DISCARD)
         return;
@@ -163,8 +158,7 @@ TAO_EC_Dispatching_Task::push (TAO_EC_ProxyPushSupplier *proxy,
   void* buf = this->allocator_->malloc (sizeof (TAO_EC_Push_Command));
 
   if (buf == 0)
-    ACE_THROW (CORBA::NO_MEMORY (TAO::VMCID,
-                                 CORBA::COMPLETED_NO));
+    throw CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO);
 
   ACE_Message_Block *mb =
     new (buf) TAO_EC_Push_Command (proxy,
@@ -200,8 +194,7 @@ int
 TAO_EC_Push_Command::execute (void)
 {
   this->proxy_->push_to_consumer (this->consumer_.in (),
-                                  this->event_
-                                   ACE_ENV_ARG_PARAMETER);
+                                  this->event_);
   return 0;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
index b8aa758449f..87dadae0b03 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
@@ -50,8 +50,7 @@ public:
   virtual int queue_full_action (TAO_EC_Dispatching_Task *task,
                                  TAO_EC_ProxyPushSupplier *proxy,
                                  RtecEventComm::PushConsumer_ptr consumer,
-                                 RtecEventComm::EventSet& event
-                                 ACE_ENV_ARG_DECL) = 0;
+                                 RtecEventComm::EventSet& event) = 0;
 };
 
 class TAO_RTEvent_Serv_Export TAO_EC_Simple_Queue_Full_Action :
@@ -71,8 +70,7 @@ public:
   virtual int queue_full_action (TAO_EC_Dispatching_Task *task,
                                  TAO_EC_ProxyPushSupplier *proxy,
                                  RtecEventComm::PushConsumer_ptr consumer,
-                                 RtecEventComm::EventSet& event
-                                 ACE_ENV_ARG_DECL);
+                                 RtecEventComm::EventSet& event);
 
 protected:
   int queue_full_action_return_value_;
@@ -109,8 +107,7 @@ public:
 
   virtual void push (TAO_EC_ProxyPushSupplier *proxy,
                      RtecEventComm::PushConsumer_ptr consumer,
-                     RtecEventComm::EventSet& event
-                     ACE_ENV_ARG_DECL);
+                     RtecEventComm::EventSet& event);
 
 private:
   /// An per-task allocator
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp
index 3b78da8ed16..8c8f38a4209 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp
@@ -167,92 +167,83 @@ TAO_EC_Event_Channel_Base::shutdown (void)
 void
 TAO_EC_Event_Channel_Base::deactivate_supplier_admin (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       PortableServer::POA_var supplier_poa =
         this->supplier_admin_->_default_POA ();
       PortableServer::ObjectId_var supplier_id =
-        supplier_poa->servant_to_id (this->supplier_admin_ ACE_ENV_ARG_PARAMETER);
-      supplier_poa->deactivate_object (supplier_id.in () ACE_ENV_ARG_PARAMETER);
+        supplier_poa->servant_to_id (this->supplier_admin_);
+      supplier_poa->deactivate_object (supplier_id.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
             // The deactivation can throw...
     }
-  ACE_ENDTRY;
 }
 
 void
 TAO_EC_Event_Channel_Base::deactivate_consumer_admin (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       PortableServer::POA_var consumer_poa =
         this->consumer_admin_->_default_POA ();
       PortableServer::ObjectId_var consumer_id =
-        consumer_poa->servant_to_id (this->consumer_admin_ ACE_ENV_ARG_PARAMETER);
-      consumer_poa->deactivate_object (consumer_id.in () ACE_ENV_ARG_PARAMETER);
+        consumer_poa->servant_to_id (this->consumer_admin_);
+      consumer_poa->deactivate_object (consumer_id.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
             // The deactivation can throw...
     }
-  ACE_ENDTRY;
 }
 
 void
-TAO_EC_Event_Channel_Base::connected (TAO_EC_ProxyPushConsumer* consumer
-                                      ACE_ENV_ARG_DECL)
+TAO_EC_Event_Channel_Base::connected (TAO_EC_ProxyPushConsumer* consumer)
 {
-  this->consumer_admin_->peer_connected (consumer ACE_ENV_ARG_PARAMETER);
-  this->supplier_admin_->connected (consumer ACE_ENV_ARG_PARAMETER);
-  this->observer_strategy_->connected (consumer ACE_ENV_ARG_PARAMETER);
+  this->consumer_admin_->peer_connected (consumer);
+  this->supplier_admin_->connected (consumer);
+  this->observer_strategy_->connected (consumer);
 }
 
 void
-TAO_EC_Event_Channel_Base::reconnected (TAO_EC_ProxyPushConsumer* consumer
-                                        ACE_ENV_ARG_DECL)
+TAO_EC_Event_Channel_Base::reconnected (TAO_EC_ProxyPushConsumer* consumer)
 {
-  this->consumer_admin_->peer_reconnected (consumer ACE_ENV_ARG_PARAMETER);
-  this->supplier_admin_->reconnected (consumer ACE_ENV_ARG_PARAMETER);
-  this->observer_strategy_->connected (consumer ACE_ENV_ARG_PARAMETER);
+  this->consumer_admin_->peer_reconnected (consumer);
+  this->supplier_admin_->reconnected (consumer);
+  this->observer_strategy_->connected (consumer);
 }
 
 void
-TAO_EC_Event_Channel_Base::disconnected (TAO_EC_ProxyPushConsumer* consumer
-                                         ACE_ENV_ARG_DECL)
+TAO_EC_Event_Channel_Base::disconnected (TAO_EC_ProxyPushConsumer* consumer)
 {
-  this->consumer_admin_->peer_disconnected (consumer ACE_ENV_ARG_PARAMETER);
-  this->supplier_admin_->disconnected (consumer ACE_ENV_ARG_PARAMETER);
-  this->observer_strategy_->disconnected (consumer ACE_ENV_ARG_PARAMETER);
+  this->consumer_admin_->peer_disconnected (consumer);
+  this->supplier_admin_->disconnected (consumer);
+  this->observer_strategy_->disconnected (consumer);
 }
 
 void
-TAO_EC_Event_Channel_Base::connected (TAO_EC_ProxyPushSupplier* supplier
-                                      ACE_ENV_ARG_DECL)
+TAO_EC_Event_Channel_Base::connected (TAO_EC_ProxyPushSupplier* supplier)
 {
-  this->supplier_admin_->peer_connected (supplier ACE_ENV_ARG_PARAMETER);
-  this->consumer_admin_->connected (supplier ACE_ENV_ARG_PARAMETER);
-  this->observer_strategy_->connected (supplier ACE_ENV_ARG_PARAMETER);
+  this->supplier_admin_->peer_connected (supplier);
+  this->consumer_admin_->connected (supplier);
+  this->observer_strategy_->connected (supplier);
 }
 
 void
-TAO_EC_Event_Channel_Base::reconnected (TAO_EC_ProxyPushSupplier* supplier
-                                        ACE_ENV_ARG_DECL)
+TAO_EC_Event_Channel_Base::reconnected (TAO_EC_ProxyPushSupplier* supplier)
 {
-  this->supplier_admin_->peer_reconnected (supplier ACE_ENV_ARG_PARAMETER);
-  this->consumer_admin_->reconnected (supplier ACE_ENV_ARG_PARAMETER);
-  this->observer_strategy_->connected (supplier ACE_ENV_ARG_PARAMETER);
+  this->supplier_admin_->peer_reconnected (supplier);
+  this->consumer_admin_->reconnected (supplier);
+  this->observer_strategy_->connected (supplier);
 }
 
 void
-TAO_EC_Event_Channel_Base::disconnected (TAO_EC_ProxyPushSupplier* supplier
-                                         ACE_ENV_ARG_DECL)
+TAO_EC_Event_Channel_Base::disconnected (TAO_EC_ProxyPushSupplier* supplier)
 {
-  this->supplier_admin_->peer_disconnected (supplier ACE_ENV_ARG_PARAMETER);
-  this->consumer_admin_->disconnected (supplier ACE_ENV_ARG_PARAMETER);
-  this->observer_strategy_->disconnected (supplier ACE_ENV_ARG_PARAMETER);
+  this->supplier_admin_->peer_disconnected (supplier);
+  this->consumer_admin_->disconnected (supplier);
+  this->observer_strategy_->disconnected (supplier);
 }
 
 RtecEventChannelAdmin::ConsumerAdmin_ptr
@@ -278,48 +269,40 @@ TAO_EC_Event_Channel_Base::destroy (void)
 
 RtecEventChannelAdmin::Observer_Handle
 TAO_EC_Event_Channel_Base::append_observer (
-       RtecEventChannelAdmin::Observer_ptr observer
-       ACE_ENV_ARG_DECL)
+       RtecEventChannelAdmin::Observer_ptr observer)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
         RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER))
 {
-  return this->observer_strategy_->append_observer (observer
-                                                    ACE_ENV_ARG_PARAMETER);
+  return this->observer_strategy_->append_observer (observer);
 }
 
 void
 TAO_EC_Event_Channel_Base::remove_observer (
-       RtecEventChannelAdmin::Observer_Handle handle
-       ACE_ENV_ARG_DECL)
+       RtecEventChannelAdmin::Observer_Handle handle)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
         RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER))
 {
-  this->observer_strategy_->remove_observer (handle
-                                             ACE_ENV_ARG_PARAMETER);
+  this->observer_strategy_->remove_observer (handle);
 }
 
 void
 TAO_EC_Event_Channel_Base::for_each_consumer (
-                    TAO_ESF_Worker<TAO_EC_ProxyPushSupplier> *worker
-                    ACE_ENV_ARG_DECL)
+                    TAO_ESF_Worker<TAO_EC_ProxyPushSupplier> *worker)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->consumer_admin_->for_each (worker
-                                   ACE_ENV_ARG_PARAMETER);
+  this->consumer_admin_->for_each (worker);
 }
 
 void
 TAO_EC_Event_Channel_Base::for_each_supplier (
-                    TAO_ESF_Worker<TAO_EC_ProxyPushConsumer> *worker
-                    ACE_ENV_ARG_DECL)
+                    TAO_ESF_Worker<TAO_EC_ProxyPushConsumer> *worker)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->supplier_admin_->for_each (worker
-                                   ACE_ENV_ARG_PARAMETER);
+  this->supplier_admin_->for_each (worker);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
index 4b4bfa75f9d..20df5b0d3a3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
@@ -123,13 +123,11 @@ public:
   virtual void shutdown (void);
 
   virtual void for_each_consumer (
-                    TAO_ESF_Worker<TAO_EC_ProxyPushSupplier> *worker
-                    ACE_ENV_ARG_DECL)
+                    TAO_ESF_Worker<TAO_EC_ProxyPushSupplier> *worker)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void for_each_supplier (
-                    TAO_ESF_Worker<TAO_EC_ProxyPushConsumer> *worker
-                    ACE_ENV_ARG_DECL)
+                    TAO_ESF_Worker<TAO_EC_ProxyPushConsumer> *worker)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Access the dispatching module....
@@ -193,21 +191,15 @@ public:
 
   /// Used to inform the EC that a Consumer has connected or
   /// disconnected from it.
-  virtual void connected (TAO_EC_ProxyPushConsumer*
-                          ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void reconnected (TAO_EC_ProxyPushConsumer*
-                            ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void disconnected (TAO_EC_ProxyPushConsumer*
-                             ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void connected (TAO_EC_ProxyPushConsumer*);
+  virtual void reconnected (TAO_EC_ProxyPushConsumer*);
+  virtual void disconnected (TAO_EC_ProxyPushConsumer*);
 
   /// Used to inform the EC that a Supplier has connected or
   /// disconnected from it.
-  virtual void connected (TAO_EC_ProxyPushSupplier*
-                          ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void reconnected (TAO_EC_ProxyPushSupplier*
-                            ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void disconnected (TAO_EC_ProxyPushSupplier*
-                             ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void connected (TAO_EC_ProxyPushSupplier*);
+  virtual void reconnected (TAO_EC_ProxyPushSupplier*);
+  virtual void disconnected (TAO_EC_ProxyPushSupplier*);
 
   // Simple flags to control the EC behavior, set by the application
   // at construction time.
@@ -243,15 +235,13 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual RtecEventChannelAdmin::Observer_Handle
-      append_observer (RtecEventChannelAdmin::Observer_ptr
-                       ACE_ENV_ARG_DECL)
+      append_observer (RtecEventChannelAdmin::Observer_ptr)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
           RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER));
   virtual void
-      remove_observer (RtecEventChannelAdmin::Observer_Handle
-                       ACE_ENV_ARG_DECL)
+      remove_observer (RtecEventChannelAdmin::Observer_Handle)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp
index 260e65786a7..ef641d07bbf 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp
@@ -44,54 +44,48 @@ TAO_EC_Filter::size (void) const
 }
 
 void
-TAO_EC_Filter::get_qos_info (TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL)
+TAO_EC_Filter::get_qos_info (TAO_EC_QOS_Info& qos_info)
 {
   ACE_UNUSED_ARG (qos_info);
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO::VMCID,
-                                  CORBA::COMPLETED_NO));
+  throw CORBA::NO_IMPLEMENT (TAO::VMCID, CORBA::COMPLETED_NO);
 }
 
 // ****************************************************************
 
 int
 TAO_EC_Null_Filter::filter (const RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info
-                            ACE_ENV_ARG_DECL)
+                            TAO_EC_QOS_Info& qos_info)
 {
   // This is a leaf, no need to query any children, and we accept all
   // events, so push it.
-  this->push (event, qos_info ACE_ENV_ARG_PARAMETER);
+  this->push (event, qos_info);
   return 1;
 }
 
 int
 TAO_EC_Null_Filter::filter_nocopy (RtecEventComm::EventSet& event,
-                                   TAO_EC_QOS_Info& qos_info
-                                   ACE_ENV_ARG_DECL)
+                                   TAO_EC_QOS_Info& qos_info)
 {
   // This is a leaf, no need to query any children, and we accept all
   // events, so push it.
-  this->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
+  this->push_nocopy (event, qos_info);
   return 1;
 }
 
 void
 TAO_EC_Null_Filter::push (const RtecEventComm::EventSet& event,
-                          TAO_EC_QOS_Info& qos_info
-                          ACE_ENV_ARG_DECL)
+                          TAO_EC_QOS_Info& qos_info)
 {
   if (this->parent () != 0)
-    this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER);
+    this->parent ()->push (event, qos_info);
 }
 
 void
 TAO_EC_Null_Filter::push_nocopy (RtecEventComm::EventSet& event,
-                                 TAO_EC_QOS_Info& qos_info
-                                 ACE_ENV_ARG_DECL)
+                                 TAO_EC_QOS_Info& qos_info)
 {
   if (this->parent () != 0)
-    this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
+    this->parent ()->push_nocopy (event, qos_info);
 }
 
 void
@@ -118,8 +112,7 @@ TAO_EC_Null_Filter::can_match (const RtecEventComm::EventHeader&) const
 int
 TAO_EC_Null_Filter::add_dependencies (
       const RtecEventComm::EventHeader &,
-      const TAO_EC_QOS_Info &
-      ACE_ENV_ARG_DECL_NOT_USED)
+      const TAO_EC_QOS_Info &)
 
 {
   return 0;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
index a08dcf7a711..a0909dcec8b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
@@ -95,11 +95,9 @@ public:
    * EC_ProxyPushSupplier take an event rather than a set?
    */
   virtual int filter (const RtecEventComm::EventSet& event,
-                      TAO_EC_QOS_Info& qos_info
-                      ACE_ENV_ARG_DECL) = 0;
+                      TAO_EC_QOS_Info& qos_info) = 0;
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL) = 0;
+                             TAO_EC_QOS_Info& qos_info) = 0;
 
   /**
    * This is called by the children when they accept an event and
@@ -108,11 +106,9 @@ public:
    * not const then filter can take ownership of the event.
    */
   virtual void push (const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info
-                     ACE_ENV_ARG_DECL) = 0;
+                     TAO_EC_QOS_Info& qos_info) = 0;
   virtual void push_nocopy (RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info
-                            ACE_ENV_ARG_DECL) = 0;
+                            TAO_EC_QOS_Info& qos_info) = 0;
 
   /// Clear any saved state, must reset and assume no events have been
   /// received.
@@ -143,8 +139,7 @@ public:
    * fairly soon.
    */
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info& qos_info
-                                ACE_ENV_ARG_DECL) = 0;
+                                const TAO_EC_QOS_Info& qos_info) = 0;
 
   /**
    * Obtain the QOS information for this filter, the default
@@ -152,8 +147,7 @@ public:
    * support scheduling information implement this method.
    * @return Returns 0 on success and -1 on failure
    */
-  virtual void get_qos_info (TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL);
+  virtual void get_qos_info (TAO_EC_QOS_Info& qos_info);
 
 private:
   /// The parent...
@@ -184,23 +178,18 @@ public:
   // = The TAO_EC_Filter methods, please check the documentation in
   // TAO_EC_Filter.
   virtual int filter (const RtecEventComm::EventSet& event,
-                      TAO_EC_QOS_Info& qos_info
-                      ACE_ENV_ARG_DECL);
+                      TAO_EC_QOS_Info& qos_info);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL);
+                             TAO_EC_QOS_Info& qos_info);
   virtual void push (const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info
-                     ACE_ENV_ARG_DECL);
+                     TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info
-                            ACE_ENV_ARG_DECL);
+                            TAO_EC_QOS_Info& qos_info);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info &qos_info
-                                ACE_ENV_ARG_DECL);
+                                const TAO_EC_QOS_Info &qos_info);
 };
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
index 8f1bbdb6ea1..f06edd5439c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
@@ -24,8 +24,7 @@ TAO_EC_Null_Filter_Builder::~TAO_EC_Null_Filter_Builder (void)
 TAO_EC_Filter*
 TAO_EC_Null_Filter_Builder::build (
     TAO_EC_ProxyPushSupplier *,
-    RtecEventChannelAdmin::ConsumerQOS&
-    ACE_ENV_ARG_DECL_NOT_USED) const
+    RtecEventChannelAdmin::ConsumerQOS&) const
 {
   return new TAO_EC_Null_Filter;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
index 45d8a6e573b..58ddcd276bd 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
@@ -50,8 +50,7 @@ public:
   /// returned.
   virtual TAO_EC_Filter*
       build (TAO_EC_ProxyPushSupplier *supplier,
-             RtecEventChannelAdmin::ConsumerQOS& qos
-             ACE_ENV_ARG_DECL) const = 0;
+             RtecEventChannelAdmin::ConsumerQOS& qos) const = 0;
 
 };
 
@@ -75,8 +74,7 @@ public:
 
   // = The TAO_EC_Filter_Builder methods...
   TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier,
-                        RtecEventChannelAdmin::ConsumerQOS& qos
-                        ACE_ENV_ARG_DECL) const;
+                        RtecEventChannelAdmin::ConsumerQOS& qos) const;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
index f4c1c343c21..34c4bccb1dd 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
@@ -61,18 +61,16 @@ TAO_EC_Gateway_IIOP::~TAO_EC_Gateway_IIOP (void)
 
 int
 TAO_EC_Gateway_IIOP::init (RtecEventChannelAdmin::EventChannel_ptr supplier_ec,
-                           RtecEventChannelAdmin::EventChannel_ptr consumer_ec
-                           ACE_ENV_ARG_DECL)
+                           RtecEventChannelAdmin::EventChannel_ptr consumer_ec)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, -1);
 
-  return this->init_i (supplier_ec, consumer_ec ACE_ENV_ARG_PARAMETER);
+  return this->init_i (supplier_ec, consumer_ec);
 }
 
 int
 TAO_EC_Gateway_IIOP::init_i (RtecEventChannelAdmin::EventChannel_ptr supplier_ec,
-                             RtecEventChannelAdmin::EventChannel_ptr consumer_ec
-                             ACE_ENV_ARG_DECL_NOT_USED)
+                             RtecEventChannelAdmin::EventChannel_ptr consumer_ec)
 {
   if (CORBA::is_nil (this->supplier_ec_.in ()) && CORBA::is_nil (this->consumer_ec_.in ()))
   {
@@ -140,14 +138,13 @@ TAO_EC_Gateway_IIOP::disconnect_consumer_proxies_i (void)
           RtecEventComm::PushConsumer_ptr consumer = (*j).int_id_;
           if (CORBA::is_nil (consumer))
             continue;
-          ACE_TRY
+          try
             {
               consumer->disconnect_push_consumer ();
             }
-          ACE_CATCHANY
+          catch (const CORBA::Exception& ex)
             {
             }
-          ACE_ENDTRY;
           CORBA::release (consumer);
         }
       // Remove all the elements on the map.  Calling close() does not
@@ -187,13 +184,12 @@ TAO_EC_Gateway_IIOP::reconnect_consumer_ec(void)
       return;
     }
 
-  this->update_consumer_i (c_qos_ ACE_ENV_ARG_PARAMETER);
+  this->update_consumer_i (c_qos_);
 }
 
 void
 TAO_EC_Gateway_IIOP::update_consumer (
-    const RtecEventChannelAdmin::ConsumerQOS& c_qos
-    ACE_ENV_ARG_DECL)
+    const RtecEventChannelAdmin::ConsumerQOS& c_qos)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (c_qos.dependencies.length () == 0)
@@ -209,7 +205,7 @@ TAO_EC_Gateway_IIOP::update_consumer (
       return;
     }
 
-  this->update_consumer_i (c_qos ACE_ENV_ARG_PARAMETER);
+  this->update_consumer_i (c_qos);
 }
 
 void
@@ -241,8 +237,7 @@ TAO_EC_Gateway_IIOP::cleanup_consumer_proxies_i (void)
 
 void
 TAO_EC_Gateway_IIOP::update_consumer_i (
-    const RtecEventChannelAdmin::ConsumerQOS& c_qos
-    ACE_ENV_ARG_DECL)
+    const RtecEventChannelAdmin::ConsumerQOS& c_qos)
 {
   this->close_i ();
 
@@ -252,13 +247,12 @@ TAO_EC_Gateway_IIOP::update_consumer_i (
 
   // ACE_DEBUG ((LM_DEBUG, "ECG (%t) update_consumer_i \n"));
 
-  this->open_i (c_qos ACE_ENV_ARG_PARAMETER);
+  this->open_i (c_qos);
 }
 
 void
 TAO_EC_Gateway_IIOP::open_i (
-    const RtecEventChannelAdmin::ConsumerQOS& c_qos
-    ACE_ENV_ARG_DECL)
+    const RtecEventChannelAdmin::ConsumerQOS& c_qos)
 {
   // = Connect as a supplier to the consumer EC
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
@@ -355,8 +349,7 @@ TAO_EC_Gateway_IIOP::open_i (
           // ACE_DEBUG ((LM_DEBUG, "ECG (%P|%t) Gateway/Supplier "));
           // ACE_SupplierQOS_Factory::debug (pub);
           (*j).int_id_->connect_push_supplier (supplier_ref.in (),
-                                               pub
-                                               ACE_ENV_ARG_PARAMETER);
+                                               pub);
         }
     }
 
@@ -406,8 +399,7 @@ TAO_EC_Gateway_IIOP::open_i (
       // ACE_DEBUG ((LM_DEBUG, "ECG (%t) Gateway/Supplier "));
       // ACE_SupplierQOS_Factory::debug (pub);
       this->default_consumer_proxy_->connect_push_supplier (supplier_ref.in (),
-                                                            pub
-                                                            ACE_ENV_ARG_PARAMETER);
+                                                            pub);
     }
 
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
@@ -424,14 +416,12 @@ TAO_EC_Gateway_IIOP::open_i (
   // ACE_ConsumerQOS_Factory::debug (sub);
 
   this->supplier_proxy_->connect_push_consumer (consumer_ref.in (),
-                                                sub
-                                                ACE_ENV_ARG_PARAMETER);
+                                                sub);
 }
 
 void
 TAO_EC_Gateway_IIOP::update_supplier (
-    const RtecEventChannelAdmin::SupplierQOS&
-    ACE_ENV_ARG_DECL_NOT_USED)
+    const RtecEventChannelAdmin::SupplierQOS&)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do nothing...
@@ -454,8 +444,7 @@ TAO_EC_Gateway_IIOP::disconnect_push_supplier (void)
 }
 
 void
-TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events
-                           ACE_ENV_ARG_DECL)
+TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events)
 {
   // ACE_DEBUG ((LM_DEBUG, "TAO_EC_Gateway_IIOP::push (%P|%t) - \n"));
 
@@ -504,7 +493,7 @@ TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events
         out[0].header.ttl--;
 
       // ACE_DEBUG ((LM_DEBUG, "ECG: event sent to proxy\n"));
-      this->push_to_consumer(proxy, out ACE_ENV_ARG_PARAMETER);
+      this->push_to_consumer(proxy, out);
     }
 
   {
@@ -521,7 +510,7 @@ TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events
     if (this->busy_count_ == 0 && this->update_posted_ != 0)
       {
         this->update_posted_ = 0;
-        this->update_consumer_i (this->c_qos_ ACE_ENV_ARG_PARAMETER);
+        this->update_consumer_i (this->c_qos_);
       }
   }
 }
@@ -529,28 +518,25 @@ TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events
 void
 TAO_EC_Gateway_IIOP::push_to_consumer (
     RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer,
-    const RtecEventComm::EventSet& event
-    ACE_ENV_ARG_DECL)
+    const RtecEventComm::EventSet& event)
 {
-  ACE_TRY
+  try
     {
-      consumer->push (event ACE_ENV_ARG_PARAMETER);
+      consumer->push (event);
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used)
+  catch (const CORBA::OBJECT_NOT_EXIST& not_used)
     {
-      ec_control_->event_channel_not_exist (this ACE_ENV_ARG_PARAMETER);
+      ec_control_->event_channel_not_exist (this);
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (CORBA::SystemException& sysex)
     {
       ec_control_->system_exception (this,
-                                     sysex
-                                     ACE_ENV_ARG_PARAMETER);
+                                     sysex);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Shouldn't happen.
     }
-  ACE_ENDTRY;
 }
 
 int
@@ -567,8 +553,8 @@ TAO_EC_Gateway_IIOP::shutdown (void)
       PortableServer::POA_var poa =
         this->supplier_._default_POA ();
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (&this->supplier_ ACE_ENV_ARG_PARAMETER);
-      poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
+        poa->servant_to_id (&this->supplier_);
+      poa->deactivate_object (id.in ());
       this->supplier_is_active_ = 0;
     }
 
@@ -577,8 +563,8 @@ TAO_EC_Gateway_IIOP::shutdown (void)
       PortableServer::POA_var poa =
         this->consumer_._default_POA ();
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (&this->consumer_ ACE_ENV_ARG_PARAMETER);
-      poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
+        poa->servant_to_id (&this->consumer_);
+      poa->deactivate_object (id.in ());
       this->consumer_is_active_ = 0;
     }
 
@@ -630,8 +616,7 @@ TAO_EC_Gateway_IIOP::is_consumer_ec_connected_i (void) const
 
 CORBA::Boolean
 TAO_EC_Gateway_IIOP::consumer_ec_non_existent (
-      CORBA::Boolean_out disconnected
-      ACE_ENV_ARG_DECL)
+      CORBA::Boolean_out disconnected)
 {
   CORBA::Object_var consumer_ec;
   {
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
index 38405741d13..03d35384fe7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
@@ -74,8 +74,7 @@ public:
    * @return 0 in case of success, -1 in case of failure
    */
   int init (RtecEventChannelAdmin::EventChannel_ptr supplier_ec,
-            RtecEventChannelAdmin::EventChannel_ptr consumer_ec
-            ACE_ENV_ARG_DECL);
+            RtecEventChannelAdmin::EventChannel_ptr consumer_ec);
 
   /// The channel is disconnecting.
   void disconnect_push_supplier (void);
@@ -85,27 +84,23 @@ public:
 
   /// This is the consumer side behavior, it pushes the events to the
   /// local event channel.
-  void push (const RtecEventComm::EventSet &events
-             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  void push (const RtecEventComm::EventSet &events);
 
   /// Disconnect and shutdown the gateway
   int shutdown (void);
 
   // The following methods are documented in the base class.
   virtual void close (void);
-  virtual void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub)
       ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void update_supplier (const RtecEventChannelAdmin::SupplierQOS& pub
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void update_supplier (const RtecEventChannelAdmin::SupplierQOS& pub)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Let the gateway reconnect itself to the consumer ec given exisiting QoS
   void reconnect_consumer_ec(void);
 
   /// Check whether the consumer event channel is non existent or not
-  CORBA::Boolean consumer_ec_non_existent (CORBA::Boolean_out disconnected
-                                           ACE_ENV_ARG_DECL);
+  CORBA::Boolean consumer_ec_non_existent (CORBA::Boolean_out disconnected);
 
   /**
    * Cleanup all consumer proxies we have without trying to tell the
@@ -141,19 +136,17 @@ private:
   /// Remove all consumer proxies without calling disconnect on them
   void cleanup_consumer_proxies_i (void);
 
-  void update_consumer_i (const RtecEventChannelAdmin::ConsumerQOS& sub
-                          ACE_ENV_ARG_DECL);
+  void update_consumer_i (const RtecEventChannelAdmin::ConsumerQOS& sub);
 
   /// Create all connections to consumer ec and to supplier ec.
-  void open_i (const RtecEventChannelAdmin::ConsumerQOS& sub
-               ACE_ENV_ARG_DECL);
+  void open_i (const RtecEventChannelAdmin::ConsumerQOS& sub);
 
   /// Helper method to see if consumer ec is connected
   CORBA::Boolean is_consumer_ec_connected_i (void) const;
 
   /// Push the @a event to the @a consumer.
   void push_to_consumer (RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer,
-                         const RtecEventComm::EventSet& event ACE_ENV_ARG_DECL);
+                         const RtecEventComm::EventSet& event);
 
   void cleanup_consumer_ec_i (void);
 
@@ -162,8 +155,7 @@ private:
 protected:
   /// Do the real work in init()
   int init_i (RtecEventChannelAdmin::EventChannel_ptr supplier_ec,
-              RtecEventChannelAdmin::EventChannel_ptr consumer_ec
-              ACE_ENV_ARG_DECL);
+              RtecEventChannelAdmin::EventChannel_ptr consumer_ec);
 
 protected:
   /// Lock to synchronize internal changes
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp
index 0e90d510031..319d1167fad 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp
@@ -24,22 +24,21 @@ TAO_EC_Gateway_Sched::init (RtecEventChannelAdmin::EventChannel_ptr supplier_ec,
                            RtecScheduler::Scheduler_ptr supplier_sched,
                            RtecScheduler::Scheduler_ptr consumer_sched,
                            const char* consumer_name,
-                           const char* supplier_name
-                           ACE_ENV_ARG_DECL)
+                           const char* supplier_name)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
-  this->init_i (supplier_ec, consumer_ec ACE_ENV_ARG_PARAMETER);
+  this->init_i (supplier_ec, consumer_ec);
 
   // @@ Should we throw a system exception here?
   if (CORBA::is_nil (supplier_sched)
       || CORBA::is_nil (consumer_sched)
       || consumer_name == 0
       || supplier_name == 0)
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   this->supplier_info_ =
-    supplier_sched->create (supplier_name ACE_ENV_ARG_PARAMETER);
+    supplier_sched->create (supplier_name);
 
   // @@ TODO Many things are hard-coded in the RT_Info here.
 
@@ -55,11 +54,10 @@ TAO_EC_Gateway_Sched::init (RtecEventChannelAdmin::EventChannel_ptr supplier_ec,
                        RtecScheduler::VERY_LOW_IMPORTANCE,
                        time,
                        0,
-                       RtecScheduler::OPERATION
-                       ACE_ENV_ARG_PARAMETER);
+                       RtecScheduler::OPERATION);
 
   this->consumer_info_ =
-    consumer_sched->create (consumer_name ACE_ENV_ARG_PARAMETER);
+    consumer_sched->create (consumer_name);
 
   tv = ACE_Time_Value (0, 500);
   ORBSVCS_Time::Time_Value_to_TimeT (time, tv);
@@ -70,8 +68,7 @@ TAO_EC_Gateway_Sched::init (RtecEventChannelAdmin::EventChannel_ptr supplier_ec,
                        RtecScheduler::VERY_LOW_IMPORTANCE,
                        time,
                        1,
-                       RtecScheduler::REMOTE_DEPENDANT
-                       ACE_ENV_ARG_PARAMETER);
+                       RtecScheduler::REMOTE_DEPENDANT);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h
index 5267546de17..a9d0cb609bb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h
@@ -49,8 +49,7 @@ public:
              RtecScheduler::Scheduler_ptr supplier_sched,
              RtecScheduler::Scheduler_ptr consumer_sched,
              const char* consumer_name,
-             const char* supplier_name
-             ACE_ENV_ARG_DECL);
+             const char* supplier_name);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp
index 9e39ef1f631..8d701f9f8fb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp
@@ -13,20 +13,17 @@ ACE_RCSID(Event, EC_Group_Scheduling, "$Id$")
 void
 TAO_EC_Group_Scheduling::add_proxy_supplier_dependencies (
       TAO_EC_ProxyPushSupplier *,
-      TAO_EC_ProxyPushConsumer *
-      ACE_ENV_ARG_DECL_NOT_USED)
+      TAO_EC_ProxyPushConsumer *)
 {
 }
 
 void
 TAO_EC_Group_Scheduling::schedule_event (const RtecEventComm::EventSet &event,
                                         TAO_EC_ProxyPushConsumer *,
-                                        TAO_EC_Supplier_Filter *filter
-                                        ACE_ENV_ARG_DECL)
+                                        TAO_EC_Supplier_Filter *filter)
 {
   TAO_EC_QOS_Info event_info;
   // @@ yuck...
   filter->push_scheduled_event (const_cast<RtecEventComm::EventSet&> (event),
-                                event_info
-                                ACE_ENV_ARG_PARAMETER);
+                                event_info);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h
index 1a9b35f07e2..1df8922ec23 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h
@@ -36,12 +36,10 @@ public:
   // Read EC_Scheduling_Strategy.h for more details
   virtual void add_proxy_supplier_dependencies (
       TAO_EC_ProxyPushSupplier *supplier,
-      TAO_EC_ProxyPushConsumer *consumer
-      ACE_ENV_ARG_DECL);
+      TAO_EC_ProxyPushConsumer *consumer);
   virtual void schedule_event (const RtecEventComm::EventSet &event,
                                TAO_EC_ProxyPushConsumer *consumer,
-                               TAO_EC_Supplier_Filter *filter
-                               ACE_ENV_ARG_DECL);
+                               TAO_EC_Supplier_Filter *filter);
 
 private:
   TAO_EC_Group_Scheduling (const TAO_EC_Group_Scheduling&);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
index b6a0b9d0f67..af497337481 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
@@ -55,18 +55,16 @@ TAO_EC_Kokyu_Dispatching::activate (void)
 void
 TAO_EC_Kokyu_Dispatching::setup_lanes (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
   // Query the scheduler togetConfig_Infos
   RtecScheduler::Config_Info_Set_var configs;
-  ACE_TRY
+  try
     {
       this->scheduler_->get_config_infos(configs.out());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore exceptions..
     }
-  ACE_ENDTRY;
 
   //might be no Config_Infos in the set (if none passed to scheduler_)
 
@@ -113,19 +111,17 @@ void
 TAO_EC_Kokyu_Dispatching::push (TAO_EC_ProxyPushSupplier* proxy,
                                 RtecEventComm::PushConsumer_ptr consumer,
                                 const RtecEventComm::EventSet& event,
-                                TAO_EC_QOS_Info&     qos_info
-                                ACE_ENV_ARG_DECL)
+                                TAO_EC_QOS_Info&     qos_info)
 {
   RtecEventComm::EventSet event_copy = event;
-  this->push_nocopy (proxy, consumer, event_copy, qos_info ACE_ENV_ARG_PARAMETER);
+  this->push_nocopy (proxy, consumer, event_copy, qos_info);
 }
 
 void
 TAO_EC_Kokyu_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
                                        RtecEventComm::PushConsumer_ptr consumer,
                                        RtecEventComm::EventSet& event,
-                                       TAO_EC_QOS_Info& qos_info
-                                       ACE_ENV_ARG_DECL)
+                                       TAO_EC_QOS_Info& qos_info)
 {
     if (this->dispatcher_.get () == 0)
         this->setup_lanes ();
@@ -134,8 +130,7 @@ TAO_EC_Kokyu_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
       this->allocator_->malloc (sizeof (TAO_EC_Kokyu_Push_Command ));
 
     if (buf == 0)
-      ACE_THROW (CORBA::NO_MEMORY (TAO::VMCID,
-                                   CORBA::COMPLETED_NO));
+      throw CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO);
 
   // Create Dispatch_Command
   TAO_EC_Kokyu_Push_Command *cmd =
@@ -185,22 +180,19 @@ TAO_EC_Kokyu_Push_Command::~TAO_EC_Kokyu_Push_Command(void)
 int
 TAO_EC_Kokyu_Push_Command::execute ()
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       //ACE_DEBUG ((LM_DEBUG,
       //            "(%t) Command object executed.\n"));
 
       this->proxy_->push_to_consumer (this->consumer_.in (),
-                                      this->event_
-                                      ACE_ENV_ARG_PARAMETER);
+                                      this->event_);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h
index 3e8f0e7c98e..ce61893e2c6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h
@@ -67,13 +67,11 @@ public:
   virtual void push (TAO_EC_ProxyPushSupplier* proxy,
                      RtecEventComm::PushConsumer_ptr consumer,
                      const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info
-                     ACE_ENV_ARG_DECL);
+                     TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
                             RtecEventComm::PushConsumer_ptr consumer,
                             RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info
-                            ACE_ENV_ARG_DECL);
+                            TAO_EC_QOS_Info& qos_info);
 
 private:
   ACE_Allocator *allocator_;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp
index 1aeeb35af7a..d3700e473f2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp
@@ -56,24 +56,21 @@ TAO_EC_Kokyu_Filter::size (void) const
 
 int
 TAO_EC_Kokyu_Filter::filter (const RtecEventComm::EventSet &event,
-                             TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL)
+                             TAO_EC_QOS_Info& qos_info)
 {
-  return this->body_->filter (event, qos_info ACE_ENV_ARG_PARAMETER);
+  return this->body_->filter (event, qos_info);
 }
 
 int
 TAO_EC_Kokyu_Filter::filter_nocopy (RtecEventComm::EventSet &event,
-                                    TAO_EC_QOS_Info& qos_info
-                                    ACE_ENV_ARG_DECL)
+                                    TAO_EC_QOS_Info& qos_info)
 {
-  return this->body_->filter_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
+  return this->body_->filter_nocopy (event, qos_info);
 }
 
 // This is private, so we can make it inline in the .cpp file...
 void
-TAO_EC_Kokyu_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info
-                                       ACE_ENV_ARG_DECL)
+TAO_EC_Kokyu_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info)
 {
   this->init_rt_info ();
 
@@ -93,8 +90,7 @@ TAO_EC_Kokyu_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info
         this->scheduler_->priority (this->rt_info_,
                                     os_priority,
                                     p_subpriority,
-                                    p_priority
-                                     ACE_ENV_ARG_PARAMETER);
+                                    p_priority);
         qos_info.preemption_priority = p_priority;
       }
     }
@@ -102,27 +98,25 @@ TAO_EC_Kokyu_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info
 
 void
 TAO_EC_Kokyu_Filter::push (const RtecEventComm::EventSet &event,
-                           TAO_EC_QOS_Info& qos_info
-                           ACE_ENV_ARG_DECL)
+                           TAO_EC_QOS_Info& qos_info)
 {
   if (this->parent () != 0)
     {
-      this->compute_qos_info (qos_info ACE_ENV_ARG_PARAMETER);
+      this->compute_qos_info (qos_info);
 
-      this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER);
+      this->parent ()->push (event, qos_info);
     }
 }
 
 void
 TAO_EC_Kokyu_Filter::push_nocopy (RtecEventComm::EventSet &event,
-                                  TAO_EC_QOS_Info& qos_info
-                                  ACE_ENV_ARG_DECL)
+                                  TAO_EC_QOS_Info& qos_info)
 {
   if (this->parent () != 0)
     {
-      this->compute_qos_info (qos_info ACE_ENV_ARG_PARAMETER);
+      this->compute_qos_info (qos_info);
 
-      this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
+      this->parent ()->push_nocopy (event, qos_info);
     }
 }
 
@@ -172,8 +166,7 @@ supplier2<-----|
 
 int
 TAO_EC_Kokyu_Filter::add_dependencies (const RtecEventComm::EventHeader& header,
-                                       const TAO_EC_QOS_Info &qos_info
-                                       ACE_ENV_ARG_DECL)
+                                       const TAO_EC_QOS_Info &qos_info)
 {
 #ifdef EC_KOKYU_LOGGING
   ACE_DEBUG ((LM_DEBUG, "Entering EC_Kokyu_Filter::add_dependencies\n"));
@@ -188,8 +181,7 @@ TAO_EC_Kokyu_Filter::add_dependencies (const RtecEventComm::EventHeader& header,
 
   //this call the add_dependencies() on con/disjunction filter
   int matches = this->body_->add_dependencies (header,
-                                               qos_info
-                                               ACE_ENV_ARG_PARAMETER);
+                                               qos_info);
 
   if (matches != 0)
     {
@@ -197,11 +189,10 @@ TAO_EC_Kokyu_Filter::add_dependencies (const RtecEventComm::EventHeader& header,
       ACE_DEBUG ((LM_DEBUG, "Kokyu_Filter::matches != 0\n"));
 #endif
       this->scheduler_->add_dependency (this->rt_info_, qos_info.rt_info, 1,
-                                        RtecBase::ONE_WAY_CALL
-                                         ACE_ENV_ARG_PARAMETER);
+                                        RtecBase::ONE_WAY_CALL);
 
       RtecScheduler::RT_Info_var info =
-        this->scheduler_->get (qos_info.rt_info ACE_ENV_ARG_PARAMETER);
+        this->scheduler_->get (qos_info.rt_info);
       ACE_DEBUG ((LM_DEBUG, "[%s][%d] ----> [%s][%d]\n",
                   this->name_.c_str (),
                   this->rt_info_,
@@ -221,7 +212,7 @@ TAO_EC_Kokyu_Filter::add_dependencies (const RtecEventComm::EventHeader& header,
   ChildrenIterator end = this->end ();
   for (ChildrenIterator i = this->begin (); i != end; ++i)
     {
-      (*i)->add_dependencies (header, qos_info ACE_ENV_ARG_PARAMETER);
+      (*i)->add_dependencies (header, qos_info);
     }
 #ifdef EC_KOKYU_LOGGING
   ACE_DEBUG ((LM_DEBUG, "Exiting EC_Kokyu_Filter: add_dependencies\n"));
@@ -230,8 +221,7 @@ TAO_EC_Kokyu_Filter::add_dependencies (const RtecEventComm::EventHeader& header,
 }
 
 void
-TAO_EC_Kokyu_Filter::get_qos_info (TAO_EC_QOS_Info& qos_info
-                                   ACE_ENV_ARG_DECL)
+TAO_EC_Kokyu_Filter::get_qos_info (TAO_EC_QOS_Info& qos_info)
 {
   this->init_rt_info ();
 
@@ -257,8 +247,7 @@ TAO_EC_Kokyu_Filter::init_rt_info (void)
                          RtecScheduler::VERY_LOW_IMPORTANCE,
                          0, // quantum
                          0, // threads
-                         this->info_type_
-                         ACE_ENV_ARG_PARAMETER);
+                         this->info_type_);
 #endif  //ifdef'ed by VS
 
 #if 0 //ifdef changed from 1 to 0 by VS
@@ -267,11 +256,10 @@ TAO_EC_Kokyu_Filter::init_rt_info (void)
       this->scheduler_->add_dependency (this->rt_info_,
                                         this->body_info_,
                                         1,
-                                        RtecBase::TWO_WAY_CALL
-                                         ACE_ENV_ARG_PARAMETER);
+                                        RtecBase::TWO_WAY_CALL);
 
       RtecScheduler::RT_Info_var info =
-        this->scheduler_->get (this->body_info_ ACE_ENV_ARG_PARAMETER);
+        this->scheduler_->get (this->body_info_);
       ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n",
                   info->entry_point.in (),
                   this->name_.c_str ()));
@@ -282,11 +270,10 @@ TAO_EC_Kokyu_Filter::init_rt_info (void)
   this->scheduler_->add_dependency (this->parent_info_,
                                     this->rt_info_,
                                     1,
-                                    RtecBase::TWO_WAY_CALL
-                                     ACE_ENV_ARG_PARAMETER);
+                                    RtecBase::TWO_WAY_CALL);
 
   RtecScheduler::RT_Info_var info =
-    this->scheduler_->get (this->parent_info_ ACE_ENV_ARG_PARAMETER);
+    this->scheduler_->get (this->parent_info_);
   ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n",
               this->name_.c_str (),
               info->entry_point.in ()));
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h
index b31c5ba7425..63c1d6ac284 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h
@@ -66,25 +66,19 @@ public:
   virtual ChildrenIterator end (void) const;
   virtual int size (void) const;
   virtual int filter (const RtecEventComm::EventSet& event,
-                      TAO_EC_QOS_Info& qos_info
-                      ACE_ENV_ARG_DECL);
+                      TAO_EC_QOS_Info& qos_info);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL);
+                             TAO_EC_QOS_Info& qos_info);
   virtual void push (const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info
-                     ACE_ENV_ARG_DECL);
+                     TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info
-                            ACE_ENV_ARG_DECL);
+                            TAO_EC_QOS_Info& qos_info);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info &qos_info
-                                ACE_ENV_ARG_DECL);
-  virtual void get_qos_info (TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL);
+                                const TAO_EC_QOS_Info &qos_info);
+  virtual void get_qos_info (TAO_EC_QOS_Info& qos_info);
 
 private:
   TAO_EC_Kokyu_Filter (const TAO_EC_Kokyu_Filter&);
@@ -94,8 +88,7 @@ private:
   void init_rt_info (void);
 
   /// Compute a new qos_info to push up.
-  void compute_qos_info (TAO_EC_QOS_Info& qos_info
-                         ACE_ENV_ARG_DECL);
+  void compute_qos_info (TAO_EC_QOS_Info& qos_info);
 
 private:
   /// The RT_Info handle for this object
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
index 8140345939f..ed8e4d4e1b3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
@@ -44,8 +44,7 @@ TAO_EC_Kokyu_Filter_Builder::~TAO_EC_Kokyu_Filter_Builder (void)
 TAO_EC_Filter*
 TAO_EC_Kokyu_Filter_Builder::build (
     TAO_EC_ProxyPushSupplier *supplier,
-    RtecEventChannelAdmin::ConsumerQOS& qos
-    ACE_ENV_ARG_DECL) const
+    RtecEventChannelAdmin::ConsumerQOS& qos) const
 {
   CORBA::ULong i=0,found=0;
   CORBA::ULong pos = 0;
@@ -56,7 +55,7 @@ TAO_EC_Kokyu_Filter_Builder::build (
     this->event_channel_->scheduler ();
 
   RtecScheduler::Scheduler_var scheduler =
-    RtecScheduler::Scheduler::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER);
+    RtecScheduler::Scheduler::_narrow (tmp.in ());
 
 #ifdef EC_KOKYU_LOGGING
   for (i=0; i<qos.dependencies.length (); ++i)
@@ -119,8 +118,7 @@ TAO_EC_Kokyu_Filter_Builder::build (
 #endif
 
       RtecScheduler::RT_Info_var final_consumer_rt_info =
-        scheduler->get ( h_final_consumer_rt_info
-                         ACE_ENV_ARG_PARAMETER);
+        scheduler->get ( h_final_consumer_rt_info);
 
       final_consumer_rep_name = final_consumer_rt_info->entry_point.in ();
       final_consumer_rep_name += "#rep";
@@ -132,8 +130,7 @@ TAO_EC_Kokyu_Filter_Builder::build (
 
       //create an rt_info corresponding to this rep.
       h_final_consumer_rep_rt_info =
-        scheduler->create (final_consumer_rep_name.c_str ()
-                           ACE_ENV_ARG_PARAMETER);
+        scheduler->create (final_consumer_rep_name.c_str ());
 #ifdef EC_KOKYU_LOGGING
       ACE_DEBUG ((LM_DEBUG, "consumer rep created\n"));
 #endif
@@ -148,7 +145,7 @@ TAO_EC_Kokyu_Filter_Builder::build (
     this->recursive_build (supplier, qos, pos,
                            scheduler.in (),
                            h_final_consumer_rep_rt_info  //parent_info
-                           ACE_ENV_ARG_PARAMETER);
+                           );
 
 #ifdef EC_KOKYU_LOGGING
   ACE_DEBUG ((LM_DEBUG,
@@ -169,13 +166,12 @@ TAO_EC_Kokyu_Filter_Builder::build (
       //add the dependency between the root in the filter hierarchy and
       //the final consumer
       TAO_EC_QOS_Info qos_info;
-      kokyu_filter->get_qos_info (qos_info ACE_ENV_ARG_PARAMETER);
+      kokyu_filter->get_qos_info (qos_info);
 
       scheduler->add_dependency (h_final_consumer_rt_info,
                                  qos_info.rt_info,
                                  1,
-                                 RtecBase::ONE_WAY_CALL
-                                 ACE_ENV_ARG_PARAMETER);
+                                 RtecBase::ONE_WAY_CALL);
     }
   return filter;
 }
@@ -186,8 +182,7 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build (
     RtecEventChannelAdmin::ConsumerQOS& qos,
     CORBA::ULong& pos,
     RtecScheduler::Scheduler_ptr scheduler,
-    RtecScheduler::handle_t parent_info
-    ACE_ENV_ARG_DECL) const
+    RtecScheduler::handle_t parent_info) const
 {
   const RtecEventComm::Event& e = qos.dependencies[pos].event;
 
@@ -203,8 +198,7 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build (
       CORBA::ULong npos = pos;
       ACE_CString name;
       this->recursive_name (qos, npos,
-                            scheduler, name
-                             ACE_ENV_ARG_PARAMETER);
+                            scheduler, name);
 
       pos++; // Consume the designator
 
@@ -218,8 +212,7 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build (
         {
           children[i] = this->recursive_build (supplier, qos, pos,
                                                scheduler,
-                                               conj_rt_info
-                                               ACE_ENV_ARG_PARAMETER);
+                                               conj_rt_info);
         }
 
       TAO_EC_Kokyu_Filter *filter;
@@ -234,7 +227,7 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build (
                                            RtecScheduler::CONJUNCTION),
                       0);
       TAO_EC_QOS_Info qos_info;
-      filter->get_qos_info (qos_info ACE_ENV_ARG_PARAMETER);
+      filter->get_qos_info (qos_info);
       // @@
       return filter;
     }
@@ -247,8 +240,7 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build (
       CORBA::ULong npos = pos;
       ACE_CString name;
       this->recursive_name (qos, npos,
-                            scheduler, name
-                             ACE_ENV_ARG_PARAMETER);
+                            scheduler, name);
 
       pos++; // Consume the designator
 
@@ -262,8 +254,7 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build (
         {
           children[i] = this->recursive_build (supplier, qos, pos,
                                                scheduler,
-                                               disj_rt_info
-                                                ACE_ENV_ARG_PARAMETER);
+                                               disj_rt_info);
         }
       TAO_EC_Kokyu_Filter *filter;
       ACE_NEW_RETURN (filter,
@@ -278,7 +269,7 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build (
                       0);
 
       TAO_EC_QOS_Info qos_info;
-      filter->get_qos_info (qos_info ACE_ENV_ARG_PARAMETER);
+      filter->get_qos_info (qos_info);
       // @@
       return filter;
     }
@@ -304,7 +295,7 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build (
 
         TAO_EC_QOS_Info qos_info;
         qos_info.rt_info =
-          scheduler->create (name.c_str () ACE_ENV_ARG_PARAMETER);
+          scheduler->create (name.c_str ());
 
         // Convert the time to the proper units....
         RtecScheduler::Period_t period =
@@ -323,14 +314,12 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build (
                         consumer_rt_info_ptr->importance,
                         0, // quantum
                         1, // threads
-                        RtecScheduler::OPERATION
-                        ACE_ENV_ARG_PARAMETER);
+                        RtecScheduler::OPERATION);
 
         scheduler->add_dependency (qos_info.rt_info,
                                    h_consumer_rt_info,
                                    1,
-                                   RtecBase::TWO_WAY_CALL
-                                   ACE_ENV_ARG_PARAMETER);
+                                   RtecBase::TWO_WAY_CALL);
 #endif //by VS
 
         pos++;
@@ -347,8 +336,7 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build (
       pos++;
       return this->recursive_build (supplier, qos, pos,
                                     scheduler,
-                                    parent_info
-                                    ACE_ENV_ARG_PARAMETER);
+                                    parent_info);
     }
   else
     {
@@ -369,7 +357,7 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build (
     }
 
   RtecScheduler::RT_Info_var info =
-    scheduler->get (parent_info ACE_ENV_ARG_PARAMETER);
+    scheduler->get (parent_info);
 
   ACE_CString name = info->entry_point.in ();
 
@@ -386,7 +374,7 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build (
                   0);
 
   TAO_EC_QOS_Info qos_info;
-  filter->get_qos_info (qos_info ACE_ENV_ARG_PARAMETER);
+  filter->get_qos_info (qos_info);
   // @@
   return filter;
 }
@@ -396,8 +384,7 @@ TAO_EC_Kokyu_Filter_Builder:: recursive_name (
     RtecEventChannelAdmin::ConsumerQOS& qos,
     CORBA::ULong& pos,
     RtecScheduler::Scheduler_ptr scheduler,
-    ACE_CString& name
-    ACE_ENV_ARG_DECL) const
+    ACE_CString& name) const
 {
   const RtecEventComm::Event& e = qos.dependencies[pos].event;
 
@@ -411,8 +398,7 @@ TAO_EC_Kokyu_Filter_Builder:: recursive_name (
           ACE_CString child_name;
           this->recursive_name (qos, pos,
                                 scheduler,
-                                child_name
-                                 ACE_ENV_ARG_PARAMETER);
+                                child_name);
 
           if (i == 0)
             name += "(";
@@ -435,8 +421,7 @@ TAO_EC_Kokyu_Filter_Builder:: recursive_name (
 
           this->recursive_name (qos, pos,
                                 scheduler,
-                                child_name
-                                 ACE_ENV_ARG_PARAMETER);
+                                child_name);
 
           if (i == 0)
             name += "(";
@@ -465,7 +450,7 @@ TAO_EC_Kokyu_Filter_Builder:: recursive_name (
   RtecScheduler::handle_t body_info = qos.dependencies[pos].rt_info;
 
   RtecScheduler::RT_Info_var info =
-    scheduler->get (body_info ACE_ENV_ARG_PARAMETER);
+    scheduler->get (body_info);
 
   name = info->entry_point.in ();
   name += "#rep";
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h
index e63b901bab4..3bd52930bce 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h
@@ -50,8 +50,7 @@ public:
 
   // = The TAO_EC_Filter_Builder methods...
   TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier,
-                        RtecEventChannelAdmin::ConsumerQOS& qos
-                        ACE_ENV_ARG_DECL) const;
+                        RtecEventChannelAdmin::ConsumerQOS& qos) const;
 
 private:
   /// Recursively build the filter tree.
@@ -59,15 +58,13 @@ private:
                                   RtecEventChannelAdmin::ConsumerQOS& qos,
                                   CORBA::ULong& pos,
                                   RtecScheduler::Scheduler_ptr scheduler,
-                                  RtecScheduler::handle_t parent_info
-                                  ACE_ENV_ARG_DECL) const;
+                                  RtecScheduler::handle_t parent_info) const;
 
   /// Build the name recursively...
   void recursive_name (RtecEventChannelAdmin::ConsumerQOS& qos,
                        CORBA::ULong& pos,
                        RtecScheduler::Scheduler_ptr scheduler,
-                       ACE_CString &name
-                       ACE_ENV_ARG_DECL) const;
+                       ACE_CString &name) const;
 
   /// Count the number of children of the current node, i.e. until a
   /// conjunction or disjunction starts.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp
index 7f1f2a89db2..891cc55c412 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp
@@ -21,8 +21,7 @@ TAO_EC_Kokyu_Scheduling::~TAO_EC_Kokyu_Scheduling (void)
 void
 TAO_EC_Kokyu_Scheduling::add_proxy_supplier_dependencies (
       TAO_EC_ProxyPushSupplier *supplier,
-      TAO_EC_ProxyPushConsumer *consumer
-      ACE_ENV_ARG_DECL)
+      TAO_EC_ProxyPushConsumer *consumer)
 {
   const RtecEventChannelAdmin::SupplierQOS& qos =
     consumer->publications ();
@@ -40,19 +39,17 @@ TAO_EC_Kokyu_Scheduling::add_proxy_supplier_dependencies (
       this->scheduler_->priority (qos_info.rt_info,
                                   os_priority,
                                   p_subpriority,
-                                  p_priority
-                                   ACE_ENV_ARG_PARAMETER);
+                                  p_priority);
       qos_info.preemption_priority = p_priority;
 
-      supplier->add_dependencies (header, qos_info ACE_ENV_ARG_PARAMETER);
+      supplier->add_dependencies (header, qos_info);
     }
 }
 
 void
 TAO_EC_Kokyu_Scheduling::schedule_event (const RtecEventComm::EventSet &event,
                                             TAO_EC_ProxyPushConsumer *consumer,
-                                            TAO_EC_Supplier_Filter *filter
-                                            ACE_ENV_ARG_DECL)
+                                            TAO_EC_Supplier_Filter *filter)
 {
   RtecEventChannelAdmin::SupplierQOS qos =
     consumer->publications ();
@@ -82,13 +79,11 @@ TAO_EC_Kokyu_Scheduling::schedule_event (const RtecEventComm::EventSet &event,
           this->scheduler_->priority (qos_info.rt_info,
                                       os_priority,
                                       p_subpriority,
-                                      p_priority
-                                      ACE_ENV_ARG_PARAMETER);
+                                      p_priority);
           qos_info.preemption_priority = p_priority;
         }
 
-      filter->push_scheduled_event (single_event, qos_info
-                                    ACE_ENV_ARG_PARAMETER);
+      filter->push_scheduled_event (single_event, qos_info);
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h
index 9552d221124..58d774e8ae4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h
@@ -48,12 +48,10 @@ public:
 
   virtual void add_proxy_supplier_dependencies (
       TAO_EC_ProxyPushSupplier *supplier,
-      TAO_EC_ProxyPushConsumer *consumer
-      ACE_ENV_ARG_DECL);
+      TAO_EC_ProxyPushConsumer *consumer);
   virtual void schedule_event (const RtecEventComm::EventSet &event,
                                TAO_EC_ProxyPushConsumer *consumer,
-                               TAO_EC_Supplier_Filter *filter
-                               ACE_ENV_ARG_DECL);
+                               TAO_EC_Supplier_Filter *filter);
 
 private:
   TAO_EC_Kokyu_Scheduling (const TAO_EC_Kokyu_Scheduling&);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.inl
index a2c6e3a3dd7..84c56db8e2c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.inl
@@ -27,17 +27,15 @@ TAO_EC_Object_Deactivator::deactivate (void)
 {
   if (this->deactivate_ && !CORBA::is_nil (this->poa_.in ()))
   {
-    ACE_DECLARE_NEW_CORBA_ENV;
-    ACE_TRY
+    try
     {
       this->deactivate_ = 0;
-      this->poa_->deactivate_object (id_ ACE_ENV_ARG_PARAMETER);
+      this->poa_->deactivate_object (id_);
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
       // The deactivation can throw...
     }
-    ACE_ENDTRY;
   }
 }
 
@@ -121,16 +119,14 @@ TAO_EC_ORB_Holder::~TAO_EC_ORB_Holder (void)
 {
   if (!CORBA::is_nil (this->orb_.in ()))
   {
-    ACE_DECLARE_NEW_CORBA_ENV;
-    ACE_TRY
+    try
       {
         this->orb_->destroy ();
       }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
       {
         // Ignore.
       }
-    ACE_ENDTRY;
   }
 }
 
@@ -153,16 +149,14 @@ TAO_EC_Event_Channel_Holder::~TAO_EC_Event_Channel_Holder (void)
 {
   if (!CORBA::is_nil (this->ec_.in ()))
   {
-    ACE_DECLARE_NEW_CORBA_ENV;
-    ACE_TRY
+    try
       {
         this->ec_->destroy ();
       }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
       {
         // Ignore.
       }
-    ACE_ENDTRY;
   }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp
index 78ec7efbc6f..360f6d11744 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp
@@ -16,30 +16,28 @@ void
 activate (T & obj_ref,
           PortableServer::POA_ptr poa,
           PortableServer::ServantBase * servant,
-          TAO_EC_Object_Deactivator & suggested_object_deactivator
-          ACE_ENV_ARG_DECL)
+          TAO_EC_Object_Deactivator & suggested_object_deactivator)
 {
   // Activate the servant into the POA.
   PortableServer::ObjectId_var obj_id =
-    poa->activate_object (servant
-                          ACE_ENV_ARG_PARAMETER);
+    poa->activate_object (servant);
 
   suggested_object_deactivator.set_values (poa, obj_id.in ());
 
   // Get the object reference of the activated object.
   CORBA::Object_var obj =
-    poa->id_to_reference (obj_id.in () ACE_ENV_ARG_PARAMETER);
+    poa->id_to_reference (obj_id.in ());
 
   // Don't try to use T::_obj_type::_narrow, some compilers don't like it so
   // do this in two steps
   typedef typename T::_obj_type my_object_type;
 
   obj_ref =
-    my_object_type::_narrow (obj.in() ACE_ENV_ARG_PARAMETER);
+    my_object_type::_narrow (obj.in());
 
   if (CORBA::is_nil (obj_ref.in ()))
   {
-    ACE_THROW (CORBA::INTERNAL ());
+    throw CORBA::INTERNAL ();
   }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h
index b626216e0be..1755c5af6d0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h
@@ -35,8 +35,7 @@ template <typename T>
 void activate (T & obj_ref,
                PortableServer::POA_ptr poa,
                PortableServer::ServantBase * servant,
-               TAO_EC_Object_Deactivator & object_deactivator
-               ACE_ENV_ARG_DECL);
+               TAO_EC_Object_Deactivator & object_deactivator);
 
 
 //***************************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl
index 74e0c219295..b0355172641 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl
@@ -55,15 +55,14 @@ TAO_EC_Auto_Command<T>::execute (void)
     {
       this->allow_command_ = 0;
 
-      ACE_TRY_NEW_ENV
+      try
         {
           this->command_.execute ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           // ignore.
         }
-      ACE_ENDTRY;
     }
 }
 
@@ -136,15 +135,14 @@ TAO_EC_Servant_Var(TAO_EC_Servant_Var<T> const & rhs)
 {
   if (ptr_)
     {
-      ACE_TRY_NEW_ENV
+      try
         {
           ptr_->_add_ref ();
         }
-      ACE_CATCHALL
+      catch (...)
         {
-	  ACE_RE_THROW;
+	  throw;
         }
-	ACE_ENDTRY;
     }
 }
 
@@ -186,14 +184,13 @@ ACE_INLINE TAO_EC_Servant_Var<T>::
   // destructor.
   if (ptr_ != 0)
   {
-    ACE_TRY_NEW_ENV
+    try
     {
       ptr_->_remove_ref ();
     }
-    ACE_CATCHALL
+    catch (...)
     {
     }
-    ACE_ENDTRY;
   }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
index 096ae4c3ba0..118a5b086fe 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
@@ -68,25 +68,23 @@ void
 TAO_EC_MT_Dispatching::push (TAO_EC_ProxyPushSupplier* proxy,
                              RtecEventComm::PushConsumer_ptr consumer,
                              const RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL)
+                             TAO_EC_QOS_Info& qos_info)
 {
   RtecEventComm::EventSet event_copy = event;
-  this->push_nocopy (proxy, consumer, event_copy, qos_info ACE_ENV_ARG_PARAMETER);
+  this->push_nocopy (proxy, consumer, event_copy, qos_info);
 }
 
 void
 TAO_EC_MT_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
                                     RtecEventComm::PushConsumer_ptr consumer,
                                     RtecEventComm::EventSet& event,
-                                    TAO_EC_QOS_Info&
-                                    ACE_ENV_ARG_DECL)
+                                    TAO_EC_QOS_Info&)
 {
   // Double checked locking....
   if (this->active_ == 0)
     this->activate ();
 
-  this->task_.push (proxy, consumer, event ACE_ENV_ARG_PARAMETER);
+  this->task_.push (proxy, consumer, event);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
index b38b5a160fd..4bdb60096a3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
@@ -53,13 +53,11 @@ public:
   virtual void push (TAO_EC_ProxyPushSupplier* proxy,
                      RtecEventComm::PushConsumer_ptr consumer,
                      const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info
-                     ACE_ENV_ARG_DECL);
+                     TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
                             RtecEventComm::PushConsumer_ptr consumer,
                             RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info
-                            ACE_ENV_ARG_DECL);
+                            TAO_EC_QOS_Info& qos_info);
 
 private:
   /// Use our own thread manager.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
index fe0b630e686..cff73bd1cd3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
@@ -42,8 +42,7 @@ TAO_EC_Masked_Type_Filter::size (void) const
 
 int
 TAO_EC_Masked_Type_Filter::filter (const RtecEventComm::EventSet& event,
-                                   TAO_EC_QOS_Info& qos_info
-                                   ACE_ENV_ARG_DECL)
+                                   TAO_EC_QOS_Info& qos_info)
 {
   if (event.length () != 1)
     return 0;
@@ -54,15 +53,14 @@ TAO_EC_Masked_Type_Filter::filter (const RtecEventComm::EventSet& event,
 
   if (this->parent () != 0)
     {
-      this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER);
+      this->parent ()->push (event, qos_info);
     }
   return 1;
 }
 
 int
 TAO_EC_Masked_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event,
-                                          TAO_EC_QOS_Info& qos_info
-                                          ACE_ENV_ARG_DECL)
+                                          TAO_EC_QOS_Info& qos_info)
 {
   if (event.length () != 1)
     return 0;
@@ -73,22 +71,20 @@ TAO_EC_Masked_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event,
 
   if (this->parent () != 0)
     {
-      this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
+      this->parent ()->push_nocopy (event, qos_info);
     }
   return 1;
 }
 
 void
 TAO_EC_Masked_Type_Filter::push (const RtecEventComm::EventSet &,
-                                 TAO_EC_QOS_Info &
-                                 ACE_ENV_ARG_DECL_NOT_USED)
+                                 TAO_EC_QOS_Info &)
 {
 }
 
 void
 TAO_EC_Masked_Type_Filter::push_nocopy (RtecEventComm::EventSet &,
-                                        TAO_EC_QOS_Info &
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+                                        TAO_EC_QOS_Info &)
 {
 }
 
@@ -117,8 +113,7 @@ TAO_EC_Masked_Type_Filter::can_match (
 int
 TAO_EC_Masked_Type_Filter::add_dependencies (
       const RtecEventComm::EventHeader&,
-      const TAO_EC_QOS_Info &
-      ACE_ENV_ARG_DECL_NOT_USED)
+      const TAO_EC_QOS_Info &)
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h
index 97a83d622ea..27b86da6ada 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h
@@ -55,23 +55,18 @@ public:
   virtual ChildrenIterator end (void) const;
   virtual int size (void) const;
   virtual int filter (const RtecEventComm::EventSet& event,
-                      TAO_EC_QOS_Info& qos_info
-                      ACE_ENV_ARG_DECL);
+                      TAO_EC_QOS_Info& qos_info);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL);
+                             TAO_EC_QOS_Info& qos_info);
   virtual void push (const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info
-                     ACE_ENV_ARG_DECL);
+                     TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info
-                            ACE_ENV_ARG_DECL);
+                            TAO_EC_QOS_Info& qos_info);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info &qos_info
-                                ACE_ENV_ARG_DECL);
+                                const TAO_EC_QOS_Info &qos_info);
 
 private:
   TAO_EC_Masked_Type_Filter (const TAO_EC_Masked_Type_Filter&);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
index 2d72037f250..577da9bf02f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
@@ -37,14 +37,13 @@ TAO_EC_Negation_Filter::size (void) const
 
 int
 TAO_EC_Negation_Filter::filter (const RtecEventComm::EventSet& event,
-                                TAO_EC_QOS_Info& qos_info
-                                ACE_ENV_ARG_DECL)
+                                TAO_EC_QOS_Info& qos_info)
 {
   int n =
-    this->child_->filter (event, qos_info ACE_ENV_ARG_PARAMETER);
+    this->child_->filter (event, qos_info);
   if (this->parent () != 0 && n == 0)
     {
-      this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER);
+      this->parent ()->push (event, qos_info);
       return 1;
     }
   return 0;
@@ -52,14 +51,13 @@ TAO_EC_Negation_Filter::filter (const RtecEventComm::EventSet& event,
 
 int
 TAO_EC_Negation_Filter::filter_nocopy (RtecEventComm::EventSet& event,
-                                   TAO_EC_QOS_Info& qos_info
-                                   ACE_ENV_ARG_DECL)
+                                   TAO_EC_QOS_Info& qos_info)
 {
   int n =
-    this->child_->filter_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
+    this->child_->filter_nocopy (event, qos_info);
   if (this->parent () != 0 && n == 0)
     {
-      this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
+      this->parent ()->push_nocopy (event, qos_info);
       return 1;
     }
   return 0;
@@ -67,15 +65,13 @@ TAO_EC_Negation_Filter::filter_nocopy (RtecEventComm::EventSet& event,
 
 void
 TAO_EC_Negation_Filter::push (const RtecEventComm::EventSet&,
-                                 TAO_EC_QOS_Info&
-                                 ACE_ENV_ARG_DECL_NOT_USED)
+                                 TAO_EC_QOS_Info&)
 {
 }
 
 void
 TAO_EC_Negation_Filter::push_nocopy (RtecEventComm::EventSet&,
-                                        TAO_EC_QOS_Info&
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+                                        TAO_EC_QOS_Info&)
 {
 }
 
@@ -101,8 +97,7 @@ TAO_EC_Negation_Filter::can_match (
 int
 TAO_EC_Negation_Filter::add_dependencies (
       const RtecEventComm::EventHeader&,
-      const TAO_EC_QOS_Info &
-      ACE_ENV_ARG_DECL_NOT_USED)
+      const TAO_EC_QOS_Info &)
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h
index f4f141f0e27..fad7ad3b3b7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h
@@ -53,23 +53,18 @@ public:
   virtual ChildrenIterator end (void) const;
   virtual int size (void) const;
   virtual int filter (const RtecEventComm::EventSet& event,
-                      TAO_EC_QOS_Info& qos_info
-                      ACE_ENV_ARG_DECL);
+                      TAO_EC_QOS_Info& qos_info);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL);
+                             TAO_EC_QOS_Info& qos_info);
   virtual void push (const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info
-                     ACE_ENV_ARG_DECL);
+                     TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info
-                            ACE_ENV_ARG_DECL);
+                            TAO_EC_QOS_Info& qos_info);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info &qos_info
-                                ACE_ENV_ARG_DECL);
+                                const TAO_EC_QOS_Info &qos_info);
 
 private:
   TAO_EC_Negation_Filter (const TAO_EC_Negation_Filter&);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
index e980e93b5e6..cfec105b9a4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
@@ -13,16 +13,14 @@ ACE_RCSID(Event, EC_Null_Scheduling, "$Id$")
 void
 TAO_EC_Null_Scheduling::add_proxy_supplier_dependencies (
       TAO_EC_ProxyPushSupplier *,
-      TAO_EC_ProxyPushConsumer *
-      ACE_ENV_ARG_DECL_NOT_USED)
+      TAO_EC_ProxyPushConsumer *)
 {
 }
 
 void
 TAO_EC_Null_Scheduling::schedule_event (const RtecEventComm::EventSet &event,
                                         TAO_EC_ProxyPushConsumer *,
-                                        TAO_EC_Supplier_Filter *filter
-                                        ACE_ENV_ARG_DECL)
+                                        TAO_EC_Supplier_Filter *filter)
 {
   for (CORBA::ULong j = 0; j < event.length (); ++j)
     {
@@ -32,7 +30,6 @@ TAO_EC_Null_Scheduling::schedule_event (const RtecEventComm::EventSet &event,
       RtecEventComm::EventSet single_event (1, 1, buffer, 0);
 
       TAO_EC_QOS_Info event_info;
-      filter->push_scheduled_event (single_event, event_info
-                                    ACE_ENV_ARG_PARAMETER);
+      filter->push_scheduled_event (single_event, event_info);
     }
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h
index fff1ad22617..9c685e6cc86 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h
@@ -39,12 +39,10 @@ public:
   // Read EC_Scheduling_Strategy.h for more details
   virtual void add_proxy_supplier_dependencies (
       TAO_EC_ProxyPushSupplier *supplier,
-      TAO_EC_ProxyPushConsumer *consumer
-      ACE_ENV_ARG_DECL);
+      TAO_EC_ProxyPushConsumer *consumer);
   virtual void schedule_event (const RtecEventComm::EventSet &event,
                                TAO_EC_ProxyPushConsumer *consumer,
-                               TAO_EC_Supplier_Filter *filter
-                               ACE_ENV_ARG_DECL);
+                               TAO_EC_Supplier_Filter *filter);
 
 private:
   TAO_EC_Null_Scheduling (const TAO_EC_Null_Scheduling&);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
index dd58901ce10..e3bfd3c21f0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
@@ -25,8 +25,7 @@ TAO_EC_ObserverStrategy::~TAO_EC_ObserverStrategy (void)
 
 RtecEventChannelAdmin::Observer_Handle
 TAO_EC_Null_ObserverStrategy::append_observer (
-       RtecEventChannelAdmin::Observer_ptr
-       ACE_ENV_ARG_DECL)
+       RtecEventChannelAdmin::Observer_ptr)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
@@ -39,37 +38,32 @@ TAO_EC_Null_ObserverStrategy::append_observer (
 
 void
 TAO_EC_Null_ObserverStrategy::remove_observer (
-       RtecEventChannelAdmin::Observer_Handle
-       ACE_ENV_ARG_DECL)
+       RtecEventChannelAdmin::Observer_Handle)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
         RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER))
 {
-  ACE_THROW (RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER());
+  throw RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER();
 }
 
 void
-TAO_EC_Null_ObserverStrategy::connected (TAO_EC_ProxyPushConsumer*
-                                         ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_Null_ObserverStrategy::connected (TAO_EC_ProxyPushConsumer*)
 {
 }
 
 void
-TAO_EC_Null_ObserverStrategy::disconnected (TAO_EC_ProxyPushConsumer*
-                                            ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_Null_ObserverStrategy::disconnected (TAO_EC_ProxyPushConsumer*)
 {
 }
 
 void
-TAO_EC_Null_ObserverStrategy::connected (TAO_EC_ProxyPushSupplier*
-                                         ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_Null_ObserverStrategy::connected (TAO_EC_ProxyPushSupplier*)
 {
 }
 
 void
-TAO_EC_Null_ObserverStrategy::disconnected (TAO_EC_ProxyPushSupplier*
-                                            ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_Null_ObserverStrategy::disconnected (TAO_EC_ProxyPushSupplier*)
 {
 }
 
@@ -83,8 +77,7 @@ TAO_EC_Basic_ObserverStrategy::~TAO_EC_Basic_ObserverStrategy (void)
 
 RtecEventChannelAdmin::Observer_Handle
 TAO_EC_Basic_ObserverStrategy::append_observer (
-       RtecEventChannelAdmin::Observer_ptr obs
-       ACE_ENV_ARG_DECL)
+       RtecEventChannelAdmin::Observer_ptr obs)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
@@ -106,12 +99,12 @@ TAO_EC_Basic_ObserverStrategy::append_observer (
   }
 
   RtecEventChannelAdmin::ConsumerQOS c_qos;
-  this->fill_qos (c_qos ACE_ENV_ARG_PARAMETER);
-  obs->update_consumer (c_qos ACE_ENV_ARG_PARAMETER);
+  this->fill_qos (c_qos);
+  obs->update_consumer (c_qos);
 
   RtecEventChannelAdmin::SupplierQOS s_qos;
-  this->fill_qos (s_qos ACE_ENV_ARG_PARAMETER);
-  obs->update_supplier (s_qos ACE_ENV_ARG_PARAMETER);
+  this->fill_qos (s_qos);
+  obs->update_supplier (s_qos);
 
   return this->handle_generator_;
 }
@@ -119,8 +112,7 @@ TAO_EC_Basic_ObserverStrategy::append_observer (
 
 void
 TAO_EC_Basic_ObserverStrategy::remove_observer (
-       RtecEventChannelAdmin::Observer_Handle handle
-       ACE_ENV_ARG_DECL)
+       RtecEventChannelAdmin::Observer_Handle handle)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
@@ -130,14 +122,12 @@ TAO_EC_Basic_ObserverStrategy::remove_observer (
       RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
 
   if (this->observers_.unbind (handle) == -1)
-    ACE_THROW (
-        RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER());
+    throw RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER();
 }
 
 int
 TAO_EC_Basic_ObserverStrategy::create_observer_list (
-                                RtecEventChannelAdmin::Observer_var *&lst
-                                ACE_ENV_ARG_DECL)
+                                RtecEventChannelAdmin::Observer_var *&lst)
 {
   ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_,
                  RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
@@ -166,106 +156,96 @@ TAO_EC_Basic_ObserverStrategy::create_observer_list (
 
 void
 TAO_EC_Basic_ObserverStrategy::connected (
-    TAO_EC_ProxyPushConsumer *consumer
-    ACE_ENV_ARG_DECL)
+    TAO_EC_ProxyPushConsumer *consumer)
 {
-  this->supplier_qos_update (consumer ACE_ENV_ARG_PARAMETER);
+  this->supplier_qos_update (consumer);
 }
 
 void
 TAO_EC_Basic_ObserverStrategy::disconnected (
-    TAO_EC_ProxyPushConsumer* consumer
-    ACE_ENV_ARG_DECL)
+    TAO_EC_ProxyPushConsumer* consumer)
 {
-  this->supplier_qos_update (consumer ACE_ENV_ARG_PARAMETER);
+  this->supplier_qos_update (consumer);
 }
 
 void
 TAO_EC_Basic_ObserverStrategy::supplier_qos_update (
-                                        TAO_EC_ProxyPushConsumer *consumer
-                                        ACE_ENV_ARG_DECL)
+                                        TAO_EC_ProxyPushConsumer *consumer)
 {
   if (consumer->publications ().is_gateway)
     return;
 
   RtecEventChannelAdmin::SupplierQOS s_qos;
-  this->fill_qos (s_qos ACE_ENV_ARG_PARAMETER);
+  this->fill_qos (s_qos);
 
   RtecEventChannelAdmin::Observer_var *tmp = 0;
-  int size = this->create_observer_list (tmp ACE_ENV_ARG_PARAMETER);
+  int size = this->create_observer_list (tmp);
   ACE_Auto_Basic_Array_Ptr<RtecEventChannelAdmin::Observer_var> copy (tmp);
 
   for (int i = 0; i != size; ++i)
     {
-      ACE_TRY
+      try
         {
-          copy[i]->update_supplier (s_qos ACE_ENV_ARG_PARAMETER);
+          copy[i]->update_supplier (s_qos);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           // Ignore exceptions, we must isolate other observers from
           // failures on this one.
         }
-      ACE_ENDTRY;
     }
 }
 
 void
 TAO_EC_Basic_ObserverStrategy::connected (
-    TAO_EC_ProxyPushSupplier* supplier
-    ACE_ENV_ARG_DECL)
+    TAO_EC_ProxyPushSupplier* supplier)
 {
-  this->consumer_qos_update (supplier ACE_ENV_ARG_PARAMETER);
+  this->consumer_qos_update (supplier);
 }
 
 void
 TAO_EC_Basic_ObserverStrategy::disconnected (
-    TAO_EC_ProxyPushSupplier* supplier
-    ACE_ENV_ARG_DECL)
+    TAO_EC_ProxyPushSupplier* supplier)
 {
-  this->consumer_qos_update (supplier ACE_ENV_ARG_PARAMETER);
+  this->consumer_qos_update (supplier);
 }
 
 void
 TAO_EC_Basic_ObserverStrategy::consumer_qos_update (
-                                        TAO_EC_ProxyPushSupplier *supplier
-                                        ACE_ENV_ARG_DECL)
+                                        TAO_EC_ProxyPushSupplier *supplier)
 {
   if (supplier->subscriptions ().is_gateway)
     return;
 
   RtecEventChannelAdmin::ConsumerQOS c_qos;
-  this->fill_qos (c_qos ACE_ENV_ARG_PARAMETER);
+  this->fill_qos (c_qos);
 
   RtecEventChannelAdmin::Observer_var *tmp = 0;
-  int size = this->create_observer_list (tmp ACE_ENV_ARG_PARAMETER);
+  int size = this->create_observer_list (tmp);
   ACE_Auto_Basic_Array_Ptr<RtecEventChannelAdmin::Observer_var> copy (tmp);
 
   for (int i = 0; i != size; ++i)
     {
-      ACE_TRY
+      try
         {
-          copy[i]->update_consumer (c_qos ACE_ENV_ARG_PARAMETER);
+          copy[i]->update_consumer (c_qos);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           // Ignore exceptions, we must isolate other observers from
           // failures on this one.
         }
-      ACE_ENDTRY;
     }
 }
 
 void
 TAO_EC_Basic_ObserverStrategy::fill_qos (
-      RtecEventChannelAdmin::ConsumerQOS &qos
-      ACE_ENV_ARG_DECL)
+      RtecEventChannelAdmin::ConsumerQOS &qos)
 {
   Headers headers;
 
   TAO_EC_Accumulate_Supplier_Headers worker (headers);
-  this->event_channel_->for_each_consumer (&worker
-                                           ACE_ENV_ARG_PARAMETER);
+  this->event_channel_->for_each_consumer (&worker);
 
   RtecEventChannelAdmin::DependencySet& dep = qos.dependencies;
 
@@ -285,14 +265,12 @@ TAO_EC_Basic_ObserverStrategy::fill_qos (
 
 void
 TAO_EC_Basic_ObserverStrategy::fill_qos (
-      RtecEventChannelAdmin::SupplierQOS &qos
-      ACE_ENV_ARG_DECL)
+      RtecEventChannelAdmin::SupplierQOS &qos)
 {
   Headers headers;
 
   TAO_EC_Accumulate_Consumer_Headers worker (headers);
-  this->event_channel_->for_each_supplier (&worker
-                                           ACE_ENV_ARG_PARAMETER);
+  this->event_channel_->for_each_supplier (&worker);
 
   qos.publications.length (static_cast<CORBA::ULong> (headers.current_size ()));
 
@@ -312,17 +290,16 @@ TAO_EC_Reactive_ObserverStrategy::~TAO_EC_Reactive_ObserverStrategy (void)
 
 void
 TAO_EC_Reactive_ObserverStrategy::supplier_qos_update (
-                                        TAO_EC_ProxyPushConsumer *consumer
-                                        ACE_ENV_ARG_DECL)
+                                        TAO_EC_ProxyPushConsumer *consumer)
 {
   if (consumer->publications ().is_gateway)
     return;
 
   RtecEventChannelAdmin::SupplierQOS s_qos;
-  this->fill_qos (s_qos ACE_ENV_ARG_PARAMETER);
+  this->fill_qos (s_qos);
 
   Observer_Map copy;
-  this->create_observer_map (copy ACE_ENV_ARG_PARAMETER);
+  this->create_observer_map (copy);
 
   Observer_Map_Iterator end = copy.end ();
   for (Observer_Map_Iterator i  = copy.begin ();
@@ -330,43 +307,41 @@ TAO_EC_Reactive_ObserverStrategy::supplier_qos_update (
        ++i)
     {
       Observer_Entry& entry = (*i).int_id_;
-      ACE_TRY
+      try
         {
-          entry.observer->update_supplier (s_qos ACE_ENV_ARG_PARAMETER);
+          entry.observer->update_supplier (s_qos);
         }
-      ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+      catch (const CORBA::OBJECT_NOT_EXIST& ex)
         {
           // Exception occured while updating observer, so remove it from the
           // observer list
-          this->observer_not_exists (entry ACE_ENV_ARG_PARAMETER);
+          this->observer_not_exists (entry);
         }
-      ACE_CATCH (CORBA::TRANSIENT, transient)
+      catch (const CORBA::TRANSIENT& transient)
         {
           // Exception occured while updating observer, so remove it from the
           // observer list
-          this->observer_not_exists (entry ACE_ENV_ARG_PARAMETER);
+          this->observer_not_exists (entry);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           // Ignore all exceptions
         }
-      ACE_ENDTRY;
     }
 }
 
 void
 TAO_EC_Reactive_ObserverStrategy::consumer_qos_update (
-                                        TAO_EC_ProxyPushSupplier *supplier
-                                        ACE_ENV_ARG_DECL)
+                                        TAO_EC_ProxyPushSupplier *supplier)
 {
   if (supplier->subscriptions ().is_gateway)
     return;
 
   RtecEventChannelAdmin::ConsumerQOS c_qos;
-  this->fill_qos (c_qos ACE_ENV_ARG_PARAMETER);
+  this->fill_qos (c_qos);
 
   Observer_Map copy;
-  this->create_observer_map (copy ACE_ENV_ARG_PARAMETER);
+  this->create_observer_map (copy);
 
   Observer_Map_Iterator end = copy.end ();
   for (Observer_Map_Iterator i  = copy.begin ();
@@ -374,33 +349,31 @@ TAO_EC_Reactive_ObserverStrategy::consumer_qos_update (
        ++i)
     {
       Observer_Entry& entry = (*i).int_id_;
-      ACE_TRY
+      try
         {
-          entry.observer->update_consumer (c_qos ACE_ENV_ARG_PARAMETER);
+          entry.observer->update_consumer (c_qos);
         }
-      ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+      catch (const CORBA::OBJECT_NOT_EXIST& ex)
         {
           // Exception occured while updating observer, so remove it from the
           // observer list
-          this->observer_not_exists (entry ACE_ENV_ARG_PARAMETER);
+          this->observer_not_exists (entry);
         }
-      ACE_CATCH (CORBA::TRANSIENT, transient)
+      catch (const CORBA::TRANSIENT& transient)
         {
           // Exception occured while updating observer, so remove it from the
           // observer list
-          this->observer_not_exists (entry ACE_ENV_ARG_PARAMETER);
+          this->observer_not_exists (entry);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           // Ignore all exceptions
         }
-      ACE_ENDTRY;
     }
 }
 
 int
-TAO_EC_Reactive_ObserverStrategy::create_observer_map (Observer_Map &map
-                                                       ACE_ENV_ARG_DECL)
+TAO_EC_Reactive_ObserverStrategy::create_observer_map (Observer_Map &map)
 {
   ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_,
                  RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
@@ -424,25 +397,22 @@ TAO_EC_Reactive_ObserverStrategy::create_observer_map (Observer_Map &map
 }
 
 void
-TAO_EC_Reactive_ObserverStrategy::observer_not_exists (Observer_Entry& observer
-                                                       ACE_ENV_ARG_DECL)
+TAO_EC_Reactive_ObserverStrategy::observer_not_exists (Observer_Entry& observer)
 {
-  ACE_TRY
+  try
     {
-      this->remove_observer(observer.handle ACE_ENV_ARG_PARAMETER);
+      this->remove_observer(observer.handle);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore exceptions
     }
-  ACE_ENDTRY;
 }
 
 // ****************************************************************
 
 void
-TAO_EC_Accumulate_Supplier_Headers::work (TAO_EC_ProxyPushSupplier *supplier
-                                          ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_Accumulate_Supplier_Headers::work (TAO_EC_ProxyPushSupplier *supplier)
 {
   const RtecEventChannelAdmin::ConsumerQOS& sub =
     supplier->subscriptions ();
@@ -463,8 +433,7 @@ TAO_EC_Accumulate_Supplier_Headers::work (TAO_EC_ProxyPushSupplier *supplier
 // ****************************************************************
 
 void
-TAO_EC_Accumulate_Consumer_Headers::work (TAO_EC_ProxyPushConsumer *consumer
-                                          ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_Accumulate_Consumer_Headers::work (TAO_EC_ProxyPushConsumer *consumer)
 {
   const RtecEventChannelAdmin::SupplierQOS& pub =
     consumer->publications ();
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
index 86baeedcdc9..6bf462dccf0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
@@ -64,16 +64,14 @@ public:
 
   /// The basic methods to support the EC strategies.
   virtual RtecEventChannelAdmin::Observer_Handle
-      append_observer (RtecEventChannelAdmin::Observer_ptr
-                       ACE_ENV_ARG_DECL)
+      append_observer (RtecEventChannelAdmin::Observer_ptr)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
         RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER))
     = 0;
   virtual void remove_observer (
-                        RtecEventChannelAdmin::Observer_Handle
-                        ACE_ENV_ARG_DECL)
+                        RtecEventChannelAdmin::Observer_Handle)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
@@ -82,17 +80,13 @@ public:
 
   /// Used by the EC to inform the ObserverStrategy that a Consumer has
   /// connected or disconnected from it.
-  virtual void connected (TAO_EC_ProxyPushConsumer*
-                          ACE_ENV_ARG_DECL_NOT_USED) = 0;
-  virtual void disconnected (TAO_EC_ProxyPushConsumer*
-                             ACE_ENV_ARG_DECL_NOT_USED) = 0;
+  virtual void connected (TAO_EC_ProxyPushConsumer*) = 0;
+  virtual void disconnected (TAO_EC_ProxyPushConsumer*) = 0;
 
   /// Used by the EC to inform the ObserverStrategy that a Supplier has
   /// connected or disconnected from it.
-  virtual void connected (TAO_EC_ProxyPushSupplier*
-                          ACE_ENV_ARG_DECL_NOT_USED) = 0;
-  virtual void disconnected (TAO_EC_ProxyPushSupplier*
-                             ACE_ENV_ARG_DECL_NOT_USED) = 0;
+  virtual void connected (TAO_EC_ProxyPushSupplier*) = 0;
+  virtual void disconnected (TAO_EC_ProxyPushSupplier*) = 0;
 };
 
 // ****************************************************************
@@ -113,27 +107,21 @@ public:
 
   // = The TAO_EC_ObserverStrategy methods.
   virtual RtecEventChannelAdmin::Observer_Handle
-      append_observer (RtecEventChannelAdmin::Observer_ptr
-                       ACE_ENV_ARG_DECL)
+      append_observer (RtecEventChannelAdmin::Observer_ptr)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
         RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER));
   virtual void remove_observer (
-                        RtecEventChannelAdmin::Observer_Handle
-                        ACE_ENV_ARG_DECL)
+                        RtecEventChannelAdmin::Observer_Handle)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
         RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER));
-  virtual void connected (TAO_EC_ProxyPushConsumer*
-                          ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void disconnected (TAO_EC_ProxyPushConsumer*
-                             ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void connected (TAO_EC_ProxyPushSupplier*
-                          ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void disconnected (TAO_EC_ProxyPushSupplier*
-                             ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void connected (TAO_EC_ProxyPushConsumer*);
+  virtual void disconnected (TAO_EC_ProxyPushConsumer*);
+  virtual void connected (TAO_EC_ProxyPushSupplier*);
+  virtual void disconnected (TAO_EC_ProxyPushSupplier*);
 };
 
 // ****************************************************************
@@ -166,27 +154,21 @@ public:
 
   // = The TAO_EC_ObserverStrategy methods.
   virtual RtecEventChannelAdmin::Observer_Handle
-      append_observer (RtecEventChannelAdmin::Observer_ptr
-                       ACE_ENV_ARG_DECL)
+      append_observer (RtecEventChannelAdmin::Observer_ptr)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
         RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER));
   virtual void remove_observer (
-                        RtecEventChannelAdmin::Observer_Handle
-                        ACE_ENV_ARG_DECL)
+                        RtecEventChannelAdmin::Observer_Handle)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
         RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER));
-  virtual void connected (TAO_EC_ProxyPushConsumer*
-                          ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void disconnected (TAO_EC_ProxyPushConsumer*
-                             ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void connected (TAO_EC_ProxyPushSupplier*
-                          ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void disconnected (TAO_EC_ProxyPushSupplier*
-                             ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void connected (TAO_EC_ProxyPushConsumer*);
+  virtual void disconnected (TAO_EC_ProxyPushConsumer*);
+  virtual void connected (TAO_EC_ProxyPushSupplier*);
+  virtual void disconnected (TAO_EC_ProxyPushSupplier*);
 
   /**
    * @struct Observer_Entry
@@ -230,24 +212,19 @@ protected:
   /// Helpers.
   //@{
   /// Recompute EC consumer subscriptions and send them out to all observers.
-  virtual void consumer_qos_update (TAO_EC_ProxyPushSupplier *supplier
-                                    ACE_ENV_ARG_DECL);
+  virtual void consumer_qos_update (TAO_EC_ProxyPushSupplier *supplier);
 
   /// Recompute EC supplier publications and send them out to all observers.
-  virtual void supplier_qos_update (TAO_EC_ProxyPushConsumer *consumer
-                                    ACE_ENV_ARG_DECL);
+  virtual void supplier_qos_update (TAO_EC_ProxyPushConsumer *consumer);
 
   /// Compute consumer QOS.
-  void fill_qos (RtecEventChannelAdmin::ConsumerQOS &qos
-                 ACE_ENV_ARG_DECL);
+  void fill_qos (RtecEventChannelAdmin::ConsumerQOS &qos);
   /// Compute supplier QOS.
-  void fill_qos (RtecEventChannelAdmin::SupplierQOS &qos
-                 ACE_ENV_ARG_DECL);
+  void fill_qos (RtecEventChannelAdmin::SupplierQOS &qos);
 
   /// Copies all current observers into an array and passes it
   /// back to the caller through @a lst.  Returns the size of the array.
-  int create_observer_list (RtecEventChannelAdmin::Observer_var *&lst
-                            ACE_ENV_ARG_DECL);
+  int create_observer_list (RtecEventChannelAdmin::Observer_var *&lst);
   //@}
 
 protected:
@@ -298,24 +275,20 @@ protected:
   /// Helpers.
   //@{
   /// Recompute EC consumer subscriptions and send them out to all observers.
-  virtual void consumer_qos_update (TAO_EC_ProxyPushSupplier *supplier
-                                    ACE_ENV_ARG_DECL);
+  virtual void consumer_qos_update (TAO_EC_ProxyPushSupplier *supplier);
 
   /// Recompute EC supplier publications and send them out to all observers.
-  virtual void supplier_qos_update (TAO_EC_ProxyPushConsumer *consumer
-                                    ACE_ENV_ARG_DECL);
+  virtual void supplier_qos_update (TAO_EC_ProxyPushConsumer *consumer);
 
   /**
    * Copies all current observers into a map and passes it
    * back to the caller through @a map.
    * @return Returns the size of the map.
    */
-  int create_observer_map (Observer_Map &map
-                           ACE_ENV_ARG_DECL);
+  int create_observer_map (Observer_Map &map);
 
   /// The observer doesn't exist anymore
-  void observer_not_exists (Observer_Entry& observer
-                            ACE_ENV_ARG_DECL);
+  void observer_not_exists (Observer_Entry& observer);
   //@}
 };
 
@@ -328,8 +301,7 @@ public:
   /// Constructor
   TAO_EC_Accumulate_Supplier_Headers (TAO_EC_Basic_ObserverStrategy::Headers &headers);
 
-  virtual void work (TAO_EC_ProxyPushSupplier *supplier
-                     ACE_ENV_ARG_DECL);
+  virtual void work (TAO_EC_ProxyPushSupplier *supplier);
 
 private:
   TAO_EC_Basic_ObserverStrategy::Headers &headers_;
@@ -344,8 +316,7 @@ public:
   /// Constructor
   TAO_EC_Accumulate_Consumer_Headers (TAO_EC_Basic_ObserverStrategy::Headers &headers);
 
-  virtual void work (TAO_EC_ProxyPushConsumer *consumer
-                     ACE_ENV_ARG_DECL);
+  virtual void work (TAO_EC_ProxyPushConsumer *consumer);
 
 private:
   TAO_EC_Basic_ObserverStrategy::Headers &headers_;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
index a7805acdc24..f7a947a25e8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
@@ -55,20 +55,18 @@ TAO_EC_Per_Supplier_Filter::unbind (TAO_EC_ProxyPushConsumer* consumer)
 
   this->consumer_ = 0;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       this->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // @@ Ignore exceptions
     }
-  ACE_ENDTRY;
 }
 
 void
-TAO_EC_Per_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* supplier
-                                       ACE_ENV_ARG_DECL)
+TAO_EC_Per_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* supplier)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
@@ -94,7 +92,7 @@ TAO_EC_Per_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* supplier
 #if TAO_EC_ENABLE_DEBUG_MESSAGES
           ACE_DEBUG ((LM_DEBUG, "  matched\n"));
 #endif /* TAO_EC_ENABLED_DEBUG_MESSAGES */
-          this->collection_->connected (supplier ACE_ENV_ARG_PARAMETER);
+          this->collection_->connected (supplier);
           return;
         }
 #if TAO_EC_ENABLE_DEBUG_MESSAGES
@@ -104,8 +102,7 @@ TAO_EC_Per_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* supplier
 }
 
 void
-TAO_EC_Per_Supplier_Filter::reconnected (TAO_EC_ProxyPushSupplier* supplier
-                                         ACE_ENV_ARG_DECL)
+TAO_EC_Per_Supplier_Filter::reconnected (TAO_EC_ProxyPushSupplier* supplier)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
@@ -126,18 +123,17 @@ TAO_EC_Per_Supplier_Filter::reconnected (TAO_EC_ProxyPushSupplier* supplier
       if (supplier->can_match (event.header))
         {
           //          ACE_DEBUG ((LM_DEBUG, "  matched %x\n", supplier));
-          this->collection_->connected (supplier ACE_ENV_ARG_PARAMETER);
+          this->collection_->connected (supplier);
           return;
         }
     }
-  this->collection_->disconnected (supplier ACE_ENV_ARG_PARAMETER);
+  this->collection_->disconnected (supplier);
 }
 
 void
-TAO_EC_Per_Supplier_Filter::disconnected (TAO_EC_ProxyPushSupplier* supplier
-                                          ACE_ENV_ARG_DECL)
+TAO_EC_Per_Supplier_Filter::disconnected (TAO_EC_ProxyPushSupplier* supplier)
 {
-  this->collection_->disconnected (supplier ACE_ENV_ARG_PARAMETER);
+  this->collection_->disconnected (supplier);
 }
 
 void
@@ -148,24 +144,21 @@ TAO_EC_Per_Supplier_Filter::shutdown (void)
 
 void
 TAO_EC_Per_Supplier_Filter::push (const RtecEventComm::EventSet& event,
-                                  TAO_EC_ProxyPushConsumer *consumer
-                                  ACE_ENV_ARG_DECL)
+                                  TAO_EC_ProxyPushConsumer *consumer)
 {
   TAO_EC_Scheduling_Strategy* scheduling_strategy =
     this->event_channel_->scheduling_strategy ();
   scheduling_strategy->schedule_event (event,
                                        consumer,
-                                       this
-                                       ACE_ENV_ARG_PARAMETER);
+                                       this);
 }
 
 void
 TAO_EC_Per_Supplier_Filter::push_scheduled_event (RtecEventComm::EventSet &event,
-                                                  const TAO_EC_QOS_Info &event_info
-                                                  ACE_ENV_ARG_DECL)
+                                                  const TAO_EC_QOS_Info &event_info)
 {
   TAO_EC_Filter_Worker worker (event, event_info);
-  this->collection_->for_each (&worker ACE_ENV_ARG_PARAMETER);
+  this->collection_->for_each (&worker);
 }
 
 CORBA::ULong
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
index acbbbfa640d..2d0947dc512 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
@@ -53,19 +53,14 @@ public:
   // = The TAO_EC_Supplier_Filter methods.
   virtual void bind (TAO_EC_ProxyPushConsumer* consumer);
   virtual void unbind (TAO_EC_ProxyPushConsumer* consumer);
-  virtual void connected (TAO_EC_ProxyPushSupplier* supplier
-                          ACE_ENV_ARG_DECL);
-  virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier
-                            ACE_ENV_ARG_DECL);
-  virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier
-                             ACE_ENV_ARG_DECL);
+  virtual void connected (TAO_EC_ProxyPushSupplier* supplier);
+  virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier);
+  virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier);
   virtual void shutdown (void);
   virtual void push (const RtecEventComm::EventSet& event,
-                     TAO_EC_ProxyPushConsumer *consumer
-                     ACE_ENV_ARG_DECL_NOT_USED);
+                     TAO_EC_ProxyPushConsumer *consumer);
   virtual void push_scheduled_event (RtecEventComm::EventSet &event,
-                                     const TAO_EC_QOS_Info &event_info
-                                     ACE_ENV_ARG_DECL);
+                                     const TAO_EC_QOS_Info &event_info);
   virtual CORBA::ULong _decr_refcnt (void);
   virtual CORBA::ULong _incr_refcnt (void);
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
index 9aea7f9ebd7..580c0e4d4d3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
@@ -26,8 +26,7 @@ TAO_EC_Prefix_Filter_Builder::~TAO_EC_Prefix_Filter_Builder (void)
 TAO_EC_Filter*
 TAO_EC_Prefix_Filter_Builder::build (
     TAO_EC_ProxyPushSupplier *supplier,
-    RtecEventChannelAdmin::ConsumerQOS& qos
-    ACE_ENV_ARG_DECL_NOT_USED) const
+    RtecEventChannelAdmin::ConsumerQOS& qos) const
 {
   CORBA::ULong pos = 0;
   return this->recursive_build (supplier, qos, pos);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h
index afa9b699e82..01c5a950642 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h
@@ -48,8 +48,7 @@ public:
 
   // = The TAO_EC_Filter_Builder methods...
   TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier,
-                        RtecEventChannelAdmin::ConsumerQOS& qos
-                        ACE_ENV_ARG_DECL) const;
+                        RtecEventChannelAdmin::ConsumerQOS& qos) const;
 
 private:
   /// Recursively build the filter tree.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
index 782ea9f5169..c9641c01700 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
@@ -38,10 +38,9 @@ TAO_EC_Priority_Dispatching::activate (void)
      ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
   priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
   for (int i = 0; i < this->ntasks_; ++i)
     {
-      ACE_TRY
+      try
         {
           RtecScheduler::Period_t period =
             ACE_CU64_TO_CU32 (ACE_Scheduler_Rates[i]);
@@ -49,7 +48,7 @@ TAO_EC_Priority_Dispatching::activate (void)
           ACE_OS::sprintf (buf, "Dispatching_Task-%d.us", period);
 
           RtecScheduler::handle_t rt_info =
-            this->scheduler_->create (buf ACE_ENV_ARG_PARAMETER);
+            this->scheduler_->create (buf);
 
           this->scheduler_->set (rt_info,
                                  RtecScheduler::VERY_LOW_CRITICALITY,
@@ -60,14 +59,12 @@ TAO_EC_Priority_Dispatching::activate (void)
                                  RtecScheduler::VERY_LOW_IMPORTANCE,
                                  0, // quantum
                                  1, // threads
-                                 RtecScheduler::OPERATION
-                                  ACE_ENV_ARG_PARAMETER);
+                                 RtecScheduler::OPERATION);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           // Ignore exceptions..
         }
-      ACE_ENDTRY;
 
       ACE_NEW (this->tasks_[i],
                TAO_EC_Dispatching_Task (&this->thread_manager_));
@@ -108,19 +105,17 @@ void
 TAO_EC_Priority_Dispatching::push (TAO_EC_ProxyPushSupplier* proxy,
                                    RtecEventComm::PushConsumer_ptr consumer,
                                    const RtecEventComm::EventSet& event,
-                                   TAO_EC_QOS_Info& qos_info
-                                   ACE_ENV_ARG_DECL)
+                                   TAO_EC_QOS_Info& qos_info)
 {
   RtecEventComm::EventSet event_copy = event;
-  this->push_nocopy (proxy, consumer, event_copy, qos_info ACE_ENV_ARG_PARAMETER);
+  this->push_nocopy (proxy, consumer, event_copy, qos_info);
 }
 
 void
 TAO_EC_Priority_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
                                           RtecEventComm::PushConsumer_ptr consumer,
                                           RtecEventComm::EventSet& event,
-                                          TAO_EC_QOS_Info& qos_info
-                                          ACE_ENV_ARG_DECL)
+                                          TAO_EC_QOS_Info& qos_info)
 {
   if (this->tasks_ == 0)
     this->activate ();
@@ -133,7 +128,7 @@ TAO_EC_Priority_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
     }
 
 
-  this->tasks_[i]->push (proxy, consumer, event ACE_ENV_ARG_PARAMETER);
+  this->tasks_[i]->push (proxy, consumer, event);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
index ebbb6cd6085..1c7c6413c92 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
@@ -62,13 +62,11 @@ public:
   virtual void push (TAO_EC_ProxyPushSupplier* proxy,
                      RtecEventComm::PushConsumer_ptr consumer,
                      const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info
-                     ACE_ENV_ARG_DECL);
+                     TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
                             RtecEventComm::PushConsumer_ptr consumer,
                             RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info
-                            ACE_ENV_ARG_DECL);
+                            TAO_EC_QOS_Info& qos_info);
 
 private:
   /// Use our own thread manager.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
index 0f3456c0e86..7bd17246249 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
@@ -21,8 +21,7 @@ TAO_EC_Priority_Scheduling::~TAO_EC_Priority_Scheduling (void)
 void
 TAO_EC_Priority_Scheduling::add_proxy_supplier_dependencies (
       TAO_EC_ProxyPushSupplier *supplier,
-      TAO_EC_ProxyPushConsumer *consumer
-      ACE_ENV_ARG_DECL)
+      TAO_EC_ProxyPushConsumer *consumer)
 {
   ACE_DEBUG ((LM_DEBUG, "add_proxy_supplier_dependencies - %x %x\n",
               supplier, consumer));
@@ -41,19 +40,17 @@ TAO_EC_Priority_Scheduling::add_proxy_supplier_dependencies (
       this->scheduler_->priority (qos_info.rt_info,
                                   os_priority,
                                   p_subpriority,
-                                  p_priority
-                                   ACE_ENV_ARG_PARAMETER);
+                                  p_priority);
       qos_info.preemption_priority = p_priority;
 
-      supplier->add_dependencies (header, qos_info ACE_ENV_ARG_PARAMETER);
+      supplier->add_dependencies (header, qos_info);
     }
 }
 
 void
 TAO_EC_Priority_Scheduling::schedule_event (const RtecEventComm::EventSet &event,
                                             TAO_EC_ProxyPushConsumer *consumer,
-                                            TAO_EC_Supplier_Filter *filter
-                                            ACE_ENV_ARG_DECL)
+                                            TAO_EC_Supplier_Filter *filter)
 {
   RtecEventChannelAdmin::SupplierQOS qos =
     consumer->publications ();
@@ -83,13 +80,11 @@ TAO_EC_Priority_Scheduling::schedule_event (const RtecEventComm::EventSet &event
           this->scheduler_->priority (qos_info.rt_info,
                                       os_priority,
                                       p_subpriority,
-                                      p_priority
-                                      ACE_ENV_ARG_PARAMETER);
+                                      p_priority);
           qos_info.preemption_priority = p_priority;
         }
 
-      filter->push_scheduled_event (single_event, qos_info
-                                    ACE_ENV_ARG_PARAMETER);
+      filter->push_scheduled_event (single_event, qos_info);
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
index 5816bec091d..8fa6953dac9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
@@ -47,12 +47,10 @@ public:
 
   virtual void add_proxy_supplier_dependencies (
       TAO_EC_ProxyPushSupplier *supplier,
-      TAO_EC_ProxyPushConsumer *consumer
-      ACE_ENV_ARG_DECL);
+      TAO_EC_ProxyPushConsumer *consumer);
   virtual void schedule_event (const RtecEventComm::EventSet &event,
                                TAO_EC_ProxyPushConsumer *consumer,
-                               TAO_EC_Supplier_Filter *filter
-                               ACE_ENV_ARG_DECL);
+                               TAO_EC_Supplier_Filter *filter);
 
 private:
   TAO_EC_Priority_Scheduling (const TAO_EC_Priority_Scheduling&);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
index c48713fad93..8dcebde5f7f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
@@ -44,8 +44,7 @@ TAO_EC_ProxyPushConsumer::~TAO_EC_ProxyPushConsumer (void)
 
 CORBA::Boolean
 TAO_EC_ProxyPushConsumer::supplier_non_existent (
-      CORBA::Boolean_out disconnected
-      ACE_ENV_ARG_DECL)
+      CORBA::Boolean_out disconnected)
 {
   CORBA::Object_var supplier;
   {
@@ -74,8 +73,7 @@ TAO_EC_ProxyPushConsumer::supplier_non_existent (
 }
 
 void
-TAO_EC_ProxyPushConsumer::connected (TAO_EC_ProxyPushSupplier* supplier
-                                     ACE_ENV_ARG_DECL)
+TAO_EC_ProxyPushConsumer::connected (TAO_EC_ProxyPushSupplier* supplier)
 {
   TAO_EC_ProxyPushConsumer_Guard ace_mon (this->lock_,
                                           this->refcount_,
@@ -84,12 +82,11 @@ TAO_EC_ProxyPushConsumer::connected (TAO_EC_ProxyPushSupplier* supplier
   if (!ace_mon.locked ())
     return;
 
-  ace_mon.filter->connected (supplier ACE_ENV_ARG_PARAMETER);
+  ace_mon.filter->connected (supplier);
 }
 
 void
-TAO_EC_ProxyPushConsumer::reconnected (TAO_EC_ProxyPushSupplier* supplier
-                                       ACE_ENV_ARG_DECL)
+TAO_EC_ProxyPushConsumer::reconnected (TAO_EC_ProxyPushSupplier* supplier)
 {
   TAO_EC_ProxyPushConsumer_Guard ace_mon (this->lock_,
                                           this->refcount_,
@@ -98,12 +95,11 @@ TAO_EC_ProxyPushConsumer::reconnected (TAO_EC_ProxyPushSupplier* supplier
   if (!ace_mon.locked ())
     return;
 
-  ace_mon.filter->reconnected (supplier ACE_ENV_ARG_PARAMETER);
+  ace_mon.filter->reconnected (supplier);
 }
 
 void
-TAO_EC_ProxyPushConsumer::disconnected (TAO_EC_ProxyPushSupplier* supplier
-                                        ACE_ENV_ARG_DECL)
+TAO_EC_ProxyPushConsumer::disconnected (TAO_EC_ProxyPushSupplier* supplier)
 {
   TAO_EC_ProxyPushConsumer_Guard ace_mon (this->lock_,
                                           this->refcount_,
@@ -112,24 +108,21 @@ TAO_EC_ProxyPushConsumer::disconnected (TAO_EC_ProxyPushSupplier* supplier
   if (!ace_mon.locked ())
     return;
 
-  ace_mon.filter->disconnected (supplier ACE_ENV_ARG_PARAMETER);
+  ace_mon.filter->disconnected (supplier);
 }
 
 void
-TAO_EC_ProxyPushConsumer::connected (TAO_EC_ProxyPushConsumer*
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_ProxyPushConsumer::connected (TAO_EC_ProxyPushConsumer*)
 {
 }
 
 void
-TAO_EC_ProxyPushConsumer::reconnected (TAO_EC_ProxyPushConsumer*
-                                       ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_ProxyPushConsumer::reconnected (TAO_EC_ProxyPushConsumer*)
 {
 }
 
 void
-TAO_EC_ProxyPushConsumer::disconnected (TAO_EC_ProxyPushConsumer*
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_ProxyPushConsumer::disconnected (TAO_EC_ProxyPushConsumer*)
 {
 }
 
@@ -166,16 +159,15 @@ TAO_EC_ProxyPushConsumer::shutdown (void)
   if (CORBA::is_nil (supplier.in ()))
     return;
 
-  ACE_TRY
+  try
     {
       supplier->disconnect_push_supplier ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore exceptions, we must isolate other clients from
       // failures on this one.
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -196,20 +188,19 @@ TAO_EC_ProxyPushConsumer::cleanup_i (void)
 void
 TAO_EC_ProxyPushConsumer::deactivate (void)
 {
-  ACE_TRY
+  try
     {
       PortableServer::ObjectId id =
           this->object_id ();
-      this->default_POA_->deactivate_object (id ACE_ENV_ARG_PARAMETER);
+      this->default_POA_->deactivate_object (id);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Exceptions here should not be propagated.  They usually
       // indicate that an object is beign disconnected twice, or some
       // race condition, but not a fault that the user needs to know
       // about.
     }
-  ACE_ENDTRY;
 }
 
 CORBA::ULong
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
index 9977077cae5..5fa313c5857 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
@@ -68,16 +68,14 @@ public:
 
   /// Activate in the POA
   virtual void activate (
-          RtecEventChannelAdmin::ProxyPushConsumer_ptr &proxy
-          ACE_ENV_ARG_DECL)
+          RtecEventChannelAdmin::ProxyPushConsumer_ptr &proxy)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
   /// Deactivate from the POA
   virtual void deactivate (void);
 
   /// Disconnect this from
-  virtual void disconnect_push_consumer (
-            ACE_ENV_SINGLE_ARG_DECL) = 0;
+  virtual void disconnect_push_consumer () = 0;
 
   /// Return 0 if no supplier is connected...
   CORBA::Boolean is_connected (void) const;
@@ -94,26 +92,19 @@ public:
    * it is disconnected then it returns true and sets the
    * <disconnected> flag.
    */
-  CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected
-                                        ACE_ENV_ARG_DECL);
+  CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected);
 
   /// Concrete implementations can use this methods to keep track of
   /// the consumers interested in this events.
-  virtual void connected (TAO_EC_ProxyPushSupplier* supplier
-                          ACE_ENV_ARG_DECL);
-  virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier
-                            ACE_ENV_ARG_DECL);
-  virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier
-                             ACE_ENV_ARG_DECL);
+  virtual void connected (TAO_EC_ProxyPushSupplier* supplier);
+  virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier);
+  virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier);
 
   /// Usually implemented as no-ops, but some configurations may
   /// require this methods.
-  virtual void connected (TAO_EC_ProxyPushConsumer* consumer
-                          ACE_ENV_ARG_DECL);
-  virtual void reconnected (TAO_EC_ProxyPushConsumer* consumer
-                            ACE_ENV_ARG_DECL);
-  virtual void disconnected (TAO_EC_ProxyPushConsumer* consumer
-                             ACE_ENV_ARG_DECL);
+  virtual void connected (TAO_EC_ProxyPushConsumer* consumer);
+  virtual void reconnected (TAO_EC_ProxyPushConsumer* consumer);
+  virtual void disconnected (TAO_EC_ProxyPushConsumer* consumer);
 
   /// The event channel is shutting down
   virtual void shutdown (void);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
index c3953adfb4e..2f60f3c80e7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
@@ -46,50 +46,42 @@ TAO_EC_ProxyPushSupplier::~TAO_EC_ProxyPushSupplier (void)
 }
 
 void
-TAO_EC_ProxyPushSupplier::connected (TAO_EC_ProxyPushConsumer* consumer
-                                     ACE_ENV_ARG_DECL)
+TAO_EC_ProxyPushSupplier::connected (TAO_EC_ProxyPushConsumer* consumer)
 {
   TAO_EC_Scheduling_Strategy *s =
     this->event_channel_->scheduling_strategy ();
 
   s->add_proxy_supplier_dependencies (this,
-                                      consumer
-                                       ACE_ENV_ARG_PARAMETER);
+                                      consumer);
 }
 
 void
-TAO_EC_ProxyPushSupplier::reconnected (TAO_EC_ProxyPushConsumer* consumer
-                                       ACE_ENV_ARG_DECL)
+TAO_EC_ProxyPushSupplier::reconnected (TAO_EC_ProxyPushConsumer* consumer)
 {
   TAO_EC_Scheduling_Strategy *s =
     this->event_channel_->scheduling_strategy ();
 
   s->add_proxy_supplier_dependencies (this,
-                                      consumer
-                                       ACE_ENV_ARG_PARAMETER);
+                                      consumer);
 }
 
 void
-TAO_EC_ProxyPushSupplier::disconnected (TAO_EC_ProxyPushConsumer*
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_ProxyPushSupplier::disconnected (TAO_EC_ProxyPushConsumer*)
 {
 }
 
 void
-TAO_EC_ProxyPushSupplier::connected (TAO_EC_ProxyPushSupplier*
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_ProxyPushSupplier::connected (TAO_EC_ProxyPushSupplier*)
 {
 }
 
 void
-TAO_EC_ProxyPushSupplier::reconnected (TAO_EC_ProxyPushSupplier*
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_ProxyPushSupplier::reconnected (TAO_EC_ProxyPushSupplier*)
 {
 }
 
 void
-TAO_EC_ProxyPushSupplier::disconnected (TAO_EC_ProxyPushSupplier*
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_ProxyPushSupplier::disconnected (TAO_EC_ProxyPushSupplier*)
 {
 }
 
@@ -118,16 +110,15 @@ TAO_EC_ProxyPushSupplier::shutdown (void)
   if (CORBA::is_nil (consumer.in ()))
     return;
 
-  ACE_TRY
+  try
     {
       consumer->disconnect_push_consumer ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore exceptions, we must isolate other clients from
       // problems on this one.
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -145,20 +136,19 @@ TAO_EC_ProxyPushSupplier::cleanup_i (void)
 void
 TAO_EC_ProxyPushSupplier::deactivate (void) ACE_THROW_SPEC (())
 {
-  ACE_TRY
+  try
     {
       PortableServer::ObjectId id =
         this->object_id ();
-      this->default_POA_->deactivate_object (id ACE_ENV_ARG_PARAMETER);
+      this->default_POA_->deactivate_object (id);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Exceptions here should not be propagated.  They usually
       // indicate that an object is beign disconnected twice, or some
       // race condition, but not a fault that the user needs to know
       // about.
     }
-  ACE_ENDTRY;
 }
 
 CORBA::ULong
@@ -193,8 +183,7 @@ typedef TAO_ESF_Proxy_RefCount_Guard<TAO_EC_Event_Channel_Base,TAO_EC_ProxyPushS
 
 int
 TAO_EC_ProxyPushSupplier::filter (const RtecEventComm::EventSet& event,
-                                  TAO_EC_QOS_Info& qos_info
-                                  ACE_ENV_ARG_DECL)
+                                  TAO_EC_QOS_Info& qos_info)
 {
   Destroy_Guard auto_destroy (this->refcount_,
                               this->event_channel_,
@@ -210,15 +199,14 @@ TAO_EC_ProxyPushSupplier::filter (const RtecEventComm::EventSet& event,
       return 0;
 
     result =
-      this->child_->filter (event, qos_info ACE_ENV_ARG_PARAMETER);
+      this->child_->filter (event, qos_info);
   }
   return result;
 }
 
 int
 TAO_EC_ProxyPushSupplier::filter_nocopy (RtecEventComm::EventSet& event,
-                                         TAO_EC_QOS_Info& qos_info
-                                         ACE_ENV_ARG_DECL)
+                                         TAO_EC_QOS_Info& qos_info)
 {
   Destroy_Guard auto_destroy (this->refcount_,
                               this->event_channel_,
@@ -234,15 +222,14 @@ TAO_EC_ProxyPushSupplier::filter_nocopy (RtecEventComm::EventSet& event,
       return 0;
 
     result =
-      this->child_->filter_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
+      this->child_->filter_nocopy (event, qos_info);
   }
   return result;
 }
 
 void
 TAO_EC_ProxyPushSupplier::push (const RtecEventComm::EventSet& event,
-                                TAO_EC_QOS_Info& qos_info
-                                ACE_ENV_ARG_DECL)
+                                TAO_EC_QOS_Info& qos_info)
 {
   // The mutex is already held by the caller (usually the filter()
   // method)
@@ -266,8 +253,7 @@ TAO_EC_ProxyPushSupplier::push (const RtecEventComm::EventSet& event,
   RtecEventComm::PushConsumer_var consumer =
     RtecEventComm::PushConsumer::_duplicate (this->consumer_.in ());
 
-  this->pre_dispatch_hook (const_cast<RtecEventComm::EventSet&> (event)
-                           ACE_ENV_ARG_PARAMETER);
+  this->pre_dispatch_hook (const_cast<RtecEventComm::EventSet&> (event));
 
   {
     // We have to release the lock to avoid dead-locks.
@@ -279,8 +265,7 @@ TAO_EC_ProxyPushSupplier::push (const RtecEventComm::EventSet& event,
     this->event_channel_->dispatching ()->push (this,
                                                 consumer.in (),
                                                 event,
-                                                qos_info
-                                                 ACE_ENV_ARG_PARAMETER);
+                                                qos_info);
   }
 
   if (this->child_ != 0)
@@ -288,15 +273,13 @@ TAO_EC_ProxyPushSupplier::push (const RtecEventComm::EventSet& event,
 }
 
 void
-TAO_EC_ProxyPushSupplier::pre_dispatch_hook (RtecEventComm::EventSet&
-                                             ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_ProxyPushSupplier::pre_dispatch_hook (RtecEventComm::EventSet&)
 {
 }
 
 void
 TAO_EC_ProxyPushSupplier::push_nocopy (RtecEventComm::EventSet& event,
-                                       TAO_EC_QOS_Info& qos_info
-                                       ACE_ENV_ARG_DECL)
+                                       TAO_EC_QOS_Info& qos_info)
 {
   // The mutex is already held by the caller (usually the filter()
   // method)
@@ -320,7 +303,7 @@ TAO_EC_ProxyPushSupplier::push_nocopy (RtecEventComm::EventSet& event,
   RtecEventComm::PushConsumer_var consumer =
     RtecEventComm::PushConsumer::_duplicate (this->consumer_.in ());
 
-  this->pre_dispatch_hook (event ACE_ENV_ARG_PARAMETER);
+  this->pre_dispatch_hook (event);
 
   {
     TAO_EC_Unlock reverse_lock (*this->lock_);
@@ -331,8 +314,7 @@ TAO_EC_ProxyPushSupplier::push_nocopy (RtecEventComm::EventSet& event,
     this->event_channel_->dispatching ()->push_nocopy (this,
                                                        consumer.in (),
                                                        event,
-                                                       qos_info
-                                                        ACE_ENV_ARG_PARAMETER);
+                                                       qos_info);
   }
 
   if (this->child_ != 0)
@@ -342,8 +324,7 @@ TAO_EC_ProxyPushSupplier::push_nocopy (RtecEventComm::EventSet& event,
 void
 TAO_EC_ProxyPushSupplier::push_to_consumer (
     RtecEventComm::PushConsumer_ptr consumer,
-    const RtecEventComm::EventSet& event
-    ACE_ENV_ARG_DECL)
+    const RtecEventComm::EventSet& event)
 {
   {
     ACE_GUARD_THROW_EX (
@@ -357,11 +338,11 @@ TAO_EC_ProxyPushSupplier::push_to_consumer (
       return;
   }
 
-  ACE_TRY
+  try
     {
-      consumer->push (event ACE_ENV_ARG_PARAMETER);
+      consumer->push (event);
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used)
+  catch (const CORBA::OBJECT_NOT_EXIST& not_used)
     {
       // Do not report errors for old consumers
       // NOTE: The comparison below is not completely correct, it
@@ -375,10 +356,10 @@ TAO_EC_ProxyPushSupplier::push_to_consumer (
           TAO_EC_ConsumerControl *control =
             this->event_channel_->consumer_control ();
 
-          control->consumer_not_exist (this ACE_ENV_ARG_PARAMETER);
+          control->consumer_not_exist (this);
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (CORBA::SystemException& sysex)
     {
       // Do not report errors for old consumers
       // NOTE: The comparison below is not completely correct, it
@@ -393,54 +374,48 @@ TAO_EC_ProxyPushSupplier::push_to_consumer (
             this->event_channel_->consumer_control ();
 
           control->system_exception (this,
-                                     sysex
-                                      ACE_ENV_ARG_PARAMETER);
+                                     sysex);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Shouldn't happen, but does not hurt
     }
-  ACE_ENDTRY;
 }
 
 void
 TAO_EC_ProxyPushSupplier::reactive_push_to_consumer (
     RtecEventComm::PushConsumer_ptr consumer,
-    const RtecEventComm::EventSet& event
-    ACE_ENV_ARG_DECL)
+    const RtecEventComm::EventSet& event)
 {
-  ACE_TRY
+  try
     {
-      consumer->push (event ACE_ENV_ARG_PARAMETER);
+      consumer->push (event);
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used)
+  catch (const CORBA::OBJECT_NOT_EXIST& not_used)
     {
       TAO_EC_ConsumerControl *control =
         this->event_channel_->consumer_control ();
 
-      control->consumer_not_exist (this ACE_ENV_ARG_PARAMETER);
+      control->consumer_not_exist (this);
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (CORBA::SystemException& sysex)
     {
       TAO_EC_ConsumerControl *control =
         this->event_channel_->consumer_control ();
 
       control->system_exception (this,
-                                 sysex
-                                  ACE_ENV_ARG_PARAMETER);
+                                 sysex);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Shouldn't happen
     }
-  ACE_ENDTRY;
 }
 
 CORBA::Boolean
 TAO_EC_ProxyPushSupplier::consumer_non_existent (
-      CORBA::Boolean_out disconnected
-      ACE_ENV_ARG_DECL)
+      CORBA::Boolean_out disconnected)
 {
   CORBA::Object_var consumer;
   {
@@ -496,16 +471,14 @@ TAO_EC_ProxyPushSupplier::can_match (
 int
 TAO_EC_ProxyPushSupplier::add_dependencies (
       const RtecEventComm::EventHeader &header,
-      const TAO_EC_QOS_Info &qos_info
-      ACE_ENV_ARG_DECL)
+      const TAO_EC_QOS_Info &qos_info)
 {
   ACE_GUARD_THROW_EX (
           ACE_Lock, ace_mon, *this->lock_,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
 
   return this->child_->add_dependencies (header,
-                                         qos_info
-                                         ACE_ENV_ARG_PARAMETER);
+                                         qos_info);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
index 2fcb80d42de..9b80a1241f7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
@@ -68,8 +68,7 @@ public:
 
   /// Activate in the POA
   virtual void activate (
-       RtecEventChannelAdmin::ProxyPushSupplier_ptr &proxy
-       ACE_ENV_ARG_DECL)
+       RtecEventChannelAdmin::ProxyPushSupplier_ptr &proxy)
    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
   /// Deactivate from the POA
@@ -77,8 +76,7 @@ public:
     ACE_THROW_SPEC (());
 
   /// Disconnect this from
-  virtual void disconnect_push_supplier (
-            ACE_ENV_SINGLE_ARG_DECL) = 0;
+  virtual void disconnect_push_supplier () = 0;
 
   /// Return 0 if no consumer is connected...
   CORBA::Boolean is_connected (void) const;
@@ -97,21 +95,15 @@ public:
 
   /// Concrete implementations can use this methods to keep track of
   /// the suppliers that publish its events.
-  virtual void connected (TAO_EC_ProxyPushConsumer *consumer
-                          ACE_ENV_ARG_DECL);
-  virtual void reconnected (TAO_EC_ProxyPushConsumer *consumer
-                            ACE_ENV_ARG_DECL);
-  virtual void disconnected (TAO_EC_ProxyPushConsumer *consumer
-                            ACE_ENV_ARG_DECL);
+  virtual void connected (TAO_EC_ProxyPushConsumer *consumer);
+  virtual void reconnected (TAO_EC_ProxyPushConsumer *consumer);
+  virtual void disconnected (TAO_EC_ProxyPushConsumer *consumer);
 
   /// Usually implemented as no-ops, but some configurations may
   /// require this methods.
-  virtual void connected (TAO_EC_ProxyPushSupplier *supplier
-                          ACE_ENV_ARG_DECL);
-  virtual void reconnected (TAO_EC_ProxyPushSupplier *supplier
-                            ACE_ENV_ARG_DECL);
-  virtual void disconnected (TAO_EC_ProxyPushSupplier *supplier
-                             ACE_ENV_ARG_DECL);
+  virtual void connected (TAO_EC_ProxyPushSupplier *supplier);
+  virtual void reconnected (TAO_EC_ProxyPushSupplier *supplier);
+  virtual void disconnected (TAO_EC_ProxyPushSupplier *supplier);
 
   /// The event channel is shutting down
   virtual void shutdown (void);
@@ -124,19 +116,16 @@ public:
    * may have changed.
    */
   void push_to_consumer (RtecEventComm::PushConsumer_ptr consumer,
-                         const RtecEventComm::EventSet &event
-                         ACE_ENV_ARG_DECL);
+                         const RtecEventComm::EventSet &event);
   void reactive_push_to_consumer (RtecEventComm::PushConsumer_ptr consumer,
-                                  const RtecEventComm::EventSet &event
-                                  ACE_ENV_ARG_DECL);
+                                  const RtecEventComm::EventSet &event);
 
   /**
    * Invoke the _non_existent() pseudo-operation on the consumer. If
    * it is disconnected then it returns true and sets the
    * <disconnected> flag.
    */
-  CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected
-                                        ACE_ENV_ARG_DECL);
+  CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected);
 
   /// Increment and decrement the reference count.
   CORBA::ULong _incr_refcnt (void);
@@ -144,23 +133,18 @@ public:
 
   // = The TAO_EC_Filter methods, only push() is implemented...
   virtual int filter (const RtecEventComm::EventSet &event,
-                      TAO_EC_QOS_Info& qos_info
-                      ACE_ENV_ARG_DECL);
+                      TAO_EC_QOS_Info& qos_info);
   virtual int filter_nocopy (RtecEventComm::EventSet &event,
-                             TAO_EC_QOS_Info &qos_info
-                             ACE_ENV_ARG_DECL);
+                             TAO_EC_QOS_Info &qos_info);
   virtual void push (const RtecEventComm::EventSet &event,
-                     TAO_EC_QOS_Info& qos_info
-                     ACE_ENV_ARG_DECL);
+                     TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (RtecEventComm::EventSet &event,
-                            TAO_EC_QOS_Info &qos_info
-                            ACE_ENV_ARG_DECL);
+                            TAO_EC_QOS_Info &qos_info);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader &header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader &header,
-                                const TAO_EC_QOS_Info &qos_info
-                                ACE_ENV_ARG_DECL);
+                                const TAO_EC_QOS_Info &qos_info);
 
 protected:
   /// Set the consumer, used by some implementations to change the
@@ -213,8 +197,7 @@ private:
 
   /// Template method hooks.
   virtual void refcount_zero_hook (void);
-  virtual void pre_dispatch_hook (RtecEventComm::EventSet&
-                                  ACE_ENV_ARG_DECL);
+  virtual void pre_dispatch_hook (RtecEventComm::EventSet&);
   virtual PortableServer::ObjectId
             object_id (void)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp
index c3e610630d6..f6c327c190e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp
@@ -15,15 +15,13 @@ TAO_EC_Supplier_Proxy_Disconnect_Functor::operator() (
                        RtecEventComm::PushSupplier_ptr supplier)
   ACE_THROW_SPEC (())
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       supplier->disconnect_push_supplier ();
     }
-  ACE_CATCHALL
+  catch (...)
     {
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -31,15 +29,13 @@ TAO_EC_Consumer_Proxy_Disconnect_Functor::operator() (
                        RtecEventComm::PushConsumer_ptr consumer)
   ACE_THROW_SPEC (())
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       consumer->disconnect_push_consumer ();
     }
-  ACE_CATCHALL
+  catch (...)
     {
     }
-  ACE_ENDTRY;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp
index b51e300ca1e..5668c79f14e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp
@@ -70,19 +70,17 @@ void
 TAO_EC_RTCORBA_Dispatching::push (TAO_EC_ProxyPushSupplier* proxy,
                              RtecEventComm::PushConsumer_ptr consumer,
                              const RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL)
+                             TAO_EC_QOS_Info& qos_info)
 {
   RtecEventComm::EventSet event_copy = event;
-  this->push_nocopy (proxy, consumer, event_copy, qos_info ACE_ENV_ARG_PARAMETER);
+  this->push_nocopy (proxy, consumer, event_copy, qos_info);
 }
 
 void
 TAO_EC_RTCORBA_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
                                          RtecEventComm::PushConsumer_ptr consumer,
                                          RtecEventComm::EventSet& event,
-                                         TAO_EC_QOS_Info&
-                                         ACE_ENV_ARG_DECL)
+                                         TAO_EC_QOS_Info&)
 {
   RTCORBA::Priority current_priority =
     this->current_->the_priority ();
@@ -95,8 +93,7 @@ TAO_EC_RTCORBA_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
       // @@ If there were no threads available we may need to create
       // some...
 
-      this->tasks_[i].push (proxy, consumer, event
-                            ACE_ENV_ARG_PARAMETER);
+      this->tasks_[i].push (proxy, consumer, event);
       break;
     }
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h
index cb6e87fdad2..48598c1bb4a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h
@@ -51,13 +51,11 @@ public:
   virtual void push (TAO_EC_ProxyPushSupplier* proxy,
                      RtecEventComm::PushConsumer_ptr consumer,
                      const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info
-                     ACE_ENV_ARG_DECL);
+                     TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
                             RtecEventComm::PushConsumer_ptr consumer,
                             RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info
-                            ACE_ENV_ARG_DECL);
+                            TAO_EC_QOS_Info& qos_info);
 
 private:
   /// The thread pools...
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
index 5bf849a9a80..2470b369110 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
@@ -40,33 +40,27 @@ TAO_EC_Dispatching*
 TAO_EC_RTCORBA_Factory::create_dispatching (TAO_EC_Event_Channel_Base *)
 {
   TAO_EC_Dispatching *dispatching = 0;
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // @@ The ORBId could be important!!!
       int argc = 0;
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, 0, ""
-                         ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, 0, "");
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("PriorityMappingManager"
-                                         ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("PriorityMappingManager");
 
       RTCORBA::PriorityMappingManager_var priority_mapping_manager =
-        RTCORBA::PriorityMappingManager::_narrow (obj.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
+        RTCORBA::PriorityMappingManager::_narrow (obj.in ());
 
       RTCORBA::PriorityMapping *priority_mapping =
         priority_mapping_manager->mapping ();
 
       obj =
-        orb->resolve_initial_references ("RTCurrent"
-                                         ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RTCurrent");
 
       RTCORBA::Current_var current =
-        RTCORBA::Current::_narrow (obj.in ()
-                                   ACE_ENV_ARG_PARAMETER);
+        RTCORBA::Current::_narrow (obj.in ());
 
       ACE_NEW_RETURN (dispatching,
                       TAO_EC_RTCORBA_Dispatching (this->lanes_,
@@ -74,10 +68,9 @@ TAO_EC_RTCORBA_Factory::create_dispatching (TAO_EC_Event_Channel_Base *)
                                                   current.in ()),
                       0);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
     }
-  ACE_ENDTRY;
 
   return dispatching;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
index 2911ef0ee92..684665fca07 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
@@ -42,12 +42,10 @@ TAO_EC_Reactive_ConsumerControl::~TAO_EC_Reactive_ConsumerControl (void)
 }
 
 void
-TAO_EC_Reactive_ConsumerControl::query_consumers (
-      ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Reactive_ConsumerControl::query_consumers ()
 {
   TAO_EC_Ping_Consumer worker (this);
-  this->event_channel_->for_each_consumer (&worker
-                                           ACE_ENV_ARG_PARAMETER);
+  this->event_channel_->for_each_consumer (&worker);
 }
 
 void
@@ -63,52 +61,46 @@ TAO_EC_Reactive_ConsumerControl::handle_timeout (
   // RELATIVE_RT_TIMEOUT_POLICY set here in effect.
 
   // @@ TODO: should use Guard to set and reset policies.
-  ACE_TRY_NEW_ENV
+  try
     {
       // Query the state of the Current object *before* we initiate
       // the iteration...
       CORBA::PolicyTypeSeq types;
       CORBA::PolicyList_var policies =
-        this->policy_current_->get_policy_overrides (types
-                                                      ACE_ENV_ARG_PARAMETER);
+        this->policy_current_->get_policy_overrides (types);
 
       // Change the timeout
       this->policy_current_->set_policy_overrides (this->policy_list_,
-                                                   CORBA::ADD_OVERRIDE
-                                                    ACE_ENV_ARG_PARAMETER);
+                                                   CORBA::ADD_OVERRIDE);
 
       // Query the state of the consumers...
       this->query_consumers ();
 
       this->policy_current_->set_policy_overrides (policies.in (),
-                                                   CORBA::SET_OVERRIDE
-                                                    ACE_ENV_ARG_PARAMETER);
+                                                   CORBA::SET_OVERRIDE);
       for (CORBA::ULong i = 0; i != policies->length (); ++i)
         {
           policies[i]->destroy ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore all exceptions
     }
-  ACE_ENDTRY;
 }
 
 int
 TAO_EC_Reactive_ConsumerControl::activate (void)
 {
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-  ACE_TRY_NEW_ENV
+  try
     {
       // Get the PolicyCurrent object
       CORBA::Object_var tmp =
-        this->orb_->resolve_initial_references ("PolicyCurrent"
-                                                 ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("PolicyCurrent");
 
       this->policy_current_ =
-        CORBA::PolicyCurrent::_narrow (tmp.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+        CORBA::PolicyCurrent::_narrow (tmp.in ());
 
       // Timeout for polling state (default = 10 msec)
       TimeBase::TimeT timeout = timeout_.usec() * 10;
@@ -119,8 +111,7 @@ TAO_EC_Reactive_ConsumerControl::activate (void)
       this->policy_list_[0] =
         this->orb_->create_policy (
                Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-               any
-                ACE_ENV_ARG_PARAMETER);
+               any);
 
       // Only schedule the timer, when the rate is not zero
       if (this->rate_ != ACE_Time_Value::zero)
@@ -136,11 +127,10 @@ TAO_EC_Reactive_ConsumerControl::activate (void)
           return -1;
       }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       return -1;
     }
-  ACE_ENDTRY;
 #endif /* TAO_HAS_CORBA_MESSAGING */
 
   return 0;
@@ -160,32 +150,28 @@ TAO_EC_Reactive_ConsumerControl::shutdown (void)
 
 void
 TAO_EC_Reactive_ConsumerControl::consumer_not_exist (
-      TAO_EC_ProxyPushSupplier *proxy
-      ACE_ENV_ARG_DECL)
+      TAO_EC_ProxyPushSupplier *proxy)
 {
-  ACE_TRY
+  try
     {
       //ACE_DEBUG ((LM_DEBUG,
       //            "EC_Reactive_ConsumerControl(%P|%t) - "
       //            "Consumer %x does not exists\n", long(proxy)));
       proxy->disconnect_push_supplier ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Reactive_ConsumerControl::consumer_not_exist");
+      ex._tao_print_exception ("Reactive_ConsumerControl::consumer_not_exist");
       // Ignore all exceptions..
     }
-  ACE_ENDTRY;
 }
 
 void
 TAO_EC_Reactive_ConsumerControl::system_exception (
       TAO_EC_ProxyPushSupplier *proxy,
-      CORBA::SystemException & /* exception */
-      ACE_ENV_ARG_DECL)
+      CORBA::SystemException & /* exception */)
 {
-  ACE_TRY
+  try
     {
       // The current implementation is very strict, and kicks out a
       // client on the first system exception. We may
@@ -199,11 +185,10 @@ TAO_EC_Reactive_ConsumerControl::system_exception (
       // Anything else is serious, including timeouts...
       proxy->disconnect_push_supplier ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore all exceptions..
     }
-  ACE_ENDTRY;
 }
 
 // ****************************************************************
@@ -226,36 +211,33 @@ TAO_EC_ConsumerControl_Adapter::handle_timeout (
 // ****************************************************************
 
 void
-TAO_EC_Ping_Consumer::work (TAO_EC_ProxyPushSupplier *supplier
-                            ACE_ENV_ARG_DECL)
+TAO_EC_Ping_Consumer::work (TAO_EC_ProxyPushSupplier *supplier)
 {
-  ACE_TRY
+  try
     {
       CORBA::Boolean disconnected;
       CORBA::Boolean non_existent =
-        supplier->consumer_non_existent (disconnected
-                                          ACE_ENV_ARG_PARAMETER);
+        supplier->consumer_non_existent (disconnected);
       if (non_existent && !disconnected)
         {
-          this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER);
+          this->control_->consumer_not_exist (supplier);
         }
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+  catch (const CORBA::OBJECT_NOT_EXIST& ex)
     {
-      this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER);
+      this->control_->consumer_not_exist (supplier);
     }
-  ACE_CATCH (CORBA::TRANSIENT, transient)
+  catch (const CORBA::TRANSIENT& transient)
     {
       // This is TAO's minor code for a failed connection, we may
       // want to be more lenient in the future..
       // if (transient.minor () == 0x54410085)
-      this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER);
+      this->control_->consumer_not_exist (supplier);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore all exceptions
     }
-  ACE_ENDTRY;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
index a59d80661c6..cb6120a511f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
@@ -88,11 +88,9 @@ public:
   // = Documented in TAO_EC_ConsumerControl
   virtual int activate (void);
   virtual int shutdown (void);
-  virtual void consumer_not_exist (TAO_EC_ProxyPushSupplier *proxy
-                                   ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void consumer_not_exist (TAO_EC_ProxyPushSupplier *proxy);
   virtual void system_exception (TAO_EC_ProxyPushSupplier *proxy,
-                                 CORBA::SystemException &
-                                 ACE_ENV_ARG_DECL_NOT_USED);
+                                 CORBA::SystemException &);
 
 private:
   /// Check if the consumers still exists.  It is a helper method for
@@ -137,8 +135,7 @@ class TAO_EC_Ping_Consumer : public TAO_ESF_Worker<TAO_EC_ProxyPushSupplier>
 public:
   TAO_EC_Ping_Consumer (TAO_EC_ConsumerControl *control);
 
-  virtual void work (TAO_EC_ProxyPushSupplier *supplier
-                     ACE_ENV_ARG_DECL);
+  virtual void work (TAO_EC_ProxyPushSupplier *supplier);
 
 private:
   TAO_EC_ConsumerControl *control_;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp
index eb7b1bd5b7d..bffad152a77 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp
@@ -26,20 +26,18 @@ void
 TAO_EC_Reactive_Dispatching::push (TAO_EC_ProxyPushSupplier* proxy,
                                    RtecEventComm::PushConsumer_ptr consumer,
                                    const RtecEventComm::EventSet& event,
-                                   TAO_EC_QOS_Info&
-                                   ACE_ENV_ARG_DECL)
+                                   TAO_EC_QOS_Info&)
 {
-  proxy->reactive_push_to_consumer (consumer, event ACE_ENV_ARG_PARAMETER);
+  proxy->reactive_push_to_consumer (consumer, event);
 }
 
 void
 TAO_EC_Reactive_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
                                           RtecEventComm::PushConsumer_ptr consumer,
                                           RtecEventComm::EventSet& event,
-                                          TAO_EC_QOS_Info&
-                                          ACE_ENV_ARG_DECL)
+                                          TAO_EC_QOS_Info&)
 {
-  proxy->reactive_push_to_consumer (consumer, event ACE_ENV_ARG_PARAMETER);
+  proxy->reactive_push_to_consumer (consumer, event);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h
index 0ef3be3bedb..97a701572ff 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h
@@ -49,13 +49,11 @@ public:
   virtual void push (TAO_EC_ProxyPushSupplier *proxy,
                      RtecEventComm::PushConsumer_ptr consumer,
                      const RtecEventComm::EventSet &event,
-                     TAO_EC_QOS_Info &qos_info
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                     TAO_EC_QOS_Info &qos_info);
   virtual void push_nocopy (TAO_EC_ProxyPushSupplier *proxy,
                             RtecEventComm::PushConsumer_ptr consumer,
                             RtecEventComm::EventSet &event,
-                            TAO_EC_QOS_Info &qos_info
-                            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                            TAO_EC_QOS_Info &qos_info);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
index 81026aa8fd3..fb575afb18c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
@@ -42,12 +42,10 @@ TAO_EC_Reactive_SupplierControl::~TAO_EC_Reactive_SupplierControl (void)
 }
 
 void
-TAO_EC_Reactive_SupplierControl::query_suppliers (
-      ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Reactive_SupplierControl::query_suppliers ()
 {
   TAO_EC_Ping_Supplier worker (this);
-  this->event_channel_->for_each_supplier (&worker
-                                           ACE_ENV_ARG_PARAMETER);
+  this->event_channel_->for_each_supplier (&worker);
 }
 
 void
@@ -55,52 +53,46 @@ TAO_EC_Reactive_SupplierControl::handle_timeout (
       const ACE_Time_Value &,
       const void *)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Query the state of the Current object *before* we initiate
       // the iteration...
       CORBA::PolicyTypeSeq types;
       CORBA::PolicyList_var policies =
-        this->policy_current_->get_policy_overrides (types
-                                                      ACE_ENV_ARG_PARAMETER);
+        this->policy_current_->get_policy_overrides (types);
 
       // Change the timeout
       this->policy_current_->set_policy_overrides (this->policy_list_,
-                                                   CORBA::ADD_OVERRIDE
-                                                    ACE_ENV_ARG_PARAMETER);
+                                                   CORBA::ADD_OVERRIDE);
 
       // Query the state of the suppliers...
       this->query_suppliers ();
 
       this->policy_current_->set_policy_overrides (policies.in (),
-                                                   CORBA::SET_OVERRIDE
-                                                    ACE_ENV_ARG_PARAMETER);
+                                                   CORBA::SET_OVERRIDE);
       for (CORBA::ULong i = 0; i != policies->length (); ++i)
         {
           policies[i]->destroy ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore all exceptions
     }
-  ACE_ENDTRY;
 }
 
 int
 TAO_EC_Reactive_SupplierControl::activate (void)
 {
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-  ACE_TRY_NEW_ENV
+  try
     {
       // Get the PolicyCurrent object
       CORBA::Object_var tmp =
-        this->orb_->resolve_initial_references ("PolicyCurrent"
-                                                 ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("PolicyCurrent");
 
       this->policy_current_ =
-        CORBA::PolicyCurrent::_narrow (tmp.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+        CORBA::PolicyCurrent::_narrow (tmp.in ());
 
       // Timeout for polling state (default = 10 msec)
       TimeBase::TimeT timeout = timeout_.usec() * 10;
@@ -111,8 +103,7 @@ TAO_EC_Reactive_SupplierControl::activate (void)
       this->policy_list_[0] =
         this->orb_->create_policy (
                Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-               any
-               ACE_ENV_ARG_PARAMETER);
+               any);
 
       // Only schedule the timer, when the rate is not zero
       if (this->rate_ != ACE_Time_Value::zero)
@@ -128,11 +119,10 @@ TAO_EC_Reactive_SupplierControl::activate (void)
           return -1;
       }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       return -1;
     }
-  ACE_ENDTRY;
 #endif /* TAO_HAS_CORBA_MESSAGING */
 
   return 0;
@@ -152,30 +142,27 @@ TAO_EC_Reactive_SupplierControl::shutdown (void)
 
 void
 TAO_EC_Reactive_SupplierControl::supplier_not_exist (
-      TAO_EC_ProxyPushConsumer *proxy
-      ACE_ENV_ARG_DECL)
+      TAO_EC_ProxyPushConsumer *proxy)
 {
-  ACE_TRY
+  try
     {
       //ACE_DEBUG ((LM_DEBUG,
       //            "EC_Reactive_SupplierControl(%P|%t) - "
       //            "Consumer %x does not exists\n", long(proxy)));
       proxy->disconnect_push_consumer ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore all exceptions..
     }
-  ACE_ENDTRY;
 }
 
 void
 TAO_EC_Reactive_SupplierControl::system_exception (
       TAO_EC_ProxyPushConsumer *proxy,
-      CORBA::SystemException & /* exception */
-      ACE_ENV_ARG_DECL)
+      CORBA::SystemException & /* exception */)
 {
-  ACE_TRY
+  try
     {
       // The current implementation is very strict, and kicks out a
       // client on the first system exception. We may
@@ -189,11 +176,10 @@ TAO_EC_Reactive_SupplierControl::system_exception (
       // Anything else is serious, including timeouts...
       proxy->disconnect_push_consumer ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore all exceptions..
     }
-  ACE_ENDTRY;
 }
 
 // ****************************************************************
@@ -216,36 +202,33 @@ TAO_EC_SupplierControl_Adapter::handle_timeout (
 // ****************************************************************
 
 void
-TAO_EC_Ping_Supplier::work (TAO_EC_ProxyPushConsumer *consumer
-                            ACE_ENV_ARG_DECL)
+TAO_EC_Ping_Supplier::work (TAO_EC_ProxyPushConsumer *consumer)
 {
-  ACE_TRY
+  try
     {
       CORBA::Boolean disconnected;
       CORBA::Boolean non_existent =
-        consumer->supplier_non_existent (disconnected
-                                          ACE_ENV_ARG_PARAMETER);
+        consumer->supplier_non_existent (disconnected);
       if (non_existent && !disconnected)
         {
-          this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER);
+          this->control_->supplier_not_exist (consumer);
         }
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+  catch (const CORBA::OBJECT_NOT_EXIST& ex)
     {
-      this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER);
+      this->control_->supplier_not_exist (consumer);
     }
-  ACE_CATCH (CORBA::TRANSIENT, transient)
+  catch (const CORBA::TRANSIENT& transient)
     {
       // This is TAO's minor code for a failed connection, we may
       // want to be more lenient in the future..
       // if (transient.minor () == 0x54410085)
-      this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER);
+      this->control_->supplier_not_exist (consumer);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore all exceptions
     }
-  ACE_ENDTRY;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
index a704ea96b0c..ba91956541b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
@@ -99,11 +99,9 @@ public:
   // = Documented in TAO_EC_SupplierControl
   virtual int activate (void);
   virtual int shutdown (void);
-  virtual void supplier_not_exist (TAO_EC_ProxyPushConsumer *proxy
-                                   ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void supplier_not_exist (TAO_EC_ProxyPushConsumer *proxy);
   virtual void system_exception (TAO_EC_ProxyPushConsumer *proxy,
-                                 CORBA::SystemException &
-                                 ACE_ENV_ARG_DECL_NOT_USED);
+                                 CORBA::SystemException &);
 
 private:
   /// Check if the suppliers still exists.  It is a helper method for
@@ -148,8 +146,7 @@ class TAO_EC_Ping_Supplier : public TAO_ESF_Worker<TAO_EC_ProxyPushConsumer>
 public:
   TAO_EC_Ping_Supplier (TAO_EC_SupplierControl *control);
 
-  virtual void work (TAO_EC_ProxyPushConsumer *consumer
-                     ACE_ENV_ARG_DECL);
+  virtual void work (TAO_EC_ProxyPushConsumer *consumer);
 
 private:
   TAO_EC_SupplierControl *control_;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
index f49b407ff6d..82910313264 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
@@ -54,24 +54,21 @@ TAO_EC_Sched_Filter::size (void) const
 
 int
 TAO_EC_Sched_Filter::filter (const RtecEventComm::EventSet &event,
-                             TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL)
+                             TAO_EC_QOS_Info& qos_info)
 {
-  return this->body_->filter (event, qos_info ACE_ENV_ARG_PARAMETER);
+  return this->body_->filter (event, qos_info);
 }
 
 int
 TAO_EC_Sched_Filter::filter_nocopy (RtecEventComm::EventSet &event,
-                                    TAO_EC_QOS_Info& qos_info
-                                    ACE_ENV_ARG_DECL)
+                                    TAO_EC_QOS_Info& qos_info)
 {
-  return this->body_->filter_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
+  return this->body_->filter_nocopy (event, qos_info);
 }
 
 // This is private, so we can make it inline in the .cpp file...
 void
-TAO_EC_Sched_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info
-                                       ACE_ENV_ARG_DECL)
+TAO_EC_Sched_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info)
 {
   this->init_rt_info ();
 
@@ -91,8 +88,7 @@ TAO_EC_Sched_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info
         this->scheduler_->priority (this->rt_info_,
                                     os_priority,
                                     p_subpriority,
-                                    p_priority
-                                     ACE_ENV_ARG_PARAMETER);
+                                    p_priority);
         qos_info.preemption_priority = p_priority;
       }
     }
@@ -100,27 +96,25 @@ TAO_EC_Sched_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info
 
 void
 TAO_EC_Sched_Filter::push (const RtecEventComm::EventSet &event,
-                           TAO_EC_QOS_Info& qos_info
-                           ACE_ENV_ARG_DECL)
+                           TAO_EC_QOS_Info& qos_info)
 {
   if (this->parent () != 0)
     {
-      this->compute_qos_info (qos_info ACE_ENV_ARG_PARAMETER);
+      this->compute_qos_info (qos_info);
 
-      this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER);
+      this->parent ()->push (event, qos_info);
     }
 }
 
 void
 TAO_EC_Sched_Filter::push_nocopy (RtecEventComm::EventSet &event,
-                                  TAO_EC_QOS_Info& qos_info
-                                  ACE_ENV_ARG_DECL)
+                                  TAO_EC_QOS_Info& qos_info)
 {
   if (this->parent () != 0)
     {
-      this->compute_qos_info (qos_info ACE_ENV_ARG_PARAMETER);
+      this->compute_qos_info (qos_info);
 
-      this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
+      this->parent ()->push_nocopy (event, qos_info);
     }
 }
 
@@ -144,23 +138,20 @@ TAO_EC_Sched_Filter::can_match (const RtecEventComm::EventHeader& header) const
 
 int
 TAO_EC_Sched_Filter::add_dependencies (const RtecEventComm::EventHeader& header,
-                                       const TAO_EC_QOS_Info &qos_info
-                                       ACE_ENV_ARG_DECL)
+                                       const TAO_EC_QOS_Info &qos_info)
 {
   this->init_rt_info ();
 
   int matches = this->body_->add_dependencies (header,
-                                               qos_info
-                                                ACE_ENV_ARG_PARAMETER);
+                                               qos_info);
 
   if (matches != 0)
     {
       this->scheduler_->add_dependency (this->rt_info_, qos_info.rt_info, 1,
-                                        RtecBase::TWO_WAY_CALL
-                                         ACE_ENV_ARG_PARAMETER);
+                                        RtecBase::TWO_WAY_CALL);
 
       RtecScheduler::RT_Info_var info =
-        this->scheduler_->get (qos_info.rt_info ACE_ENV_ARG_PARAMETER);
+        this->scheduler_->get (qos_info.rt_info);
       ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n",
                   this->name_.c_str (),
                   info->entry_point.in ()));
@@ -169,14 +160,13 @@ TAO_EC_Sched_Filter::add_dependencies (const RtecEventComm::EventHeader& header,
   ChildrenIterator end = this->end ();
   for (ChildrenIterator i = this->begin (); i != end; ++i)
     {
-      (*i)->add_dependencies (header, qos_info ACE_ENV_ARG_PARAMETER);
+      (*i)->add_dependencies (header, qos_info);
     }
   return 0;
 }
 
 void
-TAO_EC_Sched_Filter::get_qos_info (TAO_EC_QOS_Info& qos_info
-                                   ACE_ENV_ARG_DECL)
+TAO_EC_Sched_Filter::get_qos_info (TAO_EC_QOS_Info& qos_info)
 {
   this->init_rt_info ();
 
@@ -200,8 +190,7 @@ TAO_EC_Sched_Filter::init_rt_info (void)
                          RtecScheduler::VERY_LOW_IMPORTANCE,
                          0, // quantum
                          0, // threads
-                         this->info_type_
-                          ACE_ENV_ARG_PARAMETER);
+                         this->info_type_);
 
 #if 0
   ChildrenIterator end = this->end ();
@@ -210,15 +199,14 @@ TAO_EC_Sched_Filter::init_rt_info (void)
       TAO_EC_Filter* filter = *i;
 
       TAO_EC_QOS_Info child;
-      filter->get_qos_info (child ACE_ENV_ARG_PARAMETER);
+      filter->get_qos_info (child);
 
       this->scheduler_->add_dependency (this->rt_info_,
                                         child.rt_info, 1,
-                                        RtecBase::TWO_WAY_CALL
-                                         ACE_ENV_ARG_PARAMETER);
+                                        RtecBase::TWO_WAY_CALL);
 
       RtecScheduler::RT_Info_var info =
-        this->scheduler_->get (child.rt_info ACE_ENV_ARG_PARAMETER);
+        this->scheduler_->get (child.rt_info);
       ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n",
                   info->entry_point.in (),
                   this->name_.c_str ()));
@@ -232,11 +220,10 @@ TAO_EC_Sched_Filter::init_rt_info (void)
       this->scheduler_->add_dependency (this->rt_info_,
                                         this->body_info_,
                                         1,
-                                        RtecBase::TWO_WAY_CALL
-                                         ACE_ENV_ARG_PARAMETER);
+                                        RtecBase::TWO_WAY_CALL);
 
       RtecScheduler::RT_Info_var info =
-        this->scheduler_->get (this->body_info_ ACE_ENV_ARG_PARAMETER);
+        this->scheduler_->get (this->body_info_);
       ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n",
                   info->entry_point.in (),
                   this->name_.c_str ()));
@@ -247,11 +234,10 @@ TAO_EC_Sched_Filter::init_rt_info (void)
   this->scheduler_->add_dependency (this->parent_info_,
                                     this->rt_info_,
                                     1,
-                                    RtecBase::TWO_WAY_CALL
-                                     ACE_ENV_ARG_PARAMETER);
+                                    RtecBase::TWO_WAY_CALL);
 
   RtecScheduler::RT_Info_var info =
-    this->scheduler_->get (this->parent_info_ ACE_ENV_ARG_PARAMETER);
+    this->scheduler_->get (this->parent_info_);
   ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n",
               this->name_.c_str (),
               info->entry_point.in ()));
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
index 8e45b184174..6178a49f8f7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
@@ -66,25 +66,19 @@ public:
   virtual ChildrenIterator end (void) const;
   virtual int size (void) const;
   virtual int filter (const RtecEventComm::EventSet& event,
-                      TAO_EC_QOS_Info& qos_info
-                      ACE_ENV_ARG_DECL);
+                      TAO_EC_QOS_Info& qos_info);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL);
+                             TAO_EC_QOS_Info& qos_info);
   virtual void push (const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info
-                     ACE_ENV_ARG_DECL);
+                     TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info
-                            ACE_ENV_ARG_DECL);
+                            TAO_EC_QOS_Info& qos_info);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info &qos_info
-                                ACE_ENV_ARG_DECL);
-  virtual void get_qos_info (TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL);
+                                const TAO_EC_QOS_Info &qos_info);
+  virtual void get_qos_info (TAO_EC_QOS_Info& qos_info);
 
 private:
   TAO_EC_Sched_Filter (const TAO_EC_Sched_Filter&);
@@ -94,8 +88,7 @@ private:
   void init_rt_info (void);
 
   /// Compute a new qos_info to push up.
-  void compute_qos_info (TAO_EC_QOS_Info& qos_info
-                         ACE_ENV_ARG_DECL);
+  void compute_qos_info (TAO_EC_QOS_Info& qos_info);
 
 private:
   /// The RT_Info handle for this object
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
index 02f778789dd..374a0a67cf0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
@@ -26,24 +26,22 @@ TAO_EC_Sched_Filter_Builder::~TAO_EC_Sched_Filter_Builder (void)
 TAO_EC_Filter*
 TAO_EC_Sched_Filter_Builder::build (
     TAO_EC_ProxyPushSupplier *supplier,
-    RtecEventChannelAdmin::ConsumerQOS& qos
-    ACE_ENV_ARG_DECL) const
+    RtecEventChannelAdmin::ConsumerQOS& qos) const
 {
   CORBA::ULong pos = 0;
   CORBA::Object_var tmp =
     this->event_channel_->scheduler ();
 
   RtecScheduler::Scheduler_var scheduler =
-    RtecScheduler::Scheduler::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER);
+    RtecScheduler::Scheduler::_narrow (tmp.in ());
 
   // @@ How do we figure out which parent???
   RtecScheduler::handle_t parent_info =
-    scheduler->lookup ("Dispatching_Task-250000.us" ACE_ENV_ARG_PARAMETER);
+    scheduler->lookup ("Dispatching_Task-250000.us");
 
   return this->recursive_build (supplier, qos, pos,
                                 scheduler.in (),
-                                parent_info
-                                 ACE_ENV_ARG_PARAMETER);
+                                parent_info);
 }
 
 TAO_EC_Filter*
@@ -52,8 +50,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
     RtecEventChannelAdmin::ConsumerQOS& qos,
     CORBA::ULong& pos,
     RtecScheduler::Scheduler_ptr scheduler,
-    RtecScheduler::handle_t parent_info
-    ACE_ENV_ARG_DECL) const
+    RtecScheduler::handle_t parent_info) const
 {
   const RtecEventComm::Event& e = qos.dependencies[pos].event;
 
@@ -62,11 +59,10 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
       CORBA::ULong npos = pos;
       ACE_CString name;
       this->recursive_name (qos, npos,
-                            scheduler, name
-                             ACE_ENV_ARG_PARAMETER);
+                            scheduler, name);
 
       RtecScheduler::handle_t rt_info =
-        scheduler->create (name.c_str () ACE_ENV_ARG_PARAMETER);
+        scheduler->create (name.c_str ());
 
       pos++; // Consume the designator
       CORBA::ULong n = this->count_children (qos, pos);
@@ -77,8 +73,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
         {
           children[i] = this->recursive_build (supplier, qos, pos,
                                                scheduler,
-                                               rt_info
-                                                ACE_ENV_ARG_PARAMETER);
+                                               rt_info);
         }
 
       TAO_EC_Sched_Filter *filter;
@@ -93,7 +88,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
                                            RtecScheduler::CONJUNCTION),
                       0);
       TAO_EC_QOS_Info qos_info;
-      filter->get_qos_info (qos_info ACE_ENV_ARG_PARAMETER);
+      filter->get_qos_info (qos_info);
       // @@
       return filter;
     }
@@ -103,11 +98,10 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
       CORBA::ULong npos = pos;
       ACE_CString name;
       this->recursive_name (qos, npos,
-                            scheduler, name
-                             ACE_ENV_ARG_PARAMETER);
+                            scheduler, name);
 
       RtecScheduler::handle_t rt_info =
-        scheduler->create (name.c_str () ACE_ENV_ARG_PARAMETER);
+        scheduler->create (name.c_str ());
 
       pos++; // Consume the designator
       CORBA::ULong n = this->count_children (qos, pos);
@@ -118,8 +112,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
         {
           children[i] = this->recursive_build (supplier, qos, pos,
                                                scheduler,
-                                               rt_info
-                                                ACE_ENV_ARG_PARAMETER);
+                                               rt_info);
         }
       TAO_EC_Sched_Filter *filter;
       ACE_NEW_RETURN (filter,
@@ -134,7 +127,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
                       0);
 
       TAO_EC_QOS_Info qos_info;
-      filter->get_qos_info (qos_info ACE_ENV_ARG_PARAMETER);
+      filter->get_qos_info (qos_info);
       // @@
       return filter;
     }
@@ -154,7 +147,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
 
       TAO_EC_QOS_Info qos_info;
       qos_info.rt_info =
-        scheduler->create (name.c_str () ACE_ENV_ARG_PARAMETER);
+        scheduler->create (name.c_str ());
 
       // Convert the time to the proper units....
       RtecScheduler::Period_t period =
@@ -169,14 +162,12 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
                       RtecScheduler::VERY_LOW_IMPORTANCE,
                       0, // quantum
                       1, // threads
-                      RtecScheduler::OPERATION
-                       ACE_ENV_ARG_PARAMETER);
+                      RtecScheduler::OPERATION);
 
       scheduler->add_dependency (qos_info.rt_info,
                                  parent_info,
                                  1,
-                                 RtecBase::TWO_WAY_CALL
-                                  ACE_ENV_ARG_PARAMETER);
+                                 RtecBase::TWO_WAY_CALL);
 
       return new TAO_EC_Timeout_Filter (this->event_channel_,
                                         supplier,
@@ -188,13 +179,13 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
   RtecScheduler::handle_t body_info = qos.dependencies[pos].rt_info;
 
   RtecScheduler::RT_Info_var info =
-    scheduler->get (body_info ACE_ENV_ARG_PARAMETER);
+    scheduler->get (body_info);
 
   ACE_CString name = info->entry_point.in ();
   name += "#rep";
 
   RtecScheduler::handle_t rt_info =
-    scheduler->create (name.c_str () ACE_ENV_ARG_PARAMETER);
+    scheduler->create (name.c_str ());
 
   pos++;
   TAO_EC_Sched_Filter *filter;
@@ -209,7 +200,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
                   0);
 
   TAO_EC_QOS_Info qos_info;
-  filter->get_qos_info (qos_info ACE_ENV_ARG_PARAMETER);
+  filter->get_qos_info (qos_info);
   // @@
   return filter;
 }
@@ -219,8 +210,7 @@ TAO_EC_Sched_Filter_Builder:: recursive_name (
     RtecEventChannelAdmin::ConsumerQOS& qos,
     CORBA::ULong& pos,
     RtecScheduler::Scheduler_ptr scheduler,
-    ACE_CString& name
-    ACE_ENV_ARG_DECL) const
+    ACE_CString& name) const
 {
   const RtecEventComm::Event& e = qos.dependencies[pos].event;
 
@@ -234,8 +224,7 @@ TAO_EC_Sched_Filter_Builder:: recursive_name (
           ACE_CString child_name;
           this->recursive_name (qos, pos,
                                 scheduler,
-                                child_name
-                                 ACE_ENV_ARG_PARAMETER);
+                                child_name);
 
           if (i == 0)
             name += "(";
@@ -258,8 +247,7 @@ TAO_EC_Sched_Filter_Builder:: recursive_name (
 
           this->recursive_name (qos, pos,
                                 scheduler,
-                                child_name
-                                 ACE_ENV_ARG_PARAMETER);
+                                child_name);
 
           if (i == 0)
             name += "(";
@@ -288,7 +276,7 @@ TAO_EC_Sched_Filter_Builder:: recursive_name (
   RtecScheduler::handle_t body_info = qos.dependencies[pos].rt_info;
 
   RtecScheduler::RT_Info_var info =
-    scheduler->get (body_info ACE_ENV_ARG_PARAMETER);
+    scheduler->get (body_info);
 
   name = info->entry_point.in ();
   name += "#rep";
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h
index 8c088259450..0cf0577f6a4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h
@@ -50,8 +50,7 @@ public:
 
   // = The TAO_EC_Filter_Builder methods...
   TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier,
-                        RtecEventChannelAdmin::ConsumerQOS& qos
-                        ACE_ENV_ARG_DECL) const;
+                        RtecEventChannelAdmin::ConsumerQOS& qos) const;
 
 private:
   /// Recursively build the filter tree.
@@ -59,15 +58,13 @@ private:
                                   RtecEventChannelAdmin::ConsumerQOS& qos,
                                   CORBA::ULong& pos,
                                   RtecScheduler::Scheduler_ptr scheduler,
-                                  RtecScheduler::handle_t parent_info
-                                  ACE_ENV_ARG_DECL) const;
+                                  RtecScheduler::handle_t parent_info) const;
 
   /// Build the name recursively...
   void recursive_name (RtecEventChannelAdmin::ConsumerQOS& qos,
                        CORBA::ULong& pos,
                        RtecScheduler::Scheduler_ptr scheduler,
-                       ACE_CString &name
-                       ACE_ENV_ARG_DECL) const;
+                       ACE_CString &name) const;
 
   /// Count the number of children of the current node, i.e. until a
   /// conjunction or disjunction starts.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
index 08d3a6bf5c2..b0ebc96cd20 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
@@ -54,15 +54,13 @@ public:
   /// Add all the dependencies between @a supplier and @a consumer
   virtual void add_proxy_supplier_dependencies (
       TAO_EC_ProxyPushSupplier *supplier,
-      TAO_EC_ProxyPushConsumer *consumer
-      ACE_ENV_ARG_DECL) = 0;
+      TAO_EC_ProxyPushConsumer *consumer) = 0;
 
   /// Schedule an event set and deliver them to the filter in the
   /// desired order and grouping.
   virtual void schedule_event (const RtecEventComm::EventSet &event,
                                TAO_EC_ProxyPushConsumer *consumer,
-                               TAO_EC_Supplier_Filter *filter
-                               ACE_ENV_ARG_DECL) = 0;
+                               TAO_EC_Supplier_Filter *filter) = 0;
 
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
index 7d73bfbaf53..3b9fa1c3563 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
@@ -27,15 +27,13 @@ TAO_EC_SupplierControl::shutdown (void)
 }
 
 void
-TAO_EC_SupplierControl::supplier_not_exist (TAO_EC_ProxyPushConsumer *
-                                            ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_SupplierControl::supplier_not_exist (TAO_EC_ProxyPushConsumer *)
 {
 }
 
 void
 TAO_EC_SupplierControl::system_exception (TAO_EC_ProxyPushConsumer *,
-                                          CORBA::SystemException &
-                                          ACE_ENV_ARG_DECL_NOT_USED)
+                                          CORBA::SystemException &)
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h
index e4247d13b5b..23194f3304c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h
@@ -64,14 +64,12 @@ public:
    * not exists (i.e. _non_existent() returns true and/or the
    * CORBA::OBJECT_NOT_EXIST exception has been raised).
    */
-  virtual void supplier_not_exist (TAO_EC_ProxyPushConsumer *proxy
-                                   ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void supplier_not_exist (TAO_EC_ProxyPushConsumer *proxy);
 
   /// Some system exception was raised while trying to contact the
   /// supplier
   virtual void system_exception (TAO_EC_ProxyPushConsumer * proxy,
-                                 CORBA::SystemException &
-                                 ACE_ENV_ARG_DECL_NOT_USED);
+                                 CORBA::SystemException &);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
index dcd69dbd794..dfe1f96394d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
@@ -19,11 +19,10 @@ TAO_EC_Supplier_Filter::~TAO_EC_Supplier_Filter (void)
 // ****************************************************************
 
 void
-TAO_EC_Filter_Worker::work (TAO_EC_ProxyPushSupplier *supplier
-                            ACE_ENV_ARG_DECL)
+TAO_EC_Filter_Worker::work (TAO_EC_ProxyPushSupplier *supplier)
 {
   TAO_EC_QOS_Info qos_info = this->event_info_;
-  supplier->filter (this->event_, qos_info ACE_ENV_ARG_PARAMETER);
+  supplier->filter (this->event_, qos_info);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
index 9fa578fec95..200543baba2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
@@ -93,12 +93,9 @@ public:
 
   /// Concrete implementations can use this methods to keep track of
   /// the consumers interested in this events.
-  virtual void connected (TAO_EC_ProxyPushSupplier *supplier
-                          ACE_ENV_ARG_DECL) = 0;
-  virtual void reconnected (TAO_EC_ProxyPushSupplier *supplier
-                          ACE_ENV_ARG_DECL) = 0;
-  virtual void disconnected (TAO_EC_ProxyPushSupplier *supplier
-                             ACE_ENV_ARG_DECL) = 0;
+  virtual void connected (TAO_EC_ProxyPushSupplier *supplier) = 0;
+  virtual void reconnected (TAO_EC_ProxyPushSupplier *supplier) = 0;
+  virtual void disconnected (TAO_EC_ProxyPushSupplier *supplier) = 0;
 
   /// The event channel is shutting down.
   virtual void shutdown (void) = 0;
@@ -106,14 +103,12 @@ public:
   /// The ProxyPushConsumer delegates on this class to actually send
   /// the event.
   virtual void push (const RtecEventComm::EventSet &event,
-                     TAO_EC_ProxyPushConsumer *consumer
-                     ACE_ENV_ARG_DECL) = 0;
+                     TAO_EC_ProxyPushConsumer *consumer) = 0;
 
   /// Events are first scheduled by the TAO_EC_Scheduling_Strategy,
   /// and then pushed through this class again.
   virtual void push_scheduled_event (RtecEventComm::EventSet &event,
-                                     const TAO_EC_QOS_Info &event_info
-                                     ACE_ENV_ARG_DECL) = 0;
+                                     const TAO_EC_QOS_Info &event_info) = 0;
 
   /// Increment and decrement the reference count, locking must be
   /// provided by the user.
@@ -129,8 +124,7 @@ public:
   TAO_EC_Filter_Worker (RtecEventComm::EventSet &event,
                         const TAO_EC_QOS_Info &event_info);
 
-  virtual void work (TAO_EC_ProxyPushSupplier *supplier
-                     ACE_ENV_ARG_DECL);
+  virtual void work (TAO_EC_ProxyPushSupplier *supplier);
 
 private:
   /// The event we push on each case, use a reference to avoid copies.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
index ce47c645bbb..962a359017e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
@@ -39,8 +39,7 @@ TAO_EC_TPC_Dispatching::~TAO_EC_TPC_Dispatching ()
 }
 
 int
-TAO_EC_TPC_Dispatching::add_consumer (RtecEventComm::PushConsumer_ptr consumer
-                                      ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_TPC_Dispatching::add_consumer (RtecEventComm::PushConsumer_ptr consumer)
 {
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
 
@@ -96,8 +95,7 @@ TAO_EC_TPC_Dispatching::add_consumer (RtecEventComm::PushConsumer_ptr consumer
 }
 
 int
-TAO_EC_TPC_Dispatching::remove_consumer (RtecEventComm::PushConsumer_ptr consumer
-                                         ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_TPC_Dispatching::remove_consumer (RtecEventComm::PushConsumer_ptr consumer)
 {
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
 
@@ -170,19 +168,17 @@ void
 TAO_EC_TPC_Dispatching::push (TAO_EC_ProxyPushSupplier* proxy,
                              RtecEventComm::PushConsumer_ptr consumer,
                              const RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL)
+                             TAO_EC_QOS_Info& qos_info)
 {
   RtecEventComm::EventSet event_copy = event;
-  this->push_nocopy (proxy, consumer, event_copy, qos_info ACE_ENV_ARG_PARAMETER);
+  this->push_nocopy (proxy, consumer, event_copy, qos_info);
 }
 
 void
 TAO_EC_TPC_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
                                     RtecEventComm::PushConsumer_ptr consumer,
                                     RtecEventComm::EventSet& event,
-                                    TAO_EC_QOS_Info&
-                                    ACE_ENV_ARG_DECL)
+                                    TAO_EC_QOS_Info&)
 {
   if (TAO_EC_TPC_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "EC (%P|%t) TPC_Dispatching::push_nocopy(supplier=%@,consumer=%@)\n", proxy, consumer));
@@ -198,7 +194,7 @@ TAO_EC_TPC_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
     }
   else
     {
-      dtask->push (proxy, consumer, event ACE_ENV_ARG_PARAMETER);
+      dtask->push (proxy, consumer, event);
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h
index d507f3f5c1d..b7ece85cb30 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h
@@ -52,16 +52,14 @@ public:
   virtual void push (TAO_EC_ProxyPushSupplier* proxy,
                      RtecEventComm::PushConsumer_ptr consumer,
                      const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info
-                     ACE_ENV_ARG_DECL);
+                     TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
                             RtecEventComm::PushConsumer_ptr consumer,
                             RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info
-                            ACE_ENV_ARG_DECL);
+                            TAO_EC_QOS_Info& qos_info);
 
-  int add_consumer (RtecEventComm::PushConsumer_ptr consumer ACE_ENV_ARG_DECL);
-  int remove_consumer (RtecEventComm::PushConsumer_ptr consumer ACE_ENV_ARG_DECL);
+  int add_consumer (RtecEventComm::PushConsumer_ptr consumer);
+  int remove_consumer (RtecEventComm::PushConsumer_ptr consumer);
 
 private:
   // Use our own thread manager
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
index 0ca2973e9a4..09b2c3fdcac 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
@@ -36,15 +36,13 @@ TAO_EC_TPC_ProxyPushConsumer::~TAO_EC_TPC_ProxyPushConsumer (void)
 }
 
 void
-TAO_EC_TPC_ProxyPushConsumer::disconnect_push_consumer (
-      ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_TPC_ProxyPushConsumer::disconnect_push_consumer ()
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecEventComm::PushConsumer_var emulated_exceptions_suck =
     this->_this ();
 
-  this->tpc_dispatching ()->remove_consumer (emulated_exceptions_suck.in ()
-                                             ACE_ENV_ARG_PARAMETER);
+  this->tpc_dispatching ()->remove_consumer (emulated_exceptions_suck.in ());
 
   BASECLASS::disconnect_push_consumer ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
index 7f181e4a6df..26b206d447d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
@@ -32,8 +32,7 @@ TAO_EC_TPC_ProxyPushSupplier:: disconnect_push_supplier (void)
 
   if (this->is_connected_i ())
     {
-      this->tpc_dispatching ()->remove_consumer (this->consumer_.in()
-                                                 ACE_ENV_ARG_PARAMETER);
+      this->tpc_dispatching ()->remove_consumer (this->consumer_.in());
     }
   BASECLASS::disconnect_push_supplier ();
 
@@ -52,13 +51,12 @@ TAO_EC_TPC_ProxyPushSupplier::tpc_dispatching ()
 void
 TAO_EC_TPC_ProxyPushSupplier::connect_push_consumer (
       RtecEventComm::PushConsumer_ptr push_consumer,
-      const RtecEventChannelAdmin::ConsumerQOS& qos
-      ACE_ENV_ARG_DECL)
+      const RtecEventChannelAdmin::ConsumerQOS& qos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecEventChannelAdmin::AlreadyConnected,
                      RtecEventChannelAdmin::TypeError))
 {
-  BASECLASS::connect_push_consumer (push_consumer, qos ACE_ENV_ARG_PARAMETER);
+  BASECLASS::connect_push_consumer (push_consumer, qos);
 
   if (TAO_EC_TPC_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "EC (%P|%t): EC_ProxySupplier(%@): refcount=%u,consumer=%@\n",
@@ -67,7 +65,7 @@ TAO_EC_TPC_ProxyPushSupplier::connect_push_consumer (
   TAO_EC_TPC_Dispatching* tpcdispatcher = this->tpc_dispatching ();
 
   // the new dispatching task gets automatically created
-  tpcdispatcher->add_consumer (push_consumer ACE_ENV_ARG_PARAMETER);
+  tpcdispatcher->add_consumer (push_consumer);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h
index 99e03d651ae..ceda25e79fe 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h
@@ -39,8 +39,7 @@ public:
   // = The RtecEventChannelAdmin::ProxyPushSupplier methods...
   virtual void connect_push_consumer (
                 RtecEventComm::PushConsumer_ptr push_consumer,
-                const RtecEventChannelAdmin::ConsumerQOS &qos
-                ACE_ENV_ARG_DECL_NOT_USED)
+                const RtecEventChannelAdmin::ConsumerQOS &qos)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        RtecEventChannelAdmin::AlreadyConnected,
                        RtecEventChannelAdmin::TypeError));
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
index 0d5332d3ed1..8191211f5bc 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
@@ -69,26 +69,23 @@ TAO_EC_Timeout_Filter::~TAO_EC_Timeout_Filter (void)
 
 void
 TAO_EC_Timeout_Filter::push_to_proxy (const RtecEventComm::EventSet& event,
-                                      TAO_EC_QOS_Info& qos_info
-                                      ACE_ENV_ARG_DECL)
+                                      TAO_EC_QOS_Info& qos_info)
 {
   qos_info.timer_id_ = this->id_;
 
   if (this->supplier_ != 0)
     this->supplier_->filter (event,
-                             qos_info
-                              ACE_ENV_ARG_PARAMETER);
+                             qos_info);
 }
 
 int
 TAO_EC_Timeout_Filter::filter (const RtecEventComm::EventSet &event,
-                               TAO_EC_QOS_Info &qos_info
-                               ACE_ENV_ARG_DECL)
+                               TAO_EC_QOS_Info &qos_info)
 {
   if (qos_info.timer_id_ == this->id_
       && this->parent () != 0)
     {
-      this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER);
+      this->parent ()->push (event, qos_info);
       return 1;
     }
   return 0;
@@ -96,13 +93,12 @@ TAO_EC_Timeout_Filter::filter (const RtecEventComm::EventSet &event,
 
 int
 TAO_EC_Timeout_Filter::filter_nocopy (RtecEventComm::EventSet &event,
-                                      TAO_EC_QOS_Info &qos_info
-                                      ACE_ENV_ARG_DECL)
+                                      TAO_EC_QOS_Info &qos_info)
 {
   if (qos_info.timer_id_ == this->id_
       && this->parent () != 0)
     {
-      this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
+      this->parent ()->push_nocopy (event, qos_info);
       return 1;
     }
   return 0;
@@ -110,15 +106,13 @@ TAO_EC_Timeout_Filter::filter_nocopy (RtecEventComm::EventSet &event,
 
 void
 TAO_EC_Timeout_Filter::push (const RtecEventComm::EventSet&,
-                          TAO_EC_QOS_Info&
-                          ACE_ENV_ARG_DECL_NOT_USED)
+                          TAO_EC_QOS_Info&)
 {
 }
 
 void
 TAO_EC_Timeout_Filter::push_nocopy (RtecEventComm::EventSet&,
-                                    TAO_EC_QOS_Info&
-                                    ACE_ENV_ARG_DECL_NOT_USED)
+                                    TAO_EC_QOS_Info&)
 {
 }
 
@@ -160,8 +154,7 @@ TAO_EC_Timeout_Filter::can_match (
 int
 TAO_EC_Timeout_Filter::add_dependencies (
       const RtecEventComm::EventHeader&,
-      const TAO_EC_QOS_Info &
-      ACE_ENV_ARG_DECL_NOT_USED)
+      const TAO_EC_QOS_Info &)
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h
index b9d5fbbacc3..4fce96dcfeb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h
@@ -60,29 +60,23 @@ public:
 
   /// Callback from the Timeout_Generator
   void push_to_proxy (const RtecEventComm::EventSet& event,
-                      TAO_EC_QOS_Info& qos_info
-                      ACE_ENV_ARG_DECL);
+                      TAO_EC_QOS_Info& qos_info);
 
   // = The TAO_EC_Filter methods, please check the documentation in
   // TAO_EC_Filter.
   virtual int filter (const RtecEventComm::EventSet& event,
-                      TAO_EC_QOS_Info& qos_info
-                      ACE_ENV_ARG_DECL);
+                      TAO_EC_QOS_Info& qos_info);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL);
+                             TAO_EC_QOS_Info& qos_info);
   virtual void push (const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info
-                     ACE_ENV_ARG_DECL);
+                     TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info
-                            ACE_ENV_ARG_DECL);
+                            TAO_EC_QOS_Info& qos_info);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info &qos_info
-                                ACE_ENV_ARG_DECL);
+                                const TAO_EC_QOS_Info &qos_info);
 
 private:
   TAO_EC_Timeout_Filter (const TAO_EC_Timeout_Filter&);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
index 5657c13187b..718cface0d5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
@@ -35,7 +35,7 @@ TAO_EC_Timeout_Adapter::handle_timeout (const ACE_Time_Value & /* tv */,
   if (filter == 0)
     return 0;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       RtecEventComm::Event e;
       e.header.type = filter->type ();
@@ -45,14 +45,12 @@ TAO_EC_Timeout_Adapter::handle_timeout (const ACE_Time_Value & /* tv */,
 
       TAO_EC_QOS_Info qos_info = filter->qos_info ();
       filter->push_to_proxy (single_event,
-                             qos_info
-                              ACE_ENV_ARG_PARAMETER);
+                             qos_info);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
index e8fcab0a19d..93f1264d176 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
@@ -31,20 +31,17 @@ TAO_EC_Trivial_Supplier_Filter::unbind (TAO_EC_ProxyPushConsumer*)
 }
 
 void
-TAO_EC_Trivial_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier*
-                                           ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_Trivial_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier*)
 {
 }
 
 void
-TAO_EC_Trivial_Supplier_Filter::reconnected (TAO_EC_ProxyPushSupplier*
-                                             ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_Trivial_Supplier_Filter::reconnected (TAO_EC_ProxyPushSupplier*)
 {
 }
 
 void
-TAO_EC_Trivial_Supplier_Filter::disconnected (TAO_EC_ProxyPushSupplier*
-                                              ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_Trivial_Supplier_Filter::disconnected (TAO_EC_ProxyPushSupplier*)
 {
 }
 
@@ -55,25 +52,21 @@ TAO_EC_Trivial_Supplier_Filter::shutdown (void)
 
 void
 TAO_EC_Trivial_Supplier_Filter::push (const RtecEventComm::EventSet& event,
-                                      TAO_EC_ProxyPushConsumer *consumer
-                                      ACE_ENV_ARG_DECL)
+                                      TAO_EC_ProxyPushConsumer *consumer)
 {
   TAO_EC_Scheduling_Strategy* scheduling_strategy =
     this->event_channel_->scheduling_strategy ();
   scheduling_strategy->schedule_event (event,
                                        consumer,
-                                       this
-                                       ACE_ENV_ARG_PARAMETER);
+                                       this);
 }
 
 void
 TAO_EC_Trivial_Supplier_Filter::push_scheduled_event (RtecEventComm::EventSet &event,
-                                                      const TAO_EC_QOS_Info &event_info
-                                                      ACE_ENV_ARG_DECL)
+                                                      const TAO_EC_QOS_Info &event_info)
 {
   TAO_EC_Filter_Worker worker (event, event_info);
-  this->event_channel_->for_each_consumer (&worker
-                                           ACE_ENV_ARG_PARAMETER);
+  this->event_channel_->for_each_consumer (&worker);
 }
 
 CORBA::ULong
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
index b512b2539f9..7b35833fc62 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
@@ -53,19 +53,14 @@ public:
   // = The TAO_EC_Supplier_Filter methods.
   virtual void bind (TAO_EC_ProxyPushConsumer* consumer);
   virtual void unbind (TAO_EC_ProxyPushConsumer* consumer);
-  virtual void connected (TAO_EC_ProxyPushSupplier* supplier
-                          ACE_ENV_ARG_DECL);
-  virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier
-                            ACE_ENV_ARG_DECL);
-  virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier
-                             ACE_ENV_ARG_DECL);
+  virtual void connected (TAO_EC_ProxyPushSupplier* supplier);
+  virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier);
+  virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier);
   virtual void shutdown (void);
   virtual void push (const RtecEventComm::EventSet& event,
-                     TAO_EC_ProxyPushConsumer *consumer
-                     ACE_ENV_ARG_DECL_NOT_USED);
+                     TAO_EC_ProxyPushConsumer *consumer);
   virtual void push_scheduled_event (RtecEventComm::EventSet &event,
-                                     const TAO_EC_QOS_Info &event_info
-                                     ACE_ENV_ARG_DECL);
+                                     const TAO_EC_QOS_Info &event_info);
   virtual CORBA::ULong _decr_refcnt (void);
   virtual CORBA::ULong _incr_refcnt (void);
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
index 28b08859ecb..f4f99440f0c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
@@ -13,15 +13,14 @@ TAO_EC_Type_Filter::TAO_EC_Type_Filter (const RtecEventComm::EventHeader& header
 
 int
 TAO_EC_Type_Filter::filter (const RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info
-                            ACE_ENV_ARG_DECL)
+                            TAO_EC_QOS_Info& qos_info)
 {
   if (event.length () != 1)
-    return this->filter_set (event, qos_info ACE_ENV_ARG_PARAMETER);
+    return this->filter_set (event, qos_info);
 
   if (this->can_match (event[0].header))
     {
-      this->push (event, qos_info ACE_ENV_ARG_PARAMETER);
+      this->push (event, qos_info);
       return 1;
     }
   return 0;
@@ -29,15 +28,14 @@ TAO_EC_Type_Filter::filter (const RtecEventComm::EventSet& event,
 
 int
 TAO_EC_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event,
-                                   TAO_EC_QOS_Info& qos_info
-                                   ACE_ENV_ARG_DECL)
+                                   TAO_EC_QOS_Info& qos_info)
 {
   if (event.length () != 1)
-    return this->filter_set (event, qos_info ACE_ENV_ARG_PARAMETER);
+    return this->filter_set (event, qos_info);
 
   if (this->can_match (event[0].header))
     {
-      this->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
+      this->push_nocopy (event, qos_info);
       return 1;
     }
   return 0;
@@ -45,20 +43,18 @@ TAO_EC_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event,
 
 void
 TAO_EC_Type_Filter::push (const RtecEventComm::EventSet& event,
-                          TAO_EC_QOS_Info& qos_info
-                          ACE_ENV_ARG_DECL)
+                          TAO_EC_QOS_Info& qos_info)
 {
   if (this->parent () != 0)
-    this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER);
+    this->parent ()->push (event, qos_info);
 }
 
 void
 TAO_EC_Type_Filter::push_nocopy (RtecEventComm::EventSet& event,
-                                 TAO_EC_QOS_Info& qos_info
-                                 ACE_ENV_ARG_DECL)
+                                 TAO_EC_QOS_Info& qos_info)
 {
   if (this->parent () != 0)
-    this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
+    this->parent ()->push_nocopy (event, qos_info);
 }
 
 void
@@ -111,16 +107,14 @@ TAO_EC_Type_Filter::can_match (
 int
 TAO_EC_Type_Filter::add_dependencies (
       const RtecEventComm::EventHeader& header,
-      const TAO_EC_QOS_Info &
-      ACE_ENV_ARG_DECL_NOT_USED)
+      const TAO_EC_QOS_Info &)
 {
   return this->can_match (header);
 }
 
 int
 TAO_EC_Type_Filter::filter_set (const RtecEventComm::EventSet& event,
-                                TAO_EC_QOS_Info& qos_info
-                                ACE_ENV_ARG_DECL)
+                                TAO_EC_QOS_Info& qos_info)
 {
   CORBA::ULong maximum = event.length ();
   if (event.maximum () == 0)
@@ -139,7 +133,7 @@ TAO_EC_Type_Filter::filter_set (const RtecEventComm::EventSet& event,
   if (matched.length () == 0)
     return 0;
 
-  this->push (matched, qos_info ACE_ENV_ARG_PARAMETER);
+  this->push (matched, qos_info);
 
   return 1;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
index 12a0660bf72..ba115eab809 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
@@ -43,23 +43,18 @@ public:
   // = The TAO_EC_Filter methods, please check the documentation in
   // TAO_EC_Filter.
   virtual int filter (const RtecEventComm::EventSet& event,
-                      TAO_EC_QOS_Info& qos_info
-                      ACE_ENV_ARG_DECL);
+                      TAO_EC_QOS_Info& qos_info);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL);
+                             TAO_EC_QOS_Info& qos_info);
   virtual void push (const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info
-                     ACE_ENV_ARG_DECL);
+                     TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info
-                            ACE_ENV_ARG_DECL);
+                            TAO_EC_QOS_Info& qos_info);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info &qos_info
-                                ACE_ENV_ARG_DECL);
+                                const TAO_EC_QOS_Info &qos_info);
 
 private:
   TAO_EC_Type_Filter (const TAO_EC_Type_Filter&);
@@ -67,8 +62,7 @@ private:
 
   /// Filter an EventSet that contains more than one event.
   int filter_set (const RtecEventComm::EventSet& event,
-                  TAO_EC_QOS_Info& qos_info
-                  ACE_ENV_ARG_DECL);
+                  TAO_EC_QOS_Info& qos_info);
 
 private:
   /// Encapsulate the type/source that we must match.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
index eba83581c8d..a52e42d1ca7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
@@ -2,8 +2,8 @@
 
 #include "orbsvcs/Event/EC_UDP_Admin.h"
 
-ACE_RCSID (Event, 
-           EC_UDP_Admin, 
+ACE_RCSID (Event,
+           EC_UDP_Admin,
            "$Id$")
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -19,8 +19,7 @@ TAO_EC_Simple_AddrServer::~TAO_EC_Simple_AddrServer (void)
 
 void
 TAO_EC_Simple_AddrServer::get_addr (const RtecEventComm::EventHeader& header,
-                                    RtecUDPAdmin::UDP_Addr_out addr
-                                    ACE_ENV_ARG_DECL_NOT_USED)
+                                    RtecUDPAdmin::UDP_Addr_out addr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   addr.ipaddr = header.type;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
index 7e5ccff9920..1b2600c1178 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
@@ -46,8 +46,7 @@ public:
 
   // = The RtecUDPAdmin::AddrServer methods
   virtual void get_addr (const RtecEventComm::EventHeader& header,
-                         RtecUDPAdmin::UDP_Addr_out addr
-                         ACE_ENV_ARG_DECL)
+                         RtecUDPAdmin::UDP_Addr_out addr)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp
index 480c0bc0542..4a35a62a269 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp
@@ -15,24 +15,20 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 TAO_FT_ClientORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_FT_ClientORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->register_policy_factories (info
-                                   ACE_ENV_ARG_PARAMETER);
+  this->register_policy_factories (info);
 
 
-  this->register_client_request_interceptors (info
-                                              ACE_ENV_ARG_PARAMETER);
+  this->register_client_request_interceptors (info);
 
 
 
@@ -40,8 +36,7 @@ TAO_FT_ClientORBInitializer::post_init (
 
 void
 TAO_FT_ClientORBInitializer::register_policy_factories (
-  PortableInterceptor::ORBInitInfo_ptr info
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Register the FTCORBA policy factories.
@@ -68,27 +63,23 @@ TAO_FT_ClientORBInitializer::register_policy_factories (
 
   CORBA::PolicyType type = FT::REQUEST_DURATION_POLICY;
   info->register_policy_factory (type,
-                                 policy_factory.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+                                 policy_factory.in ());
 
   type = FT::HEARTBEAT_POLICY;
   info->register_policy_factory (type,
-                                 policy_factory.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+                                 policy_factory.in ());
 
   /*
   type = FT::HEARTBEAT_ENABLED_POLICY;
   info->register_policy_factory (type,
-                                 policy_factory.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+                                 policy_factory.in ());
   */
 }
 
 
 void
 TAO_FT_ClientORBInitializer::register_client_request_interceptors (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ClientRequestInterceptor_ptr cri =
@@ -101,8 +92,7 @@ TAO_FT_ClientORBInitializer::register_client_request_interceptors (
   PortableInterceptor::ClientRequestInterceptor_var
     client_interceptor = cri;
 
-  info->add_client_request_interceptor (client_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+  info->add_client_request_interceptor (client_interceptor.in ());
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h
index c0383c99cbc..278a80f3c4b 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h
@@ -39,26 +39,22 @@ class TAO_FT_ClientORBInitializer
 {
 public:
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
 
   /// Register FTCORBA policy factories.
   void register_policy_factories (
-         PortableInterceptor::ORBInitInfo_ptr info
-         ACE_ENV_ARG_DECL)
+         PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Register the necessary interceptors.
   void register_client_request_interceptors (
-         PortableInterceptor::ORBInitInfo_ptr info
-         ACE_ENV_ARG_DECL)
+         PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp
index 852e1c2c97b..56c9b3f7a63 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp
@@ -14,18 +14,15 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 CORBA::Policy_ptr
 TAO_FT_ClientPolicyFactory::create_policy (
     CORBA::PolicyType type,
-    const CORBA::Any &val
-    ACE_ENV_ARG_DECL)
+    const CORBA::Any &val)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA::PolicyError))
 {
 
   if (type ==  FT::REQUEST_DURATION_POLICY)
-    return TAO_FT_Request_Duration_Policy::create (val
-                                                   ACE_ENV_ARG_PARAMETER);
+    return TAO_FT_Request_Duration_Policy::create (val);
   else if (type == FT::HEARTBEAT_POLICY)
-    return TAO_FT_Heart_Beat_Policy::create (val
-                                             ACE_ENV_ARG_PARAMETER);
+    return TAO_FT_Heart_Beat_Policy::create (val);
 
   ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
                     CORBA::Policy::_nil ());
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h
index 7ee620338b9..0e16efe8059 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h
@@ -43,8 +43,7 @@ class TAO_FT_ClientPolicyFactory
 public:
 
   virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                           const CORBA::Any &value
-                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                           const CORBA::Any &value)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CORBA::PolicyError));
 };
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
index 57e0a9e6389..758e9dc7019 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
@@ -29,8 +29,7 @@ TAO_FT_Request_Duration_Policy::policy_type (void)
 }
 
 CORBA::Policy_ptr
-TAO_FT_Request_Duration_Policy::create (const CORBA::Any& val
-                                        ACE_ENV_ARG_DECL)
+TAO_FT_Request_Duration_Policy::create (const CORBA::Any& val)
 {
   TimeBase::TimeT value;
   if ((val >>= value) == 0)
@@ -108,8 +107,7 @@ TAO_FT_Heart_Beat_Policy::heartbeat_policy_value (void)
 
 
 CORBA::Policy_ptr
-TAO_FT_Heart_Beat_Policy::create (const CORBA::Any& val
-                                  ACE_ENV_ARG_DECL)
+TAO_FT_Heart_Beat_Policy::create (const CORBA::Any& val)
 {
   FT::HeartbeatPolicyValue *value = 0;
   if ((val >>= value) == 0)
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
index da7381e53f5..7ccdac2f82a 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
@@ -56,8 +56,7 @@ public:
 
   /// Helper method for the implementation of
   /// CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any& val
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  static CORBA::Policy_ptr create (const CORBA::Any& val);
 
   /// Returns a copy of <this>.
   virtual TAO_FT_Request_Duration_Policy *clone (void) const;
@@ -66,16 +65,13 @@ public:
   virtual TimeBase::TimeT request_duration_policy_value (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyType policy_type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyType policy_type ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Policy_ptr copy ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Change the CORBA representation to the ACE representation.
@@ -111,8 +107,7 @@ public:
 
   /// Helper method for the implementation of
   /// CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any& val
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  static CORBA::Policy_ptr create (const CORBA::Any& val);
 
   /// Returns a copy of <this>.
   virtual TAO_FT_Heart_Beat_Policy *clone (void) const;
@@ -121,16 +116,13 @@ public:
   virtual FT::HeartbeatPolicyValue heartbeat_policy_value (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyType policy_type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyType policy_type ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Policy_ptr copy ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Change the CORBA representation to the ACE representation.
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
index f60feeafbab..51c03ac928c 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
@@ -62,8 +62,7 @@ namespace TAO
 
   void
   FT_ClientRequest_Interceptor::send_poll (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
   {
     // Do Nothing
@@ -71,8 +70,7 @@ namespace TAO
 
   void
   FT_ClientRequest_Interceptor::send_request (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
   {
@@ -88,38 +86,32 @@ namespace TAO
       }
 
     IOP::TaggedComponent_var tp;
-    ACE_TRY
+    try
       {
         tp =
-          ri->get_effective_component (IOP::TAG_FT_GROUP
-                                       ACE_ENV_ARG_PARAMETER);
+          ri->get_effective_component (IOP::TAG_FT_GROUP);
       }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
       {
         return;
       }
-    ACE_ENDTRY;
 
     this->group_version_context (ri,
-                                 tp
-                                 ACE_ENV_ARG_PARAMETER);
+                                 tp);
 
-    this->request_service_context (ri
-                                   ACE_ENV_ARG_PARAMETER);
+    this->request_service_context (ri);
   }
 
   void
   FT_ClientRequest_Interceptor::receive_reply (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
   }
 
   void
   FT_ClientRequest_Interceptor::receive_other (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest))
   {
@@ -127,7 +119,7 @@ namespace TAO
 
     if (!tao_ri)
       {
-        ACE_THROW (CORBA::INTERNAL ());
+        throw CORBA::INTERNAL ();
       }
 
     TimeBase::TimeT expires = tao_ri->tao_ft_expiration_time ();
@@ -140,16 +132,15 @@ namespace TAO
 
     PortableInterceptor::ReplyStatus status = -1;
 
-    ACE_TRY
+    try
     {
        status = ri->reply_status();
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
        // No reply status => Not a location forward.
        return;
     }
-    ACE_ENDTRY;
 
     if (status == PortableInterceptor::LOCATION_FORWARD)
       {
@@ -167,19 +158,18 @@ namespace TAO
 
             // The spec says throw a SYSTEM_EXCEPTION, but doesn't specify which one.
             // I think a TRANSIENT is the most suitable.
-            ACE_THROW (CORBA::TRANSIENT (
+            throw CORBA::TRANSIENT (
               CORBA::SystemException::_tao_minor_code (
-              TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE,
-              errno),
-              CORBA::COMPLETED_NO));
+                TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE,
+                errno),
+              CORBA::COMPLETED_NO);
           }
       }
   }
 
   void
   FT_ClientRequest_Interceptor::receive_exception (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
   {
@@ -212,8 +202,7 @@ namespace TAO
     if (!(icdr.read_string (rep_id.out ()) &&
           icdr.read_ulong (min) &&
           icdr.read_ulong (cs)))
-      ACE_THROW (CORBA::MARSHAL (TAO::VMCID,
-                                 CORBA::COMPLETED_MAYBE));
+      throw CORBA::MARSHAL (TAO::VMCID, CORBA::COMPLETED_MAYBE);
 
     cs = CORBA::CompletionStatus (cs);
 
@@ -225,21 +214,17 @@ namespace TAO
     // which the ORB should understand
     if (ACE_OS_String::strcmp (rep_id.in (),
                                "IDL:omg.org/CORBA/TRANSIENT:1.0") == 0)
-      ACE_THROW (CORBA::TRANSIENT (min,
-                                   CORBA::COMPLETED_NO));
+      throw CORBA::TRANSIENT (min, CORBA::COMPLETED_NO);
     else if (ACE_OS_String::strcmp (rep_id.in (),
                                   "IDL:omg.org/CORBA/COMM_FAILURE:1.0") == 0)
-      ACE_THROW (CORBA::COMM_FAILURE (min,
-                                      CORBA::COMPLETED_NO));
+      throw CORBA::COMM_FAILURE (min, CORBA::COMPLETED_NO);
     else if (ACE_OS_String::strcmp (rep_id.in (),
                                     "IDL:omg.org/CORBA/NO_REPONSE:1.0") == 0)
-      ACE_THROW (CORBA::NO_RESPONSE (min,
-                                   CORBA::COMPLETED_NO));
+      throw CORBA::NO_RESPONSE (min, CORBA::COMPLETED_NO);
 
     else if (ACE_OS_String::strcmp (rep_id.in (),
                                     "IDL:omg.org/CORBA/OBJ_ADAPTER:1.0") == 0)
-    ACE_THROW (CORBA::OBJ_ADAPTER (min,
-                                   CORBA::COMPLETED_NO));
+    throw CORBA::OBJ_ADAPTER (min, CORBA::COMPLETED_NO);
     cout << "Didnt throw exception " << endl;
 #endif /*if 0*/
     return;
@@ -249,11 +234,10 @@ namespace TAO
   void
     FT_ClientRequest_Interceptor::group_version_context (
     PortableInterceptor::ClientRequestInfo_ptr ri,
-    IOP::TaggedComponent* tp
-    ACE_ENV_ARG_DECL)
+    IOP::TaggedComponent* tp)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    ACE_TRY
+    try
     {
       // Grab the object group version
       // @@ NOTE: This involves an allocation and a dellocation. This is
@@ -270,8 +254,7 @@ namespace TAO
       FT::TagFTGroupTaggedComponent gtc;
 
       if ((cdr >> gtc) == 0)
-        ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28,
-        CORBA::COMPLETED_NO));
+        throw CORBA::BAD_PARAM (CORBA::OMGVMCID | 28, CORBA::COMPLETED_NO);
 
       IOP::ServiceContext sc;
       sc.context_id = IOP::FT_GROUP_VERSION;
@@ -300,34 +283,30 @@ namespace TAO
 
       // Add this context to the service context list.
       ri->add_request_service_context (sc,
-        0
-        ACE_ENV_ARG_PARAMETER);
+        0);
 
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
       // Not much can be done anyway. Just keep quiet
       // ACE_RE_THROW;
     }
-    ACE_ENDTRY;
 
     return;
   }
 
   void
     FT_ClientRequest_Interceptor::request_service_context (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    ACE_TRY
+    try
     {
       IOP::ServiceContext sc;
       sc.context_id = IOP::FT_REQUEST;
 
       CORBA::Policy_var policy =
-        ri->get_request_policy (FT::REQUEST_DURATION_POLICY
-        ACE_ENV_ARG_PARAMETER);
+        ri->get_request_policy (FT::REQUEST_DURATION_POLICY);
 
       FT::FTRequestServiceContext ftrsc;
       ftrsc.client_id =
@@ -337,7 +316,7 @@ namespace TAO
 
       if (!tao_ri)
         {
-          ACE_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
 
       if (tao_ri->tao_ft_expiration_time ())
@@ -353,8 +332,7 @@ namespace TAO
 
           ftrsc.retention_id = ++this->retention_id_;
           ftrsc.expiration_time =
-              this->request_expiration_time (policy.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+              this->request_expiration_time (policy.in ());
 
           tao_ri->tao_ft_retention_id (ftrsc.retention_id);
           tao_ri->tao_ft_expiration_time (ftrsc.expiration_time);
@@ -385,29 +363,25 @@ namespace TAO
 
       // Add this context to the service context list.
       ri->add_request_service_context (sc,
-        0
-        ACE_ENV_ARG_PARAMETER);
+        0);
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
       // ACE_RE_THROW;
     }
-    ACE_ENDTRY;
     return;
   }
 
   TimeBase::TimeT
   FT_ClientRequest_Interceptor::request_expiration_time (
-    CORBA::Policy *policy
-    ACE_ENV_ARG_DECL)
+    CORBA::Policy *policy)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     FT::RequestDurationPolicy_var p;
 
     if (policy != 0)
       {
-        p =  FT::RequestDurationPolicy::_narrow (policy
-                                                 ACE_ENV_ARG_PARAMETER);
+        p =  FT::RequestDurationPolicy::_narrow (policy);
       }
 
     TimeBase::TimeT t = 0;
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h
index 465b9f820b3..6c8e4424575 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h
@@ -83,26 +83,21 @@ namespace TAO
     virtual void destroy (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr
-                            ACE_ENV_ARG_DECL)
+    virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-                               ACE_ENV_ARG_DECL)
+    virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
-    virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-                                ACE_ENV_ARG_DECL)
+    virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr
-                                ACE_ENV_ARG_DECL)
+    virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
-    virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
-                                    ACE_ENV_ARG_DECL)
+    virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
@@ -113,16 +108,13 @@ namespace TAO
   private:
 
     void group_version_context (PortableInterceptor::ClientRequestInfo_ptr ri,
-                                IOP::TaggedComponent* tp
-                                ACE_ENV_ARG_DECL)
+                                IOP::TaggedComponent* tp)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    void request_service_context (PortableInterceptor::ClientRequestInfo_ptr ri
-                                  ACE_ENV_ARG_DECL)
+    void request_service_context (PortableInterceptor::ClientRequestInfo_ptr ri)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    TimeBase::TimeT request_expiration_time (CORBA::Policy *policy
-                                             ACE_ENV_ARG_DECL)
+    TimeBase::TimeT request_expiration_time (CORBA::Policy *policy)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   private:
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp
index 13500e5692a..3a785fe5698 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp
@@ -24,8 +24,7 @@ TAO_FT_Endpoint_Selector_Factory::~TAO_FT_Endpoint_Selector_Factory (void)
 
 
 TAO_Invocation_Endpoint_Selector *
-TAO_FT_Endpoint_Selector_Factory::get_selector (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO_FT_Endpoint_Selector_Factory::get_selector ()
 {
     if (this->ft_endpoint_selector_ == 0)
     {
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h
index d2a6462b4e0..e8c5e72f783 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h
@@ -52,8 +52,7 @@ public:
 
   /// Get an Invocation's endpoint selection strategy and
   /// initialize the endpoint selection state instance.
-  virtual TAO_Invocation_Endpoint_Selector *get_selector (
-      ACE_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Invocation_Endpoint_Selector *get_selector ();
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
index 365df8487fc..4b96b917255 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
@@ -24,7 +24,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 CORBA::Boolean
 TAO_FT_IOGR_Property::set_property (
     CORBA::Object_ptr &ior
-    ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+ /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    TAO_IOP::Invalid_IOR))
 {
@@ -78,7 +78,7 @@ TAO_FT_IOGR_Property::set_property (
 CORBA::Boolean
 TAO_FT_IOGR_Property::is_primary_set (
     CORBA::Object_ptr ior
-    ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+ /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
@@ -92,8 +92,7 @@ TAO_FT_IOGR_Property::is_primary_set (
 
 CORBA::Object_ptr
 TAO_FT_IOGR_Property::get_primary (
-    CORBA::Object_ptr ior
-    ACE_ENV_ARG_DECL)
+    CORBA::Object_ptr ior)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::NotFound
@@ -164,8 +163,7 @@ TAO_FT_IOGR_Property::get_primary (
 CORBA::Boolean
 TAO_FT_IOGR_Property::set_primary (
     CORBA::Object_ptr &ior1,
-    CORBA::Object_ptr ior2
-    ACE_ENV_ARG_DECL)
+    CORBA::Object_ptr ior2)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::NotFound,
@@ -345,8 +343,7 @@ TAO_FT_IOGR_Property::get_primary_profile (
 CORBA::Boolean
 TAO_FT_IOGR_Property::get_tagged_component (
     const CORBA::Object_ptr iogr,
-    FT::TagFTGroupTaggedComponent &fgtc
-    ACE_ENV_ARG_DECL) const
+    FT::TagFTGroupTaggedComponent &fgtc) const
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Stub *stub =
@@ -398,8 +395,7 @@ TAO_FT_IOGR_Property::get_tagged_component (
 
 CORBA::Boolean
 TAO_FT_IOGR_Property::remove_primary_tag (
-    CORBA::Object_ptr &iogr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    CORBA::Object_ptr &iogr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the MProfile
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
index cc888e28e31..36cdbfbfdf8 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
@@ -67,8 +67,7 @@ public:
 
   /// Set the property for the IOGR
   virtual CORBA::Boolean set_property (
-      CORBA::Object_ptr &ior
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::Object_ptr &ior)
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       TAO_IOP::Invalid_IOR
@@ -77,8 +76,7 @@ public:
   /// Set <ior1> as  primary which is a part of <ior2>
   virtual CORBA::Boolean set_primary (
       CORBA::Object_ptr &ior1,
-      CORBA::Object_ptr ior2
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::Object_ptr ior2)
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       TAO_IOP::NotFound,
@@ -87,8 +85,7 @@ public:
 
   /// Get the primary member from the IOGR <ior>
   virtual CORBA::Object_ptr get_primary (
-      CORBA::Object_ptr ior
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::Object_ptr ior)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::NotFound
@@ -96,15 +93,13 @@ public:
 
   /// Is there a primary available for <ior>
   virtual CORBA::Boolean is_primary_set (
-      CORBA::Object_ptr ior
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::Object_ptr ior)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
   virtual CORBA::Boolean remove_primary_tag (
-      CORBA::Object_ptr &iogr
-      ACE_ENV_ARG_DECL)
+      CORBA::Object_ptr &iogr)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Reset the underlying tagged components held by the class
@@ -114,8 +109,7 @@ public:
   /// Extract the TagFTGroupTaggedComponent inside the <ior>
   CORBA::Boolean get_tagged_component (
       const CORBA::Object_ptr iogr,
-      FT::TagFTGroupTaggedComponent &ft_group
-      ACE_ENV_ARG_DECL) const
+      FT::TagFTGroupTaggedComponent &ft_group) const
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
index bafea90d822..cdc5d50b363 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
@@ -29,28 +29,24 @@ TAO_FT_Invocation_Endpoint_Selector::~TAO_FT_Invocation_Endpoint_Selector (void)
 void
 TAO_FT_Invocation_Endpoint_Selector::select_endpoint (
     TAO::Profile_Transport_Resolver *r,
-    ACE_Time_Value *val
-    ACE_ENV_ARG_DECL)
+    ACE_Time_Value *val)
 {
   bool retval =
     this->select_primary (r,
-                          val
-                          ACE_ENV_ARG_PARAMETER);
+                          val);
 
   if (retval)
     return;
 
   retval =
     this->select_secondary (r,
-                            val
-                            ACE_ENV_ARG_PARAMETER);
+                            val);
 
   if (retval == false)
     {
       // If we get here, we completely failed to find an endpoint selector
       // that we know how to use, so throw an exception.
-      ACE_THROW (CORBA::TRANSIENT (CORBA::OMGVMCID | 2,
-                                   CORBA::COMPLETED_NO));
+      throw CORBA::TRANSIENT (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
     }
 
   return;
@@ -59,8 +55,7 @@ TAO_FT_Invocation_Endpoint_Selector::select_endpoint (
 bool
 TAO_FT_Invocation_Endpoint_Selector::select_primary (
     TAO::Profile_Transport_Resolver *r,
-    ACE_Time_Value *max_wait_time
-    ACE_ENV_ARG_DECL)
+    ACE_Time_Value *max_wait_time)
 {
   // Grab the forwarded list
   TAO_MProfile *prof_list =
@@ -87,8 +82,7 @@ TAO_FT_Invocation_Endpoint_Selector::select_primary (
       TAO_Profile *tmp = prof_list->get_profile (i);
 
       bool retval =
-        this->check_profile_for_primary (tmp
-                                         ACE_ENV_ARG_PARAMETER);
+        this->check_profile_for_primary (tmp);
 
       // Choose a non-primary
       if (retval == true && tmp != 0)
@@ -96,8 +90,7 @@ TAO_FT_Invocation_Endpoint_Selector::select_primary (
           retval =
             this->try_connect (r,
                                tmp,
-                               max_wait_time
-                               ACE_ENV_ARG_PARAMETER);
+                               max_wait_time);
 
           if (retval == true)
             return true;
@@ -110,8 +103,7 @@ TAO_FT_Invocation_Endpoint_Selector::select_primary (
 bool
 TAO_FT_Invocation_Endpoint_Selector::select_secondary (
     TAO::Profile_Transport_Resolver *r,
-    ACE_Time_Value *max_wait_time
-    ACE_ENV_ARG_DECL)
+    ACE_Time_Value *max_wait_time)
 {
   // Grab the forwarded list
   TAO_MProfile *prof_list =
@@ -137,8 +129,7 @@ TAO_FT_Invocation_Endpoint_Selector::select_secondary (
         prof_list->get_profile (i);
 
       bool retval =
-        this->check_profile_for_primary (tmp
-                                         ACE_ENV_ARG_PARAMETER);
+        this->check_profile_for_primary (tmp);
 
       // Choose a non-primary
       if (retval == false && tmp != 0)
@@ -146,8 +137,7 @@ TAO_FT_Invocation_Endpoint_Selector::select_secondary (
           retval =
             this->try_connect (r,
                                tmp,
-                               max_wait_time
-                               ACE_ENV_ARG_PARAMETER);
+                               max_wait_time);
 
           if (retval == true)
             return true;
@@ -161,8 +151,7 @@ bool
 TAO_FT_Invocation_Endpoint_Selector::try_connect (
     TAO::Profile_Transport_Resolver *r,
     TAO_Profile *profile,
-    ACE_Time_Value *max_wait_time
-    ACE_ENV_ARG_DECL)
+    ACE_Time_Value *max_wait_time)
 {
   r->profile (profile);
 
@@ -178,8 +167,7 @@ TAO_FT_Invocation_Endpoint_Selector::try_connect (
 
       bool retval =
         r->try_connect (&desc,
-                        max_wait_time
-                        ACE_ENV_ARG_PARAMETER);
+                        max_wait_time);
 
       // @@ Good place to handle timeouts.. We can omit timeouts and
       // go ahead looking for other things... There are some small
@@ -199,8 +187,7 @@ TAO_FT_Invocation_Endpoint_Selector::try_connect (
 
 bool
 TAO_FT_Invocation_Endpoint_Selector::check_profile_for_primary (
-    TAO_Profile *pfile
-    ACE_ENV_ARG_DECL_NOT_USED)
+    TAO_Profile *pfile)
 {
   if (pfile == 0)
     return false;
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h
index ae3a473ea34..e9c849e40eb 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h
@@ -59,32 +59,27 @@ public:
   /// $TAO_ROOT/tao/Invocation_Endpoint_Selectors.h  for details of
   /// documentation.
   virtual void select_endpoint (TAO::Profile_Transport_Resolver *r,
-                                ACE_Time_Value *val
-                                ACE_ENV_ARG_DECL);
+                                ACE_Time_Value *val);
 
 protected:
   /// Select the primary and try connecting to it.
   bool select_primary (TAO::Profile_Transport_Resolver *r,
-                       ACE_Time_Value *val
-                       ACE_ENV_ARG_DECL);
+                       ACE_Time_Value *val);
 
   /// Select the secondary and try connecting to it. Returns true if
   /// successfull.
   bool select_secondary (TAO::Profile_Transport_Resolver *r,
-                         ACE_Time_Value *val
-                         ACE_ENV_ARG_DECL);
+                         ACE_Time_Value *val);
 
   /// Helper method that tries to establish connections with all the
   /// endpoints in the profile.
   bool try_connect (TAO::Profile_Transport_Resolver *r,
                     TAO_Profile *profile,
-                    ACE_Time_Value *max_wait_time
-                    ACE_ENV_ARG_DECL);
+                    ACE_Time_Value *max_wait_time);
 
   /// Helper method that checks whether the profile is a primary or
   /// not.
-  bool check_profile_for_primary (TAO_Profile *
-                                  ACE_ENV_ARG_DECL);
+  bool check_profile_for_primary (TAO_Profile *);
 
 
 };
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp
index 25938b59b8f..05312105af0 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp
@@ -18,32 +18,26 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 TAO_FT_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_FT_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->register_policy_factories (info
-                                   ACE_ENV_ARG_PARAMETER);
+  this->register_policy_factories (info);
 
-  this->register_server_request_interceptors (info
-                                              ACE_ENV_ARG_PARAMETER);
+  this->register_server_request_interceptors (info);
 
-  this->register_client_request_interceptors (info
-                                              ACE_ENV_ARG_PARAMETER);
+  this->register_client_request_interceptors (info);
 }
 
 void
 TAO_FT_ORBInitializer::register_policy_factories (
-  PortableInterceptor::ORBInitInfo_ptr info
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Register the FTCORBA policy factories.
@@ -70,18 +64,15 @@ TAO_FT_ORBInitializer::register_policy_factories (
 
   CORBA::PolicyType type = FT::REQUEST_DURATION_POLICY;
   info->register_policy_factory (type,
-                                 policy_factory.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+                                 policy_factory.in ());
 
   type = FT::HEARTBEAT_POLICY;
   info->register_policy_factory (type,
-                                 policy_factory.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+                                 policy_factory.in ());
 
   type = FT::HEARTBEAT_ENABLED_POLICY;
   info->register_policy_factory (type,
-                                 policy_factory.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+                                 policy_factory.in ());
 
   // Transfer ownership of the policy factory to the registry.
   (void) policy_factory._retn ();
@@ -89,8 +80,7 @@ TAO_FT_ORBInitializer::register_policy_factories (
 
 void
 TAO_FT_ORBInitializer::register_server_request_interceptors (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ServerRequestInterceptor_ptr sri =
@@ -103,15 +93,13 @@ TAO_FT_ORBInitializer::register_server_request_interceptors (
   PortableInterceptor::ServerRequestInterceptor_var
     server_interceptor = sri;
 
-  info->add_server_request_interceptor (server_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+  info->add_server_request_interceptor (server_interceptor.in ());
 }
 
 
 void
 TAO_FT_ORBInitializer::register_client_request_interceptors (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ClientRequestInterceptor_ptr cri =
@@ -124,8 +112,7 @@ TAO_FT_ORBInitializer::register_client_request_interceptors (
   PortableInterceptor::ClientRequestInterceptor_var
     client_interceptor = cri;
 
-  info->add_client_request_interceptor (client_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+  info->add_client_request_interceptor (client_interceptor.in ());
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h
index 8493a77ddac..e3c00a8dc2a 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h
@@ -40,31 +40,26 @@ class TAO_FT_ORBInitializer
 {
 public:
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
 
   /// Register FTCORBA policy factories.
   void register_policy_factories (
-         PortableInterceptor::ORBInitInfo_ptr info
-         ACE_ENV_ARG_DECL)
+         PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Register the necessary interceptors.
   void register_server_request_interceptors (
-         PortableInterceptor::ORBInitInfo_ptr info
-         ACE_ENV_ARG_DECL)
+         PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void register_client_request_interceptors (
-         PortableInterceptor::ORBInitInfo_ptr info
-         ACE_ENV_ARG_DECL)
+         PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp
index 74758912067..95419a3a405 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp
@@ -15,21 +15,17 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 CORBA::Policy_ptr
 TAO_FT_PolicyFactory::create_policy (
     CORBA::PolicyType type,
-    const CORBA::Any &val
-    ACE_ENV_ARG_DECL)
+    const CORBA::Any &val)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA::PolicyError))
 {
 
   if (type ==  FT::REQUEST_DURATION_POLICY)
-    return  TAO_FT_Request_Duration_Policy::create (val
-                                                    ACE_ENV_ARG_PARAMETER);
+    return  TAO_FT_Request_Duration_Policy::create (val);
   else if (type == FT::HEARTBEAT_POLICY)
-    return TAO_FT_Heart_Beat_Policy::create (val
-                                             ACE_ENV_ARG_PARAMETER);
+    return TAO_FT_Heart_Beat_Policy::create (val);
   else if (type == FT::HEARTBEAT_ENABLED_POLICY)
-    return TAO_FT_Heart_Beat_Enabled_Policy::create (val
-                                                     ACE_ENV_ARG_PARAMETER);
+    return TAO_FT_Heart_Beat_Enabled_Policy::create (val);
 
   ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
                     CORBA::Policy::_nil ());
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h
index bb71603c077..849f149480e 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h
@@ -45,8 +45,7 @@ class TAO_FT_PolicyFactory
 public:
 
   virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                           const CORBA::Any &value
-                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                           const CORBA::Any &value)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CORBA::PolicyError));
 };
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp
index 03cd2cc560b..053e1951e89 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp
@@ -26,8 +26,7 @@ TAO_FT_Request_Duration_Policy::policy_type (void)
 }
 
 CORBA::Policy_ptr
-TAO_FT_Request_Duration_Policy::create (const CORBA::Any& val
-                                        ACE_ENV_ARG_DECL)
+TAO_FT_Request_Duration_Policy::create (const CORBA::Any& val)
 {
   TimeBase::TimeT value;
   if ((val >>= value) == 0)
@@ -107,8 +106,7 @@ TAO_FT_Heart_Beat_Policy::heartbeat_policy_value (void)
 
 
 CORBA::Policy_ptr
-TAO_FT_Heart_Beat_Policy::create (const CORBA::Any& val
-                                  ACE_ENV_ARG_DECL)
+TAO_FT_Heart_Beat_Policy::create (const CORBA::Any& val)
 {
   FT::HeartbeatPolicyValue *value;
   if ((val >>= value) == 0)
@@ -186,8 +184,7 @@ TAO_FT_Heart_Beat_Policy::set_time_value (ACE_Time_Value &time_value,
 /******************************************************************/
 
 CORBA::Boolean
-TAO_FT_Heart_Beat_Enabled_Policy::heartbeat_enabled_policy_value (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Heart_Beat_Enabled_Policy::heartbeat_enabled_policy_value ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->heartbeat_enabled_value_;
@@ -195,8 +192,7 @@ TAO_FT_Heart_Beat_Enabled_Policy::heartbeat_enabled_policy_value (
 
 
 CORBA::Policy_ptr
-TAO_FT_Heart_Beat_Enabled_Policy::create (const CORBA::Any& val
-                                          ACE_ENV_ARG_DECL)
+TAO_FT_Heart_Beat_Enabled_Policy::create (const CORBA::Any& val)
 {
   CORBA::Boolean value;
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h
index c90c098e4d4..b4706c0b528 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h
@@ -54,8 +54,7 @@ public:
 
   /// Helper method for the implementation of
   /// CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any& val
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  static CORBA::Policy_ptr create (const CORBA::Any& val);
 
   /// Returns a copy of <this>.
   virtual TAO_FT_Request_Duration_Policy *clone (void) const;
@@ -64,16 +63,13 @@ public:
   virtual TimeBase::TimeT request_duration_policy_value (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyType policy_type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyType policy_type ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Policy_ptr copy ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Change the CORBA representation to the ACE representation.
@@ -109,8 +105,7 @@ public:
 
   /// Helper method for the implementation of
   /// CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any& val
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  static CORBA::Policy_ptr create (const CORBA::Any& val);
 
   /// Returns a copy of <this>.
   virtual TAO_FT_Heart_Beat_Policy *clone (void) const;
@@ -119,16 +114,13 @@ public:
   virtual FT::HeartbeatPolicyValue heartbeat_policy_value (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyType policy_type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyType policy_type ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Policy_ptr copy ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Change the CORBA representation to the ACE representation.
@@ -170,8 +162,7 @@ public:
   TAO_FT_Heart_Beat_Enabled_Policy (
       const TAO_FT_Heart_Beat_Enabled_Policy &rhs);
 
-  static CORBA::Policy_ptr create (const CORBA::Any& val
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  static CORBA::Policy_ptr create (const CORBA::Any& val);
 
   // Helper method for the implementation of
   // CORBA::ORB::create_policy.
@@ -180,20 +171,16 @@ public:
   virtual TAO_FT_Heart_Beat_Enabled_Policy *clone (void) const;
 
   // = The FT::HeartBeatPolicy methods
-  virtual CORBA::Boolean heartbeat_enabled_policy_value (
-      ACE_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Boolean heartbeat_enabled_policy_value ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyType policy_type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyType policy_type ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Policy_ptr copy ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
index aa4b3235ef8..99537c5b495 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
@@ -16,29 +16,24 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 TAO_FT_ServerORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_FT_ServerORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->register_policy_factories (info
-                                   ACE_ENV_ARG_PARAMETER);
+  this->register_policy_factories (info);
 
-  this->register_server_request_interceptors (info
-                                              ACE_ENV_ARG_PARAMETER);
+  this->register_server_request_interceptors (info);
 }
 
 void
 TAO_FT_ServerORBInitializer::register_policy_factories (
-  PortableInterceptor::ORBInitInfo_ptr info
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Register the FTCORBA policy factories.
@@ -66,15 +61,13 @@ TAO_FT_ServerORBInitializer::register_policy_factories (
 
   CORBA::PolicyType type = FT::HEARTBEAT_ENABLED_POLICY;
   info->register_policy_factory (type,
-                                 policy_factory.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+                                 policy_factory.in ());
 }
 
 
 void
 TAO_FT_ServerORBInitializer::register_server_request_interceptors (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ServerRequestInterceptor_ptr sri =
@@ -87,8 +80,7 @@ TAO_FT_ServerORBInitializer::register_server_request_interceptors (
   PortableInterceptor::ServerRequestInterceptor_var
     server_interceptor = sri;
 
-  info->add_server_request_interceptor (server_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+  info->add_server_request_interceptor (server_interceptor.in ());
 }
 
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h
index 0e2711ed429..c328b8ccfd3 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h
@@ -39,26 +39,22 @@ class TAO_FT_ServerORBInitializer
 {
 public:
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
 
   /// Register FTCORBA policy factories.
   void register_policy_factories (
-         PortableInterceptor::ORBInitInfo_ptr info
-         ACE_ENV_ARG_DECL)
+         PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Register the necessary interceptors.
   void register_server_request_interceptors (
-         PortableInterceptor::ORBInitInfo_ptr info
-         ACE_ENV_ARG_DECL)
+         PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 };
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp
index e1c8fcea33b..3e208e650c7 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp
@@ -17,15 +17,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 CORBA::Policy_ptr
 TAO_FT_ServerPolicyFactory::create_policy (
     CORBA::PolicyType type,
-    const CORBA::Any &val
-    ACE_ENV_ARG_DECL)
+    const CORBA::Any &val)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA::PolicyError))
 {
 
   if (type == FT::HEARTBEAT_ENABLED_POLICY)
-    return TAO_FT_Heart_Beat_Enabled_Policy::create (val
-                                                     ACE_ENV_ARG_PARAMETER);
+    return TAO_FT_Heart_Beat_Enabled_Policy::create (val);
 
   ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
                     CORBA::Policy::_nil ());
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h
index 2ae22af9f48..b1f8c50e3fc 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h
@@ -43,8 +43,7 @@ class TAO_FT_ServerPolicyFactory
 public:
 
   virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                           const CORBA::Any &value
-                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                           const CORBA::Any &value)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CORBA::PolicyError));
 };
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
index 86a83d333ff..a5279d8f3a5 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
@@ -14,8 +14,7 @@ ACE_RCSID(FaultTolerance, FT_ServerPolicy_i, "$Id$")
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Boolean
-TAO_FT_Heart_Beat_Enabled_Policy::heartbeat_enabled_policy_value (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Heart_Beat_Enabled_Policy::heartbeat_enabled_policy_value ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->heartbeat_enabled_value_;
@@ -23,8 +22,7 @@ TAO_FT_Heart_Beat_Enabled_Policy::heartbeat_enabled_policy_value (
 
 
 CORBA::Policy_ptr
-TAO_FT_Heart_Beat_Enabled_Policy::create (const CORBA::Any& val
-                                          ACE_ENV_ARG_DECL)
+TAO_FT_Heart_Beat_Enabled_Policy::create (const CORBA::Any& val)
 {
   CORBA::Boolean value;
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h
index 6019cdc8f70..0fb86dbeb7a 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h
@@ -49,8 +49,7 @@ public:
   TAO_FT_Heart_Beat_Enabled_Policy (
       const TAO_FT_Heart_Beat_Enabled_Policy &rhs);
 
-  static CORBA::Policy_ptr create (const CORBA::Any& val
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  static CORBA::Policy_ptr create (const CORBA::Any& val);
 
   // Helper method for the implementation of
   // CORBA::ORB::create_policy.
@@ -59,20 +58,16 @@ public:
   virtual TAO_FT_Heart_Beat_Enabled_Policy *clone (void) const;
 
   // = The FT::HeartBeatPolicy methods
-  virtual CORBA::Boolean heartbeat_enabled_policy_value (
-      ACE_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Boolean heartbeat_enabled_policy_value ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyType policy_type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyType policy_type ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Policy_ptr copy ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
index d7e8cc96e36..4f01158760a 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
@@ -43,38 +43,33 @@ namespace TAO
 
   void
   FT_ServerRequest_Interceptor::receive_request_service_contexts (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest))
   {
     // Check for the group version service context
-    ACE_TRY
+    try
       {
         IOP::ServiceContext_var sc =
-          ri->get_request_service_context (IOP::FT_GROUP_VERSION
-                                           ACE_ENV_ARG_PARAMETER);
+          ri->get_request_service_context (IOP::FT_GROUP_VERSION);
 
-        this->check_iogr_version (sc.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+        this->check_iogr_version (sc.in ());
       }
-    ACE_CATCH (CORBA::BAD_PARAM, ex)
+    catch (const CORBA::BAD_PARAM& ex)
       {
         // No group version context, no problem just return.
         return;
       }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
       {
-        ACE_RE_THROW;
+        throw;
       }
-    ACE_ENDTRY;
 
   }
 
   void
   FT_ServerRequest_Interceptor::receive_request (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest))
   {
@@ -85,8 +80,7 @@ namespace TAO
     if (ACE_OS::strcmp (op.in (),
                         "tao_update_object_group") == 0)
     {
-      this->update_iogr (ri
-                         ACE_ENV_ARG_PARAMETER);
+      this->update_iogr (ri);
     }
 
     // Else the world is fine
@@ -94,16 +88,14 @@ namespace TAO
 
   void
   FT_ServerRequest_Interceptor::send_reply (
-      PortableInterceptor::ServerRequestInfo_ptr
-      ACE_ENV_ARG_DECL_NOT_USED)
+      PortableInterceptor::ServerRequestInfo_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
   }
 
   void
   FT_ServerRequest_Interceptor::send_exception (
-      PortableInterceptor::ServerRequestInfo_ptr
-      ACE_ENV_ARG_DECL_NOT_USED)
+      PortableInterceptor::ServerRequestInfo_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest))
   {
@@ -111,8 +103,7 @@ namespace TAO
 
   void
   FT_ServerRequest_Interceptor::send_other (
-      PortableInterceptor::ServerRequestInfo_ptr
-      ACE_ENV_ARG_DECL_NOT_USED)
+      PortableInterceptor::ServerRequestInfo_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest))
   {
@@ -120,8 +111,7 @@ namespace TAO
 
   void
   FT_ServerRequest_Interceptor::check_iogr_version (
-      const IOP::ServiceContext &svc
-      ACE_ENV_ARG_DECL)
+      const IOP::ServiceContext &svc)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest))
   {
@@ -138,8 +128,7 @@ namespace TAO
     FT::FTGroupVersionServiceContext fgvsc;
 
     if ((cdr >> fgvsc) == 0)
-      ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28,
-                                   CORBA::COMPLETED_NO));
+      throw CORBA::BAD_PARAM (CORBA::OMGVMCID | 28, CORBA::COMPLETED_NO);
 
 
     if (fgvsc.object_group_ref_version >
@@ -155,18 +144,17 @@ namespace TAO
              this->object_group_ref_version_)
       {
         // Notice that this is a permanent forward.
-        ACE_THROW (PortableInterceptor::ForwardRequest (
-                   this->iogr_.in()));
+        throw PortableInterceptor::ForwardRequest (this->iogr_.in());
       }
     else if ((fgvsc.object_group_ref_version ==
              this->object_group_ref_version_) &&
              !this->is_primary_)
       {
-        ACE_THROW (CORBA::TRANSIENT (
-                       CORBA::SystemException::_tao_minor_code (
-                       TAO::VMCID,
-                       EINVAL),
-                       CORBA::COMPLETED_NO));
+        throw CORBA::TRANSIENT (
+          CORBA::SystemException::_tao_minor_code (
+            TAO::VMCID,
+            EINVAL),
+          CORBA::COMPLETED_NO);
       }
     else
       {
@@ -176,8 +164,7 @@ namespace TAO
 
   void
   FT_ServerRequest_Interceptor::update_iogr (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     if (this->orb_.in () == 0)
@@ -191,8 +178,7 @@ namespace TAO
         this->orb_ =
           CORBA::ORB_init (argc,
                            argv,
-                           orb_id.in ()
-                           ACE_ENV_ARG_PARAMETER);
+                           orb_id.in ());
       }
 
     Dynamic::ParameterList_var param =
@@ -202,7 +188,7 @@ namespace TAO
     // which accepts three parameters, i.e.,an iogr as a string,
     // a version object and a boolean.
     if (param->length () != 3 )
-      ACE_THROW (CORBA::TRANSIENT ());
+      throw CORBA::TRANSIENT ();
 
     const char *str = 0;
 
@@ -213,15 +199,14 @@ namespace TAO
     CORBA::String_var obj (str);
 
     this->iogr_ =
-      this->orb_->string_to_object (obj.in ()
-                                    ACE_ENV_ARG_PARAMETER);
+      this->orb_->string_to_object (obj.in ());
 
 
     // @@ This exception is a hack to let the RM know that we have
     // received and updated the IOGR. We will add a special minor code
     // soon.
     if (this->iogr_.in ())
-      ACE_THROW (CORBA::TRANSACTION_ROLLEDBACK ());
+      throw CORBA::TRANSACTION_ROLLEDBACK ();
   }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h
index e9926463d6f..9e5e2b6e869 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h
@@ -76,44 +76,37 @@ namespace TAO
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual void receive_request_service_contexts (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
     virtual void receive_request (
-        PortableInterceptor::ServerRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL)
+        PortableInterceptor::ServerRequestInfo_ptr ri)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
     virtual void send_reply (
-        PortableInterceptor::ServerRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL)
+        PortableInterceptor::ServerRequestInfo_ptr ri)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual void send_exception (
-        PortableInterceptor::ServerRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL)
+        PortableInterceptor::ServerRequestInfo_ptr ri)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
     virtual void send_other (
-        PortableInterceptor::ServerRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL)
+        PortableInterceptor::ServerRequestInfo_ptr ri)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
     //@}
   private:
 
-    void check_iogr_version (const IOP::ServiceContext &svc
-                             ACE_ENV_ARG_DECL)
+    void check_iogr_version (const IOP::ServiceContext &svc)
       ACE_THROW_SPEC ((CORBA::SystemException,
            PortableInterceptor::ForwardRequest));
 
     void update_iogr (
-        PortableInterceptor::ServerRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL)
+        PortableInterceptor::ServerRequestInfo_ptr ri)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   private:
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
index 36813b33d7d..2ca544403fe 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
@@ -37,10 +37,10 @@ TAO_FT_Service_Callbacks::~TAO_FT_Service_Callbacks (void)
   delete this->profile_lock_;
 }
 
-CORBA::Boolean 
+CORBA::Boolean
 TAO_FT_Service_Callbacks::select_profile (const TAO_MProfile &mprofile,
     TAO_Profile *&pfile)
-{  
+{
   CORBA::ULong sz =
     mprofile.size ();
 
@@ -270,8 +270,7 @@ TAO_FT_Service_Callbacks::is_permanent_forward_condition (const CORBA::Object_pt
 TAO::Invocation_Status
 TAO_FT_Service_Callbacks::raise_comm_failure (
     IOP::ServiceContextList &context_list,
-    TAO_Profile *profile
-    ACE_ENV_ARG_DECL)
+    TAO_Profile *profile)
 {
   if (this->restart_policy_check (context_list,
                                   profile))
@@ -290,8 +289,7 @@ TAO_FT_Service_Callbacks::raise_comm_failure (
 TAO::Invocation_Status
 TAO_FT_Service_Callbacks::raise_transient_failure (
     IOP::ServiceContextList &service,
-    TAO_Profile *profile
-    ACE_ENV_ARG_DECL_NOT_USED)
+    TAO_Profile *profile)
 {
   if (this->restart_policy_check (service,
                                   profile))
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
index b2f0403176f..de694bb723c 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
@@ -77,15 +77,13 @@ public:
   /// reinvocaton.
   virtual TAO::Invocation_Status raise_comm_failure (
       IOP::ServiceContextList &clist,
-      TAO_Profile *profile
-      ACE_ENV_ARG_DECL);
+      TAO_Profile *profile);
 
   /// Check whether we need to raise an exception or go for a
   /// reinvocaton.
   virtual TAO::Invocation_Status raise_transient_failure (
       IOP::ServiceContextList &clist,
-      TAO_Profile *profile
-      ACE_ENV_ARG_DECL);
+      TAO_Profile *profile);
 
   static TimeBase::TimeT now (void);
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp
index e4ee1d43f28..3c74fec8208 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp
@@ -16,20 +16,17 @@ FTRT_ClientORB_Initializer::FTRT_ClientORB_Initializer (int transaction_depth)
 
 void
 FTRT_ClientORB_Initializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 FTRT_ClientORB_Initializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  info->add_client_request_interceptor (client_interceptor_.in()
-                                        ACE_ENV_ARG_PARAMETER);
+  info->add_client_request_interceptor (client_interceptor_.in());
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h
index 7bfd0791eb1..355ff4bb270 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h
@@ -42,12 +42,10 @@ public:
   /// Priority mapping types
   FTRT_ClientORB_Initializer (int transaction_depth);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 private:
   PortableInterceptor::ClientRequestInterceptor_var client_interceptor_;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp
index 2fbb222d641..8958f93bb25 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp
@@ -43,21 +43,19 @@ FTRT_ClientORB_Interceptor::destroy (void)
 
 void
 FTRT_ClientORB_Interceptor::send_poll (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 FTRT_ClientORB_Interceptor::send_request (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
   ACE_TRACE("FTRT_ClientORB_Interceptor::send_request");
-  ACE_TRY
+  try
   {
     // Add FT_REQUEST context
     IOP::ServiceContext sc;
@@ -89,34 +87,30 @@ FTRT_ClientORB_Interceptor::send_request (
       }
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
 
-    ri->add_request_service_context (sc, 0 ACE_ENV_ARG_PARAMETER);
+    ri->add_request_service_context (sc, 0);
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
     // Not much can be done anyway. Just keep quiet
   }
-  ACE_ENDTRY;
 }
 
 void
 FTRT_ClientORB_Interceptor::receive_reply (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRACE("FTRT_ClientORB_Interceptor::receive_reply");
 
 
   IOP::ServiceContext_var service_context;
-  ACE_TRY {
+  try{
     service_context =
-      ri->get_reply_service_context(FTRT::FT_FORWARD
-                                    ACE_ENV_ARG_PARAMETER);
+      ri->get_reply_service_context(FTRT::FT_FORWARD);
   }
-  ACE_CATCHANY {
+  catch (const CORBA::Exception& ex){
     return;
   }
-  ACE_ENDTRY;
 
 
   const char * buf =
@@ -138,8 +132,7 @@ FTRT_ClientORB_Interceptor::receive_reply (
 
 void
 FTRT_ClientORB_Interceptor::receive_other (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -147,8 +140,7 @@ FTRT_ClientORB_Interceptor::receive_other (
 
 void
 FTRT_ClientORB_Interceptor::receive_exception (
-    PortableInterceptor::ClientRequestInfo_ptr /* ri */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr /* ri */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h
index 7cbda5660e7..304a186c184 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h
@@ -53,26 +53,21 @@ public:
   virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     PortableInterceptor::ForwardRequest));
 private:
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
index c9f9acab060..5dd426e4846 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
@@ -52,7 +52,7 @@ namespace TAO_FTRT {
 
 
       // Register the ORB initializer.
-      ACE_TRY_NEW_ENV
+      try
       {
         PortableInterceptor::ORBInitializer_ptr temp_orb_initializer =
           PortableInterceptor::ORBInitializer::_nil ();
@@ -68,17 +68,14 @@ namespace TAO_FTRT {
           CORBA::COMPLETED_NO));
         orb_initializer = temp_orb_initializer;
 
-        PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-          ACE_ENV_ARG_PARAMETER);
+        PortableInterceptor::register_orb_initializer (orb_initializer.in ());
       }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
       {
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-          "Unexpected exception caught while "
-          "initializing the TransactionDepth");
+        ex._tao_print_exception (
+          "Unexpected exception caught while ""initializing the TransactionDepth");
         return 1;
       }
-      ACE_ENDTRY;
 
       return 0;
   }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp
index 950a1fd3928..f6bdc76f5e0 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp
@@ -48,13 +48,12 @@ int  AMI_Primary_Replication_Strategy::release (void)
 
 int AMI_Primary_Replication_Strategy::svc()
 {
-  ACE_TRY_NEW_ENV {
+  try{
     int argc = 0;
     char** argv = 0;
     orb_ = CORBA::ORB_init (argc, argv);
 
-    root_poa_ =  resolve_init<PortableServer::POA>(orb_.in(), "RootPOA"
-      ACE_ENV_ARG_PARAMETER);
+    root_poa_ =  resolve_init<PortableServer::POA>(orb_.in(), "RootPOA");
 
     // create POAManager
     mgr_ = root_poa_->the_POAManager();
@@ -63,17 +62,14 @@ int AMI_Primary_Replication_Strategy::svc()
     mgr_->activate();
 
     PortableServer::IdUniquenessPolicy_var id_uniqueness_policy =
-      root_poa_->create_id_uniqueness_policy(PortableServer::MULTIPLE_ID
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK
+      root_poa_->create_id_uniqueness_policy(PortableServer::MULTIPLE_ID);
 
     TAO::Utils::PolicyList_Destroyer policy_list(3);
     policy_list.length(1);
     policy_list[0] = PortableServer::IdUniquenessPolicy::_duplicate(
         id_uniqueness_policy.in()
       );
-    poa_ = create_persistent_poa(root_poa_, mgr_, "AMI_Update", policy_list
-      ACE_ENV_ARG_PARAMETER);
+    poa_ = create_persistent_poa(root_poa_, mgr_, "AMI_Update", policy_list);
 
     id_uniqueness_policy->destroy();
 
@@ -84,12 +80,11 @@ int AMI_Primary_Replication_Strategy::svc()
     }
     orb_->destroy();
   }
-  ACE_CATCHANY {
-    ACE_PRINT_EXCEPTION(ex, "AMI_Primary_Replication_Strategy::svc");
+  catch (const CORBA::Exception& ex){
+    ex._tao_print_exception ("AMI_Primary_Replication_Strategy::svc");
     running_ = false;
     return -1;
   }
-  ACE_ENDTRY;
   running_ = false;
   return 0;
 }
@@ -98,8 +93,7 @@ void
 AMI_Primary_Replication_Strategy::replicate_request(
   const FTRT::State& state,
   RollbackOperation rollback,
-  const FtRtecEventChannelAdmin::ObjectId& oid
-  ACE_ENV_ARG_DECL)
+  const FtRtecEventChannelAdmin::ObjectId& oid)
 {
    ACE_Auto_Event event;
    Update_Manager* manager = 0;
@@ -115,7 +109,7 @@ AMI_Primary_Replication_Strategy::replicate_request(
 
    if ((size_t)transaction_depth > num_backups) {
      TAO_FTRTEC::Log(3, "Throwing FTRT::TransactionDepthTooHigh\n");
-     ACE_THROW(FTRT::TransactionDepthTooHigh());
+     throw FTRT::TransactionDepthTooHigh();
    }
 
    ACE_NEW_THROW_EX(manager,
@@ -123,53 +117,46 @@ AMI_Primary_Replication_Strategy::replicate_request(
                     CORBA::NO_MEMORY());
 
 
-   Request_Context_Repository().set_transaction_depth(0 ACE_ENV_ARG_PARAMETER);
+   Request_Context_Repository().set_transaction_depth(0);
 
    for (size_t i = 0; i < num_backups; ++i)  {
       PortableServer::ObjectId oid;
-      ACE_TRY_EX(block1) {
-          FTRT::AMI_UpdateableHandler_ptr handler = handler_.activate(manager, i, oid
-                                                                   ACE_ENV_ARG_PARAMETER);
+      try{
+          FTRT::AMI_UpdateableHandler_ptr handler = handler_.activate(manager, i, oid);
 
-          ACE_TRY_CHECK_EX(block1);
           FtRtecEventChannelAdmin::EventChannel_ptr obj = backups[i];
           // send set_update request to all the backup replicas
 
-          obj->sendc_set_update(handler, state
-                                      ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX(block1);
+          obj->sendc_set_update(handler, state);
        }
-       ACE_CATCHANY {
-         ACE_PRINT_EXCEPTION(ex, "AMI_Primary_Replication_Strategy::replicate_request : ");
+       catch (const CORBA::Exception& ex){
+         ex._tao_print_exception (
+           "AMI_Primary_Replication_Strategy::replicate_request : ");
          manager->handle_exception(i);
          if (oid.length())
            poa_->deactivate_object(oid);
        }
-       ACE_ENDTRY;
    }
    // wait until the first transaction_depth replicas replied.
    event.wait();
 
    if (!success) { // replication failed, transaction depth too high
      for (size_t i =0; i < num_backups; ++i)  {
-       ACE_TRY_EX(block2) {
-         (backups[i]->*rollback)(oid ACE_ENV_ARG_PARAMETER);
-         ACE_TRY_CHECK_EX(block2);
+       try{
+         (backups[i]->*rollback)(oid);
        }
-       ACE_CATCHALL {
+       catch (...){
        }
-       ACE_ENDTRY;
      }
      TAO_FTRTEC::Log(3, "Throwing FTRT::TransactionDepthTooHigh\n");
-     ACE_THROW(FTRT::TransactionDepthTooHigh());
+     throw FTRT::TransactionDepthTooHigh();
    }
 
 }
 
 void
 AMI_Primary_Replication_Strategy::add_member(const FTRT::ManagerInfo & info,
-                                             CORBA::ULong object_group_ref_version
-                                             ACE_ENV_ARG_DECL)
+                                             CORBA::ULong object_group_ref_version)
 {
   ACE_Auto_Event event;
   const FtRtecEventChannelAdmin::EventChannelList& backups =
@@ -180,31 +167,29 @@ AMI_Primary_Replication_Strategy::add_member(const FTRT::ManagerInfo & info,
   // The extra one is to prevent the event been signaled prematurely.
 
   PortableServer::ObjectId_var oid =
-    root_poa_->activate_object(&add_member_handler ACE_ENV_ARG_PARAMETER);
+    root_poa_->activate_object(&add_member_handler);
 
   TAO::Utils::Implicit_Deactivator deactivator(&add_member_handler);
 
   CORBA::Object_var obj =
-    root_poa_->id_to_reference(oid.in() ACE_ENV_ARG_PARAMETER);
+    root_poa_->id_to_reference(oid.in());
 
   FTRT::AMI_ObjectGroupManagerHandler_var handler =
-    FTRT::AMI_ObjectGroupManagerHandler::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+    FTRT::AMI_ObjectGroupManagerHandler::_narrow(obj.in());
 
   for (unsigned i = 0; i < num_backups; ++i) {
-    ACE_TRY {
+    try{
       backups[i]->sendc_add_member(handler.in(),
                                    info,
-                                   object_group_ref_version
-                                   ACE_ENV_ARG_PARAMETER);
+                                   object_group_ref_version);
     }
-    ACE_CATCHALL {
-      add_member_handler.add_member_excep(0 ACE_ENV_ARG_PARAMETER);
+    catch (...){
+      add_member_handler.add_member_excep(0);
     }
-    ACE_ENDTRY;
   }
   // decrement the number of members so the event can be signaled once
   // all replys have been received.
-  add_member_handler.add_member_excep(0 ACE_ENV_ARG_PARAMETER);
+  add_member_handler.add_member_excep(0);
 
   event.wait();
 }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h
index 24d44799505..2d73e64e0bf 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h
@@ -41,11 +41,9 @@ public:
   virtual ~AMI_Primary_Replication_Strategy();
   virtual void replicate_request(const FTRT::State& state,
                                    RollbackOperation rollback,
-                                   const FtRtecEventChannelAdmin::ObjectId& oid
-                                   ACE_ENV_ARG_DECL);
+                                   const FtRtecEventChannelAdmin::ObjectId& oid);
   virtual void add_member(const FTRT::ManagerInfo & info,
-                          CORBA::ULong object_group_ref_version
-                          ACE_ENV_ARG_DECL);
+                          CORBA::ULong object_group_ref_version);
   virtual int  acquire_read (void);
   virtual int  acquire_write (void);
   virtual int  release (void);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp
index b4073479419..d8d4a8ceef0 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp
@@ -25,8 +25,7 @@ void
 AMI_Replication_Strategy::replicate_request(
   const FTRT::State& state,
   RollbackOperation rollback,
-  const FtRtecEventChannelAdmin::ObjectId& oid
-  ACE_ENV_ARG_DECL_NOT_USED)
+  const FtRtecEventChannelAdmin::ObjectId& oid)
 {
   ACE_UNUSED_ARG(state);
   ACE_UNUSED_ARG(rollback);
@@ -35,8 +34,7 @@ AMI_Replication_Strategy::replicate_request(
 
 void
 AMI_Replication_Strategy::add_member(const FTRT::ManagerInfo & info,
-                                     CORBA::ULong object_group_ref_version
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+                                     CORBA::ULong object_group_ref_version)
 {
   ACE_UNUSED_ARG(info);
   ACE_UNUSED_ARG(object_group_ref_version);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h
index 8c25f96305d..866f1523798 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h
@@ -40,11 +40,9 @@ public:
   ~AMI_Replication_Strategy();
   virtual void replicate_request(const FTRT::State& state,
     RollbackOperation rollback,
-    const FtRtecEventChannelAdmin::ObjectId& oid
-    ACE_ENV_ARG_DECL);
+    const FtRtecEventChannelAdmin::ObjectId& oid);
   virtual void add_member(const FTRT::ManagerInfo & info,
-                          CORBA::ULong object_group_ref_version
-                          ACE_ENV_ARG_DECL);
+                          CORBA::ULong object_group_ref_version);
   virtual Replication_Strategy* make_primary_strategy();
 
   virtual int  acquire_read (void);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp
index 0c9e1260537..483eb71a9a5 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp
@@ -45,27 +45,25 @@ Basic_Replication_Strategy::check_validity(void)
       FTRT::OutOfSequence exception;
       exception.current = this->sequence_num_;
       TAO_FTRTEC::Log(3, "Throwing FTRT::OutOfSequence (old sequence_num_ = %d)\n", this->sequence_num_);
-      ACE_THROW(FTRT::OutOfSequence(exception));
+      throw FTRT::OutOfSequence(exception);
     }
     else
       this->sequence_num_++;
 }
 
 void twoway_set_update(FtRtecEventChannelAdmin::EventChannel_var successor,
-                       const FTRT::State& state
-                       ACE_ENV_ARG_DECL)
+                       const FTRT::State& state)
 {
   bool finished = true;
   do {
-    ACE_TRY {
-      successor->set_update(state ACE_ENV_ARG_PARAMETER);
+    try{
+      successor->set_update(state);
     }
-    ACE_CATCH(CORBA::COMM_FAILURE, ex) {
+    catch (const CORBA::COMM_FAILURE& ex){
       if (ex.minor() == 6)   finished = false;
       else
-        ACE_RE_THROW;
+        throw;
     }
-    ACE_ENDTRY;
   } while(!finished);
 }
 
@@ -73,8 +71,7 @@ void
 Basic_Replication_Strategy::replicate_request(
   const FTRT::State& state,
   RollbackOperation rollback,
-  const FtRtecEventChannelAdmin::ObjectId& oid
-  ACE_ENV_ARG_DECL)
+  const FtRtecEventChannelAdmin::ObjectId& oid)
 {
   ACE_UNUSED_ARG(rollback);
   ACE_UNUSED_ARG(oid);
@@ -89,46 +86,41 @@ Basic_Replication_Strategy::replicate_request(
       this->sequence_num_++;
 
     TAO_FTRTEC::Log(1, "replicate_request : sequence no = %d\n", sequence_num_);
-    Request_Context_Repository().set_sequence_number(sequence_num_
-      ACE_ENV_ARG_PARAMETER);
+    Request_Context_Repository().set_sequence_number(sequence_num_);
 
-    Request_Context_Repository().set_transaction_depth(transaction_depth-1 ACE_ENV_ARG_PARAMETER);
+    Request_Context_Repository().set_transaction_depth(transaction_depth-1);
 
     if (transaction_depth > 1) {
-      twoway_set_update(successor, state ACE_ENV_ARG_PARAMETER);
+      twoway_set_update(successor, state);
     }
     else {
-      ACE_TRY_EX(ONEWAY_SET_UPDATE) {
-        successor->oneway_set_update(state ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK_EX(ONEWAY_SET_UPDATE);
+      try{
+        successor->oneway_set_update(state);
       }
-      ACE_CATCHANY {
+      catch (const CORBA::Exception& ex){
       }
-      ACE_ENDTRY;
     }
   }
   else if (transaction_depth > 1) {
     TAO_FTRTEC::Log(3, "Throwing FTRT::TransactionDepthTooHigh\n");
-    ACE_THROW(FTRT::TransactionDepthTooHigh());
+    throw FTRT::TransactionDepthTooHigh();
   }
 }
 
 void
 Basic_Replication_Strategy::add_member(const FTRT::ManagerInfo & info,
-                                       CORBA::ULong object_group_ref_version
-                                       ACE_ENV_ARG_DECL)
+                                       CORBA::ULong object_group_ref_version)
 {
   FtRtecEventChannelAdmin::EventChannel_var successor = GroupInfoPublisher::instance()->successor();
   bool finished = true;
   do {
-    ACE_TRY {
-      successor->add_member(info, object_group_ref_version ACE_ENV_ARG_PARAMETER);
+    try{
+      successor->add_member(info, object_group_ref_version);
     }
-    ACE_CATCH(CORBA::COMM_FAILURE, ex) {
+    catch (const CORBA::COMM_FAILURE& ex){
       if (ex.minor() == 6) finished = false;
-      else ACE_RE_THROW;
+      else throw;
     }
-    ACE_ENDTRY;
   } while (!finished);
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h
index e3aa138bdd1..0a458fe1123 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h
@@ -39,11 +39,9 @@ public:
 
   virtual void replicate_request(const FTRT::State& state,
     RollbackOperation rollback,
-    const FtRtecEventChannelAdmin::ObjectId& oid
-    ACE_ENV_ARG_DECL);
+    const FtRtecEventChannelAdmin::ObjectId& oid);
   virtual void add_member(const FTRT::ManagerInfo & info,
-                          CORBA::ULong object_group_ref_version
-                          ACE_ENV_ARG_DECL);
+                          CORBA::ULong object_group_ref_version);
 
   virtual int  acquire_read (void);
   virtual int  acquire_write (void);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp
index 10aba5e1554..83d7e6c3079 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp
@@ -39,12 +39,11 @@ TAO_FTEC_ConsumerAdmin::obtain_push_supplier (void)
 void
 TAO_FTEC_ConsumerAdmin::disconnect(RtecEventChannelAdmin::ProxyPushSupplier_ptr obj)
 {
-  ACE_TRY_NEW_ENV {
+  try{
     obj->disconnect_push_supplier();
   }
-  ACE_CATCHALL {
+  catch (...){
   }
-  ACE_ENDTRY;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
index fb8cc2f66e3..67e075d97e0 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
@@ -38,8 +38,7 @@ TAO_FTEC_Event_Channel::~TAO_FTEC_Event_Channel()
 void setup_object_group(TAO_FTEC_Event_Channel* es,
                        CosNaming::NamingContext_ptr naming_context,
                        TAO_FTEC_Event_Channel::MEMBERSHIP membership,
-                       FtRtecEventChannelAdmin::EventChannel_ptr ec
-                       ACE_ENV_ARG_DECL)
+                       FtRtecEventChannelAdmin::EventChannel_ptr ec)
 {
     if (membership != TAO_FTEC_Event_Channel::UNSPECIFIED) {// register to naming service
       FTRT::ManagerInfoList member_list;
@@ -48,26 +47,23 @@ void setup_object_group(TAO_FTEC_Event_Channel* es,
       member_list[0].ior = FTRT::ObjectGroupManager::_duplicate(ec);
 
       if (membership == TAO_FTEC_Event_Channel::PRIMARY)
-        es->create_group(member_list, 0
-            ACE_ENV_ARG_PARAMETER);
+        es->create_group(member_list, 0);
 
       else { // BACKUP
         FtRtecEventChannelAdmin::EventChannel_var primary =
           resolve<FtRtecEventChannelAdmin::EventChannel>(naming_context,
-            FTRTEC::Identification_Service::instance()->name()
-            ACE_ENV_ARG_PARAMETER);
+            FTRTEC::Identification_Service::instance()->name());
 
         ACE_DEBUG((LM_DEBUG, "Got Primary address from Naming Service\n"));
 
-        primary->join_group(member_list[0] ACE_ENV_ARG_PARAMETER);
+        primary->join_group(member_list[0]);
       }
     }
 }
 
 
 FtRtecEventChannelAdmin::EventChannel_ptr
-TAO_FTEC_Event_Channel::activate(TAO_FTEC_Event_Channel::MEMBERSHIP membership
-                                 ACE_ENV_ARG_DECL)
+TAO_FTEC_Event_Channel::activate(TAO_FTEC_Event_Channel::MEMBERSHIP membership)
 {
     FTRTEC::Fault_Detector_Loader* detector_loader =
       ACE_Dynamic_Service<FTRTEC::Fault_Detector_Loader>::instance("FTRTEC_Fault_Detector");
@@ -79,8 +75,7 @@ TAO_FTEC_Event_Channel::activate(TAO_FTEC_Event_Channel::MEMBERSHIP membership
 
     // initialize naming_contex
     CosNaming::NamingContext_var naming_context
-      = resolve_init<CosNaming::NamingContext>(orb_.in(), "NameService"
-                                                ACE_ENV_ARG_PARAMETER);
+      = resolve_init<CosNaming::NamingContext>(orb_.in(), "NameService");
     // initialize group info publisher
     GroupInfoPublisher::instance()->set_naming_context(naming_context);
 
@@ -97,7 +92,7 @@ TAO_FTEC_Event_Channel::activate(TAO_FTEC_Event_Channel::MEMBERSHIP membership
     TAO::Utils::PolicyList_Destroyer policy_list(2);
 
     persistent_poa_ =
-      create_persistent_poa(poa_, mgr, "FTEC_Persistant_POA", policy_list ACE_ENV_ARG_PARAMETER);
+      create_persistent_poa(poa_, mgr, "FTEC_Persistant_POA", policy_list);
 
     // Activate the Event channel implementation
 
@@ -123,19 +118,16 @@ TAO_FTEC_Event_Channel::activate(TAO_FTEC_Event_Channel::MEMBERSHIP membership
 
     ec->activate_object(orb_,
                         supplier_admin_object_id,
-                        consumer_admin_object_id
-                        ACE_ENV_ARG_PARAMETER);
+                        consumer_admin_object_id);
 
     FtRtecEventChannelAdmin::EventChannel_var result;
-    activate_object_with_id(result.out(), persistent_poa_.in(), this, object_id
-                ACE_ENV_ARG_PARAMETER);
+    activate_object_with_id(result.out(), persistent_poa_.in(), this, object_id);
 
 
     setup_object_group(this,
                        naming_context.in(),
                        membership,
-                       result.in()
-                       ACE_ENV_ARG_PARAMETER);
+                       result.in());
   return result._retn();
 }
 
@@ -147,7 +139,6 @@ void TAO_FTEC_Event_Channel::set_listener(TAO_FTEC_Become_Primary_Listener* list
 
 void TAO_FTEC_Event_Channel::set_update (
         const FTRT::State & s
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -155,18 +146,17 @@ void TAO_FTEC_Event_Channel::set_update (
         , FTRT::OutOfSequence
       ))
 {
-    ec_impl_->set_update(s ACE_ENV_ARG_PARAMETER);
+    ec_impl_->set_update(s);
 }
 
 void TAO_FTEC_Event_Channel::oneway_set_update (
         const FTRT::State & s
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
 {
-    ec_impl_->set_update(s ACE_ENV_ARG_PARAMETER);
+    ec_impl_->set_update(s);
 }
 
 
@@ -186,11 +176,11 @@ TAO_FTEC_Event_Channel::for_suppliers (void)
 
 
 void
-TAO_FTEC_Event_Channel::set_state (const FTRT::State & s ACE_ENV_ARG_DECL)
+TAO_FTEC_Event_Channel::set_state (const FTRT::State & s)
   ACE_THROW_SPEC ((CORBA::SystemException, FTRT::InvalidState))
 {
   ACE_DEBUG((LM_DEBUG, "TAO_FTEC_Event_Channel::set_state\n"));
-  ec_impl_->set_state(s ACE_ENV_ARG_PARAMETER);
+  ec_impl_->set_state(s);
 }
 
 void
@@ -205,8 +195,7 @@ TAO_FTEC_Event_Channel::destroy (void)
 }
 
 RtecEventChannelAdmin::Observer_Handle
-TAO_FTEC_Event_Channel::append_observer (RtecEventChannelAdmin::Observer_ptr
-                                ACE_ENV_ARG_DECL)
+TAO_FTEC_Event_Channel::append_observer (RtecEventChannelAdmin::Observer_ptr)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
@@ -216,12 +205,11 @@ TAO_FTEC_Event_Channel::append_observer (RtecEventChannelAdmin::Observer_ptr
   /// throw an exception for the moment
   ACE_THROW_RETURN(RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER(), 0);
 
-  //return this->ec_impl_->append_observer (observer ACE_ENV_ARG_PARAMETER);
+  //return this->ec_impl_->append_observer (observer);
 }
 
 void
-TAO_FTEC_Event_Channel::remove_observer (RtecEventChannelAdmin::Observer_Handle
-                                ACE_ENV_ARG_DECL)
+TAO_FTEC_Event_Channel::remove_observer (RtecEventChannelAdmin::Observer_Handle)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
@@ -229,9 +217,9 @@ TAO_FTEC_Event_Channel::remove_observer (RtecEventChannelAdmin::Observer_Handle
 {
   /// we have yet to implement the replication of observers
   /// throw an exception for the moment
-  ACE_THROW(RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER());
+  throw RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER();
 
-  //ec_impl_->remove_observer (handle ACE_ENV_ARG_PARAMETER);
+  //ec_impl_->remove_observer (handle);
 }
 
 
@@ -240,78 +228,71 @@ CORBA::Boolean
 TAO_FTEC_Event_Channel::start (
         FTRT::FaultListener_ptr listener,
         FTRT::Location_out location
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
 {
-  return ec_impl_->start(listener, location ACE_ENV_ARG_PARAMETER);
+  return ec_impl_->start(listener, location);
 }
 
 void
 TAO_FTEC_Event_Channel::create_group (
         const FTRT::ManagerInfoList & info_list,
         CORBA::ULong object_group_ref_version
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       , FTRT::PredecessorUnreachable
       ))
 {
-  ec_impl_->create_group(info_list, object_group_ref_version ACE_ENV_ARG_PARAMETER);
+  ec_impl_->create_group(info_list, object_group_ref_version);
 }
 
 void
 TAO_FTEC_Event_Channel::join_group (
         const FTRT::ManagerInfo & info
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
 {
-  ec_impl_->join_group(info ACE_ENV_ARG_PARAMETER);
+  ec_impl_->join_group(info);
 }
 
 void
 TAO_FTEC_Event_Channel::add_member (
         const FTRT::ManagerInfo & info,
         CORBA::ULong object_group_ref_version
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
 {
-  ec_impl_->add_member(info, object_group_ref_version ACE_ENV_ARG_PARAMETER);
+  ec_impl_->add_member(info, object_group_ref_version);
 }
 
 void
 TAO_FTEC_Event_Channel::remove_member (
         const FTRT::Location & crashed_location,
-        CORBA::ULong object_group_ref_version
-        ACE_ENV_ARG_DECL)
+        CORBA::ULong object_group_ref_version)
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
 {
   ec_impl_->remove_member(crashed_location,
-                            object_group_ref_version
-                ACE_ENV_ARG_PARAMETER);
+                            object_group_ref_version);
 }
 
 void
 TAO_FTEC_Event_Channel::replica_crashed (
         const FTRT::Location & location
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
 {
-  ec_impl_->replica_crashed(location ACE_ENV_ARG_PARAMETER);
+  ec_impl_->replica_crashed(location);
 }
 
 
@@ -321,15 +302,13 @@ TAO_FTEC_Event_Channel::replica_crashed (
 TAO_FTEC_Event_Channel::connect_push_consumer (
         RtecEventComm::PushConsumer_ptr push_consumer,
         const RtecEventChannelAdmin::ConsumerQOS & qos
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
         , RtecEventChannelAdmin::TypeError
       ))
 {
-  return ec_impl_->connect_push_consumer(push_consumer, qos
-                                         ACE_ENV_ARG_PARAMETER);
+  return ec_impl_->connect_push_consumer(push_consumer, qos);
 }
 
 
@@ -337,76 +316,65 @@ TAO_FTEC_Event_Channel::connect_push_consumer (
 TAO_FTEC_Event_Channel::connect_push_supplier (
         RtecEventComm::PushSupplier_ptr push_supplier,
         const RtecEventChannelAdmin::SupplierQOS & qos
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
 {
-  return ec_impl_->connect_push_supplier(push_supplier, qos
-                                         ACE_ENV_ARG_PARAMETER);
+  return ec_impl_->connect_push_supplier(push_supplier, qos);
 
 }
 
 void
 TAO_FTEC_Event_Channel::disconnect_push_supplier (
         const FtRtecEventChannelAdmin::ObjectId & oid
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
 {
-  ec_impl_->disconnect_push_supplier(oid
-                                     ACE_ENV_ARG_PARAMETER);
+  ec_impl_->disconnect_push_supplier(oid);
 }
 
 void
 TAO_FTEC_Event_Channel::disconnect_push_consumer (
         const FtRtecEventChannelAdmin::ObjectId & oid
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
 {
-  ec_impl_->disconnect_push_consumer(oid
-                                     ACE_ENV_ARG_PARAMETER);
+  ec_impl_->disconnect_push_consumer(oid);
 }
 
 void
 TAO_FTEC_Event_Channel::suspend_push_supplier (
         const FtRtecEventChannelAdmin::ObjectId & oid
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
         , FtRtecEventComm::InvalidObjectID
       ))
 {
-  ec_impl_->suspend_push_supplier(oid
-                        ACE_ENV_ARG_PARAMETER);
+  ec_impl_->suspend_push_supplier(oid);
 }
 
 void
 TAO_FTEC_Event_Channel::resume_push_supplier (
         const FtRtecEventChannelAdmin::ObjectId & oid
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
         , FtRtecEventComm::InvalidObjectID
       ))
 {
-  ec_impl_->resume_push_supplier(oid
-                                 ACE_ENV_ARG_PARAMETER);
+  ec_impl_->resume_push_supplier(oid);
 }
 
 void
 TAO_FTEC_Event_Channel::push (
         const FtRtecEventChannelAdmin::ObjectId & oid,
         const RtecEventComm::EventSet & data
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -414,8 +382,7 @@ TAO_FTEC_Event_Channel::push (
       ))
 {
   ec_impl_->push(oid,
-                 data
-                 ACE_ENV_ARG_PARAMETER);
+                 data);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h
index d2cb2269b98..a82b2fddcc8 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h
@@ -52,7 +52,7 @@ public:
    *
    */
   FtRtecEventChannelAdmin::EventChannel_ptr
-    activate(MEMBERSHIP membership ACE_ENV_ARG_DECL);
+    activate(MEMBERSHIP membership);
 
   /**
    * Registers a listener to accept the notication when this object
@@ -75,11 +75,11 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual RtecEventChannelAdmin::Observer_Handle
-    append_observer (RtecEventChannelAdmin::Observer_ptr observer ACE_ENV_ARG_DECL)
+    append_observer (RtecEventChannelAdmin::Observer_ptr observer)
     ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
       RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER));
 
-  virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle ACE_ENV_ARG_DECL)
+  virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle)
     ACE_THROW_SPEC ((CORBA::SystemException,RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
       RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER));
 
@@ -87,89 +87,76 @@ public:
 
       virtual ::FtRtecEventChannelAdmin::ObjectId * connect_push_consumer (
         RtecEventComm::PushConsumer_ptr push_consumer,
-        const RtecEventChannelAdmin::ConsumerQOS & qos
-        ACE_ENV_ARG_DECL)
+        const RtecEventChannelAdmin::ConsumerQOS & qos)
       ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::TypeError)) ;
 
 
     virtual ::FtRtecEventChannelAdmin::ObjectId * connect_push_supplier (
         RtecEventComm::PushSupplier_ptr push_supplier,
-        const RtecEventChannelAdmin::SupplierQOS & qos
-        ACE_ENV_ARG_DECL)
+        const RtecEventChannelAdmin::SupplierQOS & qos)
       ACE_THROW_SPEC ((CORBA::SystemException)) ;
 
     virtual void disconnect_push_supplier (
-        const FtRtecEventChannelAdmin::ObjectId & oid
-        ACE_ENV_ARG_DECL)
+        const FtRtecEventChannelAdmin::ObjectId & oid)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual void disconnect_push_consumer (
-        const FtRtecEventChannelAdmin::ObjectId & oid
-        ACE_ENV_ARG_DECL)
+        const FtRtecEventChannelAdmin::ObjectId & oid)
       ACE_THROW_SPEC ((CORBA::SystemException)) ;
 
     virtual void suspend_push_supplier (
-        const FtRtecEventChannelAdmin::ObjectId & oid
-        ACE_ENV_ARG_DECL)
+        const FtRtecEventChannelAdmin::ObjectId & oid)
       ACE_THROW_SPEC ((CORBA::SystemException, FtRtecEventComm::InvalidObjectID));
 
     virtual void resume_push_supplier (
-        const FtRtecEventChannelAdmin::ObjectId & oid
-        ACE_ENV_ARG_DECL)
+        const FtRtecEventChannelAdmin::ObjectId & oid)
       ACE_THROW_SPEC ((CORBA::SystemException, FtRtecEventComm::InvalidObjectID)) ;
 
     virtual void push (
         const FtRtecEventChannelAdmin::ObjectId & oid,
-        const RtecEventComm::EventSet & data
-        ACE_ENV_ARG_DECL)
+        const RtecEventComm::EventSet & data)
       ACE_THROW_SPEC ((CORBA::SystemException, FtRtecEventComm::InvalidObjectID));
 
   /// FTRT::GroupManager Interfaces
   /// These are used for inter-replica communications
 
   void set_state (
-    const FTRT::State & s ACE_ENV_ARG_DECL)
+    const FTRT::State & s)
     ACE_THROW_SPEC ((CORBA::SystemException, FTRT::InvalidState));
 
-  virtual void set_update (const FTRT::State & s ACE_ENV_ARG_DECL)
+  virtual void set_update (const FTRT::State & s)
     ACE_THROW_SPEC ((CORBA::SystemException, FTRT::InvalidUpdate, FTRT::OutOfSequence));
 
-  virtual void oneway_set_update (const FTRT::State & s ACE_ENV_ARG_DECL)
+  virtual void oneway_set_update (const FTRT::State & s)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
   virtual CORBA::Boolean start (
         FTRT::FaultListener_ptr listener,
-        FTRT::Location_out cur
-        ACE_ENV_ARG_DECL)
+        FTRT::Location_out cur)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual void create_group (
         const FTRT::ManagerInfoList & info_list,
-        CORBA::ULong object_group_ref_version
-        ACE_ENV_ARG_DECL)
+        CORBA::ULong object_group_ref_version)
       ACE_THROW_SPEC ((CORBA::SystemException, FTRT::PredecessorUnreachable)) ;
 
     virtual void join_group (
         const FTRT::ManagerInfo & info
-        ACE_ENV_ARG_DECL
       )ACE_THROW_SPEC ((CORBA::SystemException)) ;
 
     virtual void add_member (
         const FTRT::ManagerInfo & info,
-        CORBA::ULong object_group_ref_version
-        ACE_ENV_ARG_DECL)
+        CORBA::ULong object_group_ref_version)
       ACE_THROW_SPEC ((CORBA::SystemException)) ;
 
     virtual void remove_member (
         const FTRT::Location & crashed_location,
-        CORBA::ULong object_group_ref_version
-        ACE_ENV_ARG_DECL)
+        CORBA::ULong object_group_ref_version)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual void replica_crashed (
-        const FTRT::Location & location
-        ACE_ENV_ARG_DECL)
+        const FTRT::Location & location)
       ACE_THROW_SPEC ((CORBA::SystemException)) ;
 
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
index 304d45891ba..5171b434179 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
@@ -21,46 +21,40 @@ ACE_RCSID (EventChannel,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void obtain_push_supplier(TAO_FTEC_Event_Channel_Impl* ec,
-                          FtRtecEventChannelAdmin::Operation& op
-                          ACE_ENV_ARG_DECL)
+                          FtRtecEventChannelAdmin::Operation& op)
 {
-  ec->consumer_admin()->obtain_proxy(op ACE_ENV_ARG_PARAMETER);
+  ec->consumer_admin()->obtain_proxy(op);
 }
 
 void obtain_push_consumer(TAO_FTEC_Event_Channel_Impl* ec,
-                          FtRtecEventChannelAdmin::Operation& op
-                          ACE_ENV_ARG_DECL)
+                          FtRtecEventChannelAdmin::Operation& op)
 {
-  ec->supplier_admin()->obtain_proxy(op ACE_ENV_ARG_PARAMETER);
+  ec->supplier_admin()->obtain_proxy(op);
 }
 
 void obtain_push_consumer_and_connect(TAO_FTEC_Event_Channel_Impl* ec,
                            const FtRtecEventChannelAdmin::ObjectId& oid,
                            RtecEventComm::PushSupplier_ptr push_supplier,
-                           const RtecEventChannelAdmin::SupplierQOS & qos
-                           ACE_ENV_ARG_DECL)
+                           const RtecEventChannelAdmin::SupplierQOS & qos)
 {
-  Request_Context_Repository().set_object_id(oid ACE_ENV_ARG_PARAMETER);
+  Request_Context_Repository().set_object_id(oid);
 
   RtecEventChannelAdmin::ProxyPushConsumer_var consumer =
     ec->supplier_admin()->obtain();
 
 
-  ACE_TRY {
-    consumer->connect_push_supplier(push_supplier, qos
-      ACE_ENV_ARG_PARAMETER);
+  try{
+    consumer->connect_push_supplier(push_supplier, qos);
   }
-  ACE_CATCHALL {
+  catch (...){
     ec->supplier_admin()->disconnect(consumer.in());
-    ACE_RE_THROW;
+    throw;
   }
-  ACE_ENDTRY;
 }
 
 
 void connect_push_supplier(TAO_FTEC_Event_Channel_Impl* ec,
-                           FtRtecEventChannelAdmin::Operation& op
-                           ACE_ENV_ARG_DECL)
+                           FtRtecEventChannelAdmin::Operation& op)
 {
   PortableServer::POA_var poa= ec->supplier_poa();
   FtRtecEventChannelAdmin::Connect_push_supplier_param& param
@@ -73,43 +67,37 @@ void connect_push_supplier(TAO_FTEC_Event_Channel_Impl* ec,
     obtain_push_consumer_and_connect(ec,
                                      op.object_id,
                                      param.push_supplier.in(),
-                                     param.qos
-                                     ACE_ENV_ARG_PARAMETER);
+                                     param.qos);
   }
   else {
     proxy->connect_push_supplier(param.push_supplier.in(),
-      param.qos
-      ACE_ENV_ARG_PARAMETER);
+      param.qos);
   }
 }
 
 void obtain_push_supplier_and_connect(TAO_FTEC_Event_Channel_Impl* ec,
                            const FtRtecEventChannelAdmin::ObjectId& oid,
                            RtecEventComm::PushConsumer_ptr push_consumer,
-                           const RtecEventChannelAdmin::ConsumerQOS & qos
-                           ACE_ENV_ARG_DECL)
+                           const RtecEventChannelAdmin::ConsumerQOS & qos)
 {
-  Request_Context_Repository().set_object_id(oid ACE_ENV_ARG_PARAMETER);
+  Request_Context_Repository().set_object_id(oid);
 
   RtecEventChannelAdmin::ProxyPushSupplier_var supplier =
     ec->consumer_admin()->obtain();
 
 
-  ACE_TRY {
-    supplier->connect_push_consumer(push_consumer, qos
-                                    ACE_ENV_ARG_PARAMETER);
+  try{
+    supplier->connect_push_consumer(push_consumer, qos);
   }
-  ACE_CATCHALL {
+  catch (...){
     ec->consumer_admin()->disconnect(supplier.in());
-    ACE_RE_THROW;
+    throw;
   }
-  ACE_ENDTRY;
 }
 
 
 void connect_push_consumer(TAO_FTEC_Event_Channel_Impl* ec,
-                           FtRtecEventChannelAdmin::Operation& op
-                           ACE_ENV_ARG_DECL)
+                           FtRtecEventChannelAdmin::Operation& op)
 {
   PortableServer::POA_var poa= ec->consumer_poa();
   FtRtecEventChannelAdmin::Connect_push_consumer_param& param
@@ -121,19 +109,16 @@ void connect_push_consumer(TAO_FTEC_Event_Channel_Impl* ec,
     obtain_push_supplier_and_connect(ec,
                                      op.object_id,
                                      param.push_consumer.in(),
-                                     param.qos
-                                     ACE_ENV_ARG_PARAMETER);
+                                     param.qos);
   }
   else {
     proxy->connect_push_consumer(param.push_consumer.in(),
-      param.qos
-      ACE_ENV_ARG_PARAMETER);
+      param.qos);
   }
 }
 
 void disconnect_push_supplier(TAO_FTEC_Event_Channel_Impl* ec,
-                              FtRtecEventChannelAdmin::Operation& op
-                              ACE_ENV_ARG_DECL)
+                              FtRtecEventChannelAdmin::Operation& op)
 {
   PortableServer::POA_var poa= ec->consumer_poa();
 
@@ -141,29 +126,27 @@ void disconnect_push_supplier(TAO_FTEC_Event_Channel_Impl* ec,
 
 
   if (proxy == NULL) // proxy not found
-    ACE_THROW(FTRT::InvalidUpdate());
+    throw FTRT::InvalidUpdate();
 
   proxy->disconnect_push_supplier();
 }
 
 void disconnect_push_consumer(TAO_FTEC_Event_Channel_Impl* ec,
-                              FtRtecEventChannelAdmin::Operation& op
-                              ACE_ENV_ARG_DECL)
+                              FtRtecEventChannelAdmin::Operation& op)
 {
   PortableServer::POA_var poa= ec->supplier_poa();
 
   TAO_FTEC_ProxyPushConsumer* proxy = ec->find_proxy_push_consumer(op.object_id);
 
   if (proxy == NULL) // proxy not found
-    ACE_THROW(FTRT::InvalidUpdate());
+    throw FTRT::InvalidUpdate();
 
   proxy->disconnect_push_consumer();
 }
 
 
 void suspend_connection (TAO_FTEC_Event_Channel_Impl* ec,
-                         FtRtecEventChannelAdmin::Operation& op
-                         ACE_ENV_ARG_DECL)
+                         FtRtecEventChannelAdmin::Operation& op)
 {
   PortableServer::POA_var poa= ec->consumer_poa();
 
@@ -171,28 +154,26 @@ void suspend_connection (TAO_FTEC_Event_Channel_Impl* ec,
 
 
   if (proxy == NULL) // proxy not found
-    ACE_THROW(FTRT::InvalidUpdate());
+    throw FTRT::InvalidUpdate();
 
   proxy->suspend_connection();
 }
 
 void resume_connection(TAO_FTEC_Event_Channel_Impl* ec,
-                       FtRtecEventChannelAdmin::Operation& op
-                       ACE_ENV_ARG_DECL)
+                       FtRtecEventChannelAdmin::Operation& op)
 {
   TAO_FTEC_ProxyPushSupplier* proxy = ec->find_proxy_push_supplier(op.object_id);
 
 
   if (proxy == NULL) // proxy not found
-    ACE_THROW(FTRT::InvalidUpdate());
+    throw FTRT::InvalidUpdate();
 
   proxy->resume_connection();
 }
 
 
 typedef void (*Set_update_fun)(TAO_FTEC_Event_Channel_Impl* ec,
-                               FtRtecEventChannelAdmin::Operation& op
-                               ACE_ENV_ARG_DECL);
+                               FtRtecEventChannelAdmin::Operation& op);
 
 Set_update_fun const update_table[] = {
     &obtain_push_supplier,
@@ -234,17 +215,16 @@ void
 TAO_FTEC_Event_Channel_Impl::activate_object (
   CORBA::ORB_var orb,
   const FtRtecEventComm::ObjectId& supplier_admin_oid,
-  const FtRtecEventComm::ObjectId& consumer_admin_oid
-  ACE_ENV_ARG_DECL)
+  const FtRtecEventComm::ObjectId& consumer_admin_oid)
 {
 
-  iogr_maker_.init(orb.in() ACE_ENV_ARG_PARAMETER);
+  iogr_maker_.init(orb.in());
 
   TAO_EC_Event_Channel_Base::activate();
 
-  supplier_admin()->activate(supplier_admin_oid ACE_ENV_ARG_PARAMETER);
+  supplier_admin()->activate(supplier_admin_oid);
 
-  consumer_admin()->activate(consumer_admin_oid ACE_ENV_ARG_PARAMETER);
+  consumer_admin()->activate(consumer_admin_oid);
 }
 
 
@@ -257,9 +237,8 @@ TAO_FTEC_Event_Channel_Impl::for_consumers (void)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_var obj = consumer_admin()->reference();
-  obj = IOGR_Maker::instance()->forge_iogr(obj.in()
-    ACE_ENV_ARG_PARAMETER);
-  return RtecEventChannelAdmin::ConsumerAdmin::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+  obj = IOGR_Maker::instance()->forge_iogr(obj.in());
+  return RtecEventChannelAdmin::ConsumerAdmin::_narrow(obj.in());
 }
 
 
@@ -270,9 +249,8 @@ TAO_FTEC_Event_Channel_Impl::for_suppliers (void)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_var obj = supplier_admin()->reference();
-  obj = IOGR_Maker::instance()->forge_iogr(obj.in()
-    ACE_ENV_ARG_PARAMETER);
-  return RtecEventChannelAdmin::SupplierAdmin::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+  obj = IOGR_Maker::instance()->forge_iogr(obj.in());
+  return RtecEventChannelAdmin::SupplierAdmin::_narrow(obj.in());
 }
 
 
@@ -280,7 +258,6 @@ ACE_THROW_SPEC ((CORBA::SystemException))
 TAO_FTEC_Event_Channel_Impl::connect_push_consumer (
         RtecEventComm::PushConsumer_ptr push_consumer,
         const RtecEventChannelAdmin::ConsumerQOS & qos
-        ACE_ENV_ARG_DECL
       )
 {
   CORBA::Any_var any
@@ -301,13 +278,12 @@ TAO_FTEC_Event_Channel_Impl::connect_push_consumer (
 
   FtRtecEventChannelAdmin::ObjectId_var  object_id = oid;
 
-  Request_Context_Repository().generate_object_id(*oid ACE_ENV_ARG_PARAMETER);
+  Request_Context_Repository().generate_object_id(*oid);
 
   obtain_push_supplier_and_connect(this,
                                    object_id.in(),
                                    push_consumer,
-                                   qos
-                                   ACE_ENV_ARG_PARAMETER);
+                                   qos);
 
 
   return object_id._retn();
@@ -318,7 +294,6 @@ TAO_FTEC_Event_Channel_Impl::connect_push_consumer (
 TAO_FTEC_Event_Channel_Impl::connect_push_supplier (
         RtecEventComm::PushSupplier_ptr push_supplier,
         const RtecEventChannelAdmin::SupplierQOS & qos
-        ACE_ENV_ARG_DECL
       )
 {
   CORBA::Any_var any
@@ -338,13 +313,12 @@ TAO_FTEC_Event_Channel_Impl::connect_push_supplier (
   ACE_NEW_THROW_EX(oid, FtRtecEventChannelAdmin::ObjectId, CORBA::NO_MEMORY());
   FtRtecEventChannelAdmin::ObjectId_var object_id = oid;
 
-  Request_Context_Repository().generate_object_id(*oid ACE_ENV_ARG_PARAMETER);
+  Request_Context_Repository().generate_object_id(*oid);
 
   obtain_push_consumer_and_connect(this,
                                    object_id.in(),
                                    push_supplier,
-                                   qos
-                                   ACE_ENV_ARG_PARAMETER);
+                                   qos);
 
 
   return object_id._retn();
@@ -353,7 +327,6 @@ TAO_FTEC_Event_Channel_Impl::connect_push_supplier (
 
 void TAO_FTEC_Event_Channel_Impl::disconnect_push_supplier (
         const FtRtecEventChannelAdmin::ObjectId & oid
-        ACE_ENV_ARG_DECL
       )
 {
   if (Request_Context_Repository().is_executed_request())
@@ -369,7 +342,6 @@ void TAO_FTEC_Event_Channel_Impl::disconnect_push_supplier (
 
 void TAO_FTEC_Event_Channel_Impl::disconnect_push_consumer (
         const FtRtecEventChannelAdmin::ObjectId & oid
-        ACE_ENV_ARG_DECL
       )
 {
   if (Request_Context_Repository().is_executed_request())
@@ -385,7 +357,6 @@ void TAO_FTEC_Event_Channel_Impl::disconnect_push_consumer (
 
 void TAO_FTEC_Event_Channel_Impl::suspend_push_supplier (
         const FtRtecEventChannelAdmin::ObjectId & oid
-        ACE_ENV_ARG_DECL
       )
 {
   if (Request_Context_Repository().is_executed_request())
@@ -394,7 +365,7 @@ void TAO_FTEC_Event_Channel_Impl::suspend_push_supplier (
   TAO_FTEC_ProxyPushSupplier* proxy = this->find_proxy_push_supplier(oid);
 
   if (proxy == NULL) // proxy not found
-    ACE_THROW(FtRtecEventComm::InvalidObjectID());
+    throw FtRtecEventComm::InvalidObjectID();
 
   proxy->suspend_connection();
 }
@@ -402,7 +373,6 @@ void TAO_FTEC_Event_Channel_Impl::suspend_push_supplier (
 
 void TAO_FTEC_Event_Channel_Impl::resume_push_supplier (
         const FtRtecEventChannelAdmin::ObjectId & oid
-        ACE_ENV_ARG_DECL
       )
 {
   if (Request_Context_Repository().is_executed_request())
@@ -411,7 +381,7 @@ void TAO_FTEC_Event_Channel_Impl::resume_push_supplier (
   TAO_FTEC_ProxyPushSupplier* proxy = this->find_proxy_push_supplier(oid);
 
   if (proxy == NULL) // proxy not found
-    ACE_THROW(FtRtecEventComm::InvalidObjectID());
+    throw FtRtecEventComm::InvalidObjectID();
 
   proxy->resume_connection();
 }
@@ -419,15 +389,14 @@ void TAO_FTEC_Event_Channel_Impl::resume_push_supplier (
 void TAO_FTEC_Event_Channel_Impl::push (
         const FtRtecEventChannelAdmin::ObjectId & oid,
         const RtecEventComm::EventSet & data
-        ACE_ENV_ARG_DECL
       )
 {
   TAO_FTEC_ProxyPushConsumer* proxy = this->find_proxy_push_consumer(oid);
 
   if (proxy == NULL) // proxy not found
-    ACE_THROW(FtRtecEventComm::InvalidObjectID());
+    throw FtRtecEventComm::InvalidObjectID();
 
-  proxy->push(data ACE_ENV_ARG_PARAMETER);
+  proxy->push(data);
 }
 
 
@@ -435,18 +404,16 @@ void TAO_FTEC_Event_Channel_Impl::push (
 
 void TAO_FTEC_Event_Channel_Impl::get_state (
                                         FtRtecEventChannelAdmin::EventChannelState & state
-                                        ACE_ENV_ARG_DECL
                                         )
 {
   FtEventServiceInterceptor::instance()->get_state(state.cached_operation_results);
-  this->supplier_admin()->get_state(state.supplier_admin_state ACE_ENV_ARG_PARAMETER);
-  this->consumer_admin()->get_state(state.consumer_admin_state ACE_ENV_ARG_PARAMETER);
+  this->supplier_admin()->get_state(state.supplier_admin_state);
+  this->consumer_admin()->get_state(state.consumer_admin_state);
 }
 
 
 
-void TAO_FTEC_Event_Channel_Impl::set_state (const FTRT::State & stat
-                                             ACE_ENV_ARG_DECL)
+void TAO_FTEC_Event_Channel_Impl::set_state (const FTRT::State & stat)
 {
   FtRtecEventChannelAdmin::EventChannelState state;
 
@@ -454,13 +421,12 @@ void TAO_FTEC_Event_Channel_Impl::set_state (const FTRT::State & stat
   cdr >> state;
 
   FtEventServiceInterceptor::instance()->set_state(state.cached_operation_results);
-  this->supplier_admin()->set_state(state.supplier_admin_state ACE_ENV_ARG_PARAMETER);
-  this->consumer_admin()->set_state(state.consumer_admin_state ACE_ENV_ARG_PARAMETER);
+  this->supplier_admin()->set_state(state.supplier_admin_state);
+  this->consumer_admin()->set_state(state.consumer_admin_state);
 }
 
 
-void TAO_FTEC_Event_Channel_Impl::set_update (const FTRT::State & s
-                                         ACE_ENV_ARG_DECL)
+void TAO_FTEC_Event_Channel_Impl::set_update (const FTRT::State & s)
   ACE_THROW_SPEC ((CORBA::SystemException, FTRT::InvalidUpdate))
 {
   FTRTEC::Replication_Service::instance()->check_validity();
@@ -470,10 +436,10 @@ void TAO_FTEC_Event_Channel_Impl::set_update (const FTRT::State & s
 
     FtRtecEventChannelAdmin::Operation_var op(new FtRtecEventChannelAdmin::Operation);
     if (!(cdr >> *op)) {
-      ACE_THROW(FTRT::InvalidUpdate() );
+      throw FTRT::InvalidUpdate();
     }
 
-    (update_table[op->param._d()])(this, *op ACE_ENV_ARG_PARAMETER);
+    (update_table[op->param._d()])(this, *op);
 
   }
 }
@@ -495,41 +461,37 @@ TAO_FTEC_SupplierAdmin* TAO_FTEC_Event_Channel_Impl::supplier_admin (void) const
 TAO_FTEC_ProxyPushSupplier*
 TAO_FTEC_Event_Channel_Impl::find_proxy_push_supplier(const FtRtecEventChannelAdmin::ObjectId& id)
 {
-  ACE_TRY_NEW_ENV {
+  try{
     PortableServer::POA_var poa = consumer_poa();
 
     const PortableServer::Servant servant = poa->id_to_servant(
-      reinterpret_cast<const PortableServer::ObjectId&> (id)
-      ACE_ENV_ARG_PARAMETER);
+      reinterpret_cast<const PortableServer::ObjectId&> (id));
     POA_RtecEventChannelAdmin::ProxyPushSupplier_ptr obj =
       dynamic_cast<POA_RtecEventChannelAdmin::ProxyPushSupplier_ptr> (servant);
 
     return static_cast<TAO_FTEC_ProxyPushSupplier*> (obj);
   }
-  ACE_CATCHALL {
+  catch (...){
   }
-  ACE_ENDTRY;
   return 0;
 }
 
 TAO_FTEC_ProxyPushConsumer*
 TAO_FTEC_Event_Channel_Impl::find_proxy_push_consumer(const FtRtecEventChannelAdmin::ObjectId& id)
 {
-  ACE_TRY_NEW_ENV {
+  try{
     PortableServer::POA_var poa= supplier_poa();
 
     const PortableServer::Servant servant = poa->id_to_servant(
-      reinterpret_cast<const PortableServer::ObjectId&> (id)
-      ACE_ENV_ARG_PARAMETER);
+      reinterpret_cast<const PortableServer::ObjectId&> (id));
 
     POA_RtecEventChannelAdmin::ProxyPushConsumer_ptr obj =
       dynamic_cast<POA_RtecEventChannelAdmin::ProxyPushConsumer_ptr> (servant);
 
     return static_cast<TAO_FTEC_ProxyPushConsumer*> (obj);
   }
-  ACE_CATCHALL {
+  catch (...){
   }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h
index 7f7226ca87c..6ae1dd368fd 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h
@@ -44,8 +44,7 @@ public:
   virtual void activate_object (
     CORBA::ORB_var orb,
     const FtRtecEventComm::ObjectId& supplier_admin_oid,
-    const FtRtecEventComm::ObjectId& consumer_admin_oid
-    ACE_ENV_ARG_DECL);
+    const FtRtecEventComm::ObjectId& consumer_admin_oid);
 
 
   // = The RtecEventChannelAdmin::EventChannel methods...
@@ -58,12 +57,11 @@ public:
       for_suppliers (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void get_state (FtRtecEventChannelAdmin::EventChannelState & s
-                  ACE_ENV_ARG_DECL);
+  void get_state (FtRtecEventChannelAdmin::EventChannelState & s);
 
-  void set_state (const FTRT::State & stat ACE_ENV_ARG_DECL);
+  void set_state (const FTRT::State & stat);
 
-  void set_update (const FTRT::State & s ACE_ENV_ARG_DECL)
+  void set_update (const FTRT::State & s)
       ACE_THROW_SPEC ((CORBA::SystemException, FTRT::InvalidUpdate));
 
   /// EventChannelFacade Interface
@@ -71,40 +69,33 @@ public:
    virtual ::FtRtecEventChannelAdmin::ObjectId * connect_push_consumer (
         RtecEventComm::PushConsumer_ptr push_consumer,
         const RtecEventChannelAdmin::ConsumerQOS & qos
-        ACE_ENV_ARG_DECL
       );
 
 
     virtual ::FtRtecEventChannelAdmin::ObjectId * connect_push_supplier (
         RtecEventComm::PushSupplier_ptr push_supplier,
         const RtecEventChannelAdmin::SupplierQOS & qos
-        ACE_ENV_ARG_DECL
       );
 
     virtual void disconnect_push_supplier (
         const FtRtecEventChannelAdmin::ObjectId & oid
-        ACE_ENV_ARG_DECL
       );
 
     virtual void disconnect_push_consumer (
         const FtRtecEventChannelAdmin::ObjectId & oid
-        ACE_ENV_ARG_DECL
       );
 
     virtual void suspend_push_supplier (
         const FtRtecEventChannelAdmin::ObjectId & oid
-        ACE_ENV_ARG_DECL
       );
 
     virtual void resume_push_supplier (
         const FtRtecEventChannelAdmin::ObjectId & oid
-        ACE_ENV_ARG_DECL
       );
 
     virtual void push (
         const FtRtecEventChannelAdmin::ObjectId & oid,
         const RtecEventComm::EventSet & data
-        ACE_ENV_ARG_DECL
       );
 
   ////////////////////////////////////////////
@@ -121,8 +112,7 @@ public:
   TAO_FTEC_ProxyPushConsumer* find_proxy_push_consumer(const FtRtecEventChannelAdmin::ObjectId& id);
 
 
-  CORBA::Object_var make_iogr(CORBA::Object_ptr obj
-                              ACE_ENV_ARG_DECL);
+  CORBA::Object_var make_iogr(CORBA::Object_ptr obj);
 
 protected:
   TAO_FTEC_Basic_Factory* factory();
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
index b5cd7784f55..3f74eb20063 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
@@ -60,7 +60,6 @@ TAO_FTEC_Group_Manager::~TAO_FTEC_Group_Manager()
 CORBA::Boolean TAO_FTEC_Group_Manager::start (
         FTRT::FaultListener_ptr listener,
         FTRT::Location_out cur
-        ACE_ENV_ARG_DECL_NOT_USED
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -74,8 +73,7 @@ CORBA::Boolean TAO_FTEC_Group_Manager::start (
 
 void TAO_FTEC_Group_Manager::create_group (
     const FTRT::ManagerInfoList & info_list,
-    CORBA::ULong object_group_ref_version
-    ACE_ENV_ARG_DECL)
+    CORBA::ULong object_group_ref_version)
 {
   TAO_FTRTEC::Log(1, "create_group\n");
 
@@ -87,8 +85,7 @@ void TAO_FTEC_Group_Manager::create_group (
   GroupInfoPublisherBase::Info_ptr info (
     publisher->setup_info(impl_->info_list,
                           impl_->my_position,
-                          object_group_ref_version
-                          ACE_ENV_ARG_PARAMETER));
+                          object_group_ref_version));
 
   publisher->update_info(info);
 
@@ -98,7 +95,7 @@ void TAO_FTEC_Group_Manager::create_group (
     Fault_Detector* detector = Fault_Detector::instance();
     if ( detector->connect(impl_->info_list[impl_->my_position-1].the_location) == -1) {
       ACE_DEBUG((LM_DEBUG, "Cannot connect to predecesor\n"));
-      ACE_THROW(FTRT::PredecessorUnreachable());
+      throw FTRT::PredecessorUnreachable();
     }
   }
 
@@ -106,28 +103,24 @@ void TAO_FTEC_Group_Manager::create_group (
     = publisher->successor();
 
   if (!CORBA::is_nil(successor.in())) {
-    successor->create_group(info_list, object_group_ref_version
-                            ACE_ENV_ARG_PARAMETER);
+    successor->create_group(info_list, object_group_ref_version);
   }
 }
 
 void TAO_FTEC_Group_Manager::join_group (
-    const FTRT::ManagerInfo & info
-    ACE_ENV_ARG_DECL)
+    const FTRT::ManagerInfo & info)
 {
   TAO_FTRTEC::Log(1, "join group\n");
   if (impl_->my_position == 0) {
     FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance();
     ACE_Write_Guard<FTRTEC::Replication_Service> lock(*svc);
-    add_member(info, IOGR_Maker::instance()->get_ref_version()+1
-               ACE_ENV_ARG_PARAMETER);
+    add_member(info, IOGR_Maker::instance()->get_ref_version()+1);
   }
 }
 
 void TAO_FTEC_Group_Manager::add_member (
     const FTRT::ManagerInfo & info,
-    CORBA::ULong object_group_ref_version
-    ACE_ENV_ARG_DECL)
+    CORBA::ULong object_group_ref_version)
 {
   TAO_FTRTEC::Log(1, "add_member location = <%s>\n",
     (const char*)info.the_location[0].id);
@@ -146,8 +139,7 @@ void TAO_FTEC_Group_Manager::add_member (
   GroupInfoPublisherBase::Info_ptr group_info (
     publisher->setup_info(new_impl->info_list,
                           new_impl->my_position,
-                          object_group_ref_version
-                    ACE_ENV_ARG_PARAMETER));
+                          object_group_ref_version));
 
   int last_one = (impl_->my_position == impl_->info_list.length()-1);
 
@@ -155,12 +147,10 @@ void TAO_FTEC_Group_Manager::add_member (
   {
     // I am not the last of replica, tell my successor that
     // a new member has joined in.
-    ACE_TRY_EX(block) {
-      FTRTEC::Replication_Service::instance()->add_member(info, object_group_ref_version
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX(block);
+    try{
+      FTRTEC::Replication_Service::instance()->add_member(info, object_group_ref_version);
     }
-    ACE_CATCHANY {
+    catch (const CORBA::Exception& ex){
       // Unable to send request to all the successors.
       // Now this node become the last replica of the object group.
       // update the info list again
@@ -173,13 +163,11 @@ void TAO_FTEC_Group_Manager::add_member (
       GroupInfoPublisherBase::Info_ptr group_info1 (
         publisher->setup_info(new_impl->info_list,
                               new_impl->my_position,
-                              object_group_ref_version
-                              ACE_ENV_ARG_PARAMETER));
+                              object_group_ref_version));
       ACE_AUTO_PTR_RESET(group_info, group_info1.release(), GroupInfoPublisherBase::Info);
 
       last_one = true;
     }
-    ACE_ENDTRY;
   }
 
   if (last_one)
@@ -187,7 +175,7 @@ void TAO_FTEC_Group_Manager::add_member (
     // this is the last replica in the list
     // synchornize the state with the newly joined replica.
     FtRtecEventChannelAdmin::EventChannelState state;
-    get_state(state ACE_ENV_ARG_PARAMETER);
+    get_state(state);
 
     TAO_OutputCDR cdr;
     cdr << state;
@@ -234,10 +222,9 @@ void TAO_FTEC_Group_Manager::add_member (
     }
 
     TAO_FTRTEC::Log(2, "Setting state\n");
-    info.ior->set_state(s ACE_ENV_ARG_PARAMETER);
+    info.ior->set_state(s);
     info.ior->create_group(new_impl->info_list,
-                           object_group_ref_version
-                           ACE_ENV_ARG_PARAMETER);
+                           object_group_ref_version);
     TAO_FTRTEC::Log(2, "After create_group\n");
   }
 
@@ -259,20 +246,17 @@ void remove_item(SEQ & seq, int position)
 }
 
 void TAO_FTEC_Group_Manager::replica_crashed (
-    const FTRT::Location & location
-    ACE_ENV_ARG_DECL)
+    const FTRT::Location & location)
 {
   TAO_FTRTEC::Log(1, "TAO_FTEC_Group_Manager::replica_crashed\n");
   FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance();
     ACE_Write_Guard<FTRTEC::Replication_Service> lock(*svc);
-    remove_member(location, IOGR_Maker::instance()->get_ref_version()+1
-                  ACE_ENV_ARG_PARAMETER);
+    remove_member(location, IOGR_Maker::instance()->get_ref_version()+1);
 }
 
 void TAO_FTEC_Group_Manager::remove_member (
     const FTRT::Location & crashed_location,
-    CORBA::ULong object_group_ref_version
-    ACE_ENV_ARG_DECL)
+    CORBA::ULong object_group_ref_version)
 {
   // find my position of this EventChannel in the group
   unsigned  crashed_pos = find_by_location(impl_->info_list, crashed_location);
@@ -291,8 +275,7 @@ void TAO_FTEC_Group_Manager::remove_member (
   GroupInfoPublisherBase::Info_ptr info (
     publisher->setup_info(impl_->info_list,
                           impl_->my_position,
-                          object_group_ref_version
-                          ACE_ENV_ARG_PARAMETER));
+                          object_group_ref_version));
   publisher->update_info(info);
 
   FtRtecEventChannelAdmin::EventChannel_var successor =
@@ -300,14 +283,12 @@ void TAO_FTEC_Group_Manager::remove_member (
 
   IOGR_Maker::instance()->set_ref_version(object_group_ref_version);
   if (!CORBA::is_nil(successor.in())) {
-    ACE_TRY {
+    try{
     successor->remove_member(crashed_location,
-                             object_group_ref_version
-                             ACE_ENV_ARG_PARAMETER);
+                             object_group_ref_version);
     }
-    ACE_CATCHALL {
+    catch (...){
     }
-    ACE_ENDTRY;
   }
 
   TAO_FTRTEC::Log(3, "my_position = %d, crashed_pos = %d\n", impl_->my_position, crashed_pos);
@@ -324,45 +305,34 @@ void TAO_FTEC_Group_Manager::connection_closed()
   // crashed_location will be repliaced by its successor.
   FTRT::Location crashed_location = impl_->info_list[impl_->my_position-1].the_location;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   if (impl_->my_position > 1) {
     // if I am not the new primary, tell the new primary
-    ACE_TRY_EX(block1) {
+    try{
       TAO_IOP::TAO_IOR_Manipulation::IORList iors;
       iors.length(impl_->my_position-1);
       for (size_t i = 0; i < impl_->my_position-1; ++i)
         iors[i] = CORBA::Object::_duplicate(impl_->info_list[i].ior.in());
 
       CORBA::Object_var obj =
-        IOGR_Maker::instance()->merge_iors(iors
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX(block1);
+        IOGR_Maker::instance()->merge_iors(iors);
 
       FtRtecEventChannelAdmin::EventChannel_var primary =
-        FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in()
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX(block1);
-      primary->replica_crashed(crashed_location
-                          ACE_ENV_ARG_PARAMETER);
+        FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in());
+      primary->replica_crashed(crashed_location);
 
-      ACE_TRY_CHECK_EX(block1);
       return;
     }
-    ACE_CATCHANY {
+    catch (const CORBA::Exception& ex){
     }
-    ACE_ENDTRY;
   }
 
-  ACE_TRY_EX(block2) {
+  try{
     remove_member(crashed_location,
-                  IOGR_Maker::instance()->increment_ref_version()
-                  ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(block2);
+                  IOGR_Maker::instance()->increment_ref_version());
   }
-  ACE_CATCHANY {
+  catch (const CORBA::Exception& ex){
   }
-  ACE_ENDTRY;
 
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h
index 0d06c156bf5..b154e25448f 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h
@@ -35,37 +35,30 @@ public:
 
   virtual CORBA::Boolean start (
         FTRT::FaultListener_ptr listener,
-        FTRT::Location_out cur
-        ACE_ENV_ARG_DECL)
+        FTRT::Location_out cur)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   void create_group (
     const FTRT::ManagerInfoList & info_list,
-    CORBA::ULong object_group_ref_version
-    ACE_ENV_ARG_DECL);
+    CORBA::ULong object_group_ref_version);
 
   void join_group (
-    const FTRT::ManagerInfo & info
-    ACE_ENV_ARG_DECL);
+    const FTRT::ManagerInfo & info);
 
   void add_member (
     const FTRT::ManagerInfo & info,
-    CORBA::ULong object_group_ref_version
-    ACE_ENV_ARG_DECL);
+    CORBA::ULong object_group_ref_version);
 
   void remove_member (
     const FTRT::Location & crashed_location,
-    CORBA::ULong object_group_ref_version
-    ACE_ENV_ARG_DECL);
+    CORBA::ULong object_group_ref_version);
 
   void replica_crashed (
-    const FTRT::Location & location
-    ACE_ENV_ARG_DECL);
+    const FTRT::Location & location);
 
 private:
   virtual void get_state (
         FtRtecEventChannelAdmin::EventChannelState & s
-        ACE_ENV_ARG_DECL
       )=0;
 
   virtual void connection_closed();
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp
index cf88341d153..75ee7462d2b 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp
@@ -15,20 +15,18 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 FTEC_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 FTEC_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  Request_Context_Repository().allocate_slots(info ACE_ENV_ARG_PARAMETER);
+  Request_Context_Repository().allocate_slots(info);
 
   PortableInterceptor::ClientRequestInterceptor_var client_interceptor;
   PortableInterceptor::ClientRequestInterceptor_ptr ctmp;
@@ -39,8 +37,7 @@ FTEC_ORBInitializer::post_init (
 
   client_interceptor = ctmp;
 
-  info->add_client_request_interceptor (client_interceptor.in()
-                                        ACE_ENV_ARG_PARAMETER);
+  info->add_client_request_interceptor (client_interceptor.in());
 
   PortableInterceptor::ServerRequestInterceptor_var  server_interceptor;
   PortableInterceptor::ServerRequestInterceptor_ptr  stmp;
@@ -50,15 +47,13 @@ FTEC_ORBInitializer::post_init (
                 CORBA::NO_MEMORY());
   server_interceptor = stmp;
 
-  info->add_server_request_interceptor (server_interceptor.in()
-                                        ACE_ENV_ARG_PARAMETER);
+  info->add_server_request_interceptor (server_interceptor.in());
   ACE_NEW_THROW_EX(stmp,
                 FtEventServiceInterceptor,
                 CORBA::NO_MEMORY());
   server_interceptor = stmp;
 
-  info->add_server_request_interceptor (server_interceptor.in()
-                                        ACE_ENV_ARG_PARAMETER);
+  info->add_server_request_interceptor (server_interceptor.in());
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h
index 07377cd40e1..80502fc5245 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h
@@ -27,12 +27,10 @@ class FTEC_ORBInitializer
   , public virtual TAO_Local_RefCounted_Object
 {
 public:
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp
index fdb274cb34c..74aea4e3390 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp
@@ -31,29 +31,26 @@ TAO_FTEC_ProxyPushConsumer::id() const
   /// Activate in the POA
 void
 TAO_FTEC_ProxyPushConsumer::activate (
-     RtecEventChannelAdmin::ProxyPushConsumer_ptr &result
-     ACE_ENV_ARG_DECL)
+     RtecEventChannelAdmin::ProxyPushConsumer_ptr &result)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   result = RtecEventChannelAdmin::ProxyPushConsumer::_nil();
-  ACE_TRY {
+  try{
     object_id_ = Request_Context_Repository().get_object_id();
     PortableServer::POA_var poa = _default_POA();
-    activate_object_with_id(result, poa.in(), this, id() ACE_ENV_ARG_PARAMETER);
+    activate_object_with_id(result, poa.in(), this, id());
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION, "");
+    ex._tao_print_exception ("");
     // ignore exceptions
   }
-  ACE_ENDTRY;
 }
 
     // = The RtecEventChannelAdmin::ProxyPushConsumer methods...
 void TAO_FTEC_ProxyPushConsumer::connect_push_supplier (
                 RtecEventComm::PushSupplier_ptr push_supplier,
-                const RtecEventChannelAdmin::SupplierQOS& qos
-                ACE_ENV_ARG_DECL)
+                const RtecEventChannelAdmin::SupplierQOS& qos)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        RtecEventChannelAdmin::AlreadyConnected))
 {
@@ -67,21 +64,19 @@ void TAO_FTEC_ProxyPushConsumer::connect_push_supplier (
   param.qos = qos;
   update.param.connect_supplier_param(param);
 
-  Inherited::connect_push_supplier(push_supplier, qos ACE_ENV_ARG_PARAMETER);
+  Inherited::connect_push_supplier(push_supplier, qos);
 
-  ACE_TRY {
+  try{
     FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance();
     ACE_Read_Guard<FTRTEC::Replication_Service> locker(*svc);
 
     svc->replicate_request(update,
-                           &FtRtecEventChannelAdmin::EventChannelFacade::disconnect_push_consumer
-                           ACE_ENV_ARG_PARAMETER);
+                           &FtRtecEventChannelAdmin::EventChannelFacade::disconnect_push_consumer);
   }
-  ACE_CATCHALL {
+  catch (...){
     this->disconnect_push_consumer();
-    ACE_RE_THROW;
+    throw;
   }
-  ACE_ENDTRY;
 }
 
 void TAO_FTEC_ProxyPushConsumer::disconnect_push_consumer (void)
@@ -98,7 +93,7 @@ void TAO_FTEC_ProxyPushConsumer::disconnect_push_consumer (void)
   FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance();
   ACE_Read_Guard<FTRTEC::Replication_Service> locker(*svc);
 
-  svc->replicate_request(update, 0 ACE_ENV_ARG_PARAMETER);
+  svc->replicate_request(update, 0);
 }
 
 void TAO_FTEC_ProxyPushConsumer::get_state(FtRtecEventChannelAdmin::ProxyPushConsumerStat& state)
@@ -112,14 +107,12 @@ void TAO_FTEC_ProxyPushConsumer::get_state(FtRtecEventChannelAdmin::ProxyPushCon
   }
 }
 
-void TAO_FTEC_ProxyPushConsumer::set_state(const FtRtecEventChannelAdmin::ProxyPushConsumerStat& state
-                                           ACE_ENV_ARG_DECL)
+void TAO_FTEC_ProxyPushConsumer::set_state(const FtRtecEventChannelAdmin::ProxyPushConsumerStat& state)
 {
   if (!CORBA::is_nil(state.parameter.info().push_supplier.in()) )
   {
     Inherited::connect_push_supplier(state.parameter.info().push_supplier.in(),
-                     state.parameter.info().qos
-                     ACE_ENV_ARG_PARAMETER);
+                     state.parameter.info().qos);
   }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h
index 205fdf5fd7d..2e45f985862 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h
@@ -34,16 +34,14 @@ public:
   TAO_FTEC_ProxyPushConsumer (TAO_EC_Event_Channel_Base* event_channel);
 
   virtual void activate (
-     RtecEventChannelAdmin::ProxyPushConsumer_ptr &proxy
-     ACE_ENV_ARG_DECL)
+     RtecEventChannelAdmin::ProxyPushConsumer_ptr &proxy)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
     // = The RtecEventChannelAdmin::ProxyPushConsumer methods...
   virtual void connect_push_supplier (
                 RtecEventComm::PushSupplier_ptr push_supplier,
-                const RtecEventChannelAdmin::SupplierQOS& qos
-                ACE_ENV_ARG_DECL)
+                const RtecEventChannelAdmin::SupplierQOS& qos)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        RtecEventChannelAdmin::AlreadyConnected));
   virtual void disconnect_push_consumer (void)
@@ -51,11 +49,10 @@ public:
 
   const FtRtecEventChannelAdmin::ObjectId& id() const;
   void get_state(FtRtecEventChannelAdmin::ProxyPushConsumerStat& state);
-  void set_state(const FtRtecEventChannelAdmin::ProxyPushConsumerStat& state
-                 ACE_ENV_ARG_DECL);
+  void set_state(const FtRtecEventChannelAdmin::ProxyPushConsumerStat& state);
 
   typedef void (FtRtecEventChannelAdmin::EventChannelFacade::*RollbackOperation)
-    (const FtRtecEventChannelAdmin::ObjectId& ACE_ENV_ARG_DECL);
+    (const FtRtecEventChannelAdmin::ObjectId&);
 
   static const RollbackOperation rollback_obtain;
 private:
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp
index 61b80fd1439..e7f9dd0b22f 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp
@@ -30,30 +30,27 @@ TAO_FTEC_ProxyPushSupplier::id() const
     /// Activate in the POA
 void
 TAO_FTEC_ProxyPushSupplier::activate (
-       RtecEventChannelAdmin::ProxyPushSupplier_ptr &result
-       ACE_ENV_ARG_DECL)
+       RtecEventChannelAdmin::ProxyPushSupplier_ptr &result)
    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   result =
     RtecEventChannelAdmin::ProxyPushSupplier::_nil();
-  ACE_TRY {
+  try{
     object_id_ = Request_Context_Repository().get_object_id();
     PortableServer::POA_var poa = _default_POA();
-    activate_object_with_id(result, poa.in(), this, id() ACE_ENV_ARG_PARAMETER);
+    activate_object_with_id(result, poa.in(), this, id());
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
     // ignore exceptions
   }
-  ACE_ENDTRY;
 }
 
     // = The RtecEventChannelAdmin::ProxyPushSupplier methods...
 void TAO_FTEC_ProxyPushSupplier::connect_push_consumer (
                 RtecEventComm::PushConsumer_ptr push_consumer,
-                const RtecEventChannelAdmin::ConsumerQOS &qos
-                ACE_ENV_ARG_DECL)
+                const RtecEventChannelAdmin::ConsumerQOS &qos)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        RtecEventChannelAdmin::AlreadyConnected,
                        RtecEventChannelAdmin::TypeError))
@@ -68,20 +65,18 @@ void TAO_FTEC_ProxyPushSupplier::connect_push_consumer (
   param.qos = qos;
   update.param.connect_consumer_param(param);
 
-  Inherited::connect_push_consumer(push_consumer, qos ACE_ENV_ARG_PARAMETER);
+  Inherited::connect_push_consumer(push_consumer, qos);
 
-  ACE_TRY {
+  try{
     FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance();
 
     ACE_Read_Guard<FTRTEC::Replication_Service> locker(*svc);
 
     svc->replicate_request(update,
-      &FtRtecEventChannelAdmin::EventChannelFacade::disconnect_push_supplier
-      ACE_ENV_ARG_PARAMETER);
+      &FtRtecEventChannelAdmin::EventChannelFacade::disconnect_push_supplier);
   }
-  ACE_CATCHALL {
+  catch (...){
   }
-  ACE_ENDTRY;
 }
 
 
@@ -100,7 +95,7 @@ void TAO_FTEC_ProxyPushSupplier::disconnect_push_supplier (void)
 
   ACE_Read_Guard<FTRTEC::Replication_Service> locker(*svc);
 
-  svc->replicate_request(update, 0 ACE_ENV_ARG_PARAMETER);
+  svc->replicate_request(update, 0);
 }
 
 
@@ -116,20 +111,18 @@ void TAO_FTEC_ProxyPushSupplier::suspend_connection (void)
 
   Inherited::suspend_connection();
 
-  ACE_TRY
+  try
   {
     FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance();
     ACE_Read_Guard<FTRTEC::Replication_Service> locker(*svc);
 
     svc->replicate_request(update,
-      &FtRtecEventChannelAdmin::EventChannelFacade::resume_push_supplier
-      ACE_ENV_ARG_PARAMETER);
+      &FtRtecEventChannelAdmin::EventChannelFacade::resume_push_supplier);
   }
-  ACE_CATCHALL {
+  catch (...){
     this->resume_connection();
-    ACE_RE_THROW;
+    throw;
   }
-  ACE_ENDTRY;
 }
 
 void TAO_FTEC_ProxyPushSupplier::resume_connection (void)
@@ -138,27 +131,25 @@ void TAO_FTEC_ProxyPushSupplier::resume_connection (void)
   if (Request_Context_Repository().is_executed_request())
     return;
 
-  Request_Context_Repository().set_object_id(id() ACE_ENV_ARG_PARAMETER);
+  Request_Context_Repository().set_object_id(id());
   FtRtecEventChannelAdmin::Operation update;
   update.object_id = id();
   update.param._d(FtRtecEventChannelAdmin::RESUME_CONNECTION);
 
   Inherited::resume_connection();
 
-  ACE_TRY {
+  try{
     FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance();
 
     ACE_Read_Guard<FTRTEC::Replication_Service> locker(*svc);
 
     svc->replicate_request(update,
-      &FtRtecEventChannelAdmin::EventChannelFacade::suspend_push_supplier
-      ACE_ENV_ARG_PARAMETER);
+      &FtRtecEventChannelAdmin::EventChannelFacade::suspend_push_supplier);
   }
-  ACE_CATCHALL {
+  catch (...){
     this->suspend_connection();
-    ACE_RE_THROW;
+    throw;
   }
-  ACE_ENDTRY;
 }
 
 
@@ -175,14 +166,12 @@ void TAO_FTEC_ProxyPushSupplier::get_state(FtRtecEventChannelAdmin::ProxyPushSup
 }
 
 
-void TAO_FTEC_ProxyPushSupplier::set_state(const FtRtecEventChannelAdmin::ProxyPushSupplierStat& state
-                                           ACE_ENV_ARG_DECL)
+void TAO_FTEC_ProxyPushSupplier::set_state(const FtRtecEventChannelAdmin::ProxyPushSupplierStat& state)
 {
   if (!CORBA::is_nil(state.parameter.info().push_consumer.in()))
   {
     Inherited::connect_push_consumer(state.parameter.info().push_consumer.in(),
-      state.parameter.info().qos
-      ACE_ENV_ARG_PARAMETER);
+      state.parameter.info().qos);
     if (state.suspended)
       Inherited::suspend_connection();
   }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h
index 67ac4929f26..90ad86d0101 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h
@@ -35,14 +35,12 @@ public:
                            int validate_connection);
     /// Activate in the POA
  virtual void activate (
-       RtecEventChannelAdmin::ProxyPushSupplier_ptr &proxy
-       ACE_ENV_ARG_DECL)
+       RtecEventChannelAdmin::ProxyPushSupplier_ptr &proxy)
    ACE_THROW_SPEC ((CORBA::SystemException));
     // = The RtecEventChannelAdmin::ProxyPushSupplier methods...
   virtual void connect_push_consumer (
                 RtecEventComm::PushConsumer_ptr push_consumer,
-                const RtecEventChannelAdmin::ConsumerQOS &qos
-                ACE_ENV_ARG_DECL)
+                const RtecEventChannelAdmin::ConsumerQOS &qos)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        RtecEventChannelAdmin::AlreadyConnected,
                        RtecEventChannelAdmin::TypeError));
@@ -56,11 +54,10 @@ public:
   const FtRtecEventChannelAdmin::ObjectId& id() const;
 
   void get_state(FtRtecEventChannelAdmin::ProxyPushSupplierStat& state);
-  void set_state(const FtRtecEventChannelAdmin::ProxyPushSupplierStat& state
-                 ACE_ENV_ARG_DECL);
+  void set_state(const FtRtecEventChannelAdmin::ProxyPushSupplierStat& state);
 
   typedef void (FtRtecEventChannelAdmin::EventChannelFacade::*RollbackOperation)
-    (const FtRtecEventChannelAdmin::ObjectId& ACE_ENV_ARG_DECL);
+    (const FtRtecEventChannelAdmin::ObjectId&);
 
   static const RollbackOperation rollback_obtain;
 private:
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp
index ffc32da67d3..7b1d6ff5b5a 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp
@@ -36,13 +36,12 @@ TAO_FTEC_SupplierAdmin::obtain_push_consumer (void)
 void
 TAO_FTEC_SupplierAdmin::disconnect(RtecEventChannelAdmin::ProxyPushConsumer_ptr obj)
 {
-  ACE_TRY_NEW_ENV {
+  try{
     obj->disconnect_push_consumer();
   }
-  ACE_CATCHALL
+  catch (...)
   {
   }
-  ACE_ENDTRY;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp
index f05e8c534a8..2ce6b5872e7 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp
@@ -23,13 +23,11 @@ FT_ProxyAdmin_Base::~FT_ProxyAdmin_Base()
 }
 
 void
-FT_ProxyAdmin_Base::activate(const FtRtecEventComm::ObjectId& oid
-                             ACE_ENV_ARG_DECL)
+FT_ProxyAdmin_Base::activate(const FtRtecEventComm::ObjectId& oid)
 {
   poa_->activate_object_with_id(
     reinterpret_cast<const PortableServer::ObjectId&> (oid),
-    servant_
-    ACE_ENV_ARG_PARAMETER);
+    servant_);
   object_id_ = oid;
 }
 
@@ -44,8 +42,7 @@ FT_ProxyAdmin_Base::object_id(void) const
 CORBA::Object_var
 FT_ProxyAdmin_Base::reference(void) const
 {
-  return poa_->servant_to_reference(servant_
-                                    ACE_ENV_ARG_PARAMETER);
+  return poa_->servant_to_reference(servant_);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h
index cc0eca54ce0..f94b549a7b9 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h
@@ -30,8 +30,7 @@ public:
   FT_ProxyAdmin_Base(PortableServer::ServantBase* servant,
               PortableServer::POA_var poa);
   virtual ~FT_ProxyAdmin_Base();
-  void activate(const FtRtecEventComm::ObjectId& oid
-              ACE_ENV_ARG_DECL);
+  void activate(const FtRtecEventComm::ObjectId& oid);
 
   const FtRtecEventComm::ObjectId& object_id(void) const;
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
index 303724cf69d..5eed0465310 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
@@ -19,28 +19,24 @@ template <class EC_PROXY_ADMIN, class Proxy,
           class ProxyInterface, class State>
 void
 FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface,State>::obtain_proxy (
-  const FtRtecEventChannelAdmin::Operation& op
-  ACE_ENV_ARG_DECL)
+  const FtRtecEventChannelAdmin::Operation& op)
 {
-  Request_Context_Repository().set_object_id(op.object_id
-                                     ACE_ENV_ARG_PARAMETER);
+  Request_Context_Repository().set_object_id(op.object_id);
 
   ProxyInterface_var result
     =  admin_->obtain();
 
   FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance();
-  ACE_TRY   {
+  try{
     ACE_Read_Guard<FTRTEC::Replication_Service> locker(*svc);
 
     svc->replicate_request(op,
-      Proxy::rollback_obtain
-      ACE_ENV_ARG_PARAMETER);
+      Proxy::rollback_obtain);
   }
-  ACE_CATCHALL {
+  catch (...){
     admin_->disconnect(result.in());
-    ACE_RE_THROW;
+    throw;
   }
-  ACE_ENDTRY;
 }
 
 template <class EC_PROXY_ADMIN, class Proxy,
@@ -52,11 +48,10 @@ FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::obtain_proxy (void)
 
   CORBA::Object_var obj;
   if (any >>= CORBA::Any::to_object(obj))
-    return ProxyInterface::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+    return ProxyInterface::_narrow(obj.in());
 
   FtRtecEventChannelAdmin::ObjectId oid;
-  Request_Context_Repository().generate_object_id(oid
-                                          ACE_ENV_ARG_PARAMETER);
+  Request_Context_Repository().generate_object_id(oid);
 
   FtRtecEventChannelAdmin::Operation update;
 
@@ -66,23 +61,20 @@ FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::obtain_proxy (void)
   ProxyInterface_var result
     =  admin_->obtain();
 
-  ACE_TRY {
+  try{
     FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance();
     ACE_Read_Guard<FTRTEC::Replication_Service> locker(*svc);
-    obj = IOGR_Maker::instance()->forge_iogr(result.in()
-      ACE_ENV_ARG_PARAMETER);
+    obj = IOGR_Maker::instance()->forge_iogr(result.in());
 
-    result = ProxyInterface::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+    result = ProxyInterface::_narrow(obj.in());
 
     svc->replicate_request(update,
-      Proxy::rollback_obtain
-      ACE_ENV_ARG_PARAMETER);
+      Proxy::rollback_obtain);
   }
-  ACE_CATCHALL {
+  catch (...){
     admin_->disconnect(result.in());
-    ACE_RE_THROW;
+    throw;
   }
-  ACE_ENDTRY;
 
   return result._retn();
 }
@@ -91,26 +83,23 @@ FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::obtain_proxy (void)
 template <class EC_PROXY_ADMIN, class Proxy,
           class ProxyInterface, class State>
 void FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::get_state(
-  State& state
-  ACE_ENV_ARG_DECL)
+  State& state)
 {
   typename EC_PROXY_ADMIN::StateWorker worker(state.proxies);
-  admin_->for_each(&worker ACE_ENV_ARG_PARAMETER);
+  admin_->for_each(&worker);
 }
 
 template <class EC_PROXY_ADMIN, class Proxy,
           class ProxyInterface, class State>
 void FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::set_state(
-  const State& state
-  ACE_ENV_ARG_DECL)
+  const State& state)
 {
   for (size_t i =0; i < state.proxies.length(); ++i)
   {
     const typename Proxy::State& proxy_state
       = state.proxies[i];
 
-    Request_Context_Repository().set_object_id(proxy_state.object_id
-                                       ACE_ENV_ARG_PARAMETER);
+    Request_Context_Repository().set_object_id(proxy_state.object_id);
 
     ProxyInterface_var
       proxy_ior = admin_->obtain();
@@ -120,12 +109,11 @@ void FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::set_state(
     const PortableServer::ObjectId *oid =
       reinterpret_cast<const PortableServer::ObjectId *> (temp);
     const PortableServer::Servant servant =
-      poa_->id_to_servant (*oid ACE_ENV_ARG_PARAMETER);
+      poa_->id_to_servant (*oid);
 
     Skeleton skeleton = dynamic_cast<Skeleton> (servant);
 
-    static_cast<Proxy*> (skeleton)->set_state(proxy_state
-                                              ACE_ENV_ARG_PARAMETER);
+    static_cast<Proxy*> (skeleton)->set_state(proxy_state);
   }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h
index f574107851f..ea95d97b08f 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h
@@ -36,11 +36,10 @@ public:
   ProxyInterface_ptr obtain_proxy (void);
 
   /// this is used for updating the state
-  void obtain_proxy (const FtRtecEventChannelAdmin::Operation& op
-                    ACE_ENV_ARG_DECL);
+  void obtain_proxy (const FtRtecEventChannelAdmin::Operation& op);
 
-  void get_state(State& state ACE_ENV_ARG_DECL);
-  void set_state(const State& state ACE_ENV_ARG_DECL);
+  void get_state(State& state);
+  void set_state(const State& state);
 private:
   EC_PROXY_ADMIN* admin_;
 };
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
index 5495a55f324..15c54231fca 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
@@ -19,43 +19,37 @@ ACE_RCSID (EventChannel,
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-CORBA::Object_ptr get_target(PortableInterceptor::ServerRequestInfo_ptr ri
-                             ACE_ENV_ARG_DECL)
+CORBA::Object_ptr get_target(PortableInterceptor::ServerRequestInfo_ptr ri)
 {
   CORBA::String_var orb_id = ri->orb_id();
 
   int argc =0;
   char** argv =0;
-  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, orb_id.in()
-    ACE_ENV_ARG_PARAMETER);
+  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, orb_id.in());
 
   PortableServer::POA_var poa =
-    resolve_init<PortableServer::POA>(orb.in(), "RootPOA"
-    ACE_ENV_ARG_PARAMETER);
+    resolve_init<PortableServer::POA>(orb.in(), "RootPOA");
 
   PortableInterceptor::AdapterName_var adaptor_name =
     ri->adapter_name();
 
   for (size_t i = 1; i < adaptor_name->length(); ++i) {
-    poa = poa->find_POA((*adaptor_name)[i] , false
-                        ACE_ENV_ARG_PARAMETER);
+    poa = poa->find_POA((*adaptor_name)[i] , false);
   }
 
   CORBA::OctetSeq_var oid =
     ri->object_id();
 
   CORBA::Object_var obj =
-    poa->id_to_reference(oid.in()
-                         ACE_ENV_ARG_PARAMETER);
+    poa->id_to_reference(oid.in());
 
   return obj._retn();
 }
 
-CORBA::Object_ptr get_forward(PortableInterceptor::ServerRequestInfo_ptr ri
-                             ACE_ENV_ARG_DECL)
+CORBA::Object_ptr get_forward(PortableInterceptor::ServerRequestInfo_ptr ri)
 {
   CORBA::Object_var target =
-    get_target(ri ACE_ENV_ARG_PARAMETER);
+    get_target(ri);
 
   TAO::ObjectKey_var key =
     target->_key();
@@ -64,8 +58,7 @@ CORBA::Object_ptr get_forward(PortableInterceptor::ServerRequestInfo_ptr ri
     GroupInfoPublisher::instance()->group_reference();
 
   CORBA::Object_var forward =
-    IOGR_Maker::instance()->ior_replace_key(iogr.in(), key.in()
-                                            ACE_ENV_ARG_PARAMETER);
+    IOGR_Maker::instance()->ior_replace_key(iogr.in(), key.in());
 
   return forward._retn();
 }
@@ -90,42 +83,36 @@ void ForwardCtrlServerInterceptor::destroy (void)
 {
 }
 
-void ForwardCtrlServerInterceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
-                                                    ACE_ENV_ARG_DECL)
+void ForwardCtrlServerInterceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
                                                     ACE_THROW_SPEC ((CORBA::SystemException,
                                                     PortableInterceptor::ForwardRequest))
 {
-  ACE_TRY {
+  try{
     IOP::ServiceContext_var service_context =
-      ri->get_request_service_context(IOP::FT_GROUP_VERSION
-      ACE_ENV_ARG_PARAMETER);
+      ri->get_request_service_context(IOP::FT_GROUP_VERSION);
   }
-  ACE_CATCHANY {
+  catch (const CORBA::Exception& ex){
     // not an FT call , continue to process the request
     return;
   }
-  ACE_ENDTRY;
 
   GroupInfoPublisherBase* publisher = GroupInfoPublisher::instance();
   if (!publisher->is_primary()) {
     // I am not primary, forword the request to primary
-    CORBA::Object_var forward = get_forward(ri
-      ACE_ENV_ARG_PARAMETER);
+    CORBA::Object_var forward = get_forward(ri);
 
-    ACE_THROW (PortableInterceptor::ForwardRequest (forward.in()));
+    throw PortableInterceptor::ForwardRequest (forward.in());
   }
 }
 
 void ForwardCtrlServerInterceptor::receive_request_service_contexts (
-        PortableInterceptor::ServerRequestInfo_ptr
-        ACE_ENV_ARG_DECL_NOT_USED)
+        PortableInterceptor::ServerRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest))
 {
 }
 
-FT::ObjectGroupRefVersion get_ft_group_version(IOP::ServiceContext_var service_context
-                                               ACE_ENV_ARG_DECL)
+FT::ObjectGroupRefVersion get_ft_group_version(IOP::ServiceContext_var service_context)
 {
   Safe_InputCDR cdr (reinterpret_cast<const char*> (service_context->context_data.get_buffer ()),
                       service_context->context_data.length ());
@@ -148,34 +135,27 @@ FT::ObjectGroupRefVersion get_ft_group_version(IOP::ServiceContext_var service_c
 
 
 
-void ForwardCtrlServerInterceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL)
+void ForwardCtrlServerInterceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   IOP::ServiceContext_var service_context;
   FT::ObjectGroupRefVersion version=0;
 
-  ACE_TRY_EX(block1)
+  try
   {
     if (!ri->response_expected())
       return;
-    ACE_TRY_CHECK_EX(block1);
 
     service_context =
-      ri->get_request_service_context(IOP::FT_GROUP_VERSION
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(block1);
+      ri->get_request_service_context(IOP::FT_GROUP_VERSION);
     // get the ref version service context
     version =
-      get_ft_group_version(service_context
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(block1);
+      get_ft_group_version(service_context);
   }
-  ACE_CATCHALL {
+  catch (...){
     // not an FT call , continue to reply the request
     return;
   }
-  ACE_ENDTRY;
 
   // pass a new IOGR if the client use an outdated version
 
@@ -186,10 +166,8 @@ void ForwardCtrlServerInterceptor::send_reply (PortableInterceptor::ServerReques
   if (version < maker->get_ref_version()) {
     ACE_DEBUG((LM_DEBUG, "Outdated IOGR version, passing new IOGR\n"));
 
-    ACE_TRY_EX(block2) {
-      CORBA::Object_var forward = get_forward(ri
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX(block2);
+    try{
+      CORBA::Object_var forward = get_forward(ri);
 
       IOP::ServiceContext sc;
       sc.context_id = FTRT::FT_FORWARD;
@@ -199,7 +177,7 @@ void ForwardCtrlServerInterceptor::send_reply (PortableInterceptor::ServerReques
       //ACE_THROW (CORBA::MARSHAL ());
 
       if ((cdr << forward.in() ) == 0 )
-        ACE_THROW (CORBA::MARSHAL ());
+        throw CORBA::MARSHAL ();
 
       ACE_Message_Block mb;
       ACE_CDR::consolidate(&mb, cdr.begin());
@@ -219,27 +197,23 @@ void ForwardCtrlServerInterceptor::send_reply (PortableInterceptor::ServerReques
         }
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
 
-      ri->add_reply_service_context (sc, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX(block2);
+      ri->add_reply_service_context (sc, 0);
 
       ACE_DEBUG((LM_DEBUG, "reply_service_context added\n"));
     }
-    ACE_CATCHALL {
+    catch (...){
     }
-    ACE_ENDTRY;
   }
 
 }
 
-void ForwardCtrlServerInterceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr
-                               ACE_ENV_ARG_DECL_NOT_USED)
+void ForwardCtrlServerInterceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest))
 {
 }
 
-void ForwardCtrlServerInterceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr
-                           ACE_ENV_ARG_DECL_NOT_USED)
+void ForwardCtrlServerInterceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h
index 9690d1ffc67..533fd02215c 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h
@@ -34,28 +34,23 @@ public:
   virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
-                                ACE_ENV_ARG_DECL)
+  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_request_service_contexts (
-        PortableInterceptor::ServerRequestInfo_ptr
-        ACE_ENV_ARG_DECL)
+        PortableInterceptor::ServerRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL)
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                               ACE_ENV_ARG_DECL)
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr
-                           ACE_ENV_ARG_DECL)
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 };
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
index 7caca5d3fbf..ba8800dd2b7 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
@@ -81,10 +81,9 @@ void
 retrieve_ft_request_context(
                             PortableInterceptor::ServerRequestInfo_ptr ri,
                             IOP::ServiceContext_var& service_context,
-                            FT::FTRequestServiceContext& ft_request_service_context
-                            ACE_ENV_ARG_DECL)
+                            FT::FTRequestServiceContext& ft_request_service_context)
 {
-  service_context = ri->get_request_service_context(IOP::FT_REQUEST ACE_ENV_ARG_PARAMETER);
+  service_context = ri->get_request_service_context(IOP::FT_REQUEST);
 
   const char * buf =
     reinterpret_cast<const char *> (service_context->context_data.get_buffer ());
@@ -95,32 +94,29 @@ retrieve_ft_request_context(
   CORBA::Boolean byte_order;
 
   if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   cdr.reset_byte_order (static_cast<int> (byte_order));
 
 
   if ((cdr >> ft_request_service_context) == 0)
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
 }
 
 FTRT::TransactionDepth
 get_transaction_depth_context(
-  PortableInterceptor::ServerRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ServerRequestInfo_ptr ri)
 {
   IOP::ServiceContext_var service_context;
-  ACE_TRY {
-    service_context = ri->get_request_service_context(FTRT::FT_TRANSACTION_DEPTH
-      ACE_ENV_ARG_PARAMETER);
+  try{
+    service_context = ri->get_request_service_context(FTRT::FT_TRANSACTION_DEPTH);
   }
-  ACE_CATCH  (CORBA::BAD_PARAM, ex)
+  catch (const CORBA::BAD_PARAM& ex)
   {
     ACE_DEBUG((LM_DEBUG, "Received request without transaction depth context\n"));
     return -1;
   }
-  ACE_ENDTRY;
 
   const char * buf =
     reinterpret_cast<const char *> (service_context->context_data.get_buffer ());
@@ -143,13 +139,11 @@ get_transaction_depth_context(
 
 FTRT::SequenceNumber
 get_sequence_number_context(
-                            PortableInterceptor::ServerRequestInfo_ptr ri
-                            ACE_ENV_ARG_DECL)
+                            PortableInterceptor::ServerRequestInfo_ptr ri)
 {
   FTRT::SequenceNumber result;
   IOP::ServiceContext_var service_context;
-  service_context = ri->get_request_service_context(FTRT::FT_SEQUENCE_NUMBER
-    ACE_ENV_ARG_PARAMETER);
+  service_context = ri->get_request_service_context(FTRT::FT_SEQUENCE_NUMBER);
 
   const char * buf =
     reinterpret_cast<const char *> (service_context->context_data.get_buffer ());
@@ -204,8 +198,7 @@ ACE_THROW_SPEC ((CORBA::SystemException))
 
 void
 FtEventServiceInterceptor::receive_request_service_contexts (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
   PortableInterceptor::ForwardRequest))
 {
@@ -213,8 +206,7 @@ FtEventServiceInterceptor::receive_request_service_contexts (
 
 
 void
-FtEventServiceInterceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
-                                            ACE_ENV_ARG_DECL)
+FtEventServiceInterceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
                                             ACE_THROW_SPEC ((CORBA::SystemException,
                                             PortableInterceptor::ForwardRequest))
 {
@@ -224,14 +216,12 @@ FtEventServiceInterceptor::receive_request (PortableInterceptor::ServerRequestIn
     return;
   }
 
-  ACE_TRY_EX(block1) {
+  try{
     FT::FTRequestServiceContext ft_request_service_context;
     IOP::ServiceContext_var service_context;
     retrieve_ft_request_context(ri,
       service_context,
-      ft_request_service_context
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(block1);
+      ft_request_service_context);
 
     bool is_new_request = request_table_.is_new_request(
       ft_request_service_context.client_id.in(),
@@ -243,59 +233,43 @@ FtEventServiceInterceptor::receive_request (PortableInterceptor::ServerRequestIn
         request_table_.get_result(ft_request_service_context.client_id.in());
     }
 
-    Request_Context_Repository().set_cached_result(ri, cached_result
-                                           ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(block1);
-    Request_Context_Repository().set_ft_request_service_context(ri, service_context
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(block1);
+    Request_Context_Repository().set_cached_result(ri, cached_result);
+    Request_Context_Repository().set_ft_request_service_context(ri, service_context);
 
-    ACE_TRY_EX(block2) {
+    try{
 
       FTRT::TransactionDepth transaction_depth =
-        get_transaction_depth_context(ri
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX(block2);
+        get_transaction_depth_context(ri);
 
-      Request_Context_Repository().set_transaction_depth(ri, transaction_depth
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX(block2);
+      Request_Context_Repository().set_transaction_depth(ri, transaction_depth);
     }
-    ACE_CATCH  (CORBA::BAD_PARAM, ex)   {
+    catch (const CORBA::BAD_PARAM& ex){
     }
-    ACE_ENDTRY;
 
     FTRT::SequenceNumber sequence_no =
-      get_sequence_number_context(ri ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(block1);
+      get_sequence_number_context(ri);
 
-    Request_Context_Repository().set_sequence_number(ri, sequence_no
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(block1);
+    Request_Context_Repository().set_sequence_number(ri, sequence_no);
   }
-  ACE_CATCH  (CORBA::BAD_PARAM, ex)   {
+  catch (const CORBA::BAD_PARAM& ex){
   }
-  ACE_ENDTRY;
 }
 
 void
-FtEventServiceInterceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                                       ACE_ENV_ARG_DECL)
+FtEventServiceInterceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
                                        ACE_THROW_SPEC ((CORBA::SystemException))
 {
   FT::FTRequestServiceContext ft_request_service_context;
   IOP::ServiceContext_var service_context;
 
-  ACE_TRY {
+  try{
     retrieve_ft_request_context(ri,
       service_context,
-      ft_request_service_context
-      ACE_ENV_ARG_PARAMETER);
+      ft_request_service_context);
   }
-  ACE_CATCH (CORBA::BAD_PARAM, ex) {
+  catch (const CORBA::BAD_PARAM& ex){
     return;
   }
-  ACE_ENDTRY;
 
   request_table_.update(ft_request_service_context.client_id.in(),
     ft_request_service_context.retention_id,
@@ -304,16 +278,14 @@ FtEventServiceInterceptor::send_reply (PortableInterceptor::ServerRequestInfo_pt
 
 void
 FtEventServiceInterceptor::send_exception (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
-FtEventServiceInterceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr
-                                       ACE_ENV_ARG_DECL_NOT_USED)
+FtEventServiceInterceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr)
                                        ACE_THROW_SPEC ((CORBA::SystemException,
                                        PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
index 80beac8a655..4e7d566c74c 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
@@ -60,36 +60,30 @@ public:
   virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
-                                ACE_ENV_ARG_DECL)
+  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_request_service_contexts (
-        PortableInterceptor::ServerRequestInfo_ptr
-        ACE_ENV_ARG_DECL)
+        PortableInterceptor::ServerRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL)
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                               ACE_ENV_ARG_DECL)
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr
-                           ACE_ENV_ARG_DECL)
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
   void get_state(FtRtecEventChannelAdmin::CachedOptionResults& state);
   void set_state(const FtRtecEventChannelAdmin::CachedOptionResults& state);
 private:
-  PortableInterceptor::Current_var pic(PortableInterceptor::ServerRequestInfo_ptr ri
-                                       ACE_ENV_ARG_DECL);
+  PortableInterceptor::Current_var pic(PortableInterceptor::ServerRequestInfo_ptr ri);
 
   CORBA::ORB_var orb_;
   CachedRequestTable request_table_;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
index 165ea3115a0..a1c85c10f83 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
@@ -66,8 +66,7 @@ GroupInfoPublisherBase::backups() const
 GroupInfoPublisherBase::Info*
 GroupInfoPublisherBase::setup_info(const FTRT::ManagerInfoList & info_list,
                                    int my_position,
-                                   CORBA::ULong object_group_ref_version
-                                   ACE_ENV_ARG_DECL)
+                                   CORBA::ULong object_group_ref_version)
 {
   Info_ptr result(new Info);
 
@@ -85,12 +84,10 @@ GroupInfoPublisherBase::setup_info(const FTRT::ManagerInfoList & info_list,
   }
 
   CORBA::Object_var obj =
-    IOGR_Maker::instance()->make_iogr(iors,object_group_ref_version
-                                      ACE_ENV_ARG_PARAMETER);
+    IOGR_Maker::instance()->make_iogr(iors,object_group_ref_version);
 
   result->iogr =
-    ::FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in()
-    ACE_ENV_ARG_PARAMETER);
+    ::FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in());
 
   ACE_DEBUG((LM_DEBUG, "In setup_info\n"));
   //log_obj_endpoints(result->iogr.in());
@@ -105,12 +102,10 @@ GroupInfoPublisherBase::setup_info(const FTRT::ManagerInfoList & info_list,
       iors[i] = CORBA::Object::_duplicate(info_list[i+ my_position+1].ior.in());
     }
 
-    obj =  IOGR_Maker::instance()->merge_iors(iors
-      ACE_ENV_ARG_PARAMETER);
+    obj =  IOGR_Maker::instance()->merge_iors(iors);
 
     result->successor =
-      FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in()
-      ACE_ENV_ARG_PARAMETER);
+      FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in());
   }
   /*
   else {
@@ -129,8 +124,7 @@ GroupInfoPublisherBase::setup_info(const FTRT::ManagerInfoList & info_list,
   for (i = 0; i < successors_length; ++i)  {
     result->backups[i] =
       FtRtecEventChannelAdmin::EventChannel::_narrow(
-      info_list[i+ my_position+1].ior.in()
-      ACE_ENV_ARG_PARAMETER);
+      info_list[i+ my_position+1].ior.in());
     //CORBA::PolicyList_var pols;
     //result->backups[i]->_validate_connection (pols.out ());
   }
@@ -149,14 +143,13 @@ GroupInfoPublisherBase::update_info(GroupInfoPublisherBase::Info_ptr& info)
 
     if (!CORBA::is_nil(naming_context_.in())) {
       TAO_FTRTEC::Log(1, "Registering to the Name Service\n");
-      ACE_TRY_NEW_ENV {
+      try{
         naming_context_->rebind(FTRTEC::Identification_Service::instance()->name(),
-          info->iogr.in() ACE_ENV_ARG_PARAMETER);
+          info->iogr.in());
       }
-      ACE_CATCHALL {
+      catch (...){
         /// there's nothing we can do if the naming service is down
       }
-      ACE_ENDTRY;
     }
   }
   info_ = info;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h
index 8268bb2dd89..d21db5c3fa8 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h
@@ -54,8 +54,7 @@ public:
 
   Info* setup_info(const FTRT::ManagerInfoList & info_list,
               int my_position,
-              CORBA::ULong object_group_ref_version
-              ACE_ENV_ARG_DECL);
+              CORBA::ULong object_group_ref_version);
 
   void update_info(Info_ptr& info);
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
index 1c9a6e40988..89dd7b88898 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
@@ -25,12 +25,10 @@ IOGR_Maker::IOGR_Maker()
 }
 
 void
-IOGR_Maker::init(CORBA::ORB_ptr orb
-                 ACE_ENV_ARG_DECL)
+IOGR_Maker::init(CORBA::ORB_ptr orb)
 {
     iorm_ = resolve_init<TAO_IOP::TAO_IOR_Manipulation>(orb,
-                                                        TAO_OBJID_IORMANIPULATION
-                                                        ACE_ENV_ARG_PARAMETER);
+                                                        TAO_OBJID_IORMANIPULATION);
     ft_tag_component_.group_domain_id = "ft_eventchannel";
     ft_tag_component_.object_group_id = 0;
     ft_tag_component_.object_group_ref_version = 0;
@@ -45,12 +43,11 @@ IOGR_Maker::instance()
 }
 
 CORBA::Object_ptr
-IOGR_Maker::merge_iors(const TAO_IOP::TAO_IOR_Manipulation::IORList& list
-                       ACE_ENV_ARG_DECL)
+IOGR_Maker::merge_iors(const TAO_IOP::TAO_IOR_Manipulation::IORList& list)
 {
   CORBA::Object_var obj;
   if (list.length() != 1)
-    obj = iorm_->merge_iors(list ACE_ENV_ARG_PARAMETER);
+    obj = iorm_->merge_iors(list);
   else
     obj = CORBA::Object::_duplicate(list[0]);
   return obj._retn();
@@ -59,17 +56,15 @@ IOGR_Maker::merge_iors(const TAO_IOP::TAO_IOR_Manipulation::IORList& list
 
 CORBA::Object_ptr
 IOGR_Maker::make_iogr(const TAO_IOP::TAO_IOR_Manipulation::IORList& list,
-                      CORBA::ULong object_group_ref_version
-                      ACE_ENV_ARG_DECL)
+                      CORBA::ULong object_group_ref_version)
 {
   /// generate a new IOGR if the object group changes.
-  CORBA::Object_var obj = merge_iors(list ACE_ENV_ARG_PARAMETER);
+  CORBA::Object_var obj = merge_iors(list);
 
   FT::TagFTGroupTaggedComponent ft_tag_component(ft_tag_component_);
   /// the generated IOGR should use a new object_group_ref_version
   ft_tag_component.object_group_ref_version = object_group_ref_version;
-  set_tag_components(obj.in(), list[0], ft_tag_component
-                     ACE_ENV_ARG_PARAMETER);
+  set_tag_components(obj.in(), list[0], ft_tag_component);
 
   return obj._retn();
 }
@@ -82,8 +77,7 @@ void replace_key(char* ior, char* end_ior,
 
 
 CORBA::Object_ptr
-IOGR_Maker::forge_iogr(CORBA::Object_ptr obj
-                       ACE_ENV_ARG_DECL)
+IOGR_Maker::forge_iogr(CORBA::Object_ptr obj)
 {
   /// forge an IOGR whose object_key is the same with that of \a obj.
   CORBA::Object_var merged;
@@ -93,8 +87,7 @@ IOGR_Maker::forge_iogr(CORBA::Object_ptr obj
   if (! CORBA::is_nil(successor.in())) {
     TAO::ObjectKey_var newkey = obj->_key();
 
-    CORBA::Object_var new_base = ior_replace_key(successor.in(), newkey.in()
-                                                 ACE_ENV_ARG_PARAMETER);
+    CORBA::Object_var new_base = ior_replace_key(successor.in(), newkey.in());
 
     if (CORBA::is_nil( new_base.in() ))
       return CORBA::Object::_nil();
@@ -104,8 +97,7 @@ IOGR_Maker::forge_iogr(CORBA::Object_ptr obj
     TAO_ORB_Core *orb_core = TAO_ORB_Core_instance ();
 
     TAO_Stub *stub = orb_core->create_stub (CORBA::string_dup(obj->_stubobj ()->type_id.in ()), // give the id string
-      base_profiles
-      ACE_ENV_ARG_PARAMETER);
+      base_profiles);
 
     // Make the stub memory allocation exception safe for the duration
     // of this method.
@@ -123,14 +115,12 @@ IOGR_Maker::forge_iogr(CORBA::Object_ptr obj
 
 
     merged =
-      iorm_->add_profiles(obj, temp_obj
-      ACE_ENV_ARG_PARAMETER);
+      iorm_->add_profiles(obj, temp_obj);
   }
   else
     merged = CORBA::Object::_duplicate(obj);
 
-  set_tag_components(merged.in(), obj, ft_tag_component_
-                     ACE_ENV_ARG_PARAMETER);
+  set_tag_components(merged.in(), obj, ft_tag_component_);
 
 
   return merged._retn();
@@ -138,8 +128,7 @@ IOGR_Maker::forge_iogr(CORBA::Object_ptr obj
 
 CORBA::Object_ptr
 IOGR_Maker::ior_replace_key(CORBA::Object_ptr obj,
-                            const TAO::ObjectKey& key
-                            ACE_ENV_ARG_DECL)
+                            const TAO::ObjectKey& key)
 {
     TAO_OutputCDR out_cdr;
     if (!(out_cdr << obj))
@@ -237,22 +226,18 @@ void
 IOGR_Maker::set_tag_components(
   CORBA::Object_ptr merged,
   CORBA::Object_ptr primary,
-  FT::TagFTGroupTaggedComponent& ft_tag_component
-  ACE_ENV_ARG_DECL)
+  FT::TagFTGroupTaggedComponent& ft_tag_component)
 {
     // set the primary
     TAO_FT_IOGR_Property prop (ft_tag_component);
 
 
-    prop.remove_primary_tag(merged
-                         ACE_ENV_ARG_PARAMETER);
+    prop.remove_primary_tag(merged);
 
-    iorm_->set_primary (&prop, merged, primary
-                       ACE_ENV_ARG_PARAMETER);
+    iorm_->set_primary (&prop, merged, primary);
       // Set the property
     iorm_->set_property (&prop,
-                        merged
-                        ACE_ENV_ARG_PARAMETER);
+                        merged);
 
 
 }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h
index cbc933a61c8..682405edeb2 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h
@@ -27,8 +27,7 @@ class IOGR_Maker
 public:
   IOGR_Maker();
 
-  void init(CORBA::ORB_ptr orb
-            ACE_ENV_ARG_DECL);
+  void init(CORBA::ORB_ptr orb);
 
   /// instance() will only return a valid object after an
   /// instance is explicitly created by client and init() is called.
@@ -36,22 +35,18 @@ public:
 
    /// Create a new object reference by merging the profiles lists in the
    /// supplied list of one or more object references.
-  CORBA::Object_ptr merge_iors(const TAO_IOP::TAO_IOR_Manipulation::IORList&
-                              ACE_ENV_ARG_DECL);
+  CORBA::Object_ptr merge_iors(const TAO_IOP::TAO_IOR_Manipulation::IORList&);
 
    /// Create a new IOGR (with FT_PRIMARY and FT_GROUP components) by merging
    /// the profiles lists in the supplied list of one or more object references.
   CORBA::Object_ptr make_iogr(const TAO_IOP::TAO_IOR_Manipulation::IORList&,
-                              CORBA::ULong object_group_ref_version
-                              ACE_ENV_ARG_DECL);
+                              CORBA::ULong object_group_ref_version);
 
   /// Make an new IOGR with obj as primary.
-  CORBA::Object_ptr forge_iogr(CORBA::Object_ptr obj
-                               ACE_ENV_ARG_DECL);
+  CORBA::Object_ptr forge_iogr(CORBA::Object_ptr obj);
 
   CORBA::Object_ptr ior_replace_key(CORBA::Object_ptr obj,
-                                    const TAO::ObjectKey& key
-                                    ACE_ENV_ARG_DECL);
+                                    const TAO::ObjectKey& key);
 
   bool copy_ft_group_component(CORBA::Object_ptr obj);
 
@@ -62,10 +57,9 @@ public:
   CORBA::ULong get_ref_version() const;
 
 private:
-  void set_tag_components(CORBA::Object_ptr merged, 
+  void set_tag_components(CORBA::Object_ptr merged,
                           CORBA::Object_ptr primary,
-                          FT::TagFTGroupTaggedComponent& ft_tag_component
-                          ACE_ENV_ARG_DECL);
+                          FT::TagFTGroupTaggedComponent& ft_tag_component);
   TAO_IOP::TAO_IOR_Manipulation_var iorm_;
   FT::TagFTGroupTaggedComponent ft_tag_component_;
 };
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp
index d6a5a0ac5a4..37a69cd8ceb 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp
@@ -11,8 +11,7 @@ ObjectGroupManagerHandler::ObjectGroupManagerHandler(
 
 void
 ObjectGroupManagerHandler::start (CORBA::Boolean ami_return_val,
-                                  const FTRT::Location & the_location
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+                                  const FTRT::Location & the_location)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG(ami_return_val);
@@ -20,8 +19,7 @@ ObjectGroupManagerHandler::start (CORBA::Boolean ami_return_val,
 }
 
 void
-ObjectGroupManagerHandler::start_excep (::Messaging::ExceptionHolder *
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+ObjectGroupManagerHandler::start_excep (::Messaging::ExceptionHolder *)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -33,8 +31,7 @@ void ObjectGroupManagerHandler::create_group (void)
 
 
 void
-ObjectGroupManagerHandler::create_group_excep (::Messaging::ExceptionHolder *
-                                               ACE_ENV_ARG_DECL_NOT_USED)
+ObjectGroupManagerHandler::create_group_excep (::Messaging::ExceptionHolder *)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -48,8 +45,7 @@ ObjectGroupManagerHandler::add_member (void)
 }
 
 void
-ObjectGroupManagerHandler::add_member_excep (::Messaging::ExceptionHolder *
-                                             ACE_ENV_ARG_DECL)
+ObjectGroupManagerHandler::add_member_excep (::Messaging::ExceptionHolder *)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->add_member();
@@ -62,8 +58,7 @@ ObjectGroupManagerHandler::set_state (void)
 }
 
 void
-ObjectGroupManagerHandler::set_state_excep (::Messaging::ExceptionHolder *
-                                            ACE_ENV_ARG_DECL_NOT_USED)
+ObjectGroupManagerHandler::set_state_excep (::Messaging::ExceptionHolder *)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h
index bdff8796543..252d0df335d 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h
@@ -23,33 +23,28 @@ class ObjectGroupManagerHandler
 public:
   ObjectGroupManagerHandler(ACE_Auto_Event& evt, int num_backups);
   virtual void start (CORBA::Boolean ami_return_val,
-                      const FTRT::Location & the_location
-                      ACE_ENV_ARG_DECL)
+                      const FTRT::Location & the_location)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void start_excep (::Messaging::ExceptionHolder * excep_holder
-                            ACE_ENV_ARG_DECL)
+  virtual void start_excep (::Messaging::ExceptionHolder * excep_holder)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void create_group (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void create_group_excep (::Messaging::ExceptionHolder * excep_holder
-                                   ACE_ENV_ARG_DECL)
+  virtual void create_group_excep (::Messaging::ExceptionHolder * excep_holder)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void add_member (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void add_member_excep (::Messaging::ExceptionHolder * excep_holder
-                                 ACE_ENV_ARG_DECL)
+  virtual void add_member_excep (::Messaging::ExceptionHolder * excep_holder)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void set_state (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void set_state_excep (::Messaging::ExceptionHolder * excep_holder
-                                ACE_ENV_ARG_DECL)
+  virtual void set_state_excep (::Messaging::ExceptionHolder * excep_holder)
     ACE_THROW_SPEC ((CORBA::SystemException));
 private:
   ACE_Auto_Event& evt_;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp
index 8708b6a33d7..08b889297b7 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp
@@ -26,8 +26,7 @@ void ProxyConsumerStateWorker::set_size(size_t size)
   index_ = 0;
 }
 
-void ProxyConsumerStateWorker::work(TAO_EC_ProxyPushConsumer* object
-                                    ACE_ENV_ARG_DECL_NOT_USED)
+void ProxyConsumerStateWorker::work(TAO_EC_ProxyPushConsumer* object)
 {
   TAO_FTEC_ProxyPushConsumer* proxy =
     static_cast<TAO_FTEC_ProxyPushConsumer*> (object);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h
index 1610cd90ef1..c4335787ee7 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h
@@ -31,8 +31,7 @@ public:
   ~ProxyConsumerStateWorker();
 
   virtual void set_size(size_t size);
-  virtual void work(TAO_EC_ProxyPushConsumer* object
-                    ACE_ENV_ARG_DECL);
+  virtual void work(TAO_EC_ProxyPushConsumer* object);
 private:
   int index_;
   FtRtecEventChannelAdmin::ProxyConsumerStates& consumerStates_;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp
index 5618c2d373f..8f47fd1c894 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp
@@ -27,8 +27,7 @@ void ProxySupplierStateWorker::set_size(size_t size)
   index_ = 0;
 }
 
-void ProxySupplierStateWorker::work(TAO_EC_ProxyPushSupplier* object
-            ACE_ENV_ARG_DECL_NOT_USED)
+void ProxySupplierStateWorker::work(TAO_EC_ProxyPushSupplier* object)
 {
   TAO_FTEC_ProxyPushSupplier* proxy =
     static_cast<TAO_FTEC_ProxyPushSupplier*> (object);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h
index cf9516d100d..3d3cc9aae16 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h
@@ -31,8 +31,7 @@ public:
   ~ProxySupplierStateWorker();
 
   virtual void set_size(size_t size);
-  virtual void work(TAO_EC_ProxyPushSupplier* object
-            ACE_ENV_ARG_DECL);
+  virtual void work(TAO_EC_ProxyPushSupplier* object);
 private:
   int index_;
   FtRtecEventChannelAdmin::ProxySupplierStates& supplierStates_;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
index d6ff22f60fe..37e068530ee 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
@@ -77,7 +77,7 @@ namespace FTRTEC
 
      ACE_AUTO_PTR_RESET (replication_strategy, strategy, Replication_Strategy);
 
-      ACE_TRY_NEW_ENV
+      try
       {
         PortableInterceptor::ORBInitializer_ptr temp_orb_initializer =
           PortableInterceptor::ORBInitializer::_nil ();
@@ -89,17 +89,14 @@ namespace FTRTEC
           CORBA::NO_MEMORY ());
         orb_initializer = temp_orb_initializer;
 
-        PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-          ACE_ENV_ARG_PARAMETER);
+        PortableInterceptor::register_orb_initializer (orb_initializer.in ());
       }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
       {
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-          "Unexpected exception caught while "
-          "initializing the TransactionDepth");
+        ex._tao_print_exception (
+          "Unexpected exception caught while ""initializing the TransactionDepth");
         return -1;
       }
-      ACE_ENDTRY;
     return 0;
   }
 
@@ -125,8 +122,7 @@ namespace FTRTEC
 
 
   void Replication_Service::replicate_request(const FtRtecEventChannelAdmin::Operation& update,
-    RollbackOperation rollback
-    ACE_ENV_ARG_DECL)
+    RollbackOperation rollback)
   {
     TAO_OutputCDR cdr;
     cdr << update;
@@ -154,15 +150,13 @@ namespace FTRTEC
     replication_strategy->replicate_request(
       state,
       rollback,
-      update.object_id
-      ACE_ENV_ARG_PARAMETER);
+      update.object_id);
   }
 
   void Replication_Service::add_member(const FTRT::ManagerInfo & info,
-                                       CORBA::ULong object_group_ref_version
-                                       ACE_ENV_ARG_DECL)
+                                       CORBA::ULong object_group_ref_version)
   {
-    replication_strategy->add_member(info, object_group_ref_version ACE_ENV_ARG_PARAMETER);
+    replication_strategy->add_member(info, object_group_ref_version);
   }
 
   int  Replication_Service::acquire_read (void)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h
index b6763393a01..9d9d9dd128d 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h
@@ -48,7 +48,7 @@ namespace FTRTEC
     void check_validity(void);
 
     typedef void (FtRtecEventChannelAdmin::EventChannelFacade::*RollbackOperation)
-      (const FtRtecEventChannelAdmin::ObjectId& ACE_ENV_ARG_DECL);
+      (const FtRtecEventChannelAdmin::ObjectId&);
 
    /**
     * Replicate a request.
@@ -57,16 +57,14 @@ namespace FTRTEC
     * @param rollback The rollback operation when the replication failed.
     */
     void replicate_request(const FtRtecEventChannelAdmin::Operation& update,
-      RollbackOperation rollback
-      ACE_ENV_ARG_DECL);
+      RollbackOperation rollback);
 
    /**
     * Inform the backup replicas that a new replica has joined the object
     * group.
     */
     void add_member(const FTRT::ManagerInfo & info,
-                    CORBA::ULong object_group_ref_version
-                    ACE_ENV_ARG_DECL);
+                    CORBA::ULong object_group_ref_version);
 
     int  acquire_read (void);
     int  acquire_write (void);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h
index 289cd2a337b..17bbebfbe16 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h
@@ -40,7 +40,7 @@ public:
     virtual void check_validity(void);
 
     typedef void (FtRtecEventChannelAdmin::EventChannelFacade::*RollbackOperation)
-      (const FtRtecEventChannelAdmin::ObjectId& ACE_ENV_ARG_DECL);
+      (const FtRtecEventChannelAdmin::ObjectId&);
 
   /**
    * Replicate a request.
@@ -51,16 +51,14 @@ public:
    */
     virtual void replicate_request(const FTRT::State& state,
                                    RollbackOperation rollback,
-                                   const FtRtecEventChannelAdmin::ObjectId& oid
-                                   ACE_ENV_ARG_DECL)=0;
+                                   const FtRtecEventChannelAdmin::ObjectId& oid)=0;
 
   /**
    * Inform the backup replicas that a new replica has joined the object
    * group.
    */
   virtual void add_member(const FTRT::ManagerInfo & info,
-                          CORBA::ULong object_group_ref_version
-                          ACE_ENV_ARG_DECL)=0;
+                          CORBA::ULong object_group_ref_version)=0;
 
   virtual Replication_Strategy* make_primary_strategy();
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
index 2ba591d172e..4247e0e285c 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
@@ -27,8 +27,7 @@ ACE_TSS<FtRtecEventChannelAdmin::ObjectId> oid;
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
-Request_Context_Repository::allocate_slots(PortableInterceptor::ORBInitInfo_ptr info
-            ACE_ENV_ARG_DECL)
+Request_Context_Repository::allocate_slots(PortableInterceptor::ORBInitInfo_ptr info)
 {
   object_id_slot = info->allocate_slot_id();
   cached_result_slot = info->allocate_slot_id();
@@ -44,37 +43,31 @@ Request_Context_Repository::init(CORBA::ORB_ptr the_orb)
 }
 
 void Request_Context_Repository::generate_object_id(
-  FtRtecEventChannelAdmin::ObjectId& oid
-  ACE_ENV_ARG_DECL)
+  FtRtecEventChannelAdmin::ObjectId& oid)
 {
   oid.length(sizeof(UUID));
   UUID::create(oid.get_buffer());
-  set_object_id(oid
-                ACE_ENV_ARG_PARAMETER);
+  set_object_id(oid);
 }
 
 void
 Request_Context_Repository::set_object_id(
-  const FtRtecEventChannelAdmin::ObjectId& object_id
-  ACE_ENV_ARG_DECL_NOT_USED)
+  const FtRtecEventChannelAdmin::ObjectId& object_id)
 {
   /*
   PortableInterceptor::Current_var pic =
-    resolve_init<PortableInterceptor::Current>(orb, "PICurrent"
-                                               ACE_ENV_ARG_PARAMETER);
+    resolve_init<PortableInterceptor::Current>(orb, "PICurrent");
 
   CORBA::Any a;
   a <<= object_id;
-  pic->set_slot(object_id_slot, a
-                ACE_ENV_ARG_PARAMETER);
+  pic->set_slot(object_id_slot, a);
 
   */
   *oid = object_id;
 }
 
 FtRtecEventChannelAdmin::ObjectId_var
-get_object_id(CORBA::Any_var a
-              ACE_ENV_ARG_DECL)
+get_object_id(CORBA::Any_var a)
 {
   FtRtecEventChannelAdmin::ObjectId *object_id, *r;
   FtRtecEventChannelAdmin::ObjectId_var result;
@@ -96,14 +89,11 @@ Request_Context_Repository::get_object_id(void)
 {
   /*
   PortableInterceptor::Current_var pic =
-    resolve_init<PortableInterceptor::Current>(orb, "PICurrent"
-                                               ACE_ENV_ARG_PARAMETER);
+    resolve_init<PortableInterceptor::Current>(orb, "PICurrent");
 
-  CORBA::Any_var a = pic->get_slot(object_id_slot
-                                   ACE_ENV_ARG_PARAMETER);
+  CORBA::Any_var a = pic->get_slot(object_id_slot);
 
-  return ::get_object_id(a
-                         ACE_ENV_ARG_PARAMETER);
+  return ::get_object_id(a);
   */
   FtRtecEventChannelAdmin::ObjectId *object_id;
   ACE_NEW_THROW_EX(object_id,
@@ -114,80 +104,70 @@ Request_Context_Repository::get_object_id(void)
 
 FtRtecEventChannelAdmin::ObjectId_var
 Request_Context_Repository::get_object_id(
-  PortableInterceptor::ServerRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ServerRequestInfo_ptr ri)
 {
-  CORBA::Any_var a = ri->get_slot(object_id_slot
-                                   ACE_ENV_ARG_PARAMETER);
+  CORBA::Any_var a = ri->get_slot(object_id_slot);
 
-  return ::get_object_id(a
-                         ACE_ENV_ARG_PARAMETER);
+  return ::get_object_id(a);
 
 }
 
 void
 Request_Context_Repository::set_cached_result(
   PortableInterceptor::ServerRequestInfo_ptr ri,
-  const CORBA::Any& result
-  ACE_ENV_ARG_DECL)
+  const CORBA::Any& result)
 {
   ri->set_slot(cached_result_slot,
-               result ACE_ENV_ARG_PARAMETER);
+               result);
 }
 
 CORBA::Any_ptr
 Request_Context_Repository::get_cached_result(void)
 {
   PortableInterceptor::Current_var pic =
-    resolve_init<PortableInterceptor::Current>(orb, "PICurrent"
-                                               ACE_ENV_ARG_PARAMETER);
+    resolve_init<PortableInterceptor::Current>(orb, "PICurrent");
 
-  CORBA::Any_var a = pic->get_slot(cached_result_slot
-                                   ACE_ENV_ARG_PARAMETER);
+  CORBA::Any_var a = pic->get_slot(cached_result_slot);
   return a._retn();
 }
 
 bool Request_Context_Repository::is_executed_request()
 {
-  ACE_TRY_NEW_ENV {
+  try{
     CORBA::Any_var any = get_cached_result();
     CORBA::TypeCode_var type = any->type();
     CORBA::TCKind const kind = type->kind();
     return kind != CORBA::tk_null;
   }
-  ACE_CATCHALL {
+  catch (...){
   }
-  ACE_ENDTRY;
   return false;
 }
 
 void
 Request_Context_Repository::set_sequence_number(
   PortableInterceptor::ServerRequestInfo_ptr ri,
-  FTRT::SequenceNumber seq_num
-  ACE_ENV_ARG_DECL)
+  FTRT::SequenceNumber seq_num)
 {
   CORBA::Any a;
 
   a <<= seq_num;
 
-  ri->set_slot(seq_num_slot, a ACE_ENV_ARG_PARAMETER);
+  ri->set_slot(seq_num_slot, a);
 }
 
 void
 Request_Context_Repository::set_sequence_number(
-  FTRT::SequenceNumber seq_num
-  ACE_ENV_ARG_DECL)
+  FTRT::SequenceNumber seq_num)
 {
   PortableInterceptor::Current_var pic =
-    resolve_init<PortableInterceptor::Current>(orb, "PICurrent"
-                                               ACE_ENV_ARG_PARAMETER);
+    resolve_init<PortableInterceptor::Current>(orb, "PICurrent");
 
   CORBA::Any a;
 
   a <<= seq_num;
 
-  pic->set_slot(seq_num_slot, a ACE_ENV_ARG_PARAMETER);
+  pic->set_slot(seq_num_slot, a);
 }
 
 
@@ -195,9 +175,8 @@ FTRT::SequenceNumber
 Request_Context_Repository::get_sequence_number(void)
 {
   PortableInterceptor::Current_var pic =
-    resolve_init<PortableInterceptor::Current>(orb, "PICurrent"
-                                               ACE_ENV_ARG_PARAMETER);
-  CORBA::Any_var a = pic->get_slot(seq_num_slot ACE_ENV_ARG_PARAMETER);
+    resolve_init<PortableInterceptor::Current>(orb, "PICurrent");
+  CORBA::Any_var a = pic->get_slot(seq_num_slot);
   FTRT::SequenceNumber result  = 0;
   a >>= result;
   return result;
@@ -205,10 +184,9 @@ Request_Context_Repository::get_sequence_number(void)
 
 FTRT::SequenceNumber
 Request_Context_Repository::get_sequence_number(
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
 {
-  CORBA::Any_var a = ri->get_slot(seq_num_slot ACE_ENV_ARG_PARAMETER);
+  CORBA::Any_var a = ri->get_slot(seq_num_slot);
   FTRT::SequenceNumber result  = 0;
   a >>= result;
   return result;
@@ -217,59 +195,48 @@ Request_Context_Repository::get_sequence_number(
 void
 Request_Context_Repository::set_ft_request_service_context(
     PortableInterceptor::ServerRequestInfo_ptr ri,
-    IOP::ServiceContext_var service_context
-    ACE_ENV_ARG_DECL)
+    IOP::ServiceContext_var service_context)
 {
   CORBA::Any a;
   a <<= service_context.in();
-  ri->set_slot(ft_request_service_context_slot,a
-               ACE_ENV_ARG_PARAMETER);
+  ri->set_slot(ft_request_service_context_slot,a);
 }
 
 CORBA::Any_var
 Request_Context_Repository::get_ft_request_service_context(
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
 {
-  return ri->get_slot(ft_request_service_context_slot
-                   ACE_ENV_ARG_PARAMETER);
+  return ri->get_slot(ft_request_service_context_slot);
 }
 
 void
 Request_Context_Repository::set_transaction_depth(
     PortableInterceptor::ServerRequestInfo_ptr ri,
-    FTRT::TransactionDepth depth
-    ACE_ENV_ARG_DECL)
+    FTRT::TransactionDepth depth)
 {
   CORBA::Any a;
   a <<= depth;
-  ri->set_slot(transaction_depth_slot,a
-               ACE_ENV_ARG_PARAMETER);
+  ri->set_slot(transaction_depth_slot,a);
 }
 
 void
 Request_Context_Repository::set_transaction_depth(
-    FTRT::TransactionDepth depth
-    ACE_ENV_ARG_DECL)
+    FTRT::TransactionDepth depth)
 {
   PortableInterceptor::Current_var pic =
-      resolve_init<PortableInterceptor::Current>(orb, "PICurrent"
-      ACE_ENV_ARG_PARAMETER);
+      resolve_init<PortableInterceptor::Current>(orb, "PICurrent");
 
   CORBA::Any a;
   a <<= depth;
-  pic->set_slot(transaction_depth_slot,a
-               ACE_ENV_ARG_PARAMETER);
+  pic->set_slot(transaction_depth_slot,a);
 }
 
 
 FTRT::TransactionDepth
 Request_Context_Repository::get_transaction_depth(
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
 {
-  CORBA::Any_var a = ri->get_slot(transaction_depth_slot
-    ACE_ENV_ARG_PARAMETER);
+  CORBA::Any_var a = ri->get_slot(transaction_depth_slot);
   FTRT::TransactionDepth result=0;
   a >>= result;
   return result;
@@ -277,15 +244,12 @@ Request_Context_Repository::get_transaction_depth(
 }
 
 FTRT::TransactionDepth
-Request_Context_Repository::get_transaction_depth(
-    ACE_ENV_SINGLE_ARG_DECL)
+Request_Context_Repository::get_transaction_depth()
 {
   PortableInterceptor::Current_var pic =
-      resolve_init<PortableInterceptor::Current>(orb, "PICurrent"
-      ACE_ENV_ARG_PARAMETER);
+      resolve_init<PortableInterceptor::Current>(orb, "PICurrent");
 
-  CORBA::Any_var a = pic->get_slot(transaction_depth_slot
-    ACE_ENV_ARG_PARAMETER);
+  CORBA::Any_var a = pic->get_slot(transaction_depth_slot);
 
   FTRT::TransactionDepth result=0;
   a >>= result;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h
index ed33ceecfb7..87e727382ec 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h
@@ -54,61 +54,47 @@ public:
    * Used by ORBInitializer to allocate required slots for
    * FTEC.
    */
-  void allocate_slots(PortableInterceptor::ORBInitInfo_ptr info
-            ACE_ENV_ARG_DECL);
+  void allocate_slots(PortableInterceptor::ORBInitInfo_ptr info);
 
 
-  void generate_object_id(FtRtecEventChannelAdmin::ObjectId& object_id
-                          ACE_ENV_ARG_DECL);
-  void set_object_id(const FtRtecEventChannelAdmin::ObjectId& object_id
-                     ACE_ENV_ARG_DECL);
+  void generate_object_id(FtRtecEventChannelAdmin::ObjectId& object_id);
+  void set_object_id(const FtRtecEventChannelAdmin::ObjectId& object_id);
   FtRtecEventChannelAdmin::ObjectId_var get_object_id(void);
   FtRtecEventChannelAdmin::ObjectId_var
-    get_object_id(PortableInterceptor::ServerRequestInfo_ptr ri
-                  ACE_ENV_ARG_DECL);
+    get_object_id(PortableInterceptor::ServerRequestInfo_ptr ri);
 
   void set_cached_result(PortableInterceptor::ServerRequestInfo_ptr ri,
-                         const CORBA::Any& result
-                         ACE_ENV_ARG_DECL);
+                         const CORBA::Any& result);
 
   CORBA::Any_ptr get_cached_result(void);
   bool is_executed_request();
 
   void set_sequence_number(PortableInterceptor::ServerRequestInfo_ptr ri,
-                           FTRT::SequenceNumber
-                           ACE_ENV_ARG_DECL);
+                           FTRT::SequenceNumber);
 
-  void set_sequence_number(FTRT::SequenceNumber
-                           ACE_ENV_ARG_DECL);
-  FTRT::SequenceNumber get_sequence_number(PortableInterceptor::ClientRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL);
+  void set_sequence_number(FTRT::SequenceNumber);
+  FTRT::SequenceNumber get_sequence_number(PortableInterceptor::ClientRequestInfo_ptr ri);
 
   FTRT::SequenceNumber get_sequence_number(void);
 
   void set_ft_request_service_context(
     PortableInterceptor::ServerRequestInfo_ptr ri,
-    IOP::ServiceContext_var service_context
-    ACE_ENV_ARG_DECL);
+    IOP::ServiceContext_var service_context);
 
   CORBA::Any_var get_ft_request_service_context(
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL);
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   void set_transaction_depth(
     PortableInterceptor::ServerRequestInfo_ptr ri,
-    FTRT::TransactionDepth depth
-    ACE_ENV_ARG_DECL);
+    FTRT::TransactionDepth depth);
 
  void set_transaction_depth(
-    FTRT::TransactionDepth depth
-    ACE_ENV_ARG_DECL);
+    FTRT::TransactionDepth depth);
 
- FTRT::TransactionDepth get_transaction_depth(
-    ACE_ENV_SINGLE_ARG_DECL);
+ FTRT::TransactionDepth get_transaction_depth();
 
  FTRT::TransactionDepth get_transaction_depth(
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL);
+    PortableInterceptor::ClientRequestInfo_ptr);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
index 6f8af93e08b..9434df42bf9 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
@@ -35,8 +35,7 @@ ACE_THROW_SPEC ((CORBA::SystemException))
 
 void
 TAO_Set_Update_Interceptor::send_poll (
-                                   PortableInterceptor::ClientRequestInfo_ptr
-                                   ACE_ENV_ARG_DECL_NOT_USED)
+                                   PortableInterceptor::ClientRequestInfo_ptr)
                                    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do Nothing
@@ -44,8 +43,7 @@ TAO_Set_Update_Interceptor::send_poll (
 
 void
 TAO_Set_Update_Interceptor::send_request (
-                                      PortableInterceptor::ClientRequestInfo_ptr ri
-                                      ACE_ENV_ARG_DECL)
+                                      PortableInterceptor::ClientRequestInfo_ptr ri)
                                       ACE_THROW_SPEC ((CORBA::SystemException,
                                       PortableInterceptor::ForwardRequest))
 {
@@ -53,28 +51,27 @@ TAO_Set_Update_Interceptor::send_request (
 
   if (strcmp(operation.in(), "set_update")==0 ||
     strcmp(operation.in(), "oneway_set_update") ==0) {
-      CORBA::Any_var a = Request_Context_Repository().get_ft_request_service_context(ri
-        ACE_ENV_ARG_PARAMETER);
+      CORBA::Any_var a = Request_Context_Repository().get_ft_request_service_context(ri);
 
       IOP::ServiceContext* sc;
 
       if ((a.in() >>= sc) ==0)
         return;
 
-      ri->add_request_service_context (*sc, 0 ACE_ENV_ARG_PARAMETER);
+      ri->add_request_service_context (*sc, 0);
 
       FTRT::TransactionDepth transaction_depth =
-        Request_Context_Repository().get_transaction_depth(ri ACE_ENV_ARG_PARAMETER);
+        Request_Context_Repository().get_transaction_depth(ri);
       TAO_OutputCDR cdr;
       ACE_Message_Block mb;
 
       if (transaction_depth) {
         if (!(cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)))
-          ACE_THROW (CORBA::MARSHAL ());
+          throw CORBA::MARSHAL ();
 
         // Add Transaction Depth Context
         if ((cdr << transaction_depth) == 0)
-          ACE_THROW (CORBA::MARSHAL ());
+          throw CORBA::MARSHAL ();
         sc->context_id = FTRT::FT_TRANSACTION_DEPTH;
 
         ACE_CDR::consolidate(&mb, cdr.begin());
@@ -94,7 +91,7 @@ TAO_Set_Update_Interceptor::send_request (
           }
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
 
-        ri->add_request_service_context (*sc, 0 ACE_ENV_ARG_PARAMETER);
+        ri->add_request_service_context (*sc, 0);
 
         cdr.reset();
       }
@@ -102,14 +99,14 @@ TAO_Set_Update_Interceptor::send_request (
       // Add Sequence Number Context
 
       FTRT::SequenceNumber sequence_number =
-        Request_Context_Repository().get_sequence_number(ri ACE_ENV_ARG_PARAMETER);
+        Request_Context_Repository().get_sequence_number(ri);
 
       ACE_DEBUG((LM_DEBUG, "send_request : sequence_number = %d\n", sequence_number));
       if (sequence_number != 0) {
         if (!(cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)))
-          ACE_THROW (CORBA::MARSHAL ());
+          throw CORBA::MARSHAL ();
         if ((cdr << sequence_number) == 0)
-          ACE_THROW (CORBA::MARSHAL ());
+          throw CORBA::MARSHAL ();
         sc->context_id = FTRT::FT_SEQUENCE_NUMBER;
 
         ACE_CDR::consolidate(&mb, cdr.begin());
@@ -129,23 +126,21 @@ TAO_Set_Update_Interceptor::send_request (
           }
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
 
-        ri->add_request_service_context (*sc, 0 ACE_ENV_ARG_PARAMETER);
+        ri->add_request_service_context (*sc, 0);
       }
     }
 }
 
 void
 TAO_Set_Update_Interceptor::receive_reply (
-  PortableInterceptor::ClientRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_Set_Update_Interceptor::receive_other (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -153,8 +148,7 @@ TAO_Set_Update_Interceptor::receive_other (
 
 void
 TAO_Set_Update_Interceptor::receive_exception (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h
index c6ea6c68675..e8f28530c9d 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h
@@ -54,26 +54,21 @@ public:
   virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
     PortableInterceptor::ForwardRequest));
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException,
     PortableInterceptor::ForwardRequest));
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
     PortableInterceptor::ForwardRequest));
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp
index f8f9a9fd3c9..5806ef940fd 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp
@@ -23,30 +23,26 @@ UpdateableHandler::~UpdateableHandler()
 
 FTRT::AMI_UpdateableHandler_ptr UpdateableHandler::activate(
   Update_Manager* mgr, int id,
-  PortableServer::ObjectId& object_id
-  ACE_ENV_ARG_DECL)
+  PortableServer::ObjectId& object_id)
 {
   object_id.length(sizeof(mgr) + sizeof(id));
   memcpy(object_id.get_buffer(), &mgr, sizeof(mgr));
   memcpy(object_id.get_buffer() + sizeof(mgr), &id, sizeof(id));
   strategy_->poa()->activate_object_with_id(object_id,
-                                            this
-                                            ACE_ENV_ARG_PARAMETER);
+                                            this);
   CORBA::Object_var object = strategy_->poa()->id_to_reference(
-    object_id
-    ACE_ENV_ARG_PARAMETER);
+    object_id);
 
-  return FTRT::AMI_UpdateableHandler::_narrow(object.in() ACE_ENV_ARG_PARAMETER);
+  return FTRT::AMI_UpdateableHandler::_narrow(object.in());
 }
 
 
 
-void UpdateableHandler::dispatch(UpdateableHandler::Handler handler ACE_ENV_ARG_DECL)
+void UpdateableHandler::dispatch(UpdateableHandler::Handler handler)
 {
   PortableServer::Current_var current =
     resolve_init<PortableServer::Current>(strategy_->orb(),
-    "POACurrent"
-    ACE_ENV_ARG_PARAMETER);
+    "POACurrent");
 
   PortableServer::ObjectId_var object_id =
     current->get_object_id();
@@ -65,33 +61,30 @@ void UpdateableHandler::dispatch(UpdateableHandler::Handler handler ACE_ENV_ARG_
 }
 
 void UpdateableHandler::set_update (
-                                    ACE_ENV_SINGLE_ARG_DECL
                                     )
                                     ACE_THROW_SPEC ((
                                     CORBA::SystemException
                                     ))
 {
   ACE_DEBUG((LM_DEBUG,"Received reply from "));
-  dispatch(&Update_Manager::handle_reply ACE_ENV_ARG_PARAMETER);
+  dispatch(&Update_Manager::handle_reply);
 }
 void UpdateableHandler::set_update_excep (
   ::Messaging::ExceptionHolder * excep_holder
-  ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
   CORBA::SystemException
   ))
 {
   ACE_DEBUG((LM_DEBUG, "Received Exception from"));
-  ACE_TRY {
+  try{
     excep_holder->raise_exception();
   }
-  ACE_CATCHANY {
-    ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION, "A corba exception\n");
+  catch (const CORBA::Exception& ex){
+    ex._tao_print_exception ("A corba exception\n");
   }
-  ACE_ENDTRY;
 
-  dispatch(&Update_Manager::handle_exception ACE_ENV_ARG_PARAMETER);
+  dispatch(&Update_Manager::handle_exception);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h
index 48f621bc1ef..14bb614b20d 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h
@@ -31,21 +31,18 @@ public:
 
     FTRT::AMI_UpdateableHandler_ptr activate(
       Update_Manager* mgr, int id,
-      PortableServer::ObjectId& oid
-      ACE_ENV_ARG_DECL);
+      PortableServer::ObjectId& oid);
     typedef void (Update_Manager::*Handler)(int);
 
-    void dispatch(Handler handler ACE_ENV_ARG_DECL) ;
+    void dispatch(Handler handler) ;
 
     virtual void set_update (
-        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
         ));
     virtual void set_update_excep (
         ::Messaging::ExceptionHolder * excep_holder
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp
index e35181a00b2..8485efd4868 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp
@@ -11,18 +11,15 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 PortableServer::POA_var create_persistent_poa(PortableServer::POA_var root_poa,
                                               PortableServer::POAManager_var mgr,
                                               const char* name,
-                                              CORBA::PolicyList& policy_list
-                                              ACE_ENV_ARG_DECL)
+                                              CORBA::PolicyList& policy_list)
 {
   PortableServer::POA_var result;
     PortableServer::LifespanPolicy_var lifespan =
-    root_poa->create_lifespan_policy(PortableServer::PERSISTENT
-    ACE_ENV_ARG_PARAMETER);
+    root_poa->create_lifespan_policy(PortableServer::PERSISTENT);
 
   // create a USER_ID IdAssignmentPolicy object
   PortableServer::IdAssignmentPolicy_var assign =
-    root_poa->create_id_assignment_policy(PortableServer::USER_ID
-    ACE_ENV_ARG_PARAMETER);
+    root_poa->create_id_assignment_policy(PortableServer::USER_ID);
 
   // create PolicyList.
   size_t orig_len =  policy_list.length();
@@ -33,8 +30,7 @@ PortableServer::POA_var create_persistent_poa(PortableServer::POA_var root_poa,
     PortableServer::IdAssignmentPolicy::_duplicate(assign.in());
 
   // create the child POA
-  result = root_poa->create_POA(name, mgr.in(), policy_list
-    ACE_ENV_ARG_PARAMETER);
+  result = root_poa->create_POA(name, mgr.in(), policy_list);
 
 
   return result;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h
index cd41683ea61..ccd5357e8a9 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h
@@ -22,8 +22,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 PortableServer::POA_var create_persistent_poa(PortableServer::POA_var root_poa,
                                               PortableServer::POAManager_var mgr,
                                               const char* name,
-                                              CORBA::PolicyList& policy_list
-                                              ACE_ENV_ARG_DECL);
+                                              CORBA::PolicyList& policy_list);
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
index 91b875b8542..f36a3765d6c 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
@@ -51,8 +51,7 @@ public:
   // = The RtecEventChannelAdmin::ProxyPushSupplier methods...
   virtual void connect_push_consumer (
                 RtecEventComm::PushConsumer_ptr push_consumer,
-                const RtecEventChannelAdmin::ConsumerQOS &qos
-                ACE_ENV_ARG_DECL_NOT_USED)
+                const RtecEventChannelAdmin::ConsumerQOS &qos)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        RtecEventChannelAdmin::AlreadyConnected,
                        RtecEventChannelAdmin::TypeError));
@@ -72,14 +71,12 @@ public:
   FTEC_Gateway_ProxyPushConsumer(FTEC_Gateway_Impl* impl);
   ~FTEC_Gateway_ProxyPushConsumer();
 
-  virtual void push (const RtecEventComm::EventSet & data
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void push (const RtecEventComm::EventSet & data)
       ACE_THROW_SPEC ((CORBA::SystemException));
       // = The RtecEventChannelAdmin::ProxyPushConsumer methods...
   virtual void connect_push_supplier (
                 RtecEventComm::PushSupplier_ptr push_supplier,
-                const RtecEventChannelAdmin::SupplierQOS& qos
-                ACE_ENV_ARG_DECL_NOT_USED)
+                const RtecEventChannelAdmin::SupplierQOS& qos)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        RtecEventChannelAdmin::AlreadyConnected));
   virtual void disconnect_push_consumer (void)
@@ -96,7 +93,7 @@ public:
   virtual void push (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void push_excep (::Messaging::ExceptionHolder * excep_holder ACE_ENV_ARG_DECL)
+  virtual void push_excep (::Messaging::ExceptionHolder * excep_holder)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
@@ -106,7 +103,7 @@ public:
 class Interceptor_Destoryer : public TAO_ORB_Core
 {
 public:
-  inline static void execute(CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) {
+  inline static void execute(CORBA::ORB_ptr orb) {
     static_cast<Interceptor_Destoryer*> (orb->orb_core())->do_it();
   }
 private:
@@ -158,7 +155,7 @@ FTEC_Gateway::~FTEC_Gateway()
 }
 
 RtecEventChannelAdmin::EventChannel_ptr
-FTEC_Gateway::activate(PortableServer::POA_ptr root_poa ACE_ENV_ARG_DECL)
+FTEC_Gateway::activate(PortableServer::POA_ptr root_poa)
 {
   PortableServer::POA_var poa;
   PortableServer::POAManager_var mgr;
@@ -166,13 +163,11 @@ FTEC_Gateway::activate(PortableServer::POA_ptr root_poa ACE_ENV_ARG_DECL)
   if (impl_->local_orb) {
     int argc = 0;
     char** argv = 0;
-    impl_->orb = CORBA::ORB_init(argc, argv, "FTEC_GatewayORB"
-      ACE_ENV_ARG_PARAMETER);
+    impl_->orb = CORBA::ORB_init(argc, argv, "FTEC_GatewayORB");
 
-    Interceptor_Destoryer::execute(impl_->orb.in() ACE_ENV_ARG_PARAMETER);
+    Interceptor_Destoryer::execute(impl_->orb.in());
 
-    poa = resolve_init<PortableServer::POA>(impl_->orb.in(), "RootPOA"
-      ACE_ENV_ARG_PARAMETER);
+    poa = resolve_init<PortableServer::POA>(impl_->orb.in(), "RootPOA");
 
     mgr = poa->the_POAManager();
 
@@ -184,17 +179,14 @@ FTEC_Gateway::activate(PortableServer::POA_ptr root_poa ACE_ENV_ARG_DECL)
   }
 
   PortableServer::IdUniquenessPolicy_var id_uniqueness_policy =
-    poa->create_id_uniqueness_policy(PortableServer::MULTIPLE_ID
-    ACE_ENV_ARG_PARAMETER);
+    poa->create_id_uniqueness_policy(PortableServer::MULTIPLE_ID);
 
   PortableServer::LifespanPolicy_var lifespan =
-    poa->create_lifespan_policy(PortableServer::PERSISTENT
-    ACE_ENV_ARG_PARAMETER);
+    poa->create_lifespan_policy(PortableServer::PERSISTENT);
 
   // create a USER_ID IdAssignmentPolicy object
   PortableServer::IdAssignmentPolicy_var assign =
-    poa->create_id_assignment_policy(PortableServer::USER_ID
-    ACE_ENV_ARG_PARAMETER);
+    poa->create_id_assignment_policy(PortableServer::USER_ID);
 
   CORBA::PolicyList policy_list;
   policy_list.length(3);
@@ -206,8 +198,7 @@ FTEC_Gateway::activate(PortableServer::POA_ptr root_poa ACE_ENV_ARG_DECL)
   policy_list[2]=
     PortableServer::IdAssignmentPolicy::_duplicate(assign.in());
 
-  impl_->poa = poa->create_POA("gateway_poa", mgr.in(), policy_list
-    ACE_ENV_ARG_PARAMETER);
+  impl_->poa = poa->create_POA("gateway_poa", mgr.in(), policy_list);
 
   id_uniqueness_policy->destroy();
   lifespan->destroy();
@@ -219,17 +210,17 @@ FTEC_Gateway::activate(PortableServer::POA_ptr root_poa ACE_ENV_ARG_DECL)
 
   RtecEventChannelAdmin::EventChannel_var gateway;
 
-  activate_object_with_id(gateway.out(), impl_->poa.in(), this, oid ACE_ENV_ARG_PARAMETER);
+  activate_object_with_id(gateway.out(), impl_->poa.in(), this, oid);
   ++oid[9];
   activate_object_with_id(impl_->consumer_admin.out(),
     impl_->poa.in(),
     &impl_->consumer_admin_servant,
-    oid ACE_ENV_ARG_PARAMETER);
+    oid);
   ++oid[9];
   activate_object_with_id(impl_->supplier_admin.out(),
     impl_->poa.in(),
     &impl_->supplier_admin_servant,
-    oid ACE_ENV_ARG_PARAMETER);
+    oid);
 
   return gateway._retn();
 }
@@ -257,36 +248,33 @@ ACE_THROW_SPEC ((CORBA::SystemException))
 }
 
 RtecEventChannelAdmin::Observer_Handle
-FTEC_Gateway::append_observer (RtecEventChannelAdmin::Observer_ptr observer
-                               ACE_ENV_ARG_DECL)
+FTEC_Gateway::append_observer (RtecEventChannelAdmin::Observer_ptr observer)
                                ACE_THROW_SPEC ((
                                CORBA::SystemException,
                                RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
                                RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER))
 {
-  return impl_->ftec->append_observer(observer ACE_ENV_ARG_PARAMETER);
+  return impl_->ftec->append_observer(observer);
 }
 
-void FTEC_Gateway::remove_observer (RtecEventChannelAdmin::Observer_Handle handle
-                                    ACE_ENV_ARG_DECL)
+void FTEC_Gateway::remove_observer (RtecEventChannelAdmin::Observer_Handle handle)
                                     ACE_THROW_SPEC ((
                                     CORBA::SystemException,
                                     RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
                                     RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER))
 {
-  impl_->ftec->remove_observer(handle ACE_ENV_ARG_PARAMETER);
+  impl_->ftec->remove_observer(handle);
 }
 
 void FTEC_Gateway::push(RtecEventChannelAdmin::ProxyPushConsumer_ptr proxy_consumer,
-                        const RtecEventComm::EventSet & data
-                        ACE_ENV_ARG_DECL)
+                        const RtecEventComm::EventSet & data)
 {
   PortableServer::ObjectId_var object_id =
-    impl_->poa->reference_to_id(proxy_consumer  ACE_ENV_ARG_PARAMETER);
+    impl_->poa->reference_to_id(proxy_consumer);
   FtRtecEventComm::ObjectId** result;
   memcpy(&result, &object_id[0], sizeof(FtRtecEventComm::ObjectId**));
 
-  impl_->ftec->push(**result, data ACE_ENV_ARG_PARAMETER);
+  impl_->ftec->push(**result, data);
 }
 
 
@@ -316,7 +304,7 @@ ACE_THROW_SPEC ((CORBA::SystemException))
   RtecEventChannelAdmin::ProxyPushSupplier_ptr result;
   activate_object_with_id(result, impl_->poa.in(),
                          &impl_->proxy_supplier_servant,
-                         local_oid ACE_ENV_ARG_PARAMETER);
+                         local_oid);
   return result;
 }
 
@@ -346,18 +334,17 @@ ACE_THROW_SPEC ((CORBA::SystemException))
   RtecEventChannelAdmin::ProxyPushConsumer_ptr result;
   activate_object_with_id(result, impl_->poa.in(),
                           &impl_->proxy_consumer_servant,
-                          local_oid ACE_ENV_ARG_PARAMETER);
+                          local_oid);
   return result;
 }
 
 
 FtRtecEventComm::ObjectId**
-get_remote_oid_ptr(CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+get_remote_oid_ptr(CORBA::ORB_ptr orb)
 {
   PortableServer::Current_var current =
     resolve_init<PortableServer::Current>(orb,
-    "POACurrent"
-    ACE_ENV_ARG_PARAMETER);
+    "POACurrent");
 
   PortableServer::ObjectId_var object_id =
     current->get_object_id();
@@ -382,23 +369,22 @@ FTEC_Gateway_ProxyPushSupplier::~FTEC_Gateway_ProxyPushSupplier()
 // = The RtecEventChannelAdmin::ProxyPushSupplier methods...
 void FTEC_Gateway_ProxyPushSupplier::connect_push_consumer (
   RtecEventComm::PushConsumer_ptr push_consumer,
-  const RtecEventChannelAdmin::ConsumerQOS &qos
-  ACE_ENV_ARG_DECL)
+  const RtecEventChannelAdmin::ConsumerQOS &qos)
     ACE_THROW_SPEC ((CORBA::SystemException,
     RtecEventChannelAdmin::AlreadyConnected,
     RtecEventChannelAdmin::TypeError))
 {
 
-  FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in() ACE_ENV_ARG_PARAMETER);
+  FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in());
 
-  *oid_ptr = impl_->ftec->connect_push_consumer(push_consumer, qos ACE_ENV_ARG_PARAMETER);
+  *oid_ptr = impl_->ftec->connect_push_consumer(push_consumer, qos);
 }
 
 void FTEC_Gateway_ProxyPushSupplier::disconnect_push_supplier (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in() ACE_ENV_ARG_PARAMETER);
-  impl_->ftec->disconnect_push_supplier(**oid_ptr ACE_ENV_ARG_PARAMETER);
+  FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in());
+  impl_->ftec->disconnect_push_supplier(**oid_ptr);
   delete *oid_ptr;
   delete oid_ptr;
 }
@@ -406,15 +392,15 @@ void FTEC_Gateway_ProxyPushSupplier::disconnect_push_supplier (void)
 void FTEC_Gateway_ProxyPushSupplier::suspend_connection (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in() ACE_ENV_ARG_PARAMETER);
-  impl_->ftec->suspend_push_supplier(**oid_ptr ACE_ENV_ARG_PARAMETER);
+  FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in());
+  impl_->ftec->suspend_push_supplier(**oid_ptr);
 }
 
 void FTEC_Gateway_ProxyPushSupplier::resume_connection (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in() ACE_ENV_ARG_PARAMETER);
-  impl_->ftec->resume_push_supplier(**oid_ptr ACE_ENV_ARG_PARAMETER);
+  FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in());
+  impl_->ftec->resume_push_supplier(**oid_ptr);
 }
 
 /// FTEC_Gateway_ProxyPushConsumer
@@ -431,11 +417,10 @@ FTEC_Gateway_ProxyPushConsumer::~FTEC_Gateway_ProxyPushConsumer()
 
 // = The RtecEventChannelAdmin::ProxyPushConsumer methods...
 
-void FTEC_Gateway_ProxyPushConsumer::push (const RtecEventComm::EventSet & data
-                         ACE_ENV_ARG_DECL)
+void FTEC_Gateway_ProxyPushConsumer::push (const RtecEventComm::EventSet & data)
                          ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in() ACE_ENV_ARG_PARAMETER);
+  FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in());
 
   /*
   if (CORBA::is_nil(impl_->push_handler.in())) {
@@ -444,27 +429,26 @@ void FTEC_Gateway_ProxyPushConsumer::push (const RtecEventComm::EventSet & data
 
   impl_->ftec->sendc_push (impl_->push_handler.in(),
                            **oid_ptr,
-                           data ACE_ENV_ARG_PARAMETER);
+                           data);
  */
-  impl_->ftec->push(**oid_ptr, data ACE_ENV_ARG_PARAMETER);
+  impl_->ftec->push(**oid_ptr, data);
 }
 
 void FTEC_Gateway_ProxyPushConsumer::connect_push_supplier (
   RtecEventComm::PushSupplier_ptr push_supplier,
-  const RtecEventChannelAdmin::SupplierQOS& qos
-  ACE_ENV_ARG_DECL)
+  const RtecEventChannelAdmin::SupplierQOS& qos)
     ACE_THROW_SPEC ((CORBA::SystemException,
     RtecEventChannelAdmin::AlreadyConnected))
 {
-  FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in() ACE_ENV_ARG_PARAMETER);
-  *oid_ptr = impl_->ftec->connect_push_supplier(push_supplier, qos ACE_ENV_ARG_PARAMETER);
+  FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in());
+  *oid_ptr = impl_->ftec->connect_push_supplier(push_supplier, qos);
 }
 
 void FTEC_Gateway_ProxyPushConsumer::disconnect_push_consumer (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in() ACE_ENV_ARG_PARAMETER);
-  impl_->ftec->disconnect_push_consumer(**oid_ptr ACE_ENV_ARG_PARAMETER);
+  FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in());
+  impl_->ftec->disconnect_push_consumer(**oid_ptr);
   delete *oid_ptr;
   delete oid_ptr;
 }
@@ -482,8 +466,7 @@ void PushConsumerHandler::push (void)
 {
 }
 
-void PushConsumerHandler::push_excep (::Messaging::ExceptionHolder *
-                                      ACE_ENV_ARG_DECL_NOT_USED)
+void PushConsumerHandler::push_excep (::Messaging::ExceptionHolder *)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h
index df9227ed69c..61dc86eaec3 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h
@@ -31,8 +31,7 @@ namespace TAO_FTRTEC
       ~FTEC_Gateway();
 
       RtecEventChannelAdmin::EventChannel_ptr activate
-          (PortableServer::POA_ptr poa
-            ACE_ENV_ARG_DECL);
+          (PortableServer::POA_ptr poa);
 
       RtecEventChannelAdmin::EventChannel_ptr
         _this(void);
@@ -51,22 +50,19 @@ namespace TAO_FTRTEC
 
       virtual RtecEventChannelAdmin::Observer_Handle
         append_observer
-          (RtecEventChannelAdmin::Observer_ptr observer
-           ACE_ENV_ARG_DECL) ACE_THROW_SPEC((
+          (RtecEventChannelAdmin::Observer_ptr observer) ACE_THROW_SPEC((
                              CORBA::SystemException,
                              RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
                              RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER));
 
       virtual void remove_observer
-        (RtecEventChannelAdmin::Observer_Handle
-         ACE_ENV_ARG_DECL)  ACE_THROW_SPEC((
+        (RtecEventChannelAdmin::Observer_Handle)  ACE_THROW_SPEC((
                             CORBA::SystemException,
                             RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
                             RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER));
 
       void push(RtecEventChannelAdmin::ProxyPushConsumer_ptr proxy_consumer,
-                const RtecEventComm::EventSet & data
-                ACE_ENV_ARG_DECL);
+                const RtecEventComm::EventSet & data);
   private:
       struct FTEC_Gateway_Impl  *impl_;
   };
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl
index 9e1661f75ff..e0d60d7d4ce 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl
@@ -9,7 +9,7 @@ namespace TAO_FTRTEC {
     FTEC_Gateway::_this(void)
   {
     PortableServer::POA_var poa = _default_POA();
-    return activate(poa.in() ACE_ENV_ARG_PARAMETER);
+    return activate(poa.in());
   }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h
index 286cf36e21a..c9fa2c626bd 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h
@@ -20,20 +20,17 @@ void
 activate_object_with_id (T * &result,
                          PortableServer::POA_ptr poa,
                          PortableServer::ServantBase *servant,
-                         const FtRtecEventComm::ObjectId &oid
-                         ACE_ENV_ARG_DECL)
+                         const FtRtecEventComm::ObjectId &oid)
 {
   const PortableServer::ObjectId& id =
     reinterpret_cast<const PortableServer::ObjectId&> (oid);
   poa->activate_object_with_id(id,
-                               servant
-                               ACE_ENV_ARG_PARAMETER);
+                               servant);
 
   CORBA::Object_var object =
-    poa->id_to_reference(id
-                         ACE_ENV_ARG_PARAMETER);
+    poa->id_to_reference(id);
 
-  result = T::_narrow(object.in() ACE_ENV_ARG_PARAMETER);
+  result = T::_narrow(object.in());
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h
index 6fb74c86407..6e248e21deb 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h
@@ -18,19 +18,19 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 template<class T>
 typename T::_ptr_type
 resolve_init (CORBA::ORB_ptr orb,
-              const char *id ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+              const char *id)
 {
     typename T::_var_type ref;
     CORBA::Object_var     obj;
-    ACE_TRY
+    try
     {
       CORBA::Object_var obj;
-      obj = orb->resolve_initial_references(id ACE_ENV_ARG_PARAMETER);
+      obj = orb->resolve_initial_references(id);
 
-      ref = T::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+      ref = T::_narrow(obj.in());
     }
 
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
       ACE_ERROR((
                   LM_ERROR,
@@ -42,10 +42,9 @@ resolve_init (CORBA::ORB_ptr orb,
                     LM_ERROR,
                     "    due to narrowing problem\n"
               ));
-      ACE_RE_THROW;
+      throw;
     }
 
-    ACE_ENDTRY;
     return ref._retn();
 }
 
@@ -53,15 +52,14 @@ resolve_init (CORBA::ORB_ptr orb,
 template<class T>
 typename T::_ptr_type
 resolve (CosNaming::NamingContext_ptr context,
-         const CosNaming::Name &id
-           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+         const CosNaming::Name &id)
 {
     CORBA::Object_var obj;
-    obj = context->resolve(id ACE_ENV_ARG_PARAMETER);
+    obj = context->resolve(id);
 
     ACE_ASSERT(!CORBA::is_nil(obj.in()));
 
-    typename T::_var_type ref = T::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+    typename T::_var_type ref = T::_narrow(obj.in());
     return ref._retn();
 }
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
index 1276d226fd6..03d827bba4c 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
@@ -114,8 +114,7 @@ TAO::HTIOP::Profile::decode_profile (TAO_InputCDR& cdr)
 }
 
 void
-TAO::HTIOP::Profile::parse_string_i (const char *ior
-                                   ACE_ENV_ARG_DECL)
+TAO::HTIOP::Profile::parse_string_i (const char *ior)
 {
   // Pull off the "hostname:port#token/" part of the objref
   // Copy the string because we are going to modify it...
@@ -125,11 +124,11 @@ TAO::HTIOP::Profile::parse_string_i (const char *ior
   if (okd == 0 || okd == ior)
     {
       // No object key delimiter or no hostname specified.
-      ACE_THROW (CORBA::INV_OBJREF
-                 (CORBA::SystemException::_tao_minor_code
-                  (TAO::VMCID,
-                   EINVAL),
-                  CORBA::COMPLETED_NO));
+      throw CORBA::INV_OBJREF(
+        CORBA::SystemException::_tao_minor_code(
+          TAO::VMCID,
+          EINVAL),
+        CORBA::COMPLETED_NO);
     }
 
   // Length of host string.
@@ -140,11 +139,11 @@ TAO::HTIOP::Profile::parse_string_i (const char *ior
   if (cp_pos == ior)
     {
       // No hostname specified!  It is required by the spec.
-      ACE_THROW (CORBA::INV_OBJREF
-                 (CORBA::SystemException::_tao_minor_code
-                  (TAO::VMCID,
-                   EINVAL),
-                  CORBA::COMPLETED_NO));
+      throw CORBA::INV_OBJREF(
+        CORBA::SystemException::_tao_minor_code(
+          TAO::VMCID,
+          EINVAL),
+        CORBA::COMPLETED_NO);
     }
   else if (cp_pos != 0)
     {
@@ -194,11 +193,11 @@ TAO::HTIOP::Profile::parse_string_i (const char *ior
                         ACE_TEXT ("cannot determine hostname")));
 
           // @@ What's the right exception to throw here?
-          ACE_THROW (CORBA::INV_OBJREF
-                     (CORBA::SystemException::_tao_minor_code
-                      (TAO::VMCID,
-                       EINVAL),
-                      CORBA::COMPLETED_NO));
+          throw CORBA::INV_OBJREF(
+            CORBA::SystemException::_tao_minor_code(
+              TAO::VMCID,
+              EINVAL),
+            CORBA::COMPLETED_NO);
         }
       else
         this->endpoint_.host_ = CORBA::string_dup (tmp_host);
@@ -236,8 +235,7 @@ TAO::HTIOP::Profile::do_is_equivalent (const TAO_Profile *other_profile)
 }
 
 CORBA::ULong
-TAO::HTIOP::Profile::hash (CORBA::ULong max
-                         ACE_ENV_ARG_DECL_NOT_USED)
+TAO::HTIOP::Profile::hash (CORBA::ULong max)
 {
   // Get the hashvalue for all endpoints.
   CORBA::ULong hashval = 0;
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h
index a72dd921998..ef0dc3fa9dc 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h
@@ -112,16 +112,14 @@ namespace TAO
       void add_endpoint (Endpoint *endp);
 
       /// Return a hash value for this object.
-      virtual CORBA::ULong hash (CORBA::ULong max
-                                 ACE_ENV_ARG_DECL);
+      virtual CORBA::ULong hash (CORBA::ULong max);
 
     protected:
 
       /// Template methods. Please see Profile.h for the documentation.
       virtual int decode_profile (TAO_InputCDR &cdr);
       virtual int decode_endpoints (void);
-      virtual void parse_string_i (const char *string
-                                   ACE_ENV_ARG_DECL);
+      virtual void parse_string_i (const char *string);
       virtual void create_profile_body (TAO_OutputCDR &cdr) const;
       virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp
index af5245eff74..1dc902aea56 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp
@@ -32,21 +32,18 @@ TAO_AbstractInterfaceDef_i::def_kind (void)
 }
 
 CORBA::Boolean
-TAO_AbstractInterfaceDef_i::is_a (const char *interface_id
-                                  ACE_ENV_ARG_DECL)
+TAO_AbstractInterfaceDef_i::is_a (const char *interface_id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
   this->update_key ();
 
-  return this->is_a_i (interface_id
-                       ACE_ENV_ARG_PARAMETER);
+  return this->is_a_i (interface_id);
 }
 
 CORBA::Boolean
-TAO_AbstractInterfaceDef_i::is_a_i (const char *interface_id
-                                    ACE_ENV_ARG_DECL)
+TAO_AbstractInterfaceDef_i::is_a_i (const char *interface_id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::strcmp (interface_id, "IDL:omg.org/CORBA/AbstractBase:1.0") == 0)
@@ -54,8 +51,7 @@ TAO_AbstractInterfaceDef_i::is_a_i (const char *interface_id
       return 1;
     }
 
-  return this->TAO_InterfaceDef_i::is_a_i (interface_id
-                                           ACE_ENV_ARG_PARAMETER);
+  return this->TAO_InterfaceDef_i::is_a_i (interface_id);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h
index b753a1afa16..6d63cbf1b50 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h
@@ -52,20 +52,17 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual CORBA::Boolean is_a (
       const char *interface_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_a_i (
       const char *interface_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp
index 247f58687fd..1dc15433676 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp
@@ -74,8 +74,7 @@ TAO_AliasDef_i::type_i (void)
 
   return this->repo_->tc_factory ()->create_alias_tc (id.c_str (),
                                                       name.c_str (),
-                                                      tc.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
+                                                      tc.in ());
 }
 
 CORBA::IDLType_ptr
@@ -100,29 +99,24 @@ TAO_AliasDef_i::original_type_def_i (void)
 
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (original_type,
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
+                                              this->repo_);
 
-  return CORBA::IDLType::_narrow (obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+  return CORBA::IDLType::_narrow (obj.in ());
 }
 
 void
-TAO_AliasDef_i::original_type_def (CORBA::IDLType_ptr original_type_def
-                                   ACE_ENV_ARG_DECL)
+TAO_AliasDef_i::original_type_def (CORBA::IDLType_ptr original_type_def)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->update_key ();
 
-  this->original_type_def_i (original_type_def
-                             ACE_ENV_ARG_PARAMETER);
+  this->original_type_def_i (original_type_def);
 }
 
 void
-TAO_AliasDef_i::original_type_def_i (CORBA::IDLType_ptr original_type_def
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+TAO_AliasDef_i::original_type_def_i (CORBA::IDLType_ptr original_type_def)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   char *original_type =
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h
index 7cc9c8826ca..c49b2b306c1 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h
@@ -51,43 +51,36 @@ public:
   virtual ~TAO_AliasDef_i (void);
   // Destructor
 
-  virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::DefinitionKind def_kind ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
-  virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
-  virtual CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
-  virtual CORBA::IDLType_ptr original_type_def (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::IDLType_ptr original_type_def ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::IDLType_ptr original_type_def_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::IDLType_ptr original_type_def_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void original_type_def (
-      CORBA::IDLType_ptr original_type_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::IDLType_ptr original_type_def)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void original_type_def_i (
-      CORBA::IDLType_ptr original_type_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::IDLType_ptr original_type_def)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp
index a22b674c61e..1ca4f010a9b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp
@@ -81,7 +81,6 @@ TAO_ArrayDef_i::type_i (void)
   return this->repo_->tc_factory ()->create_array_tc (
                                          length,
                                          element_typecode.in ()
-                                         ACE_ENV_ARG_PARAMETER
                                        );
 }
 
@@ -109,21 +108,18 @@ TAO_ArrayDef_i::length_i (void)
 }
 
 void
-TAO_ArrayDef_i::length (CORBA::ULong length
-                        ACE_ENV_ARG_DECL)
+TAO_ArrayDef_i::length (CORBA::ULong length)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->update_key ();
 
-  this->length_i (length
-                  ACE_ENV_ARG_PARAMETER);
+  this->length_i (length);
 }
 
 void
-TAO_ArrayDef_i::length_i (CORBA::ULong length
-                          ACE_ENV_ARG_DECL_NOT_USED)
+TAO_ArrayDef_i::length_i (CORBA::ULong length)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (this->section_key_,
@@ -179,29 +175,24 @@ TAO_ArrayDef_i::element_type_def_i (void)
 
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (element_path,
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
+                                              this->repo_);
 
-  return CORBA::IDLType::_narrow (obj.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+  return CORBA::IDLType::_narrow (obj.in ());
 }
 
 void
-TAO_ArrayDef_i::element_type_def (CORBA::IDLType_ptr element_type_def
-                                  ACE_ENV_ARG_DECL)
+TAO_ArrayDef_i::element_type_def (CORBA::IDLType_ptr element_type_def)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->update_key ();
 
-  this->element_type_def_i (element_type_def
-                            ACE_ENV_ARG_PARAMETER);
+  this->element_type_def_i (element_type_def);
 }
 
 void
-TAO_ArrayDef_i::element_type_def_i (CORBA::IDLType_ptr element_type_def
-                                    ACE_ENV_ARG_DECL)
+TAO_ArrayDef_i::element_type_def_i (CORBA::IDLType_ptr element_type_def)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->destroy_element_type ();
@@ -216,7 +207,6 @@ TAO_ArrayDef_i::element_type_def_i (CORBA::IDLType_ptr element_type_def
 
 void
 TAO_ArrayDef_i::destroy_element_type (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h
index ec0d6966f8d..34242a7312c 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h
@@ -50,90 +50,74 @@ public:
   virtual ~TAO_ArrayDef_i (void);
   // Destructor
 
-  virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::DefinitionKind def_kind ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
-  virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
-  virtual void destroy_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::ULong length (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::ULong length ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::ULong length_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::ULong length_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void length (
-      CORBA::ULong length
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::ULong length)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void length_i (
-      CORBA::ULong length
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::ULong length)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::TypeCode_ptr element_type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr element_type ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::TypeCode_ptr element_type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::TypeCode_ptr element_type_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::IDLType_ptr element_type_def (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::IDLType_ptr element_type_def ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::IDLType_ptr element_type_def_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::IDLType_ptr element_type_def_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void element_type_def (
-      CORBA::IDLType_ptr element_type_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::IDLType_ptr element_type_def)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void element_type_def_i (
-      CORBA::IDLType_ptr element_type_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::IDLType_ptr element_type_def)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
-  void destroy_element_type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void destroy_element_type ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Destroys an anonymous non-primitive element type.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp
index d4f2e919d8f..2c6b43db85d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp
@@ -63,8 +63,7 @@ TAO_AttributeDef_i::describe_i (void)
                   CORBA::AttributeDescription,
                   0);
 
-  this->make_description (*ad
-                          ACE_ENV_ARG_PARAMETER);
+  this->make_description (*ad);
 
   retval->value <<= ad;
   return retval._retn ();
@@ -119,31 +118,26 @@ TAO_AttributeDef_i::type_def_i (void)
 
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (type_path,
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
+                                              this->repo_);
 
-  CORBA::IDLType_var retval = CORBA::IDLType::_narrow (obj.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
+  CORBA::IDLType_var retval = CORBA::IDLType::_narrow (obj.in ());
 
   return retval._retn ();
 }
 
 void
-TAO_AttributeDef_i::type_def (CORBA::IDLType_ptr type_def
-                              ACE_ENV_ARG_DECL)
+TAO_AttributeDef_i::type_def (CORBA::IDLType_ptr type_def)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->update_key ();
 
-  this->type_def_i (type_def
-                    ACE_ENV_ARG_PARAMETER);
+  this->type_def_i (type_def);
 }
 
 void
-TAO_AttributeDef_i::type_def_i (CORBA::IDLType_ptr type_def
-                                ACE_ENV_ARG_DECL_NOT_USED)
+TAO_AttributeDef_i::type_def_i (CORBA::IDLType_ptr type_def)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   char *type_path =
@@ -178,21 +172,18 @@ TAO_AttributeDef_i::mode_i (void)
 }
 
 void
-TAO_AttributeDef_i::mode (CORBA::AttributeMode mode
-                          ACE_ENV_ARG_DECL)
+TAO_AttributeDef_i::mode (CORBA::AttributeMode mode)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->update_key ();
 
-  this->mode_i (mode
-                ACE_ENV_ARG_PARAMETER);
+  this->mode_i (mode);
 }
 
 void
-TAO_AttributeDef_i::mode_i (CORBA::AttributeMode mode
-                            ACE_ENV_ARG_DECL_NOT_USED)
+TAO_AttributeDef_i::mode_i (CORBA::AttributeMode mode)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (this->section_key_,
@@ -203,7 +194,6 @@ TAO_AttributeDef_i::mode_i (CORBA::AttributeMode mode
 void
 TAO_AttributeDef_i::make_description (
     CORBA::AttributeDescription &ad
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -289,11 +279,9 @@ TAO_AttributeDef_i::get_exceptions (void)
       CORBA::Object_var obj =
         TAO_IFR_Service_Utils::create_objref (CORBA::dk_Exception,
                                               path.c_str (),
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
+                                              this->repo_);
 
-      retval[i] = CORBA::ExceptionDef::_narrow (obj.in ()
-                                               ACE_ENV_ARG_PARAMETER);
+      retval[i] = CORBA::ExceptionDef::_narrow (obj.in ());
     }
 
   return retval._retn ();
@@ -363,11 +351,9 @@ TAO_AttributeDef_i::put_exceptions (void)
       CORBA::Object_var obj =
         TAO_IFR_Service_Utils::create_objref (CORBA::dk_Exception,
                                               path.c_str (),
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
+                                              this->repo_);
 
-      retval[i] = CORBA::ExceptionDef::_narrow (obj.in ()
-                                               ACE_ENV_ARG_PARAMETER);
+      retval[i] = CORBA::ExceptionDef::_narrow (obj.in ());
     }
 
   return retval._retn ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h
index d08b3dfa119..6f222d8947f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h
@@ -52,80 +52,66 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual CORBA::Contained::Description *describe (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::Contained::Description *describe_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::IDLType_ptr type_def (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::IDLType_ptr type_def_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void type_def (
       CORBA::IDLType_ptr type_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void type_def_i (
       CORBA::IDLType_ptr type_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::AttributeMode mode (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::AttributeMode mode_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void mode (
       CORBA::AttributeMode mode
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void mode_i (
       CORBA::AttributeMode mode
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void make_description (
       CORBA::AttributeDescription &ad
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Common code for InterfaceDef to call in
@@ -133,12 +119,10 @@ public:
 
   // These two are called by Contained::move().
   CORBA::ExceptionDefSeq *get_exceptions (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ExceptionDefSeq *put_exceptions (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp
index 2584f31ab1b..7c600bfc838 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp
@@ -34,7 +34,6 @@ TAO_ComponentContainer_i::create_component (
     const char *version,
     CORBA::ComponentIR::ComponentDef_ptr base_component,
     const CORBA::InterfaceDefSeq &supports_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -46,8 +45,7 @@ TAO_ComponentContainer_i::create_component (
                                    name,
                                    version,
                                    base_component,
-                                   supports_interfaces
-                                   ACE_ENV_ARG_PARAMETER);
+                                   supports_interfaces);
 }
 
 CORBA::ComponentIR::ComponentDef_ptr
@@ -57,7 +55,6 @@ TAO_ComponentContainer_i::create_component_i (
     const char *version,
     CORBA::ComponentIR::ComponentDef_ptr base_component,
     const CORBA::InterfaceDefSeq &supports_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -75,7 +72,6 @@ TAO_ComponentContainer_i::create_component_i (
         &TAO_ComponentContainer_i::same_as_tmp_name,
         version,
         "defns"
-        ACE_ENV_ARG_PARAMETER
       );
 
   if (! CORBA::is_nil (base_component))
@@ -95,8 +91,7 @@ TAO_ComponentContainer_i::create_component_i (
       TAO_IFR_Service_Utils::name_exists (&TAO_ComponentDef_i::name_clash,
                                           new_key,
                                           this->repo_,
-                                          CORBA::dk_Component
-                                          ACE_ENV_ARG_PARAMETER);
+                                          CORBA::dk_Component);
 
       // Store the id for this - that's what ComponentDescription takes.
       ACE_TString base_id;
@@ -143,11 +138,9 @@ TAO_ComponentContainer_i::create_component_i (
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Component,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
+                                          this->repo_);
 
-  return CORBA::ComponentIR::ComponentDef::_narrow (obj.in ()
-                                                    ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::ComponentDef::_narrow (obj.in ());
 }
 
 CORBA::ComponentIR::HomeDef_ptr
@@ -159,7 +152,6 @@ TAO_ComponentContainer_i::create_home (
     CORBA::ComponentIR::ComponentDef_ptr managed_component,
     const CORBA::InterfaceDefSeq &supports_interfaces,
     CORBA::ValueDef_ptr primary_key
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -173,8 +165,7 @@ TAO_ComponentContainer_i::create_home (
                               base_home,
                               managed_component,
                               supports_interfaces,
-                              primary_key
-                              ACE_ENV_ARG_PARAMETER);
+                              primary_key);
 }
 
 CORBA::ComponentIR::HomeDef_ptr
@@ -186,7 +177,6 @@ TAO_ComponentContainer_i::create_home_i (
     CORBA::ComponentIR::ComponentDef_ptr managed_component,
     const CORBA::InterfaceDefSeq &supports_interfaces,
     CORBA::ValueDef_ptr primary_key
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -204,7 +194,6 @@ TAO_ComponentContainer_i::create_home_i (
         &TAO_ComponentContainer_i::same_as_tmp_name,
         version,
         "defns"
-        ACE_ENV_ARG_PARAMETER
       );
 
   char *base_path = 0;
@@ -269,11 +258,9 @@ TAO_ComponentContainer_i::create_home_i (
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Home,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
+                                          this->repo_);
 
-  return CORBA::ComponentIR::HomeDef::_narrow (obj.in ()
-                                               ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::HomeDef::_narrow (obj.in ());
 }
 
 CORBA::ComponentIR::EventDef_ptr
@@ -288,7 +275,6 @@ TAO_ComponentContainer_i::create_event (
     const CORBA::ValueDefSeq &abstract_base_values,
     const CORBA::InterfaceDefSeq &supported_interfaces,
     const CORBA::ExtInitializerSeq &initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -305,8 +291,7 @@ TAO_ComponentContainer_i::create_event (
                                is_truncatable,
                                abstract_base_values,
                                supported_interfaces,
-                               initializers
-                               ACE_ENV_ARG_PARAMETER);
+                               initializers);
 }
 
 CORBA::ComponentIR::EventDef_ptr
@@ -321,7 +306,6 @@ TAO_ComponentContainer_i::create_event_i (
     const CORBA::ValueDefSeq &abstract_base_values,
     const CORBA::InterfaceDefSeq &supported_interfaces,
     const CORBA::ExtInitializerSeq &initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -339,7 +323,6 @@ TAO_ComponentContainer_i::create_event_i (
         &TAO_ComponentContainer_i::same_as_tmp_name,
         version,
         "defns"
-        ACE_ENV_ARG_PARAMETER
       );
 
   this->repo_->config ()->set_integer_value (new_key,
@@ -371,8 +354,7 @@ TAO_ComponentContainer_i::create_event_i (
       TAO_IFR_Service_Utils::name_exists (&TAO_ValueDef_i::name_clash,
                                           new_key,
                                           this->repo_,
-                                          CORBA::dk_Value
-                                          ACE_ENV_ARG_PARAMETER);
+                                          CORBA::dk_Value);
 
       ACE_TString base_value_id;
       this->repo_->config ()->get_string_value (TAO_IFR_Service_Utils::tmp_key_,
@@ -541,11 +523,9 @@ TAO_ComponentContainer_i::create_event_i (
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Event,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
+                                          this->repo_);
 
-  return CORBA::ComponentIR::EventDef::_narrow (obj.in ()
-                                                ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::EventDef::_narrow (obj.in ());
 }
 
 int
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h
index bc1c9e9fec6..b12a80ada92 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h
@@ -59,7 +59,6 @@ public:
       const char *version,
       CORBA::ComponentIR::ComponentDef_ptr base_component,
       const CORBA::InterfaceDefSeq &supports_interfaces
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -69,7 +68,6 @@ public:
       const char *version,
       CORBA::ComponentIR::ComponentDef_ptr base_component,
       const CORBA::InterfaceDefSeq &supports_interfaces
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -81,7 +79,6 @@ public:
       CORBA::ComponentIR::ComponentDef_ptr managed_component,
       const CORBA::InterfaceDefSeq &supports_interfaces,
       CORBA::ValueDef_ptr primary_key
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -93,7 +90,6 @@ public:
       CORBA::ComponentIR::ComponentDef_ptr managed_component,
       const CORBA::InterfaceDefSeq &supports_interfaces,
       CORBA::ValueDef_ptr primary_key
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -108,7 +104,6 @@ public:
       const CORBA::ValueDefSeq &abstract_base_values,
       const CORBA::InterfaceDefSeq &supported_interfaces,
       const CORBA::ExtInitializerSeq &initializers
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -123,7 +118,6 @@ public:
       const CORBA::ValueDefSeq &abstract_base_values,
       const CORBA::InterfaceDefSeq &supported_interfaces,
       const CORBA::ExtInitializerSeq &initializers
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp
index d15e0b0986c..5a8af24ea98 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp
@@ -111,35 +111,30 @@ TAO_ComponentDef_i::destroy_i (void)
       "provides",
       this->repo_,
       this->section_key_
-      ACE_ENV_ARG_PARAMETER
     );
 
   TAO_IFR_Generic_Utils<TAO_UsesDef_i>::destroy_special (
       "uses",
       this->repo_,
       this->section_key_
-      ACE_ENV_ARG_PARAMETER
     );
 
   TAO_IFR_Generic_Utils<TAO_EmitsDef_i>::destroy_special (
       "emits",
       this->repo_,
       this->section_key_
-      ACE_ENV_ARG_PARAMETER
     );
 
   TAO_IFR_Generic_Utils<TAO_PublishesDef_i>::destroy_special (
       "publishes",
       this->repo_,
       this->section_key_
-      ACE_ENV_ARG_PARAMETER
     );
 
   TAO_IFR_Generic_Utils<TAO_ConsumesDef_i>::destroy_special (
       "consumes",
       this->repo_,
       this->section_key_
-      ACE_ENV_ARG_PARAMETER
     );
 
   this->TAO_ExtInterfaceDef_i::destroy_i ();
@@ -166,7 +161,6 @@ TAO_ComponentDef_i::describe_i (void)
                                               cd,
                                               this->repo_,
                                               this->section_key_
-                                              ACE_ENV_ARG_PARAMETER
                                             );
 
   ACE_TString holder;
@@ -265,8 +259,7 @@ TAO_ComponentDef_i::describe_i (void)
 
       TAO_ExtAttributeDef_i impl (this->repo_);
       impl.section_key (attr_key);
-      impl.fill_description (cd.attributes[i]
-                             ACE_ENV_ARG_PARAMETER);
+      impl.fill_description (cd.attributes[i]);
     }
 
   cd.type = this->type_i ();
@@ -311,7 +304,6 @@ TAO_ComponentDef_i::type_i (void)
   return this->repo_->tc_factory ()->create_component_tc (
                                          id.c_str (),
                                          name.c_str ()
-                                         ACE_ENV_ARG_PARAMETER
                                        );
 }
 
@@ -363,11 +355,9 @@ TAO_ComponentDef_i::supported_interfaces_i (void)
                                                     path);
           tmp =
             TAO_IFR_Service_Utils::path_to_ir_object (path,
-                                                      this->repo_
-                                                      ACE_ENV_ARG_PARAMETER);
+                                                      this->repo_);
 
-          retval[i] = CORBA::InterfaceDef::_narrow (tmp.in ()
-                                                    ACE_ENV_ARG_PARAMETER);
+          retval[i] = CORBA::InterfaceDef::_narrow (tmp.in ());
         }
     }
 
@@ -377,7 +367,6 @@ TAO_ComponentDef_i::supported_interfaces_i (void)
 void
 TAO_ComponentDef_i::supported_interfaces (
     const CORBA::InterfaceDefSeq &supported_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -385,14 +374,12 @@ TAO_ComponentDef_i::supported_interfaces (
 
   this->update_key ();
 
-  this->supported_interfaces_i (supported_interfaces
-                                ACE_ENV_ARG_PARAMETER);
+  this->supported_interfaces_i (supported_interfaces);
 }
 
 void
 TAO_ComponentDef_i::supported_interfaces_i (
     const CORBA::InterfaceDefSeq &supported_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -429,8 +416,7 @@ TAO_ComponentDef_i::supported_interfaces_i (
       TAO_IFR_Service_Utils::name_exists (&TAO_InterfaceDef_i::name_clash,
                                           this->section_key_,
                                           this->repo_,
-                                          this->def_kind ()
-                                          ACE_ENV_ARG_PARAMETER);
+                                          this->def_kind ());
 
       char *stringified = TAO_IFR_Service_Utils::int_to_string (i);
       this->repo_->config ()->set_string_value (supported_key,
@@ -465,17 +451,14 @@ TAO_ComponentDef_i::base_component_i (void)
       return CORBA::ComponentIR::ComponentDef::_nil ();
     }
 
-  CORBA::Contained_var obj = this->repo_->lookup_id (base_id.fast_rep ()
-                                                     ACE_ENV_ARG_PARAMETER);
+  CORBA::Contained_var obj = this->repo_->lookup_id (base_id.fast_rep ());
 
-  return CORBA::ComponentIR::ComponentDef::_narrow (obj.in ()
-                                                    ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::ComponentDef::_narrow (obj.in ());
 }
 
 void
 TAO_ComponentDef_i::base_component (
     CORBA::ComponentIR::ComponentDef_ptr base_component
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -483,14 +466,12 @@ TAO_ComponentDef_i::base_component (
 
   this->update_key ();
 
-  this->base_component_i (base_component
-                          ACE_ENV_ARG_PARAMETER);
+  this->base_component_i (base_component);
 }
 
 void
 TAO_ComponentDef_i::base_component_i (
     CORBA::ComponentIR::ComponentDef_ptr base_component
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -516,8 +497,7 @@ TAO_ComponentDef_i::base_component_i (
   TAO_IFR_Service_Utils::name_exists (&TAO_ComponentDef_i::name_clash,
                                       this->section_key_,
                                       this->repo_,
-                                      CORBA::dk_Component
-                                      ACE_ENV_ARG_PARAMETER);
+                                      CORBA::dk_Component);
 
   this->repo_->config ()->set_string_value (
                               this->section_key_,
@@ -532,7 +512,6 @@ TAO_ComponentDef_i::create_provides (
     const char *name,
     const char *version,
     CORBA::InterfaceDef_ptr interface_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -543,8 +522,7 @@ TAO_ComponentDef_i::create_provides (
   return this->create_provides_i (id,
                                   name,
                                   version,
-                                  interface_type
-                                  ACE_ENV_ARG_PARAMETER);
+                                  interface_type);
 }
 
 CORBA::ComponentIR::ProvidesDef_ptr
@@ -553,7 +531,6 @@ TAO_ComponentDef_i::create_provides_i (
     const char *name,
     const char *version,
     CORBA::InterfaceDef_ptr interface_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -568,8 +545,7 @@ TAO_ComponentDef_i::create_provides_i (
                        0,
                        this->repo_,
                        CORBA::dk_Provides,
-                       this->section_key_
-                       ACE_ENV_ARG_PARAMETER);
+                       this->section_key_);
 }
 
 CORBA::ComponentIR::UsesDef_ptr
@@ -577,8 +553,7 @@ TAO_ComponentDef_i::create_uses (const char *id,
                                  const char *name,
                                  const char *version,
                                  CORBA::InterfaceDef_ptr interface_type,
-                                 CORBA::Boolean is_multiple
-                                 ACE_ENV_ARG_DECL)
+                                 CORBA::Boolean is_multiple)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::UsesDef::_nil ());
@@ -589,8 +564,7 @@ TAO_ComponentDef_i::create_uses (const char *id,
                               name,
                               version,
                               interface_type,
-                              is_multiple
-                              ACE_ENV_ARG_PARAMETER);
+                              is_multiple);
 }
 
 CORBA::ComponentIR::UsesDef_ptr
@@ -598,8 +572,7 @@ TAO_ComponentDef_i::create_uses_i (const char *id,
                                    const char *name,
                                    const char *version,
                                    CORBA::InterfaceDef_ptr interface_type,
-                                   CORBA::Boolean is_multiple
-                                   ACE_ENV_ARG_DECL)
+                                   CORBA::Boolean is_multiple)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -613,16 +586,14 @@ TAO_ComponentDef_i::create_uses_i (const char *id,
                        is_multiple,
                        this->repo_,
                        CORBA::dk_Uses,
-                       this->section_key_
-                       ACE_ENV_ARG_PARAMETER);
+                       this->section_key_);
 }
 
 CORBA::ComponentIR::EmitsDef_ptr
 TAO_ComponentDef_i::create_emits (const char *id,
                                   const char *name,
                                   const char *version,
-                                  CORBA::ValueDef_ptr value
-                                  ACE_ENV_ARG_DECL)
+                                  CORBA::ValueDef_ptr value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::EmitsDef::_nil ());
@@ -632,16 +603,14 @@ TAO_ComponentDef_i::create_emits (const char *id,
   return this->create_emits_i (id,
                                name,
                                version,
-                               value
-                               ACE_ENV_ARG_PARAMETER);
+                               value);
 }
 
 CORBA::ComponentIR::EmitsDef_ptr
 TAO_ComponentDef_i::create_emits_i (const char *id,
                                     const char *name,
                                     const char *version,
-                                    CORBA::ValueDef_ptr value
-                                    ACE_ENV_ARG_DECL)
+                                    CORBA::ValueDef_ptr value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -655,16 +624,14 @@ TAO_ComponentDef_i::create_emits_i (const char *id,
                        0,
                        this->repo_,
                        CORBA::dk_Emits,
-                       this->section_key_
-                       ACE_ENV_ARG_PARAMETER);
+                       this->section_key_);
 }
 
 CORBA::ComponentIR::PublishesDef_ptr
 TAO_ComponentDef_i::create_publishes (const char *id,
                                       const char *name,
                                       const char *version,
-                                      CORBA::ValueDef_ptr value
-                                      ACE_ENV_ARG_DECL)
+                                      CORBA::ValueDef_ptr value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::PublishesDef::_nil ());
@@ -674,16 +641,14 @@ TAO_ComponentDef_i::create_publishes (const char *id,
   return this->create_publishes_i (id,
                                    name,
                                    version,
-                                   value
-                                   ACE_ENV_ARG_PARAMETER);
+                                   value);
 }
 
 CORBA::ComponentIR::PublishesDef_ptr
 TAO_ComponentDef_i::create_publishes_i (const char *id,
                                         const char *name,
                                         const char *version,
-                                        CORBA::ValueDef_ptr value
-                                        ACE_ENV_ARG_DECL)
+                                        CORBA::ValueDef_ptr value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -697,16 +662,14 @@ TAO_ComponentDef_i::create_publishes_i (const char *id,
                        0,
                        this->repo_,
                        CORBA::dk_Publishes,
-                       this->section_key_
-                       ACE_ENV_ARG_PARAMETER);
+                       this->section_key_);
 }
 
 CORBA::ComponentIR::ConsumesDef_ptr
 TAO_ComponentDef_i::create_consumes (const char *id,
                                      const char *name,
                                      const char *version,
-                                     CORBA::ValueDef_ptr value
-                                     ACE_ENV_ARG_DECL)
+                                     CORBA::ValueDef_ptr value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::ConsumesDef::_nil ());
@@ -716,16 +679,14 @@ TAO_ComponentDef_i::create_consumes (const char *id,
   return this->create_consumes_i (id,
                                   name,
                                   version,
-                                  value
-                                  ACE_ENV_ARG_PARAMETER);
+                                  value);
 }
 
 CORBA::ComponentIR::ConsumesDef_ptr
 TAO_ComponentDef_i::create_consumes_i (const char *id,
                                        const char *name,
                                        const char *version,
-                                       CORBA::ValueDef_ptr value
-                                       ACE_ENV_ARG_DECL)
+                                       CORBA::ValueDef_ptr value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -739,27 +700,24 @@ TAO_ComponentDef_i::create_consumes_i (const char *id,
                        0,
                        this->repo_,
                        CORBA::dk_Consumes,
-                       this->section_key_
-                       ACE_ENV_ARG_PARAMETER);
+                       this->section_key_);
 }
 
 int
 TAO_ComponentDef_i::name_clash (const char *name)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       TAO_Container_i::tmp_name_holder_ = name;
       TAO_IFR_Service_Utils::name_exists (&TAO_Container_i::same_as_tmp_name,
                                           TAO_IFR_Service_Utils::tmp_key_,
                                           TAO_IFR_Service_Utils::repo_,
-                                          CORBA::dk_Component
-                                          ACE_ENV_ARG_PARAMETER);
+                                          CORBA::dk_Component);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h
index 0c05918d563..86d789c6842 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h
@@ -55,88 +55,73 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   void destroy_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual CORBA::Contained::Description *describe (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   CORBA::Contained::Description *describe_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::InterfaceDefSeq *supported_interfaces (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::InterfaceDefSeq *supported_interfaces_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void supported_interfaces (
       const CORBA::InterfaceDefSeq &supported_interfaces
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void supported_interfaces_i (
       const CORBA::InterfaceDefSeq &supported_interfaces
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::ComponentIR::ComponentDef_ptr base_component (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ComponentIR::ComponentDef_ptr base_component_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void base_component (
       CORBA::ComponentIR::ComponentDef_ptr base_component
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void base_component_i (
       CORBA::ComponentIR::ComponentDef_ptr base_component
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -145,7 +130,6 @@ public:
       const char *name,
       const char *version,
       CORBA::InterfaceDef_ptr interface_type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -154,7 +138,6 @@ public:
       const char *name,
       const char *version,
       CORBA::InterfaceDef_ptr interface_type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -164,7 +147,6 @@ public:
       const char *version,
       CORBA::InterfaceDef_ptr interface_type,
       CORBA::Boolean is_multiple
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -174,7 +156,6 @@ public:
       const char *version,
       CORBA::InterfaceDef_ptr interface_type,
       CORBA::Boolean is_multiple
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -183,7 +164,6 @@ public:
       const char *name,
       const char *version,
       CORBA::ValueDef_ptr value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -192,7 +172,6 @@ public:
       const char *name,
       const char *version,
       CORBA::ValueDef_ptr value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -201,7 +180,6 @@ public:
       const char *name,
       const char *version,
       CORBA::ValueDef_ptr value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -210,7 +188,6 @@ public:
       const char *name,
       const char *version,
       CORBA::ValueDef_ptr value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -219,7 +196,6 @@ public:
       const char *name,
       const char *version,
       CORBA::ValueDef_ptr value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -228,7 +204,6 @@ public:
       const char *name,
       const char *version,
       CORBA::ValueDef_ptr value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp
index 4b071e5cb43..f361f887fc3 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp
@@ -41,12 +41,10 @@ TAO_ComponentRepository_i::~TAO_ComponentRepository_i (void)
 
 int
 TAO_ComponentRepository_i::create_servants_and_poas (
-    ACE_ENV_SINGLE_ARG_DECL
   )
 {
   int status =
     this->TAO_Repository_i::create_servants_and_poas (
-        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 
   if (status != 0)
@@ -59,33 +57,28 @@ TAO_ComponentRepository_i::create_servants_and_poas (
 
   // ID Assignment Policy.
   policies[0] =
-    this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID
-                                                  ACE_ENV_ARG_PARAMETER);
+    this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID);
 
   // Lifespan Policy.
   policies[1] =
-    this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT
-                                             ACE_ENV_ARG_PARAMETER);
+    this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT);
 
   // Request Processing Policy.
   policies[2] =
     this->root_poa_->create_request_processing_policy (
         PortableServer::USE_DEFAULT_SERVANT
-        ACE_ENV_ARG_PARAMETER
       );
 
   // Servant Retention Policy.
   policies[3] =
     this->root_poa_->create_servant_retention_policy (
         PortableServer::NON_RETAIN
-        ACE_ENV_ARG_PARAMETER
       );
 
   // Id Uniqueness Policy.
   policies[4] =
     this->root_poa_->create_id_uniqueness_policy (
         PortableServer::MULTIPLE_ID
-        ACE_ENV_ARG_PARAMETER
       );
 
   PortableServer::POAManager_var poa_manager =
@@ -95,8 +88,7 @@ TAO_ComponentRepository_i::create_servants_and_poas (
   this-> name ## _poa_ = \
     this->root_poa_->create_POA (#name "_poa", \
                                  poa_manager.in (), \
-                                 policies \
-                                 ACE_ENV_ARG_PARAMETER); \
+                                 policies); \
 \
   TAO_ ## name ## _i * name ## _impl = 0; \
   ACE_NEW_RETURN (name ## _impl, \
@@ -112,8 +104,7 @@ TAO_ComponentRepository_i::create_servants_and_poas (
   PortableServer::ServantBase_var name ## _safety ( \
       this-> name ## _servant_ \
     ); \
-  this-> name ## _poa_->set_servant (this-> name ## _servant_ \
-                                     ACE_ENV_ARG_PARAMETER); \
+  this-> name ## _poa_->set_servant (this-> name ## _servant_);
 
   CONCRETE_IR_OBJECT_TYPES
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
index dbd11811b6f..f8b9a707618 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
@@ -133,29 +133,24 @@ TAO_ConstantDef_i::type_def_i (void)
 
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (type_path,
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
+                                              this->repo_);
 
-  return CORBA::IDLType::_narrow (obj.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+  return CORBA::IDLType::_narrow (obj.in ());
 }
 
 void
-TAO_ConstantDef_i::type_def (CORBA::IDLType_ptr type_def
-                             ACE_ENV_ARG_DECL)
+TAO_ConstantDef_i::type_def (CORBA::IDLType_ptr type_def)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->update_key ();
 
-  this->type_def_i (type_def
-                    ACE_ENV_ARG_PARAMETER);
+  this->type_def_i (type_def);
 }
 
 void
-TAO_ConstantDef_i::type_def_i (CORBA::IDLType_ptr type_def
-                               ACE_ENV_ARG_DECL_NOT_USED)
+TAO_ConstantDef_i::type_def_i (CORBA::IDLType_ptr type_def)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   char *type_path = TAO_IFR_Service_Utils::reference_to_path (type_def);
@@ -217,21 +212,18 @@ TAO_ConstantDef_i::value_i (void)
 }
 
 void
-TAO_ConstantDef_i::value (const CORBA::Any &value
-                          ACE_ENV_ARG_DECL)
+TAO_ConstantDef_i::value (const CORBA::Any &value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->update_key ();
 
-  this->value_i (value
-                 ACE_ENV_ARG_PARAMETER);
+  this->value_i (value);
 }
 
 void
-TAO_ConstantDef_i::value_i (const CORBA::Any &value
-                            ACE_ENV_ARG_DECL)
+TAO_ConstantDef_i::value_i (const CORBA::Any &value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::TypeCode_var my_tc =
@@ -240,8 +232,7 @@ TAO_ConstantDef_i::value_i (const CORBA::Any &value
   CORBA::TypeCode_var val_tc = value.type ();
 
   CORBA::Boolean const equal_tc =
-    my_tc.in ()->equal (val_tc.in ()
-                        ACE_ENV_ARG_PARAMETER);
+    my_tc.in ()->equal (val_tc.in ());
 
   if (!equal_tc)
     {
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h
index f9243f6d58c..d19c6294980 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h
@@ -50,75 +50,62 @@ public:
   virtual ~TAO_ConstantDef_i (void);
   // Destructor
 
-  virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::DefinitionKind def_kind ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
-  virtual CORBA::Contained::Description *describe (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Contained::Description *describe ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
-  virtual CORBA::Contained::Description *describe_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Contained::Description *describe_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
-  virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::TypeCode_ptr type_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::IDLType_ptr type_def (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::IDLType_ptr type_def ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::IDLType_ptr type_def_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::IDLType_ptr type_def_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void type_def (
-      CORBA::IDLType_ptr type_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::IDLType_ptr type_def)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void type_def_i (
-      CORBA::IDLType_ptr type_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::IDLType_ptr type_def)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Any *value (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Any *value ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Any *value_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Any *value_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void value (
-      const CORBA::Any &value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CORBA::Any &value)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void value_i (
-      const CORBA::Any &value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CORBA::Any &value)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h
index 2bbbef43916..748a33e4a26 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h
@@ -53,7 +53,6 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp
index b9e2dd81c08..f686bdc81ba 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp
@@ -118,21 +118,18 @@ TAO_Contained_i::id_i (void)
 }
 
 void
-TAO_Contained_i::id (const char *id
-                     ACE_ENV_ARG_DECL)
+TAO_Contained_i::id (const char *id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->update_key ();
 
-  this->id_i (id
-              ACE_ENV_ARG_PARAMETER);
+  this->id_i (id);
 }
 
 void
-TAO_Contained_i::id_i (const char *id
-                       ACE_ENV_ARG_DECL)
+TAO_Contained_i::id_i (const char *id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString tmp;
@@ -144,8 +141,7 @@ TAO_Contained_i::id_i (const char *id
        == 0)
     {
       // Repository id already exists.
-      ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 2,
-                                   CORBA::COMPLETED_NO));
+      throw CORBA::BAD_PARAM (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
     }
 
   // Get the old id.
@@ -223,31 +219,26 @@ TAO_Contained_i::version_i (void)
 }
 
 void
-TAO_Contained_i::name (const char *name
-                       ACE_ENV_ARG_DECL)
+TAO_Contained_i::name (const char *name)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->update_key ();
 
-  this->name_i (name
-                ACE_ENV_ARG_PARAMETER);
+  this->name_i (name);
 }
 
 void
-TAO_Contained_i::name_i (const char *name
-                         ACE_ENV_ARG_DECL)
+TAO_Contained_i::name_i (const char *name)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Check if name already exists in this container.
-  CORBA::Boolean exists = this->name_exists (name
-                                             ACE_ENV_ARG_PARAMETER);
+  CORBA::Boolean exists = this->name_exists (name);
 
   if (exists)
     {
-      ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 3,
-                                   CORBA::COMPLETED_NO));
+      throw CORBA::BAD_PARAM (CORBA::OMGVMCID | 3, CORBA::COMPLETED_NO);
     }
 
   // Reset the local name.
@@ -273,21 +264,18 @@ TAO_Contained_i::name_i (const char *name
 }
 
 void
-TAO_Contained_i::version (const char *version
-                          ACE_ENV_ARG_DECL)
+TAO_Contained_i::version (const char *version)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->update_key ();
 
-  this->version_i (version
-                   ACE_ENV_ARG_PARAMETER);
+  this->version_i (version);
 }
 
 void
-TAO_Contained_i::version_i (const char *version
-                            ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Contained_i::version_i (const char *version)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_string_value (this->section_key_,
@@ -328,11 +316,9 @@ TAO_Contained_i::defined_in_i (void)
 
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (container_path,
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
+                                              this->repo_);
 
-  CORBA::Container_var retval = CORBA::Container::_narrow (obj.in ()
-                                                         ACE_ENV_ARG_PARAMETER);
+  CORBA::Container_var retval = CORBA::Container::_narrow (obj.in ());
 
   return retval._retn ();
 }
@@ -369,7 +355,6 @@ TAO_Contained_i::containing_repository (void)
 
 CORBA::Contained::Description *
 TAO_Contained_i::describe (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -379,7 +364,6 @@ TAO_Contained_i::describe (
 
 CORBA::Contained::Description *
 TAO_Contained_i::describe_i (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -390,8 +374,7 @@ TAO_Contained_i::describe_i (
 void
 TAO_Contained_i::move (CORBA::Container_ptr new_container,
                        const char *new_name,
-                       const char *new_version
-                       ACE_ENV_ARG_DECL)
+                       const char *new_version)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
@@ -401,13 +384,11 @@ TAO_Contained_i::move (CORBA::Container_ptr new_container,
   this->move_i (new_container,
                 new_name,
                 new_version,
-                1
-                ACE_ENV_ARG_PARAMETER);
+                1);
 }
 
 CORBA::Boolean
-TAO_Contained_i::name_exists (const char *name
-                              ACE_ENV_ARG_DECL)
+TAO_Contained_i::name_exists (const char *name)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString container_id;
@@ -422,8 +403,7 @@ TAO_Contained_i::name_exists (const char *name
       TAO_IFR_Service_Utils::name_exists (&TAO_Contained_i::same_as_tmp_name,
                                           root_key,
                                           this->repo_,
-                                          CORBA::dk_Repository
-                                          ACE_ENV_ARG_PARAMETER);
+                                          CORBA::dk_Repository);
       return 0;
     }
 
@@ -525,8 +505,7 @@ void
 TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
                          const char *new_name,
                          const char *new_version,
-                         CORBA::Boolean cleanup
-                         ACE_ENV_ARG_DECL)
+                         CORBA::Boolean cleanup)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Repository_var my_repo = this->repo_->repo_objref ();
@@ -587,7 +566,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
   TAO_Container_i container_impl (this->repo_);
   container_impl.section_key (container_key);
 
-  ACE_TRY
+  try
     {
       // Call the appropriate create function.
       switch (my_dk)
@@ -606,16 +585,14 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
             {
               this->move_pre_process (new_container,
                                       my_path.c_str (),
-                                      new_name
-                                      ACE_ENV_ARG_PARAMETER);
+                                      new_name);
             }
 
           CORBA::EnumDef_var new_defn =
             container_impl.create_enum_i (new_id.c_str (),
                                           new_name,
                                           new_version,
-                                          members.in ()
-                                          ACE_ENV_ARG_PARAMETER);
+                                          members.in ());
 
           ACE_TString new_path =
             TAO_IFR_Service_Utils::reference_to_path (new_defn.in ());
@@ -635,8 +612,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
             container_impl.create_alias_i (new_id.c_str (),
                                           new_name,
                                           new_version,
-                                          otype.in ()
-                                          ACE_ENV_ARG_PARAMETER);
+                                          otype.in ());
 
           ACE_TString new_path =
             TAO_IFR_Service_Utils::reference_to_path (new_defn.in ());
@@ -648,8 +624,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
         {
           container_impl.create_native_i (new_id.c_str (),
                                           new_name,
-                                          new_version
-                                          ACE_ENV_ARG_PARAMETER);
+                                          new_version);
           break;
         }
         case CORBA::dk_ValueBox:
@@ -664,8 +639,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
             container_impl.create_value_box_i (new_id.c_str (),
                                               new_name,
                                               new_version,
-                                              otype.in ()
-                                              ACE_ENV_ARG_PARAMETER);
+                                              otype.in ());
 
           ACE_TString new_path =
             TAO_IFR_Service_Utils::reference_to_path (new_defn.in ());
@@ -687,23 +661,20 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
             {
               this->move_pre_process (new_container,
                                       my_path.c_str (),
-                                      new_name
-                                      ACE_ENV_ARG_PARAMETER);
+                                      new_name);
             }
 
           CORBA::StructDef_var new_defn =
             container_impl.create_struct_i (new_id.c_str (),
                                             new_name,
                                             new_version,
-                                            members.in ()
-                                            ACE_ENV_ARG_PARAMETER);
+                                            members.in ());
 
           ACE_TString new_path =
             TAO_IFR_Service_Utils::reference_to_path (new_defn.in ());
           container_impl.update_refs (new_path.c_str ());
 
-          this->move_contents (new_defn.in ()
-                               ACE_ENV_ARG_PARAMETER);
+          this->move_contents (new_defn.in ());
 
           break;
         }
@@ -724,8 +695,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
             {
               this->move_pre_process (new_container,
                                       my_path.c_str (),
-                                      new_name
-                                      ACE_ENV_ARG_PARAMETER);
+                                      new_name);
             }
 
           CORBA::UnionDef_var new_defn =
@@ -733,15 +703,13 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
                                            new_name,
                                            new_version,
                                            disc_type.in (),
-                                           members.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+                                           members.in ());
 
           ACE_TString new_path =
             TAO_IFR_Service_Utils::reference_to_path (new_defn.in ());
           container_impl.update_refs (new_path.c_str ());
 
-          this->move_contents (new_defn.in ()
-                               ACE_ENV_ARG_PARAMETER);
+          this->move_contents (new_defn.in ());
 
           break;
         }
@@ -750,11 +718,9 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
           CORBA::ModuleDef_var new_defn =
             container_impl.create_module_i (new_id.c_str (),
                                             new_name,
-                                            new_version
-                                            ACE_ENV_ARG_PARAMETER);
+                                            new_version);
 
-          this->move_contents (new_defn.in ()
-                               ACE_ENV_ARG_PARAMETER);
+          this->move_contents (new_defn.in ());
 
           break;
         }
@@ -770,11 +736,9 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
             container_impl.create_exception_i (new_id.c_str (),
                                                new_name,
                                                new_version,
-                                               members.in ()
-                                               ACE_ENV_ARG_PARAMETER);
+                                               members.in ());
 
-          this->move_contents (new_defn.in ()
-                               ACE_ENV_ARG_PARAMETER);
+          this->move_contents (new_defn.in ());
 
           break;
         }
@@ -790,15 +754,13 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
             container_impl.create_interface_i (new_id.c_str (),
                                                new_name,
                                                new_version,
-                                               bases.in ()
-                                               ACE_ENV_ARG_PARAMETER);
+                                               bases.in ());
 
           ACE_TString new_path =
             TAO_IFR_Service_Utils::reference_to_path (new_defn.in ());
           container_impl.update_refs (new_path.c_str ());
 
-          this->move_contents (new_defn.in ()
-                               ACE_ENV_ARG_PARAMETER);
+          this->move_contents (new_defn.in ());
 
           break;
         }
@@ -816,8 +778,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
                                             new_name,
                                             new_version,
                                             type_def.in (),
-                                            value.in ()
-                                            ACE_ENV_ARG_PARAMETER);
+                                            value.in ());
           break;
         }
         case CORBA::dk_Attribute:
@@ -840,8 +801,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
                                        new_name,
                                        new_version,
                                        type_def.in (),
-                                       mode
-                                       ACE_ENV_ARG_PARAMETER);
+                                       mode);
               break;
             }
           else if (container_dk == CORBA::dk_Value)
@@ -853,14 +813,14 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
                                        new_name,
                                        new_version,
                                        type_def.in (),
-                                       mode
-                                       ACE_ENV_ARG_PARAMETER);
+                                       mode);
               break;
             }
           else
             {
-              ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 4,
-                                           CORBA::COMPLETED_NO));
+              throw CORBA::BAD_PARAM (
+                CORBA::OMGVMCID | 4,
+                CORBA::COMPLETED_NO);
             }
         }
         case CORBA::dk_Operation:
@@ -895,8 +855,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
                                        mode,
                                        params.in (),
                                        exceptions.in (),
-                                       contexts.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+                                       contexts.in ());
               break;
             }
           else if (container_dk == CORBA::dk_Value)
@@ -911,14 +870,14 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
                                        mode,
                                        params.in (),
                                        exceptions.in (),
-                                       contexts.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+                                       contexts.in ());
               break;
             }
           else
             {
-              ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 4,
-                                           CORBA::COMPLETED_NO));
+              throw CORBA::BAD_PARAM (
+                CORBA::OMGVMCID | 4,
+                CORBA::COMPLETED_NO);
             }
         }
         case CORBA::dk_Value:
@@ -938,7 +897,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
           break;
       }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // If the move was not successful, we must restore this.
       this->repo_->config ()->set_string_value (
@@ -946,9 +905,8 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
                                   id.in (),
                                   my_path
                                 );
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
 
   if (cleanup)
     {
@@ -995,8 +953,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
 void
 TAO_Contained_i::move_pre_process (CORBA::Container_ptr container,
                                    const char *contained_path,
-                                   const char *name
-                                   ACE_ENV_ARG_DECL_NOT_USED)
+                                   const char *name)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   char *container_path =
@@ -1050,8 +1007,7 @@ TAO_Contained_i::move_pre_process (CORBA::Container_ptr container,
 }
 
 void
-TAO_Contained_i::move_contents (CORBA::Container_ptr new_container
-                                ACE_ENV_ARG_DECL)
+TAO_Contained_i::move_contents (CORBA::Container_ptr new_container)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString name;
@@ -1103,8 +1059,7 @@ TAO_Contained_i::move_contents (CORBA::Container_ptr new_container
               impl->move_i (new_container,
                             name.c_str (),
                             version.c_str (),
-                            0
-                            ACE_ENV_ARG_PARAMETER);
+                            0);
             }
         }
     }
@@ -1152,8 +1107,7 @@ TAO_Contained_i::move_contents (CORBA::Container_ptr new_container
               impl.move_i (new_container,
                            name.c_str (),
                            version.c_str (),
-                           0
-                           ACE_ENV_ARG_PARAMETER);
+                           0);
             }
         }
 
@@ -1194,8 +1148,7 @@ TAO_Contained_i::move_contents (CORBA::Container_ptr new_container
               impl.move_i (new_container,
                            name.c_str (),
                            version.c_str (),
-                           0
-                           ACE_ENV_ARG_PARAMETER);
+                           0);
             }
         }
     }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h
index 5729837ce3b..3abe7761641 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h
@@ -52,121 +52,99 @@ public:
   // Destructor.
 
   virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char *id (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   char *id_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void id (
       const char *id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void id_i (
       const char *id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char *name (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   char *name_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void name (
       const char *name
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void name_i (
       const char *name
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char *version (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   char *version_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void version (
       const char *version
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void version_i (
       const char *version
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Container_ptr defined_in (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Container_ptr defined_in_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char *absolute_name (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   char *absolute_name_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Repository_ptr containing_repository (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Contained::Description *describe (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Contained::Description *describe_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Contained::Description *describe_i ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void move (
       CORBA::Container_ptr new_container,
       const char *new_name,
       const char *new_version
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -179,7 +157,6 @@ protected:
       const char *new_name,
       const char *new_version,
       CORBA::Boolean cleanup
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Engine for move() with an extra 'cleanup'
@@ -190,7 +167,6 @@ protected:
 private:
   CORBA::Boolean name_exists (
       const char *name
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Check if <name> already exists in our container
@@ -205,7 +181,6 @@ private:
       CORBA::Container_ptr container,
       const char *contained_path,
       const char *name
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Mangle the names of references that are also
@@ -215,7 +190,6 @@ private:
 
   void move_contents (
       CORBA::Container_ptr new_container
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Recursively calls move_i for definitions,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
index ad18fe17342..9d50d1214c8 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
@@ -173,21 +173,18 @@ TAO_Container_i::destroy_i (void)
 }
 
 CORBA::Contained_ptr
-TAO_Container_i::lookup (const char *search_name
-                         ACE_ENV_ARG_DECL)
+TAO_Container_i::lookup (const char *search_name)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
   this->update_key ();
 
-  return this->lookup_i (search_name
-                         ACE_ENV_ARG_PARAMETER);
+  return this->lookup_i (search_name);
 }
 
 CORBA::Contained_ptr
-TAO_Container_i::lookup_i (const char *search_name
-                           ACE_ENV_ARG_DECL)
+TAO_Container_i::lookup_i (const char *search_name)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Configuration_Section_Key iter_key;
@@ -392,17 +389,14 @@ TAO_Container_i::lookup_i (const char *search_name
 
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (path,
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
+                                              this->repo_);
 
-  return CORBA::Contained::_narrow (obj.in ()
-                                   ACE_ENV_ARG_PARAMETER);
+  return CORBA::Contained::_narrow (obj.in ());
 }
 
 CORBA::ContainedSeq *
 TAO_Container_i::contents (CORBA::DefinitionKind limit_type,
-                           CORBA::Boolean exclude_inherited
-                           ACE_ENV_ARG_DECL)
+                           CORBA::Boolean exclude_inherited)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
@@ -410,14 +404,12 @@ TAO_Container_i::contents (CORBA::DefinitionKind limit_type,
   this->update_key ();
 
   return this->contents_i (limit_type,
-                           exclude_inherited
-                           ACE_ENV_ARG_PARAMETER);
+                           exclude_inherited);
 }
 
 CORBA::ContainedSeq *
 TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type,
-                             CORBA::Boolean exclude_inherited
-                             ACE_ENV_ARG_DECL)
+                             CORBA::Boolean exclude_inherited)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ContainedSeq *contents = 0;
@@ -513,8 +505,7 @@ TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type,
           iface.interface_contents (kind_queue,
                                     path_queue,
                                     limit_type,
-                                    exclude_inherited
-                                    ACE_ENV_ARG_PARAMETER);
+                                    exclude_inherited);
         }
     }
 
@@ -532,12 +523,10 @@ TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type,
       CORBA::Object_var obj =
         TAO_IFR_Service_Utils::create_objref (next_kind,
                                               next_path.c_str (),
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
+                                              this->repo_);
 
       CORBA::Contained_var next_cont =
-        CORBA::Contained::_narrow (obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+        CORBA::Contained::_narrow (obj.in ());
 
       retval[j] = next_cont._retn ();
     }
@@ -549,8 +538,7 @@ CORBA::ContainedSeq *
 TAO_Container_i::lookup_name (const char *search_name,
                               CORBA::Long levels_to_search,
                               CORBA::DefinitionKind limit_type,
-                              CORBA::Boolean exclude_inherited
-                              ACE_ENV_ARG_DECL)
+                              CORBA::Boolean exclude_inherited)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
@@ -560,16 +548,14 @@ TAO_Container_i::lookup_name (const char *search_name,
   return this->lookup_name_i (search_name,
                               levels_to_search,
                               limit_type,
-                              exclude_inherited
-                              ACE_ENV_ARG_PARAMETER);
+                              exclude_inherited);
 }
 
 CORBA::ContainedSeq *
 TAO_Container_i::lookup_name_i (const char *search_name,
                                 CORBA::Long levels_to_search,
                                 CORBA::DefinitionKind limit_type,
-                                CORBA::Boolean exclude_inherited
-                                ACE_ENV_ARG_DECL)
+                                CORBA::Boolean exclude_inherited)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue;
@@ -580,8 +566,7 @@ TAO_Container_i::lookup_name_i (const char *search_name,
                                search_name,
                                levels_to_search,
                                limit_type,
-                               exclude_inherited
-                               ACE_ENV_ARG_PARAMETER);
+                               exclude_inherited);
 
   CORBA::ULong size = static_cast<CORBA::ULong> (kind_queue.size ());
 
@@ -604,12 +589,10 @@ TAO_Container_i::lookup_name_i (const char *search_name,
       CORBA::Object_var obj =
         TAO_IFR_Service_Utils::create_objref (next_kind,
                                               next_path.c_str (),
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
+                                              this->repo_);
 
       CORBA::Contained_var next_cont =
-        CORBA::Contained::_narrow (obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+        CORBA::Contained::_narrow (obj.in ());
 
       retval[i] = next_cont._retn ();
     }
@@ -620,8 +603,7 @@ TAO_Container_i::lookup_name_i (const char *search_name,
 CORBA::Container::DescriptionSeq *
 TAO_Container_i::describe_contents (CORBA::DefinitionKind limit_type,
                                     CORBA::Boolean exclude_inherited,
-                                    CORBA::Long max_returned_objs
-                                    ACE_ENV_ARG_DECL)
+                                    CORBA::Long max_returned_objs)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
@@ -630,20 +612,17 @@ TAO_Container_i::describe_contents (CORBA::DefinitionKind limit_type,
 
   return this->describe_contents_i (limit_type,
                                     exclude_inherited,
-                                    max_returned_objs
-                                    ACE_ENV_ARG_PARAMETER);
+                                    max_returned_objs);
 }
 
 CORBA::Container::DescriptionSeq *
 TAO_Container_i::describe_contents_i (CORBA::DefinitionKind limit_type,
                                       CORBA::Boolean exclude_inherited,
-                                      CORBA::Long max_returned_objs
-                                      ACE_ENV_ARG_DECL)
+                                      CORBA::Long max_returned_objs)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ContainedSeq_var contents = this->contents_i (limit_type,
-                                                      exclude_inherited
-                                                      ACE_ENV_ARG_PARAMETER);
+                                                      exclude_inherited);
 
   CORBA::ULong length = contents->length ();
   CORBA::ULong ret_len = 0;
@@ -695,8 +674,7 @@ TAO_Container_i::describe_contents_i (CORBA::DefinitionKind limit_type,
 CORBA::ModuleDef_ptr
 TAO_Container_i::create_module (const char *id,
                                 const char *name,
-                                const char *version
-                                ACE_ENV_ARG_DECL)
+                                const char *version)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ModuleDef::_nil ());
@@ -705,15 +683,13 @@ TAO_Container_i::create_module (const char *id,
 
   return this->create_module_i (id,
                                 name,
-                                version
-                                ACE_ENV_ARG_PARAMETER);
+                                version);
 }
 
 CORBA::ModuleDef_ptr
 TAO_Container_i::create_module_i (const char *id,
                                   const char *name,
-                                  const char *version
-                                  ACE_ENV_ARG_DECL)
+                                  const char *version)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // new_key is not needed when creating a module, but it is needed
@@ -730,18 +706,15 @@ TAO_Container_i::create_module_i (const char *id,
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          "defns"
-                                          ACE_ENV_ARG_PARAMETER);
+                                          "defns");
 
   // Create the object reference.
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Module,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
+                                          this->repo_);
 
-  return CORBA::ComponentIR::ModuleDef::_narrow (obj.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::ModuleDef::_narrow (obj.in ());
 }
 
 CORBA::ConstantDef_ptr
@@ -749,8 +722,7 @@ TAO_Container_i::create_constant (const char *id,
                                   const char *name,
                                   const char *version,
                                   CORBA::IDLType_ptr type,
-                                  const CORBA::Any &value
-                                  ACE_ENV_ARG_DECL)
+                                  const CORBA::Any &value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ConstantDef::_nil ());
@@ -761,8 +733,7 @@ TAO_Container_i::create_constant (const char *id,
                                   name,
                                   version,
                                   type,
-                                  value
-                                  ACE_ENV_ARG_PARAMETER);
+                                  value);
 }
 
 CORBA::ConstantDef_ptr
@@ -770,8 +741,7 @@ TAO_Container_i::create_constant_i (const char *id,
                                     const char *name,
                                     const char *version,
                                     CORBA::IDLType_ptr type,
-                                    const CORBA::Any &value
-                                    ACE_ENV_ARG_DECL)
+                                    const CORBA::Any &value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Container_i::tmp_name_holder_ = name;
@@ -786,8 +756,7 @@ TAO_Container_i::create_constant_i (const char *id,
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          "defns"
-                                          ACE_ENV_ARG_PARAMETER);
+                                          "defns");
 
   // Get the path to our type and store it.
   char *type_path = TAO_IFR_Service_Utils::reference_to_path (type);
@@ -847,19 +816,16 @@ TAO_Container_i::create_constant_i (const char *id,
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Constant,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
+                                          this->repo_);
 
-  return CORBA::ConstantDef::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+  return CORBA::ConstantDef::_narrow (obj.in ());
 }
 
 CORBA::StructDef_ptr
 TAO_Container_i::create_struct (const char *id,
                                 const char *name,
                                 const char *version,
-                                const CORBA::StructMemberSeq &members
-                                ACE_ENV_ARG_DECL)
+                                const CORBA::StructMemberSeq &members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::StructDef::_nil ());
@@ -869,16 +835,14 @@ TAO_Container_i::create_struct (const char *id,
   return this->create_struct_i (id,
                                 name,
                                 version,
-                                members
-                                ACE_ENV_ARG_PARAMETER);
+                                members);
 }
 
 CORBA::StructDef_ptr
 TAO_Container_i::create_struct_i (const char *id,
                                   const char *name,
                                   const char *version,
-                                  const CORBA::StructMemberSeq &members
-                                  ACE_ENV_ARG_DECL)
+                                  const CORBA::StructMemberSeq &members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Container_i::tmp_name_holder_ = name;
@@ -893,8 +857,7 @@ TAO_Container_i::create_struct_i (const char *id,
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          "defns"
-                                          ACE_ENV_ARG_PARAMETER);
+                                          "defns");
 
   // Open a section for the struct's members.
   ACE_Configuration_Section_Key refs_key;
@@ -947,11 +910,9 @@ TAO_Container_i::create_struct_i (const char *id,
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Struct,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
+                                          this->repo_);
 
-  return CORBA::StructDef::_narrow (obj.in ()
-                                   ACE_ENV_ARG_PARAMETER);
+  return CORBA::StructDef::_narrow (obj.in ());
 }
 
 CORBA::UnionDef_ptr
@@ -959,8 +920,7 @@ TAO_Container_i::create_union (const char *id,
                                const char *name,
                                const char *version,
                                CORBA::IDLType_ptr discriminator_type,
-                               const CORBA::UnionMemberSeq &members
-                               ACE_ENV_ARG_DECL)
+                               const CORBA::UnionMemberSeq &members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::UnionDef::_nil ());
@@ -971,8 +931,7 @@ TAO_Container_i::create_union (const char *id,
                                name,
                                version,
                                discriminator_type,
-                               members
-                               ACE_ENV_ARG_PARAMETER);
+                               members);
 }
 
 CORBA::UnionDef_ptr
@@ -980,8 +939,7 @@ TAO_Container_i::create_union_i (const char *id,
                                  const char *name,
                                  const char *version,
                                  CORBA::IDLType_ptr discriminator_type,
-                                 const CORBA::UnionMemberSeq &members
-                                 ACE_ENV_ARG_DECL)
+                                 const CORBA::UnionMemberSeq &members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Container_i::tmp_name_holder_ = name;
@@ -996,8 +954,7 @@ TAO_Container_i::create_union_i (const char *id,
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          "defns"
-                                          ACE_ENV_ARG_PARAMETER);
+                                          "defns");
 
   // Add a field to hold the path to the discriminator type.
   char *disc_path =
@@ -1044,8 +1001,7 @@ TAO_Container_i::create_union_i (const char *id,
                                                 member_path);
 
       this->store_label (member_key,
-                         members[i].label
-                         ACE_ENV_ARG_PARAMETER);
+                         members[i].label);
     }
 
   CORBA::DefinitionKind def_kind =
@@ -1063,19 +1019,16 @@ TAO_Container_i::create_union_i (const char *id,
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Union,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
+                                          this->repo_);
 
-  return CORBA::UnionDef::_narrow (obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+  return CORBA::UnionDef::_narrow (obj.in ());
 }
 
 CORBA::EnumDef_ptr
 TAO_Container_i::create_enum (const char *id,
                               const char *name,
                               const char *version,
-                              const CORBA::EnumMemberSeq &members
-                              ACE_ENV_ARG_DECL)
+                              const CORBA::EnumMemberSeq &members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::EnumDef::_nil ());
@@ -1085,16 +1038,14 @@ TAO_Container_i::create_enum (const char *id,
   return this->create_enum_i (id,
                               name,
                               version,
-                              members
-                              ACE_ENV_ARG_PARAMETER);
+                              members);
 }
 
 CORBA::EnumDef_ptr
 TAO_Container_i::create_enum_i (const char *id,
                                 const char *name,
                                 const char *version,
-                                const CORBA::EnumMemberSeq &members
-                                ACE_ENV_ARG_DECL)
+                                const CORBA::EnumMemberSeq &members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Container_i::tmp_name_holder_ = name;
@@ -1109,8 +1060,7 @@ TAO_Container_i::create_enum_i (const char *id,
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          "defns"
-                                          ACE_ENV_ARG_PARAMETER);
+                                          "defns");
 
   // Store the member count of the enum.
   CORBA::ULong count = members.length ();
@@ -1149,19 +1099,16 @@ TAO_Container_i::create_enum_i (const char *id,
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Enum,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
+                                          this->repo_);
 
-  return CORBA::EnumDef::_narrow (obj.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+  return CORBA::EnumDef::_narrow (obj.in ());
 }
 
 CORBA::AliasDef_ptr
 TAO_Container_i::create_alias (const char *id,
                                const char *name,
                                const char *version,
-                               CORBA::IDLType_ptr original_type
-                               ACE_ENV_ARG_DECL)
+                               CORBA::IDLType_ptr original_type)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::AliasDef::_nil ());
@@ -1171,16 +1118,14 @@ TAO_Container_i::create_alias (const char *id,
   return this->create_alias_i (id,
                                name,
                                version,
-                               original_type
-                               ACE_ENV_ARG_PARAMETER);
+                               original_type);
 }
 
 CORBA::AliasDef_ptr
 TAO_Container_i::create_alias_i (const char *id,
                                  const char *name,
                                  const char *version,
-                                 CORBA::IDLType_ptr original_type
-                                 ACE_ENV_ARG_DECL)
+                                 CORBA::IDLType_ptr original_type)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Container_i::tmp_name_holder_ = name;
@@ -1195,8 +1140,7 @@ TAO_Container_i::create_alias_i (const char *id,
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          "defns"
-                                          ACE_ENV_ARG_PARAMETER);
+                                          "defns");
 
   // Get the path to our original type and store it.
   char *unalias_path =
@@ -1210,19 +1154,16 @@ TAO_Container_i::create_alias_i (const char *id,
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Alias,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
+                                          this->repo_);
 
-  return CORBA::AliasDef::_narrow (obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+  return CORBA::AliasDef::_narrow (obj.in ());
 }
 
 CORBA::InterfaceDef_ptr
 TAO_Container_i::create_interface (const char *id,
                                    const char *name,
                                    const char *version,
-                                   const CORBA::InterfaceDefSeq &base_interfaces
-                                   ACE_ENV_ARG_DECL)
+                                   const CORBA::InterfaceDefSeq &base_interfaces)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::InterfaceDef::_nil ());
@@ -1232,16 +1173,14 @@ TAO_Container_i::create_interface (const char *id,
   return this->create_interface_i (id,
                                    name,
                                    version,
-                                   base_interfaces
-                                   ACE_ENV_ARG_PARAMETER);
+                                   base_interfaces);
 }
 
 CORBA::InterfaceDef_ptr
 TAO_Container_i::create_interface_i (const char *id,
                                      const char *name,
                                      const char *version,
-                                     const CORBA::InterfaceDefSeq &base_interfaces
-                                     ACE_ENV_ARG_DECL)
+                                     const CORBA::InterfaceDefSeq &base_interfaces)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Container_i::tmp_name_holder_ = name;
@@ -1256,8 +1195,7 @@ TAO_Container_i::create_interface_i (const char *id,
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          "defns"
-                                          ACE_ENV_ARG_PARAMETER);
+                                          "defns");
 
   CORBA::ULong length = base_interfaces.length ();
 
@@ -1289,11 +1227,9 @@ TAO_Container_i::create_interface_i (const char *id,
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Interface,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
+                                          this->repo_);
 
-  return CORBA::InterfaceDef::_narrow (obj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+  return CORBA::InterfaceDef::_narrow (obj.in ());
 }
 
 CORBA::ValueDef_ptr
@@ -1308,7 +1244,6 @@ TAO_Container_i::create_value (
     const CORBA::ValueDefSeq &abstract_base_values,
     const CORBA::InterfaceDefSeq &supported_interfaces,
     const CORBA::InitializerSeq &initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1325,8 +1260,7 @@ TAO_Container_i::create_value (
                                is_truncatable,
                                abstract_base_values,
                                supported_interfaces,
-                               initializers
-                               ACE_ENV_ARG_PARAMETER);
+                               initializers);
 }
 
 CORBA::ValueDef_ptr
@@ -1341,7 +1275,6 @@ TAO_Container_i::create_value_i (
     const CORBA::ValueDefSeq &abstract_base_values,
     const CORBA::InterfaceDefSeq &supported_interfaces,
     const CORBA::InitializerSeq &initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1358,8 +1291,7 @@ TAO_Container_i::create_value_i (
                                base_value,
                                is_truncatable,
                                abstract_base_values,
-                               supported_interfaces
-                               ACE_ENV_ARG_PARAMETER);
+                               supported_interfaces);
 
   TAO_IFR_Generic_Utils<CORBA::InitializerSeq>::set_initializers (
       initializers,
@@ -1371,19 +1303,16 @@ TAO_Container_i::create_value_i (
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Value,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
+                                          this->repo_);
 
-  return CORBA::ValueDef::_narrow (obj.in ()
-                                   ACE_ENV_ARG_PARAMETER);
+  return CORBA::ValueDef::_narrow (obj.in ());
 }
 
 CORBA::ValueBoxDef_ptr
 TAO_Container_i::create_value_box (const char *id,
                                    const char *name,
                                    const char *version,
-                                   CORBA::IDLType_ptr original_type_def
-                                   ACE_ENV_ARG_DECL)
+                                   CORBA::IDLType_ptr original_type_def)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ValueBoxDef::_nil ());
@@ -1393,8 +1322,7 @@ TAO_Container_i::create_value_box (const char *id,
   return this->create_value_box_i (id,
                                    name,
                                    version,
-                                   original_type_def
-                                   ACE_ENV_ARG_PARAMETER);
+                                   original_type_def);
 }
 
 CORBA::ValueBoxDef_ptr
@@ -1402,7 +1330,7 @@ TAO_Container_i::create_value_box_i (const char *id,
                                      const char *name,
                                      const char *version,
                                      CORBA::IDLType_ptr original_type_def
-                                     ACE_ENV_ARG_DECL )
+ )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Container_i::tmp_name_holder_ = name;
@@ -1417,8 +1345,7 @@ TAO_Container_i::create_value_box_i (const char *id,
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          "defns"
-                                          ACE_ENV_ARG_PARAMETER);
+                                          "defns");
 
   // Get the path to our original type and store it.
   char *boxed_path =
@@ -1432,19 +1359,16 @@ TAO_Container_i::create_value_box_i (const char *id,
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_ValueBox,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
+                                          this->repo_);
 
-  return CORBA::ValueBoxDef::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+  return CORBA::ValueBoxDef::_narrow (obj.in ());
 }
 
 CORBA::ExceptionDef_ptr
 TAO_Container_i::create_exception (const char *id,
                                    const char *name,
                                    const char *version,
-                                   const CORBA::StructMemberSeq &members
-                                   ACE_ENV_ARG_DECL)
+                                   const CORBA::StructMemberSeq &members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ExceptionDef::_nil ());
@@ -1454,16 +1378,14 @@ TAO_Container_i::create_exception (const char *id,
   return this->create_exception_i (id,
                                    name,
                                    version,
-                                   members
-                                   ACE_ENV_ARG_PARAMETER);
+                                   members);
 }
 
 CORBA::ExceptionDef_ptr
 TAO_Container_i::create_exception_i (const char *id,
                                      const char *name,
                                      const char *version,
-                                     const CORBA::StructMemberSeq &members
-                                     ACE_ENV_ARG_DECL)
+                                     const CORBA::StructMemberSeq &members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Container_i::tmp_name_holder_ = name;
@@ -1478,8 +1400,7 @@ TAO_Container_i::create_exception_i (const char *id,
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          "defns"
-                                          ACE_ENV_ARG_PARAMETER);
+                                          "defns");
 
   ACE_Configuration_Section_Key refs_key;
   this->repo_->config ()->open_section (new_key,
@@ -1520,18 +1441,15 @@ TAO_Container_i::create_exception_i (const char *id,
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Exception,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
+                                          this->repo_);
 
-  return CORBA::ExceptionDef::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+  return CORBA::ExceptionDef::_narrow (obj.in ());
 }
 
 CORBA::NativeDef_ptr
 TAO_Container_i::create_native (const char *id,
                                 const char *name,
-                                const char *version
-                                ACE_ENV_ARG_DECL)
+                                const char *version)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::NativeDef::_nil ());
@@ -1540,15 +1458,13 @@ TAO_Container_i::create_native (const char *id,
 
   return this->create_native_i (id,
                                 name,
-                                version
-                                ACE_ENV_ARG_PARAMETER);
+                                version);
 }
 
 CORBA::NativeDef_ptr
 TAO_Container_i::create_native_i (const char *id,
                                   const char *name,
-                                  const char *version
-                                  ACE_ENV_ARG_DECL)
+                                  const char *version)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Container_i::tmp_name_holder_ = name;
@@ -1563,18 +1479,15 @@ TAO_Container_i::create_native_i (const char *id,
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          "defns"
-                                          ACE_ENV_ARG_PARAMETER);
+                                          "defns");
 
   // Create the object reference.
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Native,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
+                                          this->repo_);
 
-  return CORBA::NativeDef::_narrow (obj.in ()
-                                   ACE_ENV_ARG_PARAMETER);
+  return CORBA::NativeDef::_narrow (obj.in ());
 }
 
 CORBA::AbstractInterfaceDef_ptr
@@ -1583,7 +1496,6 @@ TAO_Container_i::create_abstract_interface (
     const char *name,
     const char *version,
     const CORBA::AbstractInterfaceDefSeq &base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1594,8 +1506,7 @@ TAO_Container_i::create_abstract_interface (
   return this->create_abstract_interface_i (id,
                                             name,
                                             version,
-                                            base_interfaces
-                                            ACE_ENV_ARG_PARAMETER);
+                                            base_interfaces);
 }
 
 CORBA::AbstractInterfaceDef_ptr
@@ -1604,7 +1515,6 @@ TAO_Container_i::create_abstract_interface_i (
     const char *name,
     const char *version,
     const CORBA::AbstractInterfaceDefSeq &base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1620,8 +1530,7 @@ TAO_Container_i::create_abstract_interface_i (
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          "defns"
-                                          ACE_ENV_ARG_PARAMETER);
+                                          "defns");
 
   CORBA::ULong length = base_interfaces.length ();
 
@@ -1653,11 +1562,9 @@ TAO_Container_i::create_abstract_interface_i (
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_AbstractInterface,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
+                                          this->repo_);
 
-  return CORBA::AbstractInterfaceDef::_narrow (obj.in ()
-                                              ACE_ENV_ARG_PARAMETER);
+  return CORBA::AbstractInterfaceDef::_narrow (obj.in ());
 }
 
 CORBA::LocalInterfaceDef_ptr
@@ -1666,7 +1573,6 @@ TAO_Container_i::create_local_interface (
     const char *name,
     const char *version,
     const CORBA::InterfaceDefSeq &base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1677,8 +1583,7 @@ TAO_Container_i::create_local_interface (
   return this->create_local_interface_i (id,
                                          name,
                                          version,
-                                         base_interfaces
-                                         ACE_ENV_ARG_PARAMETER);
+                                         base_interfaces);
 }
 
 CORBA::LocalInterfaceDef_ptr
@@ -1687,7 +1592,6 @@ TAO_Container_i::create_local_interface_i (
     const char *name,
     const char *version,
     const CORBA::InterfaceDefSeq &base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1703,8 +1607,7 @@ TAO_Container_i::create_local_interface_i (
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          "defns"
-                                          ACE_ENV_ARG_PARAMETER);
+                                          "defns");
 
   CORBA::ULong length = base_interfaces.length ();
 
@@ -1736,11 +1639,9 @@ TAO_Container_i::create_local_interface_i (
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_LocalInterface,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
+                                          this->repo_);
 
-  return CORBA::LocalInterfaceDef::_narrow (obj.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+  return CORBA::LocalInterfaceDef::_narrow (obj.in ());
 }
 
 CORBA::ExtValueDef_ptr
@@ -1755,7 +1656,6 @@ TAO_Container_i::create_ext_value (
       const CORBA::ValueDefSeq &abstract_base_values,
       const CORBA::InterfaceDefSeq &supported_interfaces,
       const CORBA::ExtInitializerSeq &initializers
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1772,8 +1672,7 @@ TAO_Container_i::create_ext_value (
                                    is_truncatable,
                                    abstract_base_values,
                                    supported_interfaces,
-                                   initializers
-                                   ACE_ENV_ARG_PARAMETER);
+                                   initializers);
 }
 
 CORBA::ExtValueDef_ptr
@@ -1788,7 +1687,6 @@ TAO_Container_i::create_ext_value_i (
       const CORBA::ValueDefSeq &abstract_base_values,
       const CORBA::InterfaceDefSeq &supported_interfaces,
       const CORBA::ExtInitializerSeq &initializers
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1805,8 +1703,7 @@ TAO_Container_i::create_ext_value_i (
                                base_value,
                                is_truncatable,
                                abstract_base_values,
-                               supported_interfaces
-                               ACE_ENV_ARG_PARAMETER);
+                               supported_interfaces);
 
   /// This does not handle the initializer exceptions, so we do that below.
   TAO_IFR_Generic_Utils<CORBA::ExtInitializerSeq>::set_initializers (
@@ -1847,11 +1744,9 @@ TAO_Container_i::create_ext_value_i (
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Value,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
+                                          this->repo_);
 
-  return CORBA::ExtValueDef::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+  return CORBA::ExtValueDef::_narrow (obj.in ());
 }
 
 int
@@ -1874,7 +1769,6 @@ TAO_Container_i::lookup_name_recursive (
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      ACE_ENV_ARG_DECL
     )
 {
   ACE_Configuration_Section_Key defns_key;
@@ -1953,8 +1847,7 @@ TAO_Container_i::lookup_name_recursive (
                                               ? -1
                                               : levels_to_search - 1,
                                            limit_type,
-                                           exclude_inherited
-                                           ACE_ENV_ARG_PARAMETER);
+                                           exclude_inherited);
             }
         }
     }
@@ -2188,8 +2081,7 @@ TAO_Container_i::lookup_op (
 
 void
 TAO_Container_i::store_label (ACE_Configuration_Section_Key key,
-                              const CORBA::Any &value
-                              ACE_ENV_ARG_DECL)
+                              const CORBA::Any &value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::TypeCode_var tc = value.type ();
@@ -2425,7 +2317,6 @@ TAO_Container_i::create_value_common (
     CORBA::Boolean is_truncatable,
     const CORBA::ValueDefSeq &abstract_base_values,
     const CORBA::InterfaceDefSeq &supported_interfaces
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_Container_i::tmp_name_holder_ = name;
@@ -2440,8 +2331,7 @@ TAO_Container_i::create_value_common (
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          "defns"
-                                          ACE_ENV_ARG_PARAMETER);
+                                          "defns");
 
   this->repo_->config ()->set_integer_value (new_key,
                                              "is_custom",
@@ -2471,8 +2361,7 @@ TAO_Container_i::create_value_common (
       TAO_IFR_Service_Utils::name_exists (&TAO_ValueDef_i::name_clash,
                                           new_key,
                                           this->repo_,
-                                          CORBA::dk_Value
-                                          ACE_ENV_ARG_PARAMETER);
+                                          CORBA::dk_Value);
 
       ACE_TString base_value_id;
       this->repo_->config ()->get_string_value (TAO_IFR_Service_Utils::tmp_key_,
@@ -2520,8 +2409,7 @@ TAO_Container_i::create_value_common (
           TAO_IFR_Service_Utils::name_exists (&TAO_ValueDef_i::name_clash,
                                               new_key,
                                               this->repo_,
-                                              CORBA::dk_Value
-                                              ACE_ENV_ARG_PARAMETER);
+                                              CORBA::dk_Value);
 
           this->repo_->config ()->get_string_value (
               TAO_IFR_Service_Utils::tmp_key_,
@@ -2590,8 +2478,7 @@ TAO_Container_i::create_value_common (
           TAO_IFR_Service_Utils::name_exists (&TAO_ValueDef_i::name_clash,
                                               new_key,
                                               this->repo_,
-                                              CORBA::dk_Value
-                                              ACE_ENV_ARG_PARAMETER);
+                                              CORBA::dk_Value);
 
           this->repo_->config ()->get_string_value (
               TAO_IFR_Service_Utils::tmp_key_,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h
index ab8e833579b..8ca8e62b07c 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h
@@ -58,39 +58,33 @@ public:
   // Destructor.
 
   virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove our contents.
 
   virtual void destroy_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Contained_ptr lookup (
       const char *search_name
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Contained_ptr lookup_i (
       const char *search_name
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::ContainedSeq *contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ContainedSeq *contents_i (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -99,7 +93,6 @@ public:
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -108,7 +101,6 @@ public:
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -116,7 +108,6 @@ public:
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Long max_returned_objs
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -124,7 +115,6 @@ public:
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Long max_returned_objs
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -132,7 +122,6 @@ public:
       const char *id,
       const char *name,
       const char *version
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -140,7 +129,6 @@ public:
       const char *id,
       const char *name,
       const char *version
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -150,7 +138,6 @@ public:
       const char *version,
       CORBA::IDLType_ptr type,
       const CORBA::Any & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -160,7 +147,6 @@ public:
       const char *version,
       CORBA::IDLType_ptr type,
       const CORBA::Any & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -169,7 +155,6 @@ public:
       const char *name,
       const char *version,
       const CORBA::StructMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -178,7 +163,6 @@ public:
       const char *name,
       const char *version,
       const CORBA::StructMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -188,7 +172,6 @@ public:
       const char *version,
       CORBA::IDLType_ptr discriminator_type,
       const CORBA::UnionMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -198,7 +181,6 @@ public:
       const char *version,
       CORBA::IDLType_ptr discriminator_type,
       const CORBA::UnionMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -207,7 +189,6 @@ public:
       const char *name,
       const char *version,
       const CORBA::EnumMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -216,7 +197,6 @@ public:
       const char *name,
       const char *version,
       const CORBA::EnumMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -225,7 +205,6 @@ public:
       const char *name,
       const char *version,
       CORBA::IDLType_ptr original_type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -234,7 +213,6 @@ public:
       const char *name,
       const char *version,
       CORBA::IDLType_ptr original_type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -243,7 +221,6 @@ public:
       const char *name,
       const char *version,
       const CORBA::InterfaceDefSeq &base_interfaces
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -252,7 +229,6 @@ public:
       const char *name,
       const char *version,
       const CORBA::InterfaceDefSeq &base_interfaces
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -267,7 +243,6 @@ public:
       const CORBA::ValueDefSeq &abstract_base_values,
       const CORBA::InterfaceDefSeq & supported_interfaces,
       const CORBA::InitializerSeq &initializers
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -282,7 +257,6 @@ public:
       const CORBA::ValueDefSeq &abstract_base_values,
       const CORBA::InterfaceDefSeq & supported_interfaces,
       const CORBA::InitializerSeq &initializers
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -291,7 +265,6 @@ public:
       const char *name,
       const char *version,
       CORBA::IDLType_ptr original_type_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -300,7 +273,6 @@ public:
       const char *name,
       const char *version,
       CORBA::IDLType_ptr original_type_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -309,7 +281,6 @@ public:
       const char *name,
       const char *version,
       const CORBA::StructMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -318,7 +289,6 @@ public:
       const char *name,
       const char *version,
       const CORBA::StructMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -326,7 +296,6 @@ public:
       const char *id,
       const char *name,
       const char *version
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -334,7 +303,6 @@ public:
       const char *id,
       const char *name,
       const char *version
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -343,7 +311,6 @@ public:
       const char *name,
       const char *version,
       const CORBA::AbstractInterfaceDefSeq &base_interfaces
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -352,7 +319,6 @@ public:
       const char *name,
       const char *version,
       const CORBA::AbstractInterfaceDefSeq &base_interfaces
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -361,7 +327,6 @@ public:
       const char *name,
       const char *version,
       const CORBA::InterfaceDefSeq &base_interfaces
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -370,7 +335,6 @@ public:
       const char *name,
       const char *version,
       const CORBA::InterfaceDefSeq &base_interfaces
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -385,7 +349,6 @@ public:
       const CORBA::ValueDefSeq &abstract_base_values,
       const CORBA::InterfaceDefSeq &supported_interfaces,
       const CORBA::ExtInitializerSeq &initializers
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -400,7 +363,6 @@ public:
       const CORBA::ValueDefSeq &abstract_base_values,
       const CORBA::InterfaceDefSeq &supported_interfaces,
       const CORBA::ExtInitializerSeq &initializers
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -420,7 +382,6 @@ protected:
    void store_label (
       ACE_Configuration_Section_Key key,
       const CORBA::Any &value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Store a union member's label value.
@@ -446,8 +407,7 @@ private:
       const char *search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+      CORBA::Boolean exclude_inherited);
 
   ACE_TString create_value_common (
       CORBA::DefinitionKind container_kind,
@@ -462,7 +422,6 @@ private:
       CORBA::Boolean is_truncatable,
       const CORBA::ValueDefSeq &abstract_base_values,
       const CORBA::InterfaceDefSeq &supported_interfaces
-      ACE_ENV_ARG_DECL
     );
   // Common code for create_value_i and create_ext_value_i.
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h
index 5d8e93fdeba..518a12b290b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h
@@ -53,7 +53,6 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp
index 8639e5f0452..90a70b66fdb 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp
@@ -61,8 +61,7 @@ TAO_EnumDef_i::type_i (void)
 
   return this->repo_->tc_factory ()->create_enum_tc (id.c_str (),
                                                      name.c_str (),
-                                                     members.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+                                                     members.in ());
 }
 
 CORBA::EnumMemberSeq *
@@ -113,21 +112,18 @@ TAO_EnumDef_i::members_i (void)
 }
 
 void
-TAO_EnumDef_i::members (const CORBA::EnumMemberSeq &members
-                        ACE_ENV_ARG_DECL)
+TAO_EnumDef_i::members (const CORBA::EnumMemberSeq &members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->update_key ();
 
-  this->members_i (members
-                   ACE_ENV_ARG_PARAMETER);
+  this->members_i (members);
 }
 
 void
-TAO_EnumDef_i::members_i (const CORBA::EnumMemberSeq &members
-                          ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EnumDef_i::members_i (const CORBA::EnumMemberSeq &members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->remove_section (this->section_key_,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h
index 0bd5b265451..a9f901135bf 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h
@@ -51,43 +51,36 @@ public:
   virtual ~TAO_EnumDef_i (void);
   // Destructor
 
-  virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::DefinitionKind def_kind ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
-  virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
-  virtual CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
-  virtual CORBA::EnumMemberSeq *members (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::EnumMemberSeq *members ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::EnumMemberSeq *members_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::EnumMemberSeq *members_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void members (
-      const CORBA::EnumMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CORBA::EnumMemberSeq &members)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void members_i (
-      const CORBA::EnumMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CORBA::EnumMemberSeq &members)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp
index 98b414b8970..e682d651f52 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp
@@ -69,21 +69,18 @@ TAO_EventDef_i::describe_i (void)
 }
 
 CORBA::Boolean
-TAO_EventDef_i::is_a (const char *event_id
-                      ACE_ENV_ARG_DECL)
+TAO_EventDef_i::is_a (const char *event_id)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
   this->update_key ();
 
-  return this->is_a_i (event_id
-                       ACE_ENV_ARG_PARAMETER);
+  return this->is_a_i (event_id);
 }
 
 CORBA::Boolean
-TAO_EventDef_i::is_a_i (const char *event_id
-                        ACE_ENV_ARG_DECL)
+TAO_EventDef_i::is_a_i (const char *event_id)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::strcmp (event_id, "IDL:omg.org/CORBA/EventBase:1.0") == 0)
@@ -91,8 +88,7 @@ TAO_EventDef_i::is_a_i (const char *event_id
       return 1;
     }
 
-  return this->TAO_ValueDef_i::is_a_i (event_id
-                                       ACE_ENV_ARG_PARAMETER);
+  return this->TAO_ValueDef_i::is_a_i (event_id);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h
index a1e280a2882..9746d4289d7 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h
@@ -52,43 +52,36 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Contained::Description *describe (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::Contained::Description *describe_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::Boolean is_a (
       const char *event_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_a_i (
       const char *event_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp
index dcfb8875214..71d487f0cdd 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp
@@ -27,7 +27,6 @@ TAO_EventPortDef_i::~TAO_EventPortDef_i (void)
 
 CORBA::ComponentIR::EventDef_ptr
 TAO_EventPortDef_i::event (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -40,7 +39,6 @@ TAO_EventPortDef_i::event (
 
 CORBA::ComponentIR::EventDef_ptr
 TAO_EventPortDef_i::event_i (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -48,17 +46,14 @@ TAO_EventPortDef_i::event_i (
   this->repo_->config ()->get_string_value (this->section_key_,
                                             "base_type",
                                             holder);
-  CORBA::Contained_var obj = this->repo_->lookup_id (holder.fast_rep ()
-                                                     ACE_ENV_ARG_PARAMETER);
+  CORBA::Contained_var obj = this->repo_->lookup_id (holder.fast_rep ());
 
-  return CORBA::ComponentIR::EventDef::_narrow (obj.in ()
-                                                ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::EventDef::_narrow (obj.in ());
 }
 
 void
 TAO_EventPortDef_i::event (
     CORBA::ComponentIR::EventDef_ptr event
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -66,14 +61,12 @@ TAO_EventPortDef_i::event (
 
   this->update_key ();
 
-  this->event_i (event
-                 ACE_ENV_ARG_PARAMETER);
+  this->event_i (event);
 }
 
 void
 TAO_EventPortDef_i::event_i (
     CORBA::ComponentIR::EventDef_ptr event
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -107,7 +100,6 @@ TAO_EventPortDef_i::event_i (
 CORBA::Boolean
 TAO_EventPortDef_i::is_a (
     const char *event_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -115,14 +107,12 @@ TAO_EventPortDef_i::is_a (
 
   this->update_key ();
 
-  return this->is_a_i (event_id
-                       ACE_ENV_ARG_PARAMETER);
+  return this->is_a_i (event_id);
 }
 
 CORBA::Boolean
 TAO_EventPortDef_i::is_a_i (
     const char *event_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -140,8 +130,7 @@ TAO_EventPortDef_i::is_a_i (
                                        0);
   TAO_EventDef_i impl (this->repo_);
   impl.section_key (key);
-  return impl.is_a_i (event_id
-                      ACE_ENV_ARG_PARAMETER);
+  return impl.is_a_i (event_id);
 }
 
 CORBA::Contained::Description *
@@ -165,7 +154,6 @@ TAO_EventPortDef_i::describe_i (void)
                                               epd,
                                               this->repo_,
                                               this->section_key_
-                                              ACE_ENV_ARG_PARAMETER
                                             );
 
   ACE_TString holder;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h
index dc84527d41f..0c292797cbb 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h
@@ -55,36 +55,30 @@ public:
   /// Destructor
 
   virtual CORBA::ComponentIR::EventDef_ptr event (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ComponentIR::EventDef_ptr event_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void event (
       CORBA::ComponentIR::EventDef_ptr event
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void event_i (
       CORBA::ComponentIR::EventDef_ptr event
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean is_a (
       const char *event_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_a_i (
       const char *event_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -92,20 +86,17 @@ public:
   /// implemented here.
 
   virtual CORBA::Contained::Description *describe (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::Contained::Description *describe_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
 private:
   virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Dummy method so we can consolidate derived class methods
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp
index b675d2cd2da..44fd01ab2f8 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp
@@ -134,7 +134,6 @@ TAO_ExceptionDef_i::type_i (void)
                                          id.c_str (),
                                          name.c_str (),
                                          members.in ()
-                                         ACE_ENV_ARG_PARAMETER
                                        );
 }
 
@@ -242,11 +241,9 @@ TAO_ExceptionDef_i::members_i (void)
       obj =
         TAO_IFR_Service_Utils::create_objref (kind,
                                               path.c_str (),
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
+                                              this->repo_);
 
-      retval[k].type_def = CORBA::IDLType::_narrow (obj.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
+      retval[k].type_def = CORBA::IDLType::_narrow (obj.in ());
 
       this->repo_->config ()->expand_path (this->repo_->root_key (),
                                            path,
@@ -263,21 +260,18 @@ TAO_ExceptionDef_i::members_i (void)
 }
 
 void
-TAO_ExceptionDef_i::members (const CORBA::StructMemberSeq &members
-                             ACE_ENV_ARG_DECL)
+TAO_ExceptionDef_i::members (const CORBA::StructMemberSeq &members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->update_key ();
 
-  this->members_i (members
-                   ACE_ENV_ARG_PARAMETER);
+  this->members_i (members);
 }
 
 void
-TAO_ExceptionDef_i::members_i (const CORBA::StructMemberSeq &members
-                               ACE_ENV_ARG_DECL)
+TAO_ExceptionDef_i::members_i (const CORBA::StructMemberSeq &members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our old members, both refs and defns.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h
index 88dd3e8bbd5..ae7c11bbc7f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h
@@ -52,65 +52,54 @@ public:
   virtual ~TAO_ExceptionDef_i (void);
   // Destructor
 
-  virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::DefinitionKind def_kind ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
-  virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
-  virtual void destroy_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
-  virtual CORBA::Contained::Description *describe (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Contained::Description *describe ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
-  virtual CORBA::Contained::Description *describe_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Contained::Description *describe_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
-  virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::TypeCode_ptr type_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::StructMemberSeq *members (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::StructMemberSeq *members ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::StructMemberSeq *members_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::StructMemberSeq *members_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void members (
-      const CORBA::StructMemberSeq & members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CORBA::StructMemberSeq & members)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void members_i (
-      const CORBA::StructMemberSeq & members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CORBA::StructMemberSeq & members)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h
index e79471d8e11..46b883aa6b0 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h
@@ -56,7 +56,6 @@ public:
   // Destructor
 
   virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp
index 4e9a697156c..c71daebd1a3 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp
@@ -28,7 +28,6 @@ TAO_ExtAttributeDef_i::~TAO_ExtAttributeDef_i (void)
 
 CORBA::ExcDescriptionSeq *
 TAO_ExtAttributeDef_i::get_exceptions (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -41,7 +40,6 @@ TAO_ExtAttributeDef_i::get_exceptions (
 
 CORBA::ExcDescriptionSeq *
 TAO_ExtAttributeDef_i::get_exceptions_i (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -52,8 +50,7 @@ TAO_ExtAttributeDef_i::get_exceptions_i (
   CORBA::ExcDescriptionSeq_var safe_retval = retval;
 
   this->fill_exceptions (*retval,
-                         "get_excepts"
-                         ACE_ENV_ARG_PARAMETER);
+                         "get_excepts");
 
   return safe_retval._retn ();
 }
@@ -61,7 +58,6 @@ TAO_ExtAttributeDef_i::get_exceptions_i (
 void
 TAO_ExtAttributeDef_i::get_exceptions (
     const CORBA::ExcDescriptionSeq &get_exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -69,14 +65,12 @@ TAO_ExtAttributeDef_i::get_exceptions (
 
   this->update_key ();
 
-  this->get_exceptions_i (get_exceptions
-                          ACE_ENV_ARG_PARAMETER);
+  this->get_exceptions_i (get_exceptions);
 }
 
 void
 TAO_ExtAttributeDef_i::get_exceptions_i (
     const CORBA::ExcDescriptionSeq &get_exceptions
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -86,7 +80,6 @@ TAO_ExtAttributeDef_i::get_exceptions_i (
 
 CORBA::ExcDescriptionSeq *
 TAO_ExtAttributeDef_i::set_exceptions (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -99,7 +92,6 @@ TAO_ExtAttributeDef_i::set_exceptions (
 
 CORBA::ExcDescriptionSeq *
 TAO_ExtAttributeDef_i::set_exceptions_i (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -110,8 +102,7 @@ TAO_ExtAttributeDef_i::set_exceptions_i (
   CORBA::ExcDescriptionSeq_var safe_retval = retval;
 
   this->fill_exceptions (*retval,
-                         "put_excepts"
-                         ACE_ENV_ARG_PARAMETER);
+                         "put_excepts");
 
   return safe_retval._retn ();
 }
@@ -119,7 +110,6 @@ TAO_ExtAttributeDef_i::set_exceptions_i (
 void
 TAO_ExtAttributeDef_i::set_exceptions (
     const CORBA::ExcDescriptionSeq &set_exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -127,14 +117,12 @@ TAO_ExtAttributeDef_i::set_exceptions (
 
   this->update_key ();
 
-  this->set_exceptions_i (set_exceptions
-                          ACE_ENV_ARG_PARAMETER);
+  this->set_exceptions_i (set_exceptions);
 }
 
 void
 TAO_ExtAttributeDef_i::set_exceptions_i (
     const CORBA::ExcDescriptionSeq &set_exceptions
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -144,7 +132,6 @@ TAO_ExtAttributeDef_i::set_exceptions_i (
 
 CORBA::ExtAttributeDescription *
 TAO_ExtAttributeDef_i::describe_attribute (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -157,7 +144,6 @@ TAO_ExtAttributeDef_i::describe_attribute (
 
 CORBA::ExtAttributeDescription *
 TAO_ExtAttributeDef_i::describe_attribute_i (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -167,8 +153,7 @@ TAO_ExtAttributeDef_i::describe_attribute_i (
                   0);
   CORBA::ExtAttributeDescription_var safe_retval = retval;
 
-  this->fill_description (*retval
-                          ACE_ENV_ARG_PARAMETER);
+  this->fill_description (*retval);
 
   return safe_retval._retn ();
 }
@@ -176,7 +161,6 @@ TAO_ExtAttributeDef_i::describe_attribute_i (
 void
 TAO_ExtAttributeDef_i::fill_description (
     CORBA::ExtAttributeDescription &desc
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -197,18 +181,15 @@ TAO_ExtAttributeDef_i::fill_description (
   desc.mode = this->mode_i ();
 
   this->fill_exceptions (desc.get_exceptions,
-                         "get_excepts"
-                         ACE_ENV_ARG_PARAMETER);
+                         "get_excepts");
 
   this->fill_exceptions (desc.put_exceptions,
-                         "put_excepts"
-                         ACE_ENV_ARG_PARAMETER);
+                         "put_excepts");
 }
 
 void
 TAO_ExtAttributeDef_i::fill_exceptions (CORBA::ExcDescriptionSeq &exceptions,
-                                        const char *sub_section
-                                        ACE_ENV_ARG_DECL)
+                                        const char *sub_section)
 {
   ACE_Configuration_Section_Key excepts_key;
   int status =
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h
index f4d9e54b665..8fe264559e3 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h
@@ -52,56 +52,46 @@ public:
   // Destructor
 
   virtual CORBA::ExcDescriptionSeq *get_exceptions (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ExcDescriptionSeq *get_exceptions_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void get_exceptions (
       const CORBA::ExcDescriptionSeq &get_exceptions
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void get_exceptions_i (
       const CORBA::ExcDescriptionSeq &get_exceptions
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::ExcDescriptionSeq *set_exceptions (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ExcDescriptionSeq *set_exceptions_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void set_exceptions (
       const CORBA::ExcDescriptionSeq &set_exceptions
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void set_exceptions_i (
       const CORBA::ExcDescriptionSeq &set_exceptions
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::ExtAttributeDescription *describe_attribute (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ExtAttributeDescription *describe_attribute_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -109,7 +99,6 @@ public:
   // ComponentDescription.
   void fill_description (
       CORBA::ExtAttributeDescription &desc
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -117,8 +106,7 @@ private:
   /// Common code for the set and get varieties.
 
   void fill_exceptions (CORBA::ExcDescriptionSeq &exceptions,
-                        const char *sub_section
-                        ACE_ENV_ARG_DECL);
+                        const char *sub_section);
 
   void exceptions (const char *sub_section,
                    const CORBA::ExcDescriptionSeq &exceptions);
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h
index 1e5eec3bcf2..fcf64d09eb7 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h
@@ -55,7 +55,6 @@ public:
   // Destructor
 
   virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp
index 7440c04bb54..51b596f3b33 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp
@@ -30,7 +30,6 @@ TAO_ExtValueDef_i::~TAO_ExtValueDef_i (void)
 
 CORBA::ExtInitializerSeq *
 TAO_ExtValueDef_i::ext_initializers (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -43,7 +42,6 @@ TAO_ExtValueDef_i::ext_initializers (
 
 CORBA::ExtInitializerSeq *
 TAO_ExtValueDef_i::ext_initializers_i (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -127,18 +125,15 @@ TAO_ExtValueDef_i::ext_initializers_i (
 
           obj =
             TAO_IFR_Service_Utils::path_to_ir_object (holder,
-                                                      this->repo_
-                                                      ACE_ENV_ARG_PARAMETER);
+                                                      this->repo_);
 
           retval[i].members[j].type_def =
-            CORBA::IDLType::_narrow (obj.in ()
-                                     ACE_ENV_ARG_PARAMETER);
+            CORBA::IDLType::_narrow (obj.in ());
         }
 
       this->fill_exceptions (retval[i].exceptions,
                              initializer_key,
-                             "excepts"
-                             ACE_ENV_ARG_PARAMETER);
+                             "excepts");
     }
 
   return retval._retn ();
@@ -147,7 +142,6 @@ TAO_ExtValueDef_i::ext_initializers_i (
 void
 TAO_ExtValueDef_i::ext_initializers (
     const CORBA::ExtInitializerSeq &ext_initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -155,14 +149,12 @@ TAO_ExtValueDef_i::ext_initializers (
 
   this->update_key ();
 
-  this->ext_initializers_i (ext_initializers
-                            ACE_ENV_ARG_PARAMETER);
+  this->ext_initializers_i (ext_initializers);
 }
 
 void
 TAO_ExtValueDef_i::ext_initializers_i (
     const CORBA::ExtInitializerSeq &ext_initializers
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -207,7 +199,6 @@ TAO_ExtValueDef_i::ext_initializers_i (
 
 CORBA::ExtValueDef::ExtFullValueDescription *
 TAO_ExtValueDef_i::describe_ext_value (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -220,7 +211,6 @@ TAO_ExtValueDef_i::describe_ext_value (
 
 CORBA::ExtValueDef::ExtFullValueDescription *
 TAO_ExtValueDef_i::describe_ext_value_i (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -379,12 +369,10 @@ TAO_ExtValueDef_i::describe_ext_value_i (
                     TAO_IFR_Service_Utils::path_to_ir_object (
                                                holder,
                                                this->repo_
-                                               ACE_ENV_ARG_PARAMETER
                                              );
 
                   fv_desc->operations[i].parameters[j].type_def =
-                    CORBA::IDLType::_narrow (obj.in ()
-                                             ACE_ENV_ARG_PARAMETER);
+                    CORBA::IDLType::_narrow (obj.in ());
 
                   this->repo_->config ()->get_integer_value (param_key,
                                                              "mode",
@@ -521,14 +509,12 @@ TAO_ExtValueDef_i::describe_ext_value_i (
 
           this->fill_exceptions (fv_desc->attributes[i].get_exceptions,
                                  attr_key,
-                                 "get_excepts"
-                                 ACE_ENV_ARG_PARAMETER);
+                                 "get_excepts");
 
 
           this->fill_exceptions (fv_desc->attributes[i].put_exceptions,
                                  attr_key,
-                                 "put_excepts"
-                                 ACE_ENV_ARG_PARAMETER);
+                                 "put_excepts");
         }
     }
 
@@ -593,12 +579,10 @@ TAO_ExtValueDef_i::describe_ext_value_i (
 
           obj =
             TAO_IFR_Service_Utils::path_to_ir_object (holder,
-                                                      this->repo_
-                                                      ACE_ENV_ARG_PARAMETER);
+                                                      this->repo_);
 
           fv_desc->members[i].type_def =
-            CORBA::IDLType::_narrow (obj.in ()
-                                     ACE_ENV_ARG_PARAMETER);
+            CORBA::IDLType::_narrow (obj.in ());
         }
     }
 
@@ -676,19 +660,16 @@ TAO_ExtValueDef_i::describe_ext_value_i (
                     TAO_IFR_Service_Utils::path_to_ir_object (
                                                holder,
                                                this->repo_
-                                               ACE_ENV_ARG_PARAMETER
                                              );
 
                   fv_desc->initializers[i].members[j].type_def =
-                    CORBA::IDLType::_narrow (obj.in ()
-                                             ACE_ENV_ARG_PARAMETER);
+                    CORBA::IDLType::_narrow (obj.in ());
                 }
             }
 
           this->fill_exceptions (fv_desc->initializers[i].exceptions,
                                  initializer_key,
-                                 "excepts"
-                                 ACE_ENV_ARG_PARAMETER);
+                                 "excepts");
         }
     }
 
@@ -728,7 +709,6 @@ TAO_ExtValueDef_i::create_ext_attribute (
     CORBA::AttributeMode mode,
     const CORBA::ExceptionDefSeq &get_exceptions,
     const CORBA::ExceptionDefSeq &set_exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -742,8 +722,7 @@ TAO_ExtValueDef_i::create_ext_attribute (
                                        type,
                                        mode,
                                        get_exceptions,
-                                       set_exceptions
-                                       ACE_ENV_ARG_PARAMETER);
+                                       set_exceptions);
 }
 
 CORBA::ExtAttributeDef_ptr
@@ -755,7 +734,6 @@ TAO_ExtValueDef_i::create_ext_attribute_i (
     CORBA::AttributeMode mode,
     const CORBA::ExceptionDefSeq &get_exceptions,
     const CORBA::ExceptionDefSeq &set_exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -773,8 +751,7 @@ TAO_ExtValueDef_i::create_ext_attribute_i (
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          "attrs"
-                                          ACE_ENV_ARG_PARAMETER);
+                                          "attrs");
 
   // Store the path to the attribute's type definition.
   char *type_path = TAO_IFR_Service_Utils::reference_to_path (type);
@@ -800,12 +777,10 @@ TAO_ExtValueDef_i::create_ext_attribute_i (
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Attribute,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
+                                          this->repo_);
 
   CORBA::ExtAttributeDef_var retval =
-    CORBA::ExtAttributeDef::_narrow (obj.in ()
-                                     ACE_ENV_ARG_PARAMETER);
+    CORBA::ExtAttributeDef::_narrow (obj.in ());
 
   return retval._retn ();
 }
@@ -813,8 +788,7 @@ TAO_ExtValueDef_i::create_ext_attribute_i (
 void
 TAO_ExtValueDef_i::fill_exceptions (CORBA::ExcDescriptionSeq &exceptions,
                                     ACE_Configuration_Section_Key &key,
-                                    const char *sub_section
-                                    ACE_ENV_ARG_DECL)
+                                    const char *sub_section)
 {
   ACE_Configuration_Section_Key excepts_key;
   int status =
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h
index d2390a47c4a..b23c69a8c1a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h
@@ -52,34 +52,28 @@ public:
   // Destructor
 
   virtual CORBA::ExtInitializerSeq *ext_initializers (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ExtInitializerSeq *ext_initializers_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void ext_initializers (
       const CORBA::ExtInitializerSeq &ext_initializers
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void ext_initializers_i (
       const CORBA::ExtInitializerSeq &ext_initializers
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::ExtValueDef::ExtFullValueDescription *describe_ext_value (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ExtValueDef::ExtFullValueDescription *describe_ext_value_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -91,7 +85,6 @@ public:
       CORBA::AttributeMode mode,
       const CORBA::ExceptionDefSeq &get_exceptions,
       const CORBA::ExceptionDefSeq &set_exceptions
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -103,7 +96,6 @@ public:
       CORBA::AttributeMode mode,
       const CORBA::ExceptionDefSeq &get_exceptions,
       const CORBA::ExceptionDefSeq &set_exceptions
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -118,8 +110,7 @@ private:
 
   void fill_exceptions (CORBA::ExcDescriptionSeq &exceptions,
                         ACE_Configuration_Section_Key &key,
-                        const char *sub_section
-                        ACE_ENV_ARG_DECL);
+                        const char *sub_section);
 
   void exceptions (ACE_Configuration_Section_Key &key,
                    const char *sub_section,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h
index 38a366914ec..0d4a5f59b5d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h
@@ -51,7 +51,6 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h
index e8ad0a283d7..12784c9c11e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h
@@ -52,7 +52,6 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp
index 3fe8ee9ff97..09d482511cb 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp
@@ -75,7 +75,7 @@ TAO_FixedDef_i::digits (void)
 }
 
 CORBA::UShort
-TAO_FixedDef_i::digits_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
+TAO_FixedDef_i::digits_i ( /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -83,21 +83,19 @@ TAO_FixedDef_i::digits_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG
 }
 
 void
-TAO_FixedDef_i::digits (CORBA::UShort digits
-                        ACE_ENV_ARG_DECL)
+TAO_FixedDef_i::digits (CORBA::UShort digits)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->update_key ();
 
-  this->digits_i (digits
-                  ACE_ENV_ARG_PARAMETER);
+  this->digits_i (digits);
 }
 
 void
 TAO_FixedDef_i::digits_i (CORBA::UShort /* digits */
-                          ACE_ENV_ARG_DECL_NOT_USED)
+                          )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -123,21 +121,19 @@ TAO_FixedDef_i::scale_i (void)
 }
 
 void
-TAO_FixedDef_i::scale (CORBA::Short scale
-                       ACE_ENV_ARG_DECL)
+TAO_FixedDef_i::scale (CORBA::Short scale)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->update_key ();
 
-  this->scale_i (scale
-                 ACE_ENV_ARG_PARAMETER);
+  this->scale_i (scale);
 }
 
 void
 TAO_FixedDef_i::scale_i (CORBA::Short /* scale */
-                         ACE_ENV_ARG_DECL_NOT_USED)
+                         )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h
index 326bc90185b..9b65f9b02dc 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h
@@ -51,75 +51,62 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::UShort digits (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::UShort digits_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void digits (
       CORBA::UShort digits
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void digits_i (
       CORBA::UShort digits
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Short scale (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Short scale_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void scale (
       CORBA::Short scale
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void scale_i (
       CORBA::Short scale
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
index e9f723aeb15..f8ae5fb993e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
@@ -64,14 +64,12 @@ TAO_HomeDef_i::destroy_i (void)
       "factories",
       this->repo_,
       this->section_key_
-      ACE_ENV_ARG_PARAMETER
     );
 
   TAO_IFR_Generic_Utils<TAO_FinderDef_i>::destroy_special (
       "finders",
       this->repo_,
       this->section_key_
-      ACE_ENV_ARG_PARAMETER
     );
 
   this->TAO_ExtInterfaceDef_i::destroy_i ();
@@ -97,8 +95,7 @@ TAO_HomeDef_i::describe_i (void)
   TAO_IFR_Desc_Utils<CORBA::ComponentIR::HomeDescription,
                      TAO_HomeDef_i>::fill_desc_begin (home_desc,
                                                       this->repo_,
-                                                      this->section_key_
-                                                      ACE_ENV_ARG_PARAMETER);
+                                                      this->section_key_);
 
   ACE_TString holder;
   int status =
@@ -138,24 +135,20 @@ TAO_HomeDef_i::describe_i (void)
                                            0);
       TAO_ValueDef_i impl (this->repo_);
       impl.section_key (tmp_key);
-      impl.fill_value_description (home_desc.primary_key
-                                   ACE_ENV_ARG_PARAMETER);
+      impl.fill_value_description (home_desc.primary_key);
     }
 
   this->fill_op_desc_seq (this->section_key_,
                           home_desc.factories,
-                          "factories"
-                          ACE_ENV_ARG_PARAMETER);
+                          "factories");
 
   this->fill_op_desc_seq (this->section_key_,
                           home_desc.finders,
-                          "finders"
-                          ACE_ENV_ARG_PARAMETER);
+                          "finders");
 
   this->fill_op_desc_seq (this->section_key_,
                           home_desc.operations,
-                          "ops"
-                          ACE_ENV_ARG_PARAMETER);
+                          "ops");
 
   home_desc.type = this->type_i ();
 
@@ -195,8 +188,7 @@ TAO_HomeDef_i::type_i (void)
                                             name);
 
   return this->repo_->tc_factory ()->create_home_tc (id.fast_rep (),
-                                                     name.fast_rep ()
-                                                     ACE_ENV_ARG_PARAMETER);
+                                                     name.fast_rep ());
 }
 
 CORBA::ComponentIR::HomeDef_ptr
@@ -227,17 +219,14 @@ TAO_HomeDef_i::base_home_i (void)
 
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (path,
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
+                                              this->repo_);
 
-  return CORBA::ComponentIR::HomeDef::_narrow (obj.in ()
-                                               ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::HomeDef::_narrow (obj.in ());
 }
 
 void
 TAO_HomeDef_i::base_home (
     CORBA::ComponentIR::HomeDef_ptr base_home
-    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -245,14 +234,12 @@ TAO_HomeDef_i::base_home (
 
   this->update_key ();
 
-  this->base_home_i (base_home
-                     ACE_ENV_ARG_PARAMETER);
+  this->base_home_i (base_home);
 }
 
 void
 TAO_HomeDef_i::base_home_i (
     CORBA::ComponentIR::HomeDef_ptr base_home
-    ACE_ENV_ARG_DECL_NOT_USED
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -264,7 +251,6 @@ TAO_HomeDef_i::base_home_i (
 
 CORBA::InterfaceDefSeq *
 TAO_HomeDef_i::supported_interfaces (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -277,7 +263,6 @@ TAO_HomeDef_i::supported_interfaces (
 
 CORBA::InterfaceDefSeq *
 TAO_HomeDef_i::supported_interfaces_i (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -315,11 +300,9 @@ TAO_HomeDef_i::supported_interfaces_i (
                                                 stringified,
                                                 holder);
       obj = TAO_IFR_Service_Utils::path_to_ir_object (holder,
-                                                      this->repo_
-                                                      ACE_ENV_ARG_PARAMETER);
+                                                      this->repo_);
 
-      safe_retval[i] = CORBA::InterfaceDef::_narrow (obj.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+      safe_retval[i] = CORBA::InterfaceDef::_narrow (obj.in ());
     }
 
   return safe_retval._retn ();
@@ -328,7 +311,6 @@ TAO_HomeDef_i::supported_interfaces_i (
 void
 TAO_HomeDef_i::supported_interfaces (
     const CORBA::InterfaceDefSeq &supported_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -336,14 +318,12 @@ TAO_HomeDef_i::supported_interfaces (
 
   this->update_key ();
 
-  this->supported_interfaces_i (supported_interfaces
-                                ACE_ENV_ARG_PARAMETER);
+  this->supported_interfaces_i (supported_interfaces);
 }
 
 void
 TAO_HomeDef_i::supported_interfaces_i (
     const CORBA::InterfaceDefSeq &supported_interfaces
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -399,17 +379,14 @@ TAO_HomeDef_i::managed_component_i (void)
                                             path);
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (path,
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
+                                              this->repo_);
 
-  return CORBA::ComponentIR::ComponentDef::_narrow (obj.in ()
-                                                    ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::ComponentDef::_narrow (obj.in ());
 }
 
 void
 TAO_HomeDef_i::managed_component (
     CORBA::ComponentIR::ComponentDef_ptr managed_component
-    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -417,14 +394,12 @@ TAO_HomeDef_i::managed_component (
 
   this->update_key ();
 
-  this->managed_component_i (managed_component
-                             ACE_ENV_ARG_PARAMETER);
+  this->managed_component_i (managed_component);
 }
 
 void
 TAO_HomeDef_i::managed_component_i (
     CORBA::ComponentIR::ComponentDef_ptr managed_component
-    ACE_ENV_ARG_DECL_NOT_USED
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -462,17 +437,14 @@ TAO_HomeDef_i::primary_key_i (void)
 
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (path,
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
+                                              this->repo_);
 
-  return CORBA::ValueDef::_narrow (obj.in ()
-                                   ACE_ENV_ARG_PARAMETER);
+  return CORBA::ValueDef::_narrow (obj.in ());
 }
 
 void
 TAO_HomeDef_i::primary_key (
     CORBA::ValueDef_ptr primary_key
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -480,14 +452,12 @@ TAO_HomeDef_i::primary_key (
 
   this->update_key ();
 
-  this->primary_key_i (primary_key
-                       ACE_ENV_ARG_PARAMETER);
+  this->primary_key_i (primary_key);
 }
 
 void
 TAO_HomeDef_i::primary_key_i (
     CORBA::ValueDef_ptr primary_key
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -509,8 +479,7 @@ TAO_HomeDef_i::create_factory (const char *id,
                                const char *name,
                                const char *version,
                                const CORBA::ParDescriptionSeq &params,
-                               const CORBA::ExceptionDefSeq &exceptions
-                               ACE_ENV_ARG_DECL)
+                               const CORBA::ExceptionDefSeq &exceptions)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::FactoryDef::_nil ());
@@ -521,8 +490,7 @@ TAO_HomeDef_i::create_factory (const char *id,
                                  name,
                                  version,
                                  params,
-                                 exceptions
-                                 ACE_ENV_ARG_PARAMETER);
+                                 exceptions);
 }
 
 CORBA::ComponentIR::FactoryDef_ptr
@@ -532,7 +500,6 @@ TAO_HomeDef_i::create_factory_i (
     const char *version,
     const CORBA::ParDescriptionSeq &params,
     const CORBA::ExceptionDefSeq &exceptions
-    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -542,11 +509,9 @@ TAO_HomeDef_i::create_factory_i (
                                                version,
                                                "factories",
                                                params,
-                                               exceptions
-                                               ACE_ENV_ARG_PARAMETER);
+                                               exceptions);
 
-  return CORBA::ComponentIR::FactoryDef::_narrow (obj.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::FactoryDef::_narrow (obj.in ());
 }
 
 CORBA::ComponentIR::FinderDef_ptr
@@ -554,8 +519,7 @@ TAO_HomeDef_i::create_finder (const char *id,
                               const char *name,
                               const char *version,
                               const CORBA::ParDescriptionSeq &params,
-                              const CORBA::ExceptionDefSeq &exceptions
-                              ACE_ENV_ARG_DECL)
+                              const CORBA::ExceptionDefSeq &exceptions)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::FinderDef::_nil ());
@@ -566,8 +530,7 @@ TAO_HomeDef_i::create_finder (const char *id,
                                 name,
                                 version,
                                 params,
-                                exceptions
-                                ACE_ENV_ARG_PARAMETER);
+                                exceptions);
 }
 
 CORBA::ComponentIR::FinderDef_ptr
@@ -577,7 +540,6 @@ TAO_HomeDef_i::create_finder_i (
     const char *version,
     const CORBA::ParDescriptionSeq &params,
     const CORBA::ExceptionDefSeq &exceptions
-    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -587,11 +549,9 @@ TAO_HomeDef_i::create_finder_i (
                                                version,
                                                "finders",
                                                params,
-                                               exceptions
-                                               ACE_ENV_ARG_PARAMETER);
+                                               exceptions);
 
-  return CORBA::ComponentIR::FinderDef::_narrow (obj.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::FinderDef::_narrow (obj.in ());
 }
 
 CORBA::Object_ptr
@@ -601,8 +561,7 @@ TAO_HomeDef_i::create_common (CORBA::DefinitionKind created_kind,
                               const char *version,
                               const char *sub_section,
                               const CORBA::ParDescriptionSeq &params,
-                              const CORBA::ExceptionDefSeq &exceptions
-                              ACE_ENV_ARG_DECL)
+                              const CORBA::ExceptionDefSeq &exceptions)
 {
   TAO_Container_i::tmp_name_holder_ = name;
   ACE_Configuration_Section_Key new_key;
@@ -618,8 +577,7 @@ TAO_HomeDef_i::create_common (CORBA::DefinitionKind created_kind,
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          sub_section
-                                          ACE_ENV_ARG_PARAMETER);
+                                          sub_section);
 
   // Set the 'result' field with the path of our managed component.
   ACE_TString managed_path;
@@ -719,15 +677,13 @@ TAO_HomeDef_i::create_common (CORBA::DefinitionKind created_kind,
   return
     TAO_IFR_Service_Utils::create_objref (created_kind,
                                           result_path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
+                                          this->repo_);
 }
 
 void
 TAO_HomeDef_i::fill_op_desc_seq (ACE_Configuration_Section_Key &key,
                                  CORBA::OpDescriptionSeq &ods,
-                                 const char *sub_section
-                                 ACE_ENV_ARG_DECL)
+                                 const char *sub_section)
 {
   ods.length (0);
   ACE_Configuration_Section_Key sub_key;
@@ -754,16 +710,14 @@ TAO_HomeDef_i::fill_op_desc_seq (ACE_Configuration_Section_Key &key,
       stringified = TAO_IFR_Service_Utils::int_to_string (i);
       this->fill_op_desc (sub_key,
                           ods[i],
-                          stringified
-                          ACE_ENV_ARG_PARAMETER);
+                          stringified);
     }
 }
 
 void
 TAO_HomeDef_i::fill_op_desc (ACE_Configuration_Section_Key &key,
                              CORBA::OperationDescription &od,
-                             const char *sub_section
-                             ACE_ENV_ARG_DECL)
+                             const char *sub_section)
 {
   ACE_Configuration_Section_Key op_key;
   this->repo_->config ()->open_section (key,
@@ -775,7 +729,6 @@ TAO_HomeDef_i::fill_op_desc (ACE_Configuration_Section_Key &key,
       od,
       this->repo_,
       op_key
-      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TString result_path;
@@ -800,20 +753,17 @@ TAO_HomeDef_i::fill_op_desc (ACE_Configuration_Section_Key &key,
 
   this->fill_param_desc_seq (op_key,
                              od.parameters,
-                             "params"
-                             ACE_ENV_ARG_PARAMETER);
+                             "params");
 
   this->fill_exc_desc_seq (op_key,
                            od.exceptions,
-                           "excepts"
-                           ACE_ENV_ARG_PARAMETER);
+                           "excepts");
 }
 
 void
 TAO_HomeDef_i::fill_param_desc_seq (ACE_Configuration_Section_Key &key,
                                     CORBA::ParDescriptionSeq &pds,
-                                    const char *sub_section
-                                    ACE_ENV_ARG_DECL)
+                                    const char *sub_section)
 {
   pds.length (0);
   ACE_Configuration_Section_Key params_key;
@@ -840,16 +790,14 @@ TAO_HomeDef_i::fill_param_desc_seq (ACE_Configuration_Section_Key &key,
       stringified = TAO_IFR_Service_Utils::int_to_string (i);
       this->fill_param_desc (params_key,
                              pds[i],
-                             stringified
-                             ACE_ENV_ARG_PARAMETER);
+                             stringified);
     }
 }
 
 void
 TAO_HomeDef_i::fill_param_desc (ACE_Configuration_Section_Key &key,
                                 CORBA::ParameterDescription &pd,
-                                const char *sub_section
-                                ACE_ENV_ARG_DECL)
+                                const char *sub_section)
 {
   ACE_Configuration_Section_Key param_key;
   this->repo_->config ()->open_section (key,
@@ -870,11 +818,9 @@ TAO_HomeDef_i::fill_param_desc (ACE_Configuration_Section_Key &key,
 
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (holder,
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
+                                              this->repo_);
 
-  pd.type_def = CORBA::IDLType::_narrow (obj.in ()
-                                         ACE_ENV_ARG_PARAMETER);
+  pd.type_def = CORBA::IDLType::_narrow (obj.in ());
 
   CORBA::ULong val;
   this->repo_->config ()->get_integer_value (param_key,
@@ -886,8 +832,7 @@ TAO_HomeDef_i::fill_param_desc (ACE_Configuration_Section_Key &key,
 void
 TAO_HomeDef_i::fill_exc_desc_seq (ACE_Configuration_Section_Key &key,
                                   CORBA::ExcDescriptionSeq &eds,
-                                  const char *sub_section
-                                  ACE_ENV_ARG_DECL)
+                                  const char *sub_section)
 {
   eds.length (0);
   ACE_Configuration_Section_Key excepts_key;
@@ -914,16 +859,14 @@ TAO_HomeDef_i::fill_exc_desc_seq (ACE_Configuration_Section_Key &key,
       stringified = TAO_IFR_Service_Utils::int_to_string (i);
       this->fill_exc_desc (excepts_key,
                            eds[i],
-                           stringified
-                           ACE_ENV_ARG_PARAMETER);
+                           stringified);
     }
 }
 
 void
 TAO_HomeDef_i::fill_exc_desc (ACE_Configuration_Section_Key &key,
                               CORBA::ExceptionDescription &ed,
-                              const char *sub_section
-                              ACE_ENV_ARG_DECL)
+                              const char *sub_section)
 {
   ACE_TString path;
   this->repo_->config ()->get_string_value (key,
@@ -943,7 +886,6 @@ TAO_HomeDef_i::fill_exc_desc (ACE_Configuration_Section_Key &key,
                                               ed,
                                               this->repo_,
                                               except_def_key
-                                              ACE_ENV_ARG_PARAMETER
                                             );
 
   TAO_ExceptionDef_i impl (this->repo_);
@@ -954,8 +896,7 @@ TAO_HomeDef_i::fill_exc_desc (ACE_Configuration_Section_Key &key,
 void
 TAO_HomeDef_i::fill_attr_desc_seq (ACE_Configuration_Section_Key &key,
                                    CORBA::ExtAttrDescriptionSeq &eads,
-                                   const char *sub_section
-                                   ACE_ENV_ARG_DECL)
+                                   const char *sub_section)
 {
   eads.length (0);
   ACE_Configuration_Section_Key attrs_key;
@@ -982,16 +923,14 @@ TAO_HomeDef_i::fill_attr_desc_seq (ACE_Configuration_Section_Key &key,
       stringified = TAO_IFR_Service_Utils::int_to_string (i);
       this->fill_attr_desc (attrs_key,
                             eads[i],
-                            stringified
-                            ACE_ENV_ARG_PARAMETER);
+                            stringified);
     }
 }
 
 void
 TAO_HomeDef_i::fill_attr_desc (ACE_Configuration_Section_Key &key,
                                CORBA::ExtAttributeDescription &ead,
-                               const char *sub_section
-                               ACE_ENV_ARG_DECL)
+                               const char *sub_section)
 {
   ACE_Configuration_Section_Key attr_key;
   this->repo_->config ()->open_section (key,
@@ -1003,7 +942,6 @@ TAO_HomeDef_i::fill_attr_desc (ACE_Configuration_Section_Key &key,
                                               ead,
                                               this->repo_,
                                               attr_key
-                                              ACE_ENV_ARG_PARAMETER
                                             );
 
   TAO_AttributeDef_i impl (this->repo_);
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h
index 7436829cb68..ed65ff0c98b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h
@@ -55,131 +55,108 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Contained::Description *describe (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::Contained::Description *describe_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::ComponentIR::HomeDef_ptr base_home (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ComponentIR::HomeDef_ptr base_home_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void base_home (
       CORBA::ComponentIR::HomeDef_ptr base_home
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void base_home_i (
       CORBA::ComponentIR::HomeDef_ptr base_home
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::InterfaceDefSeq *supported_interfaces (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::InterfaceDefSeq *supported_interfaces_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void supported_interfaces (
       const CORBA::InterfaceDefSeq &supported_interfaces
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void supported_interfaces_i (
       const CORBA::InterfaceDefSeq &supported_interfaces
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::ComponentIR::ComponentDef_ptr managed_component (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ComponentIR::ComponentDef_ptr managed_component_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void managed_component (
       CORBA::ComponentIR::ComponentDef_ptr managed_component
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void managed_component_i (
       CORBA::ComponentIR::ComponentDef_ptr managed_component
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::ValueDef_ptr primary_key (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ValueDef_ptr primary_key_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void primary_key (
       CORBA::ValueDef_ptr primary_key
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void primary_key_i (
       CORBA::ValueDef_ptr primary_key
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -189,7 +166,6 @@ public:
       const char *version,
       const CORBA::ParDescriptionSeq &params,
       const CORBA::ExceptionDefSeq &exceptions
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -199,7 +175,6 @@ public:
       const char *version,
       const CORBA::ParDescriptionSeq &params,
       const CORBA::ExceptionDefSeq &exceptions
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -209,7 +184,6 @@ public:
       const char *version,
       const CORBA::ParDescriptionSeq &params,
       const CORBA::ExceptionDefSeq &exceptions
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -219,7 +193,6 @@ public:
       const char *version,
       const CORBA::ParDescriptionSeq &params,
       const CORBA::ExceptionDefSeq &exceptions
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -233,48 +206,39 @@ private:
       const char *sub_section,
       const CORBA::ParDescriptionSeq &params,
       const CORBA::ExceptionDefSeq &exceptions
-      ACE_ENV_ARG_DECL
     );
 
   void fill_op_desc_seq (ACE_Configuration_Section_Key &key,
                          CORBA::OpDescriptionSeq &ods,
-                         const char *sub_section
-                         ACE_ENV_ARG_DECL);
+                         const char *sub_section);
 
   void fill_op_desc (ACE_Configuration_Section_Key &key,
                      CORBA::OperationDescription &od,
-                     const char *sub_section
-                     ACE_ENV_ARG_DECL);
+                     const char *sub_section);
 
   void fill_param_desc_seq (ACE_Configuration_Section_Key &key,
                             CORBA::ParDescriptionSeq &pds,
-                            const char *sub_section
-                            ACE_ENV_ARG_DECL);
+                            const char *sub_section);
 
   void fill_param_desc (ACE_Configuration_Section_Key &key,
                         CORBA::ParameterDescription &pd,
-                        const char *sub_section
-                        ACE_ENV_ARG_DECL);
+                        const char *sub_section);
 
   void fill_exc_desc_seq (ACE_Configuration_Section_Key &key,
                           CORBA::ExcDescriptionSeq &eds,
-                          const char *sub_section
-                          ACE_ENV_ARG_DECL);
+                          const char *sub_section);
 
   void fill_exc_desc (ACE_Configuration_Section_Key &key,
                       CORBA::ExceptionDescription &ed,
-                      const char *sub_section
-                      ACE_ENV_ARG_DECL);
+                      const char *sub_section);
 
   void fill_attr_desc_seq (ACE_Configuration_Section_Key &key,
                            CORBA::ExtAttrDescriptionSeq &eads,
-                           const char *sub_section
-                           ACE_ENV_ARG_DECL);
+                           const char *sub_section);
 
   void fill_attr_desc (ACE_Configuration_Section_Key &key,
                        CORBA::ExtAttributeDescription &ead,
-                       const char *sub_section
-                       ACE_ENV_ARG_DECL);
+                       const char *sub_section);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h
index 8935d63aae6..edcd9b89dc9 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h
@@ -53,14 +53,12 @@ public:
   virtual ~TAO_IDLType_i (void);
   // Destructor.
 
-  virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type ()
 
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   // Defined in concrete classes.
 
-  virtual CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   // Defined in concrete classes.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp
index d773e2b55ad..bd701288a82 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp
@@ -1476,8 +1476,7 @@ POA_CORBA::IRObject::~IRObject (void)
           this->args_);
 
       retval =
-        this->servant_->def_kind (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->def_kind ();
     }
 
   private:
@@ -1495,7 +1494,6 @@ void POA_CORBA::IRObject::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -1530,7 +1528,7 @@ void POA_CORBA::IRObject::_get_def_kind_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -1550,8 +1548,7 @@ void POA_CORBA::IRObject::_get_def_kind_skel (
 
     virtual void execute (void)
     {
-      this->servant_->destroy (
-        ACE_ENV_SINGLE_ARG_PARAMETER);
+      this->servant_->destroy ();
     }
 
   private:
@@ -1567,7 +1564,6 @@ void POA_CORBA::IRObject::destroy_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -1600,7 +1596,7 @@ void POA_CORBA::IRObject::destroy_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -1642,8 +1638,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -1658,7 +1653,6 @@ void POA_CORBA::IRObject::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -1695,7 +1689,7 @@ void POA_CORBA::IRObject::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -1725,8 +1719,7 @@ void POA_CORBA::IRObject::_is_a_skel (
           this->args_);
 
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _non_existent ();
     }
 
   private:
@@ -1741,7 +1734,6 @@ void POA_CORBA::IRObject::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -1776,7 +1768,7 @@ void POA_CORBA::IRObject::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -1806,8 +1798,7 @@ void POA_CORBA::IRObject::_non_existent_skel (
           this->args_);
 
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _repository_id ();
     }
 
   private:
@@ -1822,7 +1813,6 @@ void POA_CORBA::IRObject::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -1857,7 +1847,7 @@ void POA_CORBA::IRObject::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -1867,7 +1857,6 @@ void POA_CORBA::IRObject::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -1877,8 +1866,9 @@ void POA_CORBA::IRObject::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::IRObject * const impl =
@@ -1899,7 +1889,7 @@ void POA_CORBA::IRObject::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -1930,8 +1920,7 @@ void POA_CORBA::IRObject::_interface_skel (
           this->args_);
 
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _get_component ();
     }
 
   private:
@@ -1946,7 +1935,6 @@ void POA_CORBA::IRObject::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -1981,12 +1969,11 @@ void POA_CORBA::IRObject::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::IRObject::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -2013,13 +2000,11 @@ const char* POA_CORBA::IRObject::_interface_repository_id (void) const
 void POA_CORBA::IRObject::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -2269,8 +2254,7 @@ POA_CORBA::Contained::~Contained (void)
           this->args_);
 
       retval =
-        this->servant_->id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->id ();
     }
 
   private:
@@ -2288,7 +2272,6 @@ void POA_CORBA::Contained::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -2323,7 +2306,7 @@ void POA_CORBA::Contained::_get_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -2354,8 +2337,7 @@ void POA_CORBA::Contained::_get_id_skel (
           1);
 
       this->servant_->id (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
+        arg_1);
     }
 
   private:
@@ -2373,7 +2355,6 @@ void POA_CORBA::Contained::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -2410,7 +2391,7 @@ void POA_CORBA::Contained::_set_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -2440,8 +2421,7 @@ void POA_CORBA::Contained::_set_id_skel (
           this->args_);
 
       retval =
-        this->servant_->name (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->name ();
     }
 
   private:
@@ -2459,7 +2439,6 @@ void POA_CORBA::Contained::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -2494,7 +2473,7 @@ void POA_CORBA::Contained::_get_name_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -2525,8 +2504,7 @@ void POA_CORBA::Contained::_get_name_skel (
           1);
 
       this->servant_->name (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
+        arg_1);
     }
 
   private:
@@ -2544,7 +2522,6 @@ void POA_CORBA::Contained::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -2581,7 +2558,7 @@ void POA_CORBA::Contained::_set_name_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -2611,8 +2588,7 @@ void POA_CORBA::Contained::_set_name_skel (
           this->args_);
 
       retval =
-        this->servant_->version (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->version ();
     }
 
   private:
@@ -2630,7 +2606,6 @@ void POA_CORBA::Contained::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -2665,7 +2640,7 @@ void POA_CORBA::Contained::_get_version_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -2696,8 +2671,7 @@ void POA_CORBA::Contained::_get_version_skel (
           1);
 
       this->servant_->version (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
+        arg_1);
     }
 
   private:
@@ -2715,7 +2689,6 @@ void POA_CORBA::Contained::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -2752,7 +2725,7 @@ void POA_CORBA::Contained::_set_version_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -2782,8 +2755,7 @@ void POA_CORBA::Contained::_set_version_skel (
           this->args_);
 
       retval =
-        this->servant_->defined_in (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->defined_in ();
     }
 
   private:
@@ -2801,7 +2773,6 @@ void POA_CORBA::Contained::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -2836,7 +2807,7 @@ void POA_CORBA::Contained::_get_defined_in_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -2866,8 +2837,7 @@ void POA_CORBA::Contained::_get_defined_in_skel (
           this->args_);
 
       retval =
-        this->servant_->absolute_name (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->absolute_name ();
     }
 
   private:
@@ -2885,7 +2855,6 @@ void POA_CORBA::Contained::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -2920,7 +2889,7 @@ void POA_CORBA::Contained::_get_absolute_name_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -2950,8 +2919,7 @@ void POA_CORBA::Contained::_get_absolute_name_skel (
           this->args_);
 
       retval =
-        this->servant_->containing_repository (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->containing_repository ();
     }
 
   private:
@@ -2969,7 +2937,6 @@ void POA_CORBA::Contained::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -3004,7 +2971,7 @@ void POA_CORBA::Contained::_get_containing_repository_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -3034,8 +3001,7 @@ void POA_CORBA::Contained::_get_containing_repository_skel (
           this->args_);
 
       retval =
-        this->servant_->describe (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->describe ();
     }
 
   private:
@@ -3053,7 +3019,6 @@ void POA_CORBA::Contained::describe_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -3088,7 +3053,7 @@ void POA_CORBA::Contained::describe_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -3133,8 +3098,7 @@ void POA_CORBA::Contained::describe_skel (
       this->servant_->move (
         arg_1
         , arg_2
-        , arg_3
-        ACE_ENV_ARG_PARAMETER);
+        , arg_3);
     }
 
   private:
@@ -3152,7 +3116,6 @@ void POA_CORBA::Contained::move_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -3193,7 +3156,7 @@ void POA_CORBA::Contained::move_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -3235,8 +3198,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -3251,7 +3213,6 @@ void POA_CORBA::Contained::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -3288,7 +3249,7 @@ void POA_CORBA::Contained::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -3318,8 +3279,7 @@ void POA_CORBA::Contained::_is_a_skel (
           this->args_);
 
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _non_existent ();
     }
 
   private:
@@ -3334,7 +3294,6 @@ void POA_CORBA::Contained::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -3369,7 +3328,7 @@ void POA_CORBA::Contained::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -3399,8 +3358,7 @@ void POA_CORBA::Contained::_non_existent_skel (
           this->args_);
 
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _repository_id ();
     }
 
   private:
@@ -3415,7 +3373,6 @@ void POA_CORBA::Contained::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -3450,7 +3407,7 @@ void POA_CORBA::Contained::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -3460,7 +3417,6 @@ void POA_CORBA::Contained::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -3470,8 +3426,9 @@ void POA_CORBA::Contained::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::Contained * const impl =
@@ -3492,7 +3449,7 @@ void POA_CORBA::Contained::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -3523,8 +3480,7 @@ void POA_CORBA::Contained::_interface_skel (
           this->args_);
 
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _get_component ();
     }
 
   private:
@@ -3539,7 +3495,6 @@ void POA_CORBA::Contained::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -3574,12 +3529,11 @@ void POA_CORBA::Contained::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::Contained::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -3610,13 +3564,11 @@ const char* POA_CORBA::Contained::_interface_repository_id (void) const
 void POA_CORBA::Contained::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -3880,8 +3832,7 @@ POA_CORBA::Container::~Container (void)
 
       retval =
         this->servant_->lookup (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -3899,7 +3850,6 @@ void POA_CORBA::Container::lookup_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -3936,7 +3886,7 @@ void POA_CORBA::Container::lookup_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -3980,8 +3930,7 @@ void POA_CORBA::Container::lookup_skel (
       retval =
         this->servant_->contents (
           arg_1
-          , arg_2
-          ACE_ENV_ARG_PARAMETER);
+          , arg_2);
     }
 
   private:
@@ -3999,7 +3948,6 @@ void POA_CORBA::Container::contents_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -4038,7 +3986,7 @@ void POA_CORBA::Container::contents_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -4096,8 +4044,7 @@ void POA_CORBA::Container::contents_skel (
           arg_1
           , arg_2
           , arg_3
-          , arg_4
-          ACE_ENV_ARG_PARAMETER);
+          , arg_4);
     }
 
   private:
@@ -4115,7 +4062,6 @@ void POA_CORBA::Container::lookup_name_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -4158,7 +4104,7 @@ void POA_CORBA::Container::lookup_name_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -4209,8 +4155,7 @@ void POA_CORBA::Container::lookup_name_skel (
         this->servant_->describe_contents (
           arg_1
           , arg_2
-          , arg_3
-          ACE_ENV_ARG_PARAMETER);
+          , arg_3);
     }
 
   private:
@@ -4228,7 +4173,6 @@ void POA_CORBA::Container::describe_contents_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -4269,7 +4213,7 @@ void POA_CORBA::Container::describe_contents_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -4320,8 +4264,7 @@ void POA_CORBA::Container::describe_contents_skel (
         this->servant_->create_module (
           arg_1
           , arg_2
-          , arg_3
-          ACE_ENV_ARG_PARAMETER);
+          , arg_3);
     }
 
   private:
@@ -4339,7 +4282,6 @@ void POA_CORBA::Container::create_module_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -4380,7 +4322,7 @@ void POA_CORBA::Container::create_module_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -4445,8 +4387,7 @@ void POA_CORBA::Container::create_module_skel (
           , arg_2
           , arg_3
           , arg_4
-          , arg_5
-          ACE_ENV_ARG_PARAMETER);
+          , arg_5);
     }
 
   private:
@@ -4464,7 +4405,6 @@ void POA_CORBA::Container::create_constant_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -4509,7 +4449,7 @@ void POA_CORBA::Container::create_constant_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -4567,8 +4507,7 @@ void POA_CORBA::Container::create_constant_skel (
           arg_1
           , arg_2
           , arg_3
-          , arg_4
-          ACE_ENV_ARG_PARAMETER);
+          , arg_4);
     }
 
   private:
@@ -4586,7 +4525,6 @@ void POA_CORBA::Container::create_struct_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -4629,7 +4567,7 @@ void POA_CORBA::Container::create_struct_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -4694,8 +4632,7 @@ void POA_CORBA::Container::create_struct_skel (
           , arg_2
           , arg_3
           , arg_4
-          , arg_5
-          ACE_ENV_ARG_PARAMETER);
+          , arg_5);
     }
 
   private:
@@ -4713,7 +4650,6 @@ void POA_CORBA::Container::create_union_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -4758,7 +4694,7 @@ void POA_CORBA::Container::create_union_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -4816,8 +4752,7 @@ void POA_CORBA::Container::create_union_skel (
           arg_1
           , arg_2
           , arg_3
-          , arg_4
-          ACE_ENV_ARG_PARAMETER);
+          , arg_4);
     }
 
   private:
@@ -4835,7 +4770,6 @@ void POA_CORBA::Container::create_enum_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -4878,7 +4812,7 @@ void POA_CORBA::Container::create_enum_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -4936,8 +4870,7 @@ void POA_CORBA::Container::create_enum_skel (
           arg_1
           , arg_2
           , arg_3
-          , arg_4
-          ACE_ENV_ARG_PARAMETER);
+          , arg_4);
     }
 
   private:
@@ -4955,7 +4888,6 @@ void POA_CORBA::Container::create_alias_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -4998,7 +4930,7 @@ void POA_CORBA::Container::create_alias_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -5056,8 +4988,7 @@ void POA_CORBA::Container::create_alias_skel (
           arg_1
           , arg_2
           , arg_3
-          , arg_4
-          ACE_ENV_ARG_PARAMETER);
+          , arg_4);
     }
 
   private:
@@ -5075,7 +5006,6 @@ void POA_CORBA::Container::create_interface_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -5118,7 +5048,7 @@ void POA_CORBA::Container::create_interface_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -5218,8 +5148,7 @@ void POA_CORBA::Container::create_interface_skel (
           , arg_7
           , arg_8
           , arg_9
-          , arg_10
-          ACE_ENV_ARG_PARAMETER);
+          , arg_10);
     }
 
   private:
@@ -5237,7 +5166,6 @@ void POA_CORBA::Container::create_value_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -5292,7 +5220,7 @@ void POA_CORBA::Container::create_value_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -5350,8 +5278,7 @@ void POA_CORBA::Container::create_value_skel (
           arg_1
           , arg_2
           , arg_3
-          , arg_4
-          ACE_ENV_ARG_PARAMETER);
+          , arg_4);
     }
 
   private:
@@ -5369,7 +5296,6 @@ void POA_CORBA::Container::create_value_box_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -5412,7 +5338,7 @@ void POA_CORBA::Container::create_value_box_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -5470,8 +5396,7 @@ void POA_CORBA::Container::create_value_box_skel (
           arg_1
           , arg_2
           , arg_3
-          , arg_4
-          ACE_ENV_ARG_PARAMETER);
+          , arg_4);
     }
 
   private:
@@ -5489,7 +5414,6 @@ void POA_CORBA::Container::create_exception_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -5532,7 +5456,7 @@ void POA_CORBA::Container::create_exception_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -5583,8 +5507,7 @@ void POA_CORBA::Container::create_exception_skel (
         this->servant_->create_native (
           arg_1
           , arg_2
-          , arg_3
-          ACE_ENV_ARG_PARAMETER);
+          , arg_3);
     }
 
   private:
@@ -5602,7 +5525,6 @@ void POA_CORBA::Container::create_native_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -5643,7 +5565,7 @@ void POA_CORBA::Container::create_native_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -5701,8 +5623,7 @@ void POA_CORBA::Container::create_native_skel (
           arg_1
           , arg_2
           , arg_3
-          , arg_4
-          ACE_ENV_ARG_PARAMETER);
+          , arg_4);
     }
 
   private:
@@ -5720,7 +5641,6 @@ void POA_CORBA::Container::create_abstract_interface_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -5763,7 +5683,7 @@ void POA_CORBA::Container::create_abstract_interface_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -5821,8 +5741,7 @@ void POA_CORBA::Container::create_abstract_interface_skel (
           arg_1
           , arg_2
           , arg_3
-          , arg_4
-          ACE_ENV_ARG_PARAMETER);
+          , arg_4);
     }
 
   private:
@@ -5840,7 +5759,6 @@ void POA_CORBA::Container::create_local_interface_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -5883,7 +5801,7 @@ void POA_CORBA::Container::create_local_interface_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -5983,8 +5901,7 @@ void POA_CORBA::Container::create_local_interface_skel (
           , arg_7
           , arg_8
           , arg_9
-          , arg_10
-          ACE_ENV_ARG_PARAMETER);
+          , arg_10);
     }
 
   private:
@@ -6002,7 +5919,6 @@ void POA_CORBA::Container::create_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -6057,7 +5973,7 @@ void POA_CORBA::Container::create_ext_value_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -6099,8 +6015,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -6115,7 +6030,6 @@ void POA_CORBA::Container::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -6152,7 +6066,7 @@ void POA_CORBA::Container::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -6182,8 +6096,7 @@ void POA_CORBA::Container::_is_a_skel (
           this->args_);
 
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _non_existent ();
     }
 
   private:
@@ -6198,7 +6111,6 @@ void POA_CORBA::Container::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -6233,7 +6145,7 @@ void POA_CORBA::Container::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -6263,8 +6175,7 @@ void POA_CORBA::Container::_non_existent_skel (
           this->args_);
 
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _repository_id ();
     }
 
   private:
@@ -6279,7 +6190,6 @@ void POA_CORBA::Container::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -6314,7 +6224,7 @@ void POA_CORBA::Container::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -6324,7 +6234,6 @@ void POA_CORBA::Container::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -6334,8 +6243,9 @@ void POA_CORBA::Container::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::Container * const impl =
@@ -6356,7 +6266,7 @@ void POA_CORBA::Container::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -6387,8 +6297,7 @@ void POA_CORBA::Container::_interface_skel (
           this->args_);
 
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _get_component ();
     }
 
   private:
@@ -6403,7 +6312,6 @@ void POA_CORBA::Container::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -6438,12 +6346,11 @@ void POA_CORBA::Container::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::Container::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -6474,13 +6381,11 @@ const char* POA_CORBA::Container::_interface_repository_id (void) const
 void POA_CORBA::Container::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -6700,8 +6605,7 @@ POA_CORBA::IDLType::~IDLType (void)
           this->args_);
 
       retval =
-        this->servant_->type (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->type ();
     }
 
   private:
@@ -6719,7 +6623,6 @@ void POA_CORBA::IDLType::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -6754,7 +6657,7 @@ void POA_CORBA::IDLType::_get_type_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -6796,8 +6699,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -6812,7 +6714,6 @@ void POA_CORBA::IDLType::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -6849,7 +6750,7 @@ void POA_CORBA::IDLType::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -6879,8 +6780,7 @@ void POA_CORBA::IDLType::_is_a_skel (
           this->args_);
 
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _non_existent ();
     }
 
   private:
@@ -6895,7 +6795,6 @@ void POA_CORBA::IDLType::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -6930,7 +6829,7 @@ void POA_CORBA::IDLType::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -6960,8 +6859,7 @@ void POA_CORBA::IDLType::_non_existent_skel (
           this->args_);
 
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _repository_id ();
     }
 
   private:
@@ -6976,7 +6874,6 @@ void POA_CORBA::IDLType::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -7011,7 +6908,7 @@ void POA_CORBA::IDLType::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -7021,7 +6918,6 @@ void POA_CORBA::IDLType::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -7031,8 +6927,9 @@ void POA_CORBA::IDLType::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::IDLType * const impl =
@@ -7053,7 +6950,7 @@ void POA_CORBA::IDLType::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -7084,8 +6981,7 @@ void POA_CORBA::IDLType::_interface_skel (
           this->args_);
 
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _get_component ();
     }
 
   private:
@@ -7100,7 +6996,6 @@ void POA_CORBA::IDLType::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -7135,12 +7030,11 @@ void POA_CORBA::IDLType::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::IDLType::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -7171,13 +7065,11 @@ const char* POA_CORBA::IDLType::_interface_repository_id (void) const
 void POA_CORBA::IDLType::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -7442,8 +7334,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -7458,7 +7349,6 @@ void POA_CORBA::TypedefDef::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -7495,7 +7385,7 @@ void POA_CORBA::TypedefDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -7525,8 +7415,7 @@ void POA_CORBA::TypedefDef::_is_a_skel (
           this->args_);
 
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _non_existent ();
     }
 
   private:
@@ -7541,7 +7430,6 @@ void POA_CORBA::TypedefDef::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -7576,7 +7464,7 @@ void POA_CORBA::TypedefDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -7606,8 +7494,7 @@ void POA_CORBA::TypedefDef::_non_existent_skel (
           this->args_);
 
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _repository_id ();
     }
 
   private:
@@ -7622,7 +7509,6 @@ void POA_CORBA::TypedefDef::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -7657,7 +7543,7 @@ void POA_CORBA::TypedefDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -7667,7 +7553,6 @@ void POA_CORBA::TypedefDef::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -7677,8 +7562,9 @@ void POA_CORBA::TypedefDef::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::TypedefDef * const impl =
@@ -7699,7 +7585,7 @@ void POA_CORBA::TypedefDef::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -7730,8 +7616,7 @@ void POA_CORBA::TypedefDef::_interface_skel (
           this->args_);
 
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _get_component ();
     }
 
   private:
@@ -7746,7 +7631,6 @@ void POA_CORBA::TypedefDef::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -7781,12 +7665,11 @@ void POA_CORBA::TypedefDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::TypedefDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -7825,13 +7708,11 @@ const char* POA_CORBA::TypedefDef::_interface_repository_id (void) const
 void POA_CORBA::TypedefDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h
index 21a0ef54637..001a3580327 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h
@@ -79,53 +79,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::IRObject *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -134,7 +126,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -144,14 +135,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -161,7 +150,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
   };
 
@@ -188,53 +176,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::Contained *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -243,7 +223,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -253,7 +232,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -261,7 +239,6 @@ namespace POA_CORBA
 
     virtual void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -271,14 +248,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -288,7 +263,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -296,7 +270,6 @@ namespace POA_CORBA
 
     virtual void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -306,14 +279,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -323,7 +294,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -331,7 +301,6 @@ namespace POA_CORBA
 
     virtual void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -341,14 +310,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -358,14 +325,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -375,14 +340,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -392,14 +355,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -409,7 +370,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -419,7 +379,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -429,7 +388,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -437,7 +395,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -448,7 +405,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -475,53 +431,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::Container *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -531,7 +479,6 @@ namespace POA_CORBA
 
     virtual ::CORBA::Contained_ptr lookup (
         const char * search_name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -541,7 +488,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -550,7 +496,6 @@ namespace POA_CORBA
     virtual ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -560,7 +505,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -571,7 +515,6 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -581,7 +524,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -591,7 +533,6 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -601,7 +542,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -611,7 +551,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -621,7 +560,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -633,7 +571,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -643,7 +580,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -654,7 +590,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -664,7 +599,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -676,7 +610,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -686,7 +619,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -697,7 +629,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -707,7 +638,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -718,7 +648,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -728,7 +657,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -739,7 +667,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -749,7 +676,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -766,7 +692,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -776,7 +701,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -787,7 +711,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -797,7 +720,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -808,7 +730,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -818,7 +739,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -828,7 +748,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -838,7 +757,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -849,7 +767,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -859,7 +776,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -870,7 +786,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -880,7 +795,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -897,7 +811,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -907,7 +820,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -915,7 +827,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -926,7 +837,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -953,53 +863,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::IDLType *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -1008,7 +910,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1018,7 +919,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -1026,7 +926,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1037,7 +936,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -1065,53 +963,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::TypedefDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -1121,7 +1011,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1132,7 +1021,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1140,7 +1028,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1148,7 +1035,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1156,7 +1042,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1164,7 +1049,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1172,7 +1056,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1180,7 +1063,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1188,7 +1070,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1196,7 +1077,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1204,7 +1084,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1215,7 +1094,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1226,7 +1104,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1234,7 +1111,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.inl
index b1c86bdf5b9..f258bf2a6a4 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.inl
@@ -36,7 +36,6 @@ POA_CORBA::Contained::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::Contained *> (servant);
@@ -44,7 +43,6 @@ POA_CORBA::Contained::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -57,7 +55,6 @@ POA_CORBA::Contained::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::Contained *> (servant);
@@ -65,7 +62,6 @@ POA_CORBA::Contained::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -75,7 +71,6 @@ POA_CORBA::Container::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::Container *> (servant);
@@ -83,7 +78,6 @@ POA_CORBA::Container::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -96,7 +90,6 @@ POA_CORBA::Container::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::Container *> (servant);
@@ -104,7 +97,6 @@ POA_CORBA::Container::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -114,7 +106,6 @@ POA_CORBA::IDLType::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::IDLType *> (servant);
@@ -122,7 +113,6 @@ POA_CORBA::IDLType::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -135,7 +125,6 @@ POA_CORBA::IDLType::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::IDLType *> (servant);
@@ -143,7 +132,6 @@ POA_CORBA::IDLType::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -153,7 +141,6 @@ POA_CORBA::TypedefDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::TypedefDef *> (servant);
@@ -161,7 +148,6 @@ POA_CORBA::TypedefDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -174,7 +160,6 @@ POA_CORBA::TypedefDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::TypedefDef *> (servant);
@@ -182,7 +167,6 @@ POA_CORBA::TypedefDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -192,7 +176,6 @@ POA_CORBA::TypedefDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::TypedefDef *> (servant);
@@ -200,7 +183,6 @@ POA_CORBA::TypedefDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -210,7 +192,6 @@ POA_CORBA::TypedefDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::TypedefDef *> (servant);
@@ -218,7 +199,6 @@ POA_CORBA::TypedefDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -228,7 +208,6 @@ POA_CORBA::TypedefDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::TypedefDef *> (servant);
@@ -236,7 +215,6 @@ POA_CORBA::TypedefDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -246,7 +224,6 @@ POA_CORBA::TypedefDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::TypedefDef *> (servant);
@@ -254,7 +231,6 @@ POA_CORBA::TypedefDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -264,7 +240,6 @@ POA_CORBA::TypedefDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::TypedefDef *> (servant);
@@ -272,7 +247,6 @@ POA_CORBA::TypedefDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -282,7 +256,6 @@ POA_CORBA::TypedefDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::TypedefDef *> (servant);
@@ -290,7 +263,6 @@ POA_CORBA::TypedefDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -300,7 +272,6 @@ POA_CORBA::TypedefDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::TypedefDef *> (servant);
@@ -308,7 +279,6 @@ POA_CORBA::TypedefDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -318,7 +288,6 @@ POA_CORBA::TypedefDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::TypedefDef *> (servant);
@@ -326,7 +295,6 @@ POA_CORBA::TypedefDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -336,7 +304,6 @@ POA_CORBA::TypedefDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::TypedefDef *> (servant);
@@ -344,7 +311,6 @@ POA_CORBA::TypedefDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -357,7 +323,6 @@ POA_CORBA::TypedefDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::TypedefDef *> (servant);
@@ -365,7 +330,6 @@ POA_CORBA::TypedefDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -378,7 +342,6 @@ POA_CORBA::TypedefDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::TypedefDef *> (servant);
@@ -386,7 +349,6 @@ POA_CORBA::TypedefDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -396,7 +358,6 @@ POA_CORBA::TypedefDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::TypedefDef *> (servant);
@@ -404,7 +365,6 @@ POA_CORBA::TypedefDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h
index cf226a5d3c5..1ce7d87c23e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h
@@ -80,14 +80,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -97,7 +95,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -150,14 +147,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -167,7 +162,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -177,7 +171,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -188,7 +181,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -198,7 +190,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -209,7 +200,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -219,7 +209,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -230,7 +219,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -240,7 +228,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -250,7 +237,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -260,7 +246,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -270,7 +255,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -283,7 +267,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -336,14 +319,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -353,7 +334,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -364,7 +344,6 @@ namespace POA_CORBA
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -376,7 +355,6 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -390,7 +368,6 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -403,7 +380,6 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -416,7 +392,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -431,7 +406,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -445,7 +419,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -460,7 +433,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -474,7 +446,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -488,7 +459,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -502,7 +472,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -522,7 +491,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -536,7 +504,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -550,7 +517,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -563,7 +529,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -577,7 +542,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -591,7 +555,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -611,7 +574,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -664,14 +626,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -681,7 +641,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -691,7 +650,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -744,14 +702,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -761,7 +717,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -771,7 +726,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -782,7 +736,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -792,7 +745,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -803,7 +755,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -813,7 +764,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -824,7 +774,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -834,7 +783,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -844,7 +792,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -854,7 +801,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -864,7 +810,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -877,7 +822,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -887,7 +831,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.inl
index 4745ffc2eee..fccfd0f9853 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.inl
@@ -128,14 +128,12 @@ POA_CORBA::IRObject_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::IRObject_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -144,14 +142,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::IRObject_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -253,14 +249,12 @@ POA_CORBA::Contained_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::Contained_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -269,14 +263,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::Contained_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -285,14 +277,12 @@ void POA_CORBA::Contained_tie<T>::destroy  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::Contained_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -302,7 +292,6 @@ char * POA_CORBA::Contained_tie<T>::id  (
 template <class T> ACE_INLINE
 void POA_CORBA::Contained_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -310,7 +299,6 @@ void POA_CORBA::Contained_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -319,14 +307,12 @@ void POA_CORBA::Contained_tie<T>::id  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::Contained_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -336,7 +322,6 @@ char * POA_CORBA::Contained_tie<T>::name  (
 template <class T> ACE_INLINE
 void POA_CORBA::Contained_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -344,7 +329,6 @@ void POA_CORBA::Contained_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -353,14 +337,12 @@ void POA_CORBA::Contained_tie<T>::name  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::Contained_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -370,7 +352,6 @@ char * POA_CORBA::Contained_tie<T>::version  (
 template <class T> ACE_INLINE
 void POA_CORBA::Contained_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -378,7 +359,6 @@ void POA_CORBA::Contained_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -387,14 +367,12 @@ void POA_CORBA::Contained_tie<T>::version  (
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::Contained_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -403,14 +381,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::Contained_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -419,14 +395,12 @@ char * POA_CORBA::Contained_tie<T>::absolute_name  (
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::Contained_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -435,14 +409,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::Contained_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -454,7 +426,6 @@ void POA_CORBA::Contained_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -464,7 +435,6 @@ void POA_CORBA::Contained_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -566,14 +536,12 @@ POA_CORBA::Container_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::Container_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -582,14 +550,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::Container_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -599,7 +565,6 @@ void POA_CORBA::Container_tie<T>::destroy  (
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::Container_tie<T>::lookup  (
     const char * search_name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -607,7 +572,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup (
     search_name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -618,7 +582,6 @@ template <class T> ACE_INLINE
 ::CORBA::ContainedSeq * POA_CORBA::Container_tie<T>::contents  (
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -627,7 +590,6 @@ template <class T> ACE_INLINE
   return this->ptr_->contents (
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -640,7 +602,6 @@ template <class T> ACE_INLINE
     ::CORBA::Long levels_to_search,
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -651,7 +612,6 @@ template <class T> ACE_INLINE
     levels_to_search,
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -663,7 +623,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -673,7 +632,6 @@ template <class T> ACE_INLINE
     limit_type,
     exclude_inherited,
     max_returned_objs
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -685,7 +643,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -695,7 +652,6 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -709,7 +665,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -721,7 +676,6 @@ template <class T> ACE_INLINE
     version,
     type,
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -734,7 +688,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -745,7 +698,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -759,7 +711,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -771,7 +722,6 @@ template <class T> ACE_INLINE
     version,
     discriminator_type,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -784,7 +734,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -795,7 +744,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -808,7 +756,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -819,7 +766,6 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -832,7 +778,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -843,7 +788,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -862,7 +806,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -879,7 +822,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -892,7 +834,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -903,7 +844,6 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -916,7 +856,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -927,7 +866,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -939,7 +877,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -949,7 +886,6 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -962,7 +898,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -973,7 +908,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -986,7 +920,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -997,7 +930,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1016,7 +948,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1033,7 +964,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1135,14 +1065,12 @@ POA_CORBA::IDLType_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::IDLType_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1151,14 +1079,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::IDLType_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1167,14 +1093,12 @@ void POA_CORBA::IDLType_tie<T>::destroy  (
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::IDLType_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1276,14 +1200,12 @@ POA_CORBA::TypedefDef_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::TypedefDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1292,14 +1214,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::TypedefDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1308,14 +1228,12 @@ void POA_CORBA::TypedefDef_tie<T>::destroy  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::TypedefDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1325,7 +1243,6 @@ char * POA_CORBA::TypedefDef_tie<T>::id  (
 template <class T> ACE_INLINE
 void POA_CORBA::TypedefDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1333,7 +1250,6 @@ void POA_CORBA::TypedefDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1342,14 +1258,12 @@ void POA_CORBA::TypedefDef_tie<T>::id  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::TypedefDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1359,7 +1273,6 @@ char * POA_CORBA::TypedefDef_tie<T>::name  (
 template <class T> ACE_INLINE
 void POA_CORBA::TypedefDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1367,7 +1280,6 @@ void POA_CORBA::TypedefDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1376,14 +1288,12 @@ void POA_CORBA::TypedefDef_tie<T>::name  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::TypedefDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1393,7 +1303,6 @@ char * POA_CORBA::TypedefDef_tie<T>::version  (
 template <class T> ACE_INLINE
 void POA_CORBA::TypedefDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1401,7 +1310,6 @@ void POA_CORBA::TypedefDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1410,14 +1318,12 @@ void POA_CORBA::TypedefDef_tie<T>::version  (
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::TypedefDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1426,14 +1332,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::TypedefDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1442,14 +1346,12 @@ char * POA_CORBA::TypedefDef_tie<T>::absolute_name  (
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::TypedefDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1458,14 +1360,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::TypedefDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1477,7 +1377,6 @@ void POA_CORBA::TypedefDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1487,7 +1386,6 @@ void POA_CORBA::TypedefDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1496,14 +1394,12 @@ void POA_CORBA::TypedefDef_tie<T>::move  (
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::TypedefDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp
index 4c43a0e7327..37c591e83b7 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp
@@ -1437,8 +1437,7 @@ POA_CORBA::Repository::~Repository (void)
 
       retval =
         this->servant_->lookup_id (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -1456,7 +1455,6 @@ void POA_CORBA::Repository::lookup_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -1493,7 +1491,7 @@ void POA_CORBA::Repository::lookup_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -1530,8 +1528,7 @@ void POA_CORBA::Repository::lookup_id_skel (
 
       retval =
         this->servant_->get_canonical_typecode (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -1549,7 +1546,6 @@ void POA_CORBA::Repository::get_canonical_typecode_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -1586,7 +1582,7 @@ void POA_CORBA::Repository::get_canonical_typecode_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -1623,8 +1619,7 @@ void POA_CORBA::Repository::get_canonical_typecode_skel (
 
       retval =
         this->servant_->get_primitive (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -1642,7 +1637,6 @@ void POA_CORBA::Repository::get_primitive_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -1679,7 +1673,7 @@ void POA_CORBA::Repository::get_primitive_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -1716,8 +1710,7 @@ void POA_CORBA::Repository::get_primitive_skel (
 
       retval =
         this->servant_->create_string (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -1735,7 +1728,6 @@ void POA_CORBA::Repository::create_string_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -1772,7 +1764,7 @@ void POA_CORBA::Repository::create_string_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -1809,8 +1801,7 @@ void POA_CORBA::Repository::create_string_skel (
 
       retval =
         this->servant_->create_wstring (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -1828,7 +1819,6 @@ void POA_CORBA::Repository::create_wstring_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -1865,7 +1855,7 @@ void POA_CORBA::Repository::create_wstring_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -1909,8 +1899,7 @@ void POA_CORBA::Repository::create_wstring_skel (
       retval =
         this->servant_->create_sequence (
           arg_1
-          , arg_2
-          ACE_ENV_ARG_PARAMETER);
+          , arg_2);
     }
 
   private:
@@ -1928,7 +1917,6 @@ void POA_CORBA::Repository::create_sequence_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -1967,7 +1955,7 @@ void POA_CORBA::Repository::create_sequence_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -2011,8 +1999,7 @@ void POA_CORBA::Repository::create_sequence_skel (
       retval =
         this->servant_->create_array (
           arg_1
-          , arg_2
-          ACE_ENV_ARG_PARAMETER);
+          , arg_2);
     }
 
   private:
@@ -2030,7 +2017,6 @@ void POA_CORBA::Repository::create_array_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -2069,7 +2055,7 @@ void POA_CORBA::Repository::create_array_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -2113,8 +2099,7 @@ void POA_CORBA::Repository::create_array_skel (
       retval =
         this->servant_->create_fixed (
           arg_1
-          , arg_2
-          ACE_ENV_ARG_PARAMETER);
+          , arg_2);
     }
 
   private:
@@ -2132,7 +2117,6 @@ void POA_CORBA::Repository::create_fixed_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -2171,7 +2155,7 @@ void POA_CORBA::Repository::create_fixed_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -2213,8 +2197,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -2229,7 +2212,6 @@ void POA_CORBA::Repository::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -2266,7 +2248,7 @@ void POA_CORBA::Repository::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -2296,8 +2278,7 @@ void POA_CORBA::Repository::_is_a_skel (
           this->args_);
 
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _non_existent ();
     }
 
   private:
@@ -2312,7 +2293,6 @@ void POA_CORBA::Repository::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -2347,7 +2327,7 @@ void POA_CORBA::Repository::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -2377,8 +2357,7 @@ void POA_CORBA::Repository::_non_existent_skel (
           this->args_);
 
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _repository_id ();
     }
 
   private:
@@ -2393,7 +2372,6 @@ void POA_CORBA::Repository::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -2428,7 +2406,7 @@ void POA_CORBA::Repository::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -2438,7 +2416,6 @@ void POA_CORBA::Repository::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -2448,8 +2425,9 @@ void POA_CORBA::Repository::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::Repository * const impl =
@@ -2470,7 +2448,7 @@ void POA_CORBA::Repository::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -2501,8 +2479,7 @@ void POA_CORBA::Repository::_interface_skel (
           this->args_);
 
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _get_component ();
     }
 
   private:
@@ -2517,7 +2494,6 @@ void POA_CORBA::Repository::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -2552,12 +2528,11 @@ void POA_CORBA::Repository::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::Repository::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -2592,13 +2567,11 @@ const char* POA_CORBA::Repository::_interface_repository_id (void) const
 void POA_CORBA::Repository::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -2882,8 +2855,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -2898,7 +2870,6 @@ void POA_CORBA::ModuleDef::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -2935,7 +2906,7 @@ void POA_CORBA::ModuleDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -2965,8 +2936,7 @@ void POA_CORBA::ModuleDef::_is_a_skel (
           this->args_);
 
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _non_existent ();
     }
 
   private:
@@ -2981,7 +2951,6 @@ void POA_CORBA::ModuleDef::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -3016,7 +2985,7 @@ void POA_CORBA::ModuleDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -3046,8 +3015,7 @@ void POA_CORBA::ModuleDef::_non_existent_skel (
           this->args_);
 
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _repository_id ();
     }
 
   private:
@@ -3062,7 +3030,6 @@ void POA_CORBA::ModuleDef::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -3097,7 +3064,7 @@ void POA_CORBA::ModuleDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -3107,7 +3074,6 @@ void POA_CORBA::ModuleDef::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -3117,8 +3083,9 @@ void POA_CORBA::ModuleDef::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::ModuleDef * const impl =
@@ -3139,7 +3106,7 @@ void POA_CORBA::ModuleDef::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -3170,8 +3137,7 @@ void POA_CORBA::ModuleDef::_interface_skel (
           this->args_);
 
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _get_component ();
     }
 
   private:
@@ -3186,7 +3152,6 @@ void POA_CORBA::ModuleDef::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -3221,12 +3186,11 @@ void POA_CORBA::ModuleDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ModuleDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -3265,13 +3229,11 @@ const char* POA_CORBA::ModuleDef::_interface_repository_id (void) const
 void POA_CORBA::ModuleDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -3527,8 +3489,7 @@ POA_CORBA::ConstantDef::~ConstantDef (void)
           this->args_);
 
       retval =
-        this->servant_->type (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->type ();
     }
 
   private:
@@ -3546,7 +3507,6 @@ void POA_CORBA::ConstantDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -3581,7 +3541,7 @@ void POA_CORBA::ConstantDef::_get_type_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -3611,8 +3571,7 @@ void POA_CORBA::ConstantDef::_get_type_skel (
           this->args_);
 
       retval =
-        this->servant_->type_def (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->type_def ();
     }
 
   private:
@@ -3630,7 +3589,6 @@ void POA_CORBA::ConstantDef::_get_type_def_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -3665,7 +3623,7 @@ void POA_CORBA::ConstantDef::_get_type_def_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -3696,8 +3654,7 @@ void POA_CORBA::ConstantDef::_get_type_def_skel (
           1);
 
       this->servant_->type_def (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
+        arg_1);
     }
 
   private:
@@ -3715,7 +3672,6 @@ void POA_CORBA::ConstantDef::_set_type_def_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -3752,7 +3708,7 @@ void POA_CORBA::ConstantDef::_set_type_def_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -3782,8 +3738,7 @@ void POA_CORBA::ConstantDef::_set_type_def_skel (
           this->args_);
 
       retval =
-        this->servant_->value (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->value ();
     }
 
   private:
@@ -3801,7 +3756,6 @@ void POA_CORBA::ConstantDef::_get_value_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -3836,7 +3790,7 @@ void POA_CORBA::ConstantDef::_get_value_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -3867,8 +3821,7 @@ void POA_CORBA::ConstantDef::_get_value_skel (
           1);
 
       this->servant_->value (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
+        arg_1);
     }
 
   private:
@@ -3886,7 +3839,6 @@ void POA_CORBA::ConstantDef::_set_value_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -3923,7 +3875,7 @@ void POA_CORBA::ConstantDef::_set_value_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -3965,8 +3917,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -3981,7 +3932,6 @@ void POA_CORBA::ConstantDef::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -4018,7 +3968,7 @@ void POA_CORBA::ConstantDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -4048,8 +3998,7 @@ void POA_CORBA::ConstantDef::_is_a_skel (
           this->args_);
 
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _non_existent ();
     }
 
   private:
@@ -4064,7 +4013,6 @@ void POA_CORBA::ConstantDef::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -4099,7 +4047,7 @@ void POA_CORBA::ConstantDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -4129,8 +4077,7 @@ void POA_CORBA::ConstantDef::_non_existent_skel (
           this->args_);
 
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _repository_id ();
     }
 
   private:
@@ -4145,7 +4092,6 @@ void POA_CORBA::ConstantDef::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -4180,7 +4126,7 @@ void POA_CORBA::ConstantDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -4190,7 +4136,6 @@ void POA_CORBA::ConstantDef::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -4200,8 +4145,9 @@ void POA_CORBA::ConstantDef::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::ConstantDef * const impl =
@@ -4222,7 +4168,7 @@ void POA_CORBA::ConstantDef::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -4253,8 +4199,7 @@ void POA_CORBA::ConstantDef::_interface_skel (
           this->args_);
 
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _get_component ();
     }
 
   private:
@@ -4269,7 +4214,6 @@ void POA_CORBA::ConstantDef::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -4304,12 +4248,11 @@ void POA_CORBA::ConstantDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ConstantDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -4344,13 +4287,11 @@ const char* POA_CORBA::ConstantDef::_interface_repository_id (void) const
 void POA_CORBA::ConstantDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -4627,8 +4568,7 @@ POA_CORBA::StructDef::~StructDef (void)
           this->args_);
 
       retval =
-        this->servant_->members (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->members ();
     }
 
   private:
@@ -4646,7 +4586,6 @@ void POA_CORBA::StructDef::_get_members_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -4681,7 +4620,7 @@ void POA_CORBA::StructDef::_get_members_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -4712,8 +4651,7 @@ void POA_CORBA::StructDef::_get_members_skel (
           1);
 
       this->servant_->members (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
+        arg_1);
     }
 
   private:
@@ -4731,7 +4669,6 @@ void POA_CORBA::StructDef::_set_members_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -4768,7 +4705,7 @@ void POA_CORBA::StructDef::_set_members_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -4810,8 +4747,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -4826,7 +4762,6 @@ void POA_CORBA::StructDef::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -4863,7 +4798,7 @@ void POA_CORBA::StructDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -4893,8 +4828,7 @@ void POA_CORBA::StructDef::_is_a_skel (
           this->args_);
 
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _non_existent ();
     }
 
   private:
@@ -4909,7 +4843,6 @@ void POA_CORBA::StructDef::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -4944,7 +4877,7 @@ void POA_CORBA::StructDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -4974,8 +4907,7 @@ void POA_CORBA::StructDef::_non_existent_skel (
           this->args_);
 
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _repository_id ();
     }
 
   private:
@@ -4990,7 +4922,6 @@ void POA_CORBA::StructDef::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -5025,7 +4956,7 @@ void POA_CORBA::StructDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -5035,7 +4966,6 @@ void POA_CORBA::StructDef::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -5045,8 +4975,9 @@ void POA_CORBA::StructDef::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::StructDef * const impl =
@@ -5067,7 +4998,7 @@ void POA_CORBA::StructDef::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -5098,8 +5029,7 @@ void POA_CORBA::StructDef::_interface_skel (
           this->args_);
 
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _get_component ();
     }
 
   private:
@@ -5114,7 +5044,6 @@ void POA_CORBA::StructDef::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -5149,12 +5078,11 @@ void POA_CORBA::StructDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::StructDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -5201,13 +5129,11 @@ const char* POA_CORBA::StructDef::_interface_repository_id (void) const
 void POA_CORBA::StructDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -5489,8 +5415,7 @@ POA_CORBA::UnionDef::~UnionDef (void)
           this->args_);
 
       retval =
-        this->servant_->discriminator_type (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->discriminator_type ();
     }
 
   private:
@@ -5508,7 +5433,6 @@ void POA_CORBA::UnionDef::_get_discriminator_type_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -5543,7 +5467,7 @@ void POA_CORBA::UnionDef::_get_discriminator_type_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -5573,8 +5497,7 @@ void POA_CORBA::UnionDef::_get_discriminator_type_skel (
           this->args_);
 
       retval =
-        this->servant_->discriminator_type_def (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->discriminator_type_def ();
     }
 
   private:
@@ -5592,7 +5515,6 @@ void POA_CORBA::UnionDef::_get_discriminator_type_def_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -5627,7 +5549,7 @@ void POA_CORBA::UnionDef::_get_discriminator_type_def_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -5658,8 +5580,7 @@ void POA_CORBA::UnionDef::_get_discriminator_type_def_skel (
           1);
 
       this->servant_->discriminator_type_def (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
+        arg_1);
     }
 
   private:
@@ -5677,7 +5598,6 @@ void POA_CORBA::UnionDef::_set_discriminator_type_def_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -5714,7 +5634,7 @@ void POA_CORBA::UnionDef::_set_discriminator_type_def_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -5744,8 +5664,7 @@ void POA_CORBA::UnionDef::_set_discriminator_type_def_skel (
           this->args_);
 
       retval =
-        this->servant_->members (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->members ();
     }
 
   private:
@@ -5763,7 +5682,6 @@ void POA_CORBA::UnionDef::_get_members_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -5798,7 +5716,7 @@ void POA_CORBA::UnionDef::_get_members_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -5829,8 +5747,7 @@ void POA_CORBA::UnionDef::_get_members_skel (
           1);
 
       this->servant_->members (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
+        arg_1);
     }
 
   private:
@@ -5848,7 +5765,6 @@ void POA_CORBA::UnionDef::_set_members_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -5885,7 +5801,7 @@ void POA_CORBA::UnionDef::_set_members_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -5927,8 +5843,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -5943,7 +5858,6 @@ void POA_CORBA::UnionDef::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -5980,7 +5894,7 @@ void POA_CORBA::UnionDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -6010,8 +5924,7 @@ void POA_CORBA::UnionDef::_is_a_skel (
           this->args_);
 
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _non_existent ();
     }
 
   private:
@@ -6026,7 +5939,6 @@ void POA_CORBA::UnionDef::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -6061,7 +5973,7 @@ void POA_CORBA::UnionDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -6091,8 +6003,7 @@ void POA_CORBA::UnionDef::_non_existent_skel (
           this->args_);
 
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _repository_id ();
     }
 
   private:
@@ -6107,7 +6018,6 @@ void POA_CORBA::UnionDef::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -6142,7 +6052,7 @@ void POA_CORBA::UnionDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -6152,7 +6062,6 @@ void POA_CORBA::UnionDef::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -6162,8 +6071,9 @@ void POA_CORBA::UnionDef::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::UnionDef * const impl =
@@ -6184,7 +6094,7 @@ void POA_CORBA::UnionDef::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -6215,8 +6125,7 @@ void POA_CORBA::UnionDef::_interface_skel (
           this->args_);
 
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _get_component ();
     }
 
   private:
@@ -6231,7 +6140,6 @@ void POA_CORBA::UnionDef::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -6266,12 +6174,11 @@ void POA_CORBA::UnionDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::UnionDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -6318,13 +6225,11 @@ const char* POA_CORBA::UnionDef::_interface_repository_id (void) const
 void POA_CORBA::UnionDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -6580,8 +6485,7 @@ POA_CORBA::EnumDef::~EnumDef (void)
           this->args_);
 
       retval =
-        this->servant_->members (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->members ();
     }
 
   private:
@@ -6599,7 +6503,6 @@ void POA_CORBA::EnumDef::_get_members_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -6634,7 +6537,7 @@ void POA_CORBA::EnumDef::_get_members_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -6665,8 +6568,7 @@ void POA_CORBA::EnumDef::_get_members_skel (
           1);
 
       this->servant_->members (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
+        arg_1);
     }
 
   private:
@@ -6684,7 +6586,6 @@ void POA_CORBA::EnumDef::_set_members_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -6721,7 +6622,7 @@ void POA_CORBA::EnumDef::_set_members_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -6763,8 +6664,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -6779,7 +6679,6 @@ void POA_CORBA::EnumDef::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -6816,7 +6715,7 @@ void POA_CORBA::EnumDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -6846,8 +6745,7 @@ void POA_CORBA::EnumDef::_is_a_skel (
           this->args_);
 
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _non_existent ();
     }
 
   private:
@@ -6862,7 +6760,6 @@ void POA_CORBA::EnumDef::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -6897,7 +6794,7 @@ void POA_CORBA::EnumDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -6927,8 +6824,7 @@ void POA_CORBA::EnumDef::_non_existent_skel (
           this->args_);
 
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _repository_id ();
     }
 
   private:
@@ -6943,7 +6839,6 @@ void POA_CORBA::EnumDef::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -6978,7 +6873,7 @@ void POA_CORBA::EnumDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -6988,7 +6883,6 @@ void POA_CORBA::EnumDef::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -6998,8 +6892,9 @@ void POA_CORBA::EnumDef::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::EnumDef * const impl =
@@ -7020,7 +6915,7 @@ void POA_CORBA::EnumDef::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -7051,8 +6946,7 @@ void POA_CORBA::EnumDef::_interface_skel (
           this->args_);
 
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _get_component ();
     }
 
   private:
@@ -7067,7 +6961,6 @@ void POA_CORBA::EnumDef::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -7102,12 +6995,11 @@ void POA_CORBA::EnumDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::EnumDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -7150,13 +7042,11 @@ const char* POA_CORBA::EnumDef::_interface_repository_id (void) const
 void POA_CORBA::EnumDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -7412,8 +7302,7 @@ POA_CORBA::AliasDef::~AliasDef (void)
           this->args_);
 
       retval =
-        this->servant_->original_type_def (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->original_type_def ();
     }
 
   private:
@@ -7431,7 +7320,6 @@ void POA_CORBA::AliasDef::_get_original_type_def_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -7466,7 +7354,7 @@ void POA_CORBA::AliasDef::_get_original_type_def_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -7497,8 +7385,7 @@ void POA_CORBA::AliasDef::_get_original_type_def_skel (
           1);
 
       this->servant_->original_type_def (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
+        arg_1);
     }
 
   private:
@@ -7516,7 +7403,6 @@ void POA_CORBA::AliasDef::_set_original_type_def_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -7553,7 +7439,7 @@ void POA_CORBA::AliasDef::_set_original_type_def_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -7595,8 +7481,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -7611,7 +7496,6 @@ void POA_CORBA::AliasDef::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -7648,7 +7532,7 @@ void POA_CORBA::AliasDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -7678,8 +7562,7 @@ void POA_CORBA::AliasDef::_is_a_skel (
           this->args_);
 
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _non_existent ();
     }
 
   private:
@@ -7694,7 +7577,6 @@ void POA_CORBA::AliasDef::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -7729,7 +7611,7 @@ void POA_CORBA::AliasDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -7759,8 +7641,7 @@ void POA_CORBA::AliasDef::_non_existent_skel (
           this->args_);
 
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _repository_id ();
     }
 
   private:
@@ -7775,7 +7656,6 @@ void POA_CORBA::AliasDef::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -7810,7 +7690,7 @@ void POA_CORBA::AliasDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -7820,7 +7700,6 @@ void POA_CORBA::AliasDef::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -7830,8 +7709,9 @@ void POA_CORBA::AliasDef::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::AliasDef * const impl =
@@ -7852,7 +7732,7 @@ void POA_CORBA::AliasDef::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -7883,8 +7763,7 @@ void POA_CORBA::AliasDef::_interface_skel (
           this->args_);
 
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _get_component ();
     }
 
   private:
@@ -7899,7 +7778,6 @@ void POA_CORBA::AliasDef::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -7934,12 +7812,11 @@ void POA_CORBA::AliasDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::AliasDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -7982,13 +7859,11 @@ const char* POA_CORBA::AliasDef::_interface_repository_id (void) const
 void POA_CORBA::AliasDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -8254,8 +8129,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -8270,7 +8144,6 @@ void POA_CORBA::NativeDef::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -8307,7 +8180,7 @@ void POA_CORBA::NativeDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -8337,8 +8210,7 @@ void POA_CORBA::NativeDef::_is_a_skel (
           this->args_);
 
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _non_existent ();
     }
 
   private:
@@ -8353,7 +8225,6 @@ void POA_CORBA::NativeDef::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -8388,7 +8259,7 @@ void POA_CORBA::NativeDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -8418,8 +8289,7 @@ void POA_CORBA::NativeDef::_non_existent_skel (
           this->args_);
 
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _repository_id ();
     }
 
   private:
@@ -8434,7 +8304,6 @@ void POA_CORBA::NativeDef::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -8469,7 +8338,7 @@ void POA_CORBA::NativeDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -8479,7 +8348,6 @@ void POA_CORBA::NativeDef::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -8489,8 +8357,9 @@ void POA_CORBA::NativeDef::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::NativeDef * const impl =
@@ -8511,7 +8380,7 @@ void POA_CORBA::NativeDef::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -8542,8 +8411,7 @@ void POA_CORBA::NativeDef::_interface_skel (
           this->args_);
 
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _get_component ();
     }
 
   private:
@@ -8558,7 +8426,6 @@ void POA_CORBA::NativeDef::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -8593,12 +8460,11 @@ void POA_CORBA::NativeDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::NativeDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -8641,13 +8507,11 @@ const char* POA_CORBA::NativeDef::_interface_repository_id (void) const
 void POA_CORBA::NativeDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -8869,8 +8733,7 @@ POA_CORBA::PrimitiveDef::~PrimitiveDef (void)
           this->args_);
 
       retval =
-        this->servant_->kind (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->kind ();
     }
 
   private:
@@ -8888,7 +8751,6 @@ void POA_CORBA::PrimitiveDef::_get_kind_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -8923,7 +8785,7 @@ void POA_CORBA::PrimitiveDef::_get_kind_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -8965,8 +8827,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -8981,7 +8842,6 @@ void POA_CORBA::PrimitiveDef::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -9018,7 +8878,7 @@ void POA_CORBA::PrimitiveDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -9048,8 +8908,7 @@ void POA_CORBA::PrimitiveDef::_is_a_skel (
           this->args_);
 
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _non_existent ();
     }
 
   private:
@@ -9064,7 +8923,6 @@ void POA_CORBA::PrimitiveDef::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -9099,7 +8957,7 @@ void POA_CORBA::PrimitiveDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -9129,8 +8987,7 @@ void POA_CORBA::PrimitiveDef::_non_existent_skel (
           this->args_);
 
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _repository_id ();
     }
 
   private:
@@ -9145,7 +9002,6 @@ void POA_CORBA::PrimitiveDef::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -9180,7 +9036,7 @@ void POA_CORBA::PrimitiveDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -9190,7 +9046,6 @@ void POA_CORBA::PrimitiveDef::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -9200,8 +9055,9 @@ void POA_CORBA::PrimitiveDef::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::PrimitiveDef * const impl =
@@ -9222,7 +9078,7 @@ void POA_CORBA::PrimitiveDef::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -9253,8 +9109,7 @@ void POA_CORBA::PrimitiveDef::_interface_skel (
           this->args_);
 
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _get_component ();
     }
 
   private:
@@ -9269,7 +9124,6 @@ void POA_CORBA::PrimitiveDef::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -9304,12 +9158,11 @@ void POA_CORBA::PrimitiveDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::PrimitiveDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -9344,13 +9197,11 @@ const char* POA_CORBA::PrimitiveDef::_interface_repository_id (void) const
 void POA_CORBA::PrimitiveDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -9592,8 +9443,7 @@ POA_CORBA::StringDef::~StringDef (void)
           this->args_);
 
       retval =
-        this->servant_->bound (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->bound ();
     }
 
   private:
@@ -9611,7 +9461,6 @@ void POA_CORBA::StringDef::_get_bound_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -9646,7 +9495,7 @@ void POA_CORBA::StringDef::_get_bound_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -9677,8 +9526,7 @@ void POA_CORBA::StringDef::_get_bound_skel (
           1);
 
       this->servant_->bound (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
+        arg_1);
     }
 
   private:
@@ -9696,7 +9544,6 @@ void POA_CORBA::StringDef::_set_bound_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -9733,7 +9580,7 @@ void POA_CORBA::StringDef::_set_bound_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -9775,8 +9622,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -9791,7 +9637,6 @@ void POA_CORBA::StringDef::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -9828,7 +9673,7 @@ void POA_CORBA::StringDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -9858,8 +9703,7 @@ void POA_CORBA::StringDef::_is_a_skel (
           this->args_);
 
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _non_existent ();
     }
 
   private:
@@ -9874,7 +9718,6 @@ void POA_CORBA::StringDef::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -9909,7 +9752,7 @@ void POA_CORBA::StringDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -9939,8 +9782,7 @@ void POA_CORBA::StringDef::_non_existent_skel (
           this->args_);
 
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _repository_id ();
     }
 
   private:
@@ -9955,7 +9797,6 @@ void POA_CORBA::StringDef::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -9990,7 +9831,7 @@ void POA_CORBA::StringDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -10000,7 +9841,6 @@ void POA_CORBA::StringDef::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -10010,8 +9850,9 @@ void POA_CORBA::StringDef::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::StringDef * const impl =
@@ -10032,7 +9873,7 @@ void POA_CORBA::StringDef::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -10063,8 +9904,7 @@ void POA_CORBA::StringDef::_interface_skel (
           this->args_);
 
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _get_component ();
     }
 
   private:
@@ -10079,7 +9919,6 @@ void POA_CORBA::StringDef::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -10114,12 +9953,11 @@ void POA_CORBA::StringDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::StringDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -10154,13 +9992,11 @@ const char* POA_CORBA::StringDef::_interface_repository_id (void) const
 void POA_CORBA::StringDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -10402,8 +10238,7 @@ POA_CORBA::WstringDef::~WstringDef (void)
           this->args_);
 
       retval =
-        this->servant_->bound (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->bound ();
     }
 
   private:
@@ -10421,7 +10256,6 @@ void POA_CORBA::WstringDef::_get_bound_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -10456,7 +10290,7 @@ void POA_CORBA::WstringDef::_get_bound_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -10487,8 +10321,7 @@ void POA_CORBA::WstringDef::_get_bound_skel (
           1);
 
       this->servant_->bound (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
+        arg_1);
     }
 
   private:
@@ -10506,7 +10339,6 @@ void POA_CORBA::WstringDef::_set_bound_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -10543,7 +10375,7 @@ void POA_CORBA::WstringDef::_set_bound_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -10585,8 +10417,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -10601,7 +10432,6 @@ void POA_CORBA::WstringDef::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -10638,7 +10468,7 @@ void POA_CORBA::WstringDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -10668,8 +10498,7 @@ void POA_CORBA::WstringDef::_is_a_skel (
           this->args_);
 
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _non_existent ();
     }
 
   private:
@@ -10684,7 +10513,6 @@ void POA_CORBA::WstringDef::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -10719,7 +10547,7 @@ void POA_CORBA::WstringDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -10749,8 +10577,7 @@ void POA_CORBA::WstringDef::_non_existent_skel (
           this->args_);
 
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _repository_id ();
     }
 
   private:
@@ -10765,7 +10592,6 @@ void POA_CORBA::WstringDef::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -10800,7 +10626,7 @@ void POA_CORBA::WstringDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -10810,7 +10636,6 @@ void POA_CORBA::WstringDef::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -10820,8 +10645,9 @@ void POA_CORBA::WstringDef::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::WstringDef * const impl =
@@ -10842,7 +10668,7 @@ void POA_CORBA::WstringDef::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -10873,8 +10699,7 @@ void POA_CORBA::WstringDef::_interface_skel (
           this->args_);
 
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _get_component ();
     }
 
   private:
@@ -10889,7 +10714,6 @@ void POA_CORBA::WstringDef::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -10924,12 +10748,11 @@ void POA_CORBA::WstringDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::WstringDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -10964,13 +10787,11 @@ const char* POA_CORBA::WstringDef::_interface_repository_id (void) const
 void POA_CORBA::WstringDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -11216,8 +11037,7 @@ POA_CORBA::SequenceDef::~SequenceDef (void)
           this->args_);
 
       retval =
-        this->servant_->bound (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->bound ();
     }
 
   private:
@@ -11235,7 +11055,6 @@ void POA_CORBA::SequenceDef::_get_bound_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -11270,7 +11089,7 @@ void POA_CORBA::SequenceDef::_get_bound_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -11301,8 +11120,7 @@ void POA_CORBA::SequenceDef::_get_bound_skel (
           1);
 
       this->servant_->bound (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
+        arg_1);
     }
 
   private:
@@ -11320,7 +11138,6 @@ void POA_CORBA::SequenceDef::_set_bound_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -11357,7 +11174,7 @@ void POA_CORBA::SequenceDef::_set_bound_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -11387,8 +11204,7 @@ void POA_CORBA::SequenceDef::_set_bound_skel (
           this->args_);
 
       retval =
-        this->servant_->element_type (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->element_type ();
     }
 
   private:
@@ -11406,7 +11222,6 @@ void POA_CORBA::SequenceDef::_get_element_type_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -11441,7 +11256,7 @@ void POA_CORBA::SequenceDef::_get_element_type_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -11471,8 +11286,7 @@ void POA_CORBA::SequenceDef::_get_element_type_skel (
           this->args_);
 
       retval =
-        this->servant_->element_type_def (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->element_type_def ();
     }
 
   private:
@@ -11490,7 +11304,6 @@ void POA_CORBA::SequenceDef::_get_element_type_def_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -11525,7 +11338,7 @@ void POA_CORBA::SequenceDef::_get_element_type_def_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -11556,8 +11369,7 @@ void POA_CORBA::SequenceDef::_get_element_type_def_skel (
           1);
 
       this->servant_->element_type_def (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
+        arg_1);
     }
 
   private:
@@ -11575,7 +11387,6 @@ void POA_CORBA::SequenceDef::_set_element_type_def_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -11612,7 +11423,7 @@ void POA_CORBA::SequenceDef::_set_element_type_def_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -11654,8 +11465,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -11670,7 +11480,6 @@ void POA_CORBA::SequenceDef::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -11707,7 +11516,7 @@ void POA_CORBA::SequenceDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -11737,8 +11546,7 @@ void POA_CORBA::SequenceDef::_is_a_skel (
           this->args_);
 
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _non_existent ();
     }
 
   private:
@@ -11753,7 +11561,6 @@ void POA_CORBA::SequenceDef::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -11788,7 +11595,7 @@ void POA_CORBA::SequenceDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -11818,8 +11625,7 @@ void POA_CORBA::SequenceDef::_non_existent_skel (
           this->args_);
 
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _repository_id ();
     }
 
   private:
@@ -11834,7 +11640,6 @@ void POA_CORBA::SequenceDef::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -11869,7 +11674,7 @@ void POA_CORBA::SequenceDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -11879,7 +11684,6 @@ void POA_CORBA::SequenceDef::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -11889,8 +11693,9 @@ void POA_CORBA::SequenceDef::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::SequenceDef * const impl =
@@ -11911,7 +11716,7 @@ void POA_CORBA::SequenceDef::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -11942,8 +11747,7 @@ void POA_CORBA::SequenceDef::_interface_skel (
           this->args_);
 
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _get_component ();
     }
 
   private:
@@ -11958,7 +11762,6 @@ void POA_CORBA::SequenceDef::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -11993,12 +11796,11 @@ void POA_CORBA::SequenceDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::SequenceDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -12033,13 +11835,11 @@ const char* POA_CORBA::SequenceDef::_interface_repository_id (void) const
 void POA_CORBA::SequenceDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -12284,8 +12084,7 @@ POA_CORBA::ArrayDef::~ArrayDef (void)
           this->args_);
 
       retval =
-        this->servant_->length (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->length ();
     }
 
   private:
@@ -12303,7 +12102,6 @@ void POA_CORBA::ArrayDef::_get_length_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -12338,7 +12136,7 @@ void POA_CORBA::ArrayDef::_get_length_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -12369,8 +12167,7 @@ void POA_CORBA::ArrayDef::_get_length_skel (
           1);
 
       this->servant_->length (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
+        arg_1);
     }
 
   private:
@@ -12388,7 +12185,6 @@ void POA_CORBA::ArrayDef::_set_length_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -12425,7 +12221,7 @@ void POA_CORBA::ArrayDef::_set_length_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -12455,8 +12251,7 @@ void POA_CORBA::ArrayDef::_set_length_skel (
           this->args_);
 
       retval =
-        this->servant_->element_type (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->element_type ();
     }
 
   private:
@@ -12474,7 +12269,6 @@ void POA_CORBA::ArrayDef::_get_element_type_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -12509,7 +12303,7 @@ void POA_CORBA::ArrayDef::_get_element_type_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -12539,8 +12333,7 @@ void POA_CORBA::ArrayDef::_get_element_type_skel (
           this->args_);
 
       retval =
-        this->servant_->element_type_def (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->element_type_def ();
     }
 
   private:
@@ -12558,7 +12351,6 @@ void POA_CORBA::ArrayDef::_get_element_type_def_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -12593,7 +12385,7 @@ void POA_CORBA::ArrayDef::_get_element_type_def_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -12624,8 +12416,7 @@ void POA_CORBA::ArrayDef::_get_element_type_def_skel (
           1);
 
       this->servant_->element_type_def (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
+        arg_1);
     }
 
   private:
@@ -12643,7 +12434,6 @@ void POA_CORBA::ArrayDef::_set_element_type_def_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -12680,7 +12470,7 @@ void POA_CORBA::ArrayDef::_set_element_type_def_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -12722,8 +12512,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -12738,7 +12527,6 @@ void POA_CORBA::ArrayDef::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -12775,7 +12563,7 @@ void POA_CORBA::ArrayDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -12805,8 +12593,7 @@ void POA_CORBA::ArrayDef::_is_a_skel (
           this->args_);
 
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _non_existent ();
     }
 
   private:
@@ -12821,7 +12608,6 @@ void POA_CORBA::ArrayDef::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -12856,7 +12642,7 @@ void POA_CORBA::ArrayDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -12886,8 +12672,7 @@ void POA_CORBA::ArrayDef::_non_existent_skel (
           this->args_);
 
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _repository_id ();
     }
 
   private:
@@ -12902,7 +12687,6 @@ void POA_CORBA::ArrayDef::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -12937,7 +12721,7 @@ void POA_CORBA::ArrayDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -12947,7 +12731,6 @@ void POA_CORBA::ArrayDef::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -12957,8 +12740,9 @@ void POA_CORBA::ArrayDef::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::ArrayDef * const impl =
@@ -12979,7 +12763,7 @@ void POA_CORBA::ArrayDef::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -13010,8 +12794,7 @@ void POA_CORBA::ArrayDef::_interface_skel (
           this->args_);
 
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _get_component ();
     }
 
   private:
@@ -13026,7 +12809,6 @@ void POA_CORBA::ArrayDef::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -13061,12 +12843,11 @@ void POA_CORBA::ArrayDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ArrayDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -13101,13 +12882,11 @@ const char* POA_CORBA::ArrayDef::_interface_repository_id (void) const
 void POA_CORBA::ArrayDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -13382,8 +13161,7 @@ POA_CORBA::ExceptionDef::~ExceptionDef (void)
           this->args_);
 
       retval =
-        this->servant_->type (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->type ();
     }
 
   private:
@@ -13401,7 +13179,6 @@ void POA_CORBA::ExceptionDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -13436,7 +13213,7 @@ void POA_CORBA::ExceptionDef::_get_type_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -13466,8 +13243,7 @@ void POA_CORBA::ExceptionDef::_get_type_skel (
           this->args_);
 
       retval =
-        this->servant_->members (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->members ();
     }
 
   private:
@@ -13485,7 +13261,6 @@ void POA_CORBA::ExceptionDef::_get_members_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -13520,7 +13295,7 @@ void POA_CORBA::ExceptionDef::_get_members_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -13551,8 +13326,7 @@ void POA_CORBA::ExceptionDef::_get_members_skel (
           1);
 
       this->servant_->members (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
+        arg_1);
     }
 
   private:
@@ -13570,7 +13344,6 @@ void POA_CORBA::ExceptionDef::_set_members_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -13607,7 +13380,7 @@ void POA_CORBA::ExceptionDef::_set_members_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -13649,8 +13422,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -13665,7 +13437,6 @@ void POA_CORBA::ExceptionDef::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -13702,7 +13473,7 @@ void POA_CORBA::ExceptionDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -13732,8 +13503,7 @@ void POA_CORBA::ExceptionDef::_is_a_skel (
           this->args_);
 
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _non_existent ();
     }
 
   private:
@@ -13748,7 +13518,6 @@ void POA_CORBA::ExceptionDef::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -13783,7 +13552,7 @@ void POA_CORBA::ExceptionDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -13813,8 +13582,7 @@ void POA_CORBA::ExceptionDef::_non_existent_skel (
           this->args_);
 
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _repository_id ();
     }
 
   private:
@@ -13829,7 +13597,6 @@ void POA_CORBA::ExceptionDef::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -13864,7 +13631,7 @@ void POA_CORBA::ExceptionDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -13874,7 +13641,6 @@ void POA_CORBA::ExceptionDef::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -13884,8 +13650,9 @@ void POA_CORBA::ExceptionDef::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::ExceptionDef * const impl =
@@ -13906,7 +13673,7 @@ void POA_CORBA::ExceptionDef::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -13937,8 +13704,7 @@ void POA_CORBA::ExceptionDef::_interface_skel (
           this->args_);
 
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _get_component ();
     }
 
   private:
@@ -13953,7 +13719,6 @@ void POA_CORBA::ExceptionDef::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -13988,12 +13753,11 @@ void POA_CORBA::ExceptionDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ExceptionDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -14032,13 +13796,11 @@ const char* POA_CORBA::ExceptionDef::_interface_repository_id (void) const
 void POA_CORBA::ExceptionDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -14294,8 +14056,7 @@ POA_CORBA::AttributeDef::~AttributeDef (void)
           this->args_);
 
       retval =
-        this->servant_->type (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->type ();
     }
 
   private:
@@ -14313,7 +14074,6 @@ void POA_CORBA::AttributeDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -14348,7 +14108,7 @@ void POA_CORBA::AttributeDef::_get_type_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -14378,8 +14138,7 @@ void POA_CORBA::AttributeDef::_get_type_skel (
           this->args_);
 
       retval =
-        this->servant_->type_def (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->type_def ();
     }
 
   private:
@@ -14397,7 +14156,6 @@ void POA_CORBA::AttributeDef::_get_type_def_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -14432,7 +14190,7 @@ void POA_CORBA::AttributeDef::_get_type_def_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -14463,8 +14221,7 @@ void POA_CORBA::AttributeDef::_get_type_def_skel (
           1);
 
       this->servant_->type_def (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
+        arg_1);
     }
 
   private:
@@ -14482,7 +14239,6 @@ void POA_CORBA::AttributeDef::_set_type_def_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -14519,7 +14275,7 @@ void POA_CORBA::AttributeDef::_set_type_def_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -14549,8 +14305,7 @@ void POA_CORBA::AttributeDef::_set_type_def_skel (
           this->args_);
 
       retval =
-        this->servant_->mode (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->mode ();
     }
 
   private:
@@ -14568,7 +14323,6 @@ void POA_CORBA::AttributeDef::_get_mode_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -14603,7 +14357,7 @@ void POA_CORBA::AttributeDef::_get_mode_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -14634,8 +14388,7 @@ void POA_CORBA::AttributeDef::_get_mode_skel (
           1);
 
       this->servant_->mode (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
+        arg_1);
     }
 
   private:
@@ -14653,7 +14406,6 @@ void POA_CORBA::AttributeDef::_set_mode_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -14690,7 +14442,7 @@ void POA_CORBA::AttributeDef::_set_mode_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -14732,8 +14484,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -14748,7 +14499,6 @@ void POA_CORBA::AttributeDef::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -14785,7 +14535,7 @@ void POA_CORBA::AttributeDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -14815,8 +14565,7 @@ void POA_CORBA::AttributeDef::_is_a_skel (
           this->args_);
 
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _non_existent ();
     }
 
   private:
@@ -14831,7 +14580,6 @@ void POA_CORBA::AttributeDef::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -14866,7 +14614,7 @@ void POA_CORBA::AttributeDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -14896,8 +14644,7 @@ void POA_CORBA::AttributeDef::_non_existent_skel (
           this->args_);
 
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _repository_id ();
     }
 
   private:
@@ -14912,7 +14659,6 @@ void POA_CORBA::AttributeDef::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -14947,7 +14693,7 @@ void POA_CORBA::AttributeDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -14957,7 +14703,6 @@ void POA_CORBA::AttributeDef::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -14967,8 +14712,9 @@ void POA_CORBA::AttributeDef::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::AttributeDef * const impl =
@@ -14989,7 +14735,7 @@ void POA_CORBA::AttributeDef::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -15020,8 +14766,7 @@ void POA_CORBA::AttributeDef::_interface_skel (
           this->args_);
 
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _get_component ();
     }
 
   private:
@@ -15036,7 +14781,6 @@ void POA_CORBA::AttributeDef::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -15071,12 +14815,11 @@ void POA_CORBA::AttributeDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::AttributeDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -15111,13 +14854,11 @@ const char* POA_CORBA::AttributeDef::_interface_repository_id (void) const
 void POA_CORBA::AttributeDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -15380,8 +15121,7 @@ POA_CORBA::ExtAttributeDef::~ExtAttributeDef (void)
           this->args_);
 
       retval =
-        this->servant_->get_exceptions (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->get_exceptions ();
     }
 
   private:
@@ -15399,7 +15139,6 @@ void POA_CORBA::ExtAttributeDef::_get_get_exceptions_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -15434,7 +15173,7 @@ void POA_CORBA::ExtAttributeDef::_get_get_exceptions_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -15465,8 +15204,7 @@ void POA_CORBA::ExtAttributeDef::_get_get_exceptions_skel (
           1);
 
       this->servant_->get_exceptions (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
+        arg_1);
     }
 
   private:
@@ -15484,7 +15222,6 @@ void POA_CORBA::ExtAttributeDef::_set_get_exceptions_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -15521,7 +15258,7 @@ void POA_CORBA::ExtAttributeDef::_set_get_exceptions_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -15551,8 +15288,7 @@ void POA_CORBA::ExtAttributeDef::_set_get_exceptions_skel (
           this->args_);
 
       retval =
-        this->servant_->set_exceptions (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->set_exceptions ();
     }
 
   private:
@@ -15570,7 +15306,6 @@ void POA_CORBA::ExtAttributeDef::_get_set_exceptions_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -15605,7 +15340,7 @@ void POA_CORBA::ExtAttributeDef::_get_set_exceptions_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -15636,8 +15371,7 @@ void POA_CORBA::ExtAttributeDef::_get_set_exceptions_skel (
           1);
 
       this->servant_->set_exceptions (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
+        arg_1);
     }
 
   private:
@@ -15655,7 +15389,6 @@ void POA_CORBA::ExtAttributeDef::_set_set_exceptions_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -15692,7 +15425,7 @@ void POA_CORBA::ExtAttributeDef::_set_set_exceptions_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -15722,8 +15455,7 @@ void POA_CORBA::ExtAttributeDef::_set_set_exceptions_skel (
           this->args_);
 
       retval =
-        this->servant_->describe_attribute (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->describe_attribute ();
     }
 
   private:
@@ -15741,7 +15473,6 @@ void POA_CORBA::ExtAttributeDef::describe_attribute_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -15776,7 +15507,7 @@ void POA_CORBA::ExtAttributeDef::describe_attribute_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -15818,8 +15549,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -15834,7 +15564,6 @@ void POA_CORBA::ExtAttributeDef::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -15871,7 +15600,7 @@ void POA_CORBA::ExtAttributeDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -15901,8 +15630,7 @@ void POA_CORBA::ExtAttributeDef::_is_a_skel (
           this->args_);
 
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _non_existent ();
     }
 
   private:
@@ -15917,7 +15645,6 @@ void POA_CORBA::ExtAttributeDef::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -15952,7 +15679,7 @@ void POA_CORBA::ExtAttributeDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -15982,8 +15709,7 @@ void POA_CORBA::ExtAttributeDef::_non_existent_skel (
           this->args_);
 
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _repository_id ();
     }
 
   private:
@@ -15998,7 +15724,6 @@ void POA_CORBA::ExtAttributeDef::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -16033,7 +15758,7 @@ void POA_CORBA::ExtAttributeDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -16043,7 +15768,6 @@ void POA_CORBA::ExtAttributeDef::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -16053,8 +15777,9 @@ void POA_CORBA::ExtAttributeDef::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::ExtAttributeDef * const impl =
@@ -16075,7 +15800,7 @@ void POA_CORBA::ExtAttributeDef::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -16106,8 +15831,7 @@ void POA_CORBA::ExtAttributeDef::_interface_skel (
           this->args_);
 
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _get_component ();
     }
 
   private:
@@ -16122,7 +15846,6 @@ void POA_CORBA::ExtAttributeDef::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -16157,12 +15880,11 @@ void POA_CORBA::ExtAttributeDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ExtAttributeDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -16201,13 +15923,11 @@ const char* POA_CORBA::ExtAttributeDef::_interface_repository_id (void) const
 void POA_CORBA::ExtAttributeDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -16524,8 +16244,7 @@ POA_CORBA::OperationDef::~OperationDef (void)
           this->args_);
 
       retval =
-        this->servant_->result (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->result ();
     }
 
   private:
@@ -16543,7 +16262,6 @@ void POA_CORBA::OperationDef::_get_result_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -16578,7 +16296,7 @@ void POA_CORBA::OperationDef::_get_result_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -16608,8 +16326,7 @@ void POA_CORBA::OperationDef::_get_result_skel (
           this->args_);
 
       retval =
-        this->servant_->result_def (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->result_def ();
     }
 
   private:
@@ -16627,7 +16344,6 @@ void POA_CORBA::OperationDef::_get_result_def_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -16662,7 +16378,7 @@ void POA_CORBA::OperationDef::_get_result_def_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -16693,8 +16409,7 @@ void POA_CORBA::OperationDef::_get_result_def_skel (
           1);
 
       this->servant_->result_def (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
+        arg_1);
     }
 
   private:
@@ -16712,7 +16427,6 @@ void POA_CORBA::OperationDef::_set_result_def_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -16749,7 +16463,7 @@ void POA_CORBA::OperationDef::_set_result_def_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -16779,8 +16493,7 @@ void POA_CORBA::OperationDef::_set_result_def_skel (
           this->args_);
 
       retval =
-        this->servant_->params (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->params ();
     }
 
   private:
@@ -16798,7 +16511,6 @@ void POA_CORBA::OperationDef::_get_params_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -16833,7 +16545,7 @@ void POA_CORBA::OperationDef::_get_params_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -16864,8 +16576,7 @@ void POA_CORBA::OperationDef::_get_params_skel (
           1);
 
       this->servant_->params (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
+        arg_1);
     }
 
   private:
@@ -16883,7 +16594,6 @@ void POA_CORBA::OperationDef::_set_params_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -16920,7 +16630,7 @@ void POA_CORBA::OperationDef::_set_params_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -16950,8 +16660,7 @@ void POA_CORBA::OperationDef::_set_params_skel (
           this->args_);
 
       retval =
-        this->servant_->mode (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->mode ();
     }
 
   private:
@@ -16969,7 +16678,6 @@ void POA_CORBA::OperationDef::_get_mode_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -17004,7 +16712,7 @@ void POA_CORBA::OperationDef::_get_mode_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -17035,8 +16743,7 @@ void POA_CORBA::OperationDef::_get_mode_skel (
           1);
 
       this->servant_->mode (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
+        arg_1);
     }
 
   private:
@@ -17054,7 +16761,6 @@ void POA_CORBA::OperationDef::_set_mode_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -17091,7 +16797,7 @@ void POA_CORBA::OperationDef::_set_mode_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -17121,8 +16827,7 @@ void POA_CORBA::OperationDef::_set_mode_skel (
           this->args_);
 
       retval =
-        this->servant_->contexts (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->contexts ();
     }
 
   private:
@@ -17140,7 +16845,6 @@ void POA_CORBA::OperationDef::_get_contexts_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -17175,7 +16879,7 @@ void POA_CORBA::OperationDef::_get_contexts_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -17206,8 +16910,7 @@ void POA_CORBA::OperationDef::_get_contexts_skel (
           1);
 
       this->servant_->contexts (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
+        arg_1);
     }
 
   private:
@@ -17225,7 +16928,6 @@ void POA_CORBA::OperationDef::_set_contexts_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -17262,7 +16964,7 @@ void POA_CORBA::OperationDef::_set_contexts_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -17292,8 +16994,7 @@ void POA_CORBA::OperationDef::_set_contexts_skel (
           this->args_);
 
       retval =
-        this->servant_->exceptions (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->exceptions ();
     }
 
   private:
@@ -17311,7 +17012,6 @@ void POA_CORBA::OperationDef::_get_exceptions_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -17346,7 +17046,7 @@ void POA_CORBA::OperationDef::_get_exceptions_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -17377,8 +17077,7 @@ void POA_CORBA::OperationDef::_get_exceptions_skel (
           1);
 
       this->servant_->exceptions (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
+        arg_1);
     }
 
   private:
@@ -17396,7 +17095,6 @@ void POA_CORBA::OperationDef::_set_exceptions_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -17433,7 +17131,7 @@ void POA_CORBA::OperationDef::_set_exceptions_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -17475,8 +17173,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -17491,7 +17188,6 @@ void POA_CORBA::OperationDef::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -17528,7 +17224,7 @@ void POA_CORBA::OperationDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -17558,8 +17254,7 @@ void POA_CORBA::OperationDef::_is_a_skel (
           this->args_);
 
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _non_existent ();
     }
 
   private:
@@ -17574,7 +17269,6 @@ void POA_CORBA::OperationDef::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -17609,7 +17303,7 @@ void POA_CORBA::OperationDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -17639,8 +17333,7 @@ void POA_CORBA::OperationDef::_non_existent_skel (
           this->args_);
 
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _repository_id ();
     }
 
   private:
@@ -17655,7 +17348,6 @@ void POA_CORBA::OperationDef::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -17690,7 +17382,7 @@ void POA_CORBA::OperationDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -17700,7 +17392,6 @@ void POA_CORBA::OperationDef::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -17710,8 +17401,9 @@ void POA_CORBA::OperationDef::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::OperationDef * const impl =
@@ -17732,7 +17424,7 @@ void POA_CORBA::OperationDef::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -17763,8 +17455,7 @@ void POA_CORBA::OperationDef::_interface_skel (
           this->args_);
 
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _get_component ();
     }
 
   private:
@@ -17779,7 +17470,6 @@ void POA_CORBA::OperationDef::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -17814,12 +17504,11 @@ void POA_CORBA::OperationDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::OperationDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -17854,13 +17543,11 @@ const char* POA_CORBA::OperationDef::_interface_repository_id (void) const
 void POA_CORBA::OperationDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -18141,8 +17828,7 @@ POA_CORBA::InterfaceDef::~InterfaceDef (void)
           this->args_);
 
       retval =
-        this->servant_->base_interfaces (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->base_interfaces ();
     }
 
   private:
@@ -18160,7 +17846,6 @@ void POA_CORBA::InterfaceDef::_get_base_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -18195,7 +17880,7 @@ void POA_CORBA::InterfaceDef::_get_base_interfaces_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -18226,8 +17911,7 @@ void POA_CORBA::InterfaceDef::_get_base_interfaces_skel (
           1);
 
       this->servant_->base_interfaces (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
+        arg_1);
     }
 
   private:
@@ -18245,7 +17929,6 @@ void POA_CORBA::InterfaceDef::_set_base_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -18282,7 +17965,7 @@ void POA_CORBA::InterfaceDef::_set_base_interfaces_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -18319,8 +18002,7 @@ void POA_CORBA::InterfaceDef::_set_base_interfaces_skel (
 
       retval =
         this->servant_->is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -18338,7 +18020,6 @@ void POA_CORBA::InterfaceDef::is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -18375,7 +18056,7 @@ void POA_CORBA::InterfaceDef::is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -18405,8 +18086,7 @@ void POA_CORBA::InterfaceDef::is_a_skel (
           this->args_);
 
       retval =
-        this->servant_->describe_interface (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->describe_interface ();
     }
 
   private:
@@ -18424,7 +18104,6 @@ void POA_CORBA::InterfaceDef::describe_interface_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -18459,7 +18138,7 @@ void POA_CORBA::InterfaceDef::describe_interface_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -18524,8 +18203,7 @@ void POA_CORBA::InterfaceDef::describe_interface_skel (
           , arg_2
           , arg_3
           , arg_4
-          , arg_5
-          ACE_ENV_ARG_PARAMETER);
+          , arg_5);
     }
 
   private:
@@ -18543,7 +18221,6 @@ void POA_CORBA::InterfaceDef::create_attribute_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -18588,7 +18265,7 @@ void POA_CORBA::InterfaceDef::create_attribute_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -18674,8 +18351,7 @@ void POA_CORBA::InterfaceDef::create_attribute_skel (
           , arg_5
           , arg_6
           , arg_7
-          , arg_8
-          ACE_ENV_ARG_PARAMETER);
+          , arg_8);
     }
 
   private:
@@ -18693,7 +18369,6 @@ void POA_CORBA::InterfaceDef::create_operation_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -18744,7 +18419,7 @@ void POA_CORBA::InterfaceDef::create_operation_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -18786,8 +18461,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -18802,7 +18476,6 @@ void POA_CORBA::InterfaceDef::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -18839,7 +18512,7 @@ void POA_CORBA::InterfaceDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -18869,8 +18542,7 @@ void POA_CORBA::InterfaceDef::_is_a_skel (
           this->args_);
 
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _non_existent ();
     }
 
   private:
@@ -18885,7 +18557,6 @@ void POA_CORBA::InterfaceDef::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -18920,7 +18591,7 @@ void POA_CORBA::InterfaceDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -18950,8 +18621,7 @@ void POA_CORBA::InterfaceDef::_non_existent_skel (
           this->args_);
 
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _repository_id ();
     }
 
   private:
@@ -18966,7 +18636,6 @@ void POA_CORBA::InterfaceDef::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -19001,7 +18670,7 @@ void POA_CORBA::InterfaceDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -19011,7 +18680,6 @@ void POA_CORBA::InterfaceDef::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -19021,8 +18689,9 @@ void POA_CORBA::InterfaceDef::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::InterfaceDef * const impl =
@@ -19043,7 +18712,7 @@ void POA_CORBA::InterfaceDef::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -19074,8 +18743,7 @@ void POA_CORBA::InterfaceDef::_interface_skel (
           this->args_);
 
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _get_component ();
     }
 
   private:
@@ -19090,7 +18758,6 @@ void POA_CORBA::InterfaceDef::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -19125,12 +18792,11 @@ void POA_CORBA::InterfaceDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::InterfaceDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -19173,13 +18839,11 @@ const char* POA_CORBA::InterfaceDef::_interface_repository_id (void) const
 void POA_CORBA::InterfaceDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -19398,8 +19062,7 @@ POA_CORBA::InterfaceAttrExtension::~InterfaceAttrExtension (void)
           this->args_);
 
       retval =
-        this->servant_->describe_ext_interface (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->describe_ext_interface ();
     }
 
   private:
@@ -19417,7 +19080,6 @@ void POA_CORBA::InterfaceAttrExtension::describe_ext_interface_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -19452,7 +19114,7 @@ void POA_CORBA::InterfaceAttrExtension::describe_ext_interface_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -19531,8 +19193,7 @@ void POA_CORBA::InterfaceAttrExtension::describe_ext_interface_skel (
           , arg_4
           , arg_5
           , arg_6
-          , arg_7
-          ACE_ENV_ARG_PARAMETER);
+          , arg_7);
     }
 
   private:
@@ -19550,7 +19211,6 @@ void POA_CORBA::InterfaceAttrExtension::create_ext_attribute_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -19599,7 +19259,7 @@ void POA_CORBA::InterfaceAttrExtension::create_ext_attribute_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -19641,8 +19301,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -19657,7 +19316,6 @@ void POA_CORBA::InterfaceAttrExtension::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -19694,7 +19352,7 @@ void POA_CORBA::InterfaceAttrExtension::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -19724,8 +19382,7 @@ void POA_CORBA::InterfaceAttrExtension::_is_a_skel (
           this->args_);
 
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _non_existent ();
     }
 
   private:
@@ -19740,7 +19397,6 @@ void POA_CORBA::InterfaceAttrExtension::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -19775,7 +19431,7 @@ void POA_CORBA::InterfaceAttrExtension::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -19805,8 +19461,7 @@ void POA_CORBA::InterfaceAttrExtension::_non_existent_skel (
           this->args_);
 
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _repository_id ();
     }
 
   private:
@@ -19821,7 +19476,6 @@ void POA_CORBA::InterfaceAttrExtension::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -19856,7 +19510,7 @@ void POA_CORBA::InterfaceAttrExtension::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -19866,7 +19520,6 @@ void POA_CORBA::InterfaceAttrExtension::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -19876,8 +19529,9 @@ void POA_CORBA::InterfaceAttrExtension::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::InterfaceAttrExtension * const impl =
@@ -19898,7 +19552,7 @@ void POA_CORBA::InterfaceAttrExtension::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -19929,8 +19583,7 @@ void POA_CORBA::InterfaceAttrExtension::_interface_skel (
           this->args_);
 
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _get_component ();
     }
 
   private:
@@ -19945,7 +19598,6 @@ void POA_CORBA::InterfaceAttrExtension::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -19980,12 +19632,11 @@ void POA_CORBA::InterfaceAttrExtension::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::InterfaceAttrExtension::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -20012,13 +19663,11 @@ const char* POA_CORBA::InterfaceAttrExtension::_interface_repository_id (void) c
 void POA_CORBA::InterfaceAttrExtension::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -20315,8 +19964,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -20331,7 +19979,6 @@ void POA_CORBA::ExtInterfaceDef::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -20368,7 +20015,7 @@ void POA_CORBA::ExtInterfaceDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -20398,8 +20045,7 @@ void POA_CORBA::ExtInterfaceDef::_is_a_skel (
           this->args_);
 
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _non_existent ();
     }
 
   private:
@@ -20414,7 +20060,6 @@ void POA_CORBA::ExtInterfaceDef::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -20449,7 +20094,7 @@ void POA_CORBA::ExtInterfaceDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -20479,8 +20124,7 @@ void POA_CORBA::ExtInterfaceDef::_non_existent_skel (
           this->args_);
 
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _repository_id ();
     }
 
   private:
@@ -20495,7 +20139,6 @@ void POA_CORBA::ExtInterfaceDef::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -20530,7 +20173,7 @@ void POA_CORBA::ExtInterfaceDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -20540,7 +20183,6 @@ void POA_CORBA::ExtInterfaceDef::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -20550,8 +20192,9 @@ void POA_CORBA::ExtInterfaceDef::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::ExtInterfaceDef * const impl =
@@ -20572,7 +20215,7 @@ void POA_CORBA::ExtInterfaceDef::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -20603,8 +20246,7 @@ void POA_CORBA::ExtInterfaceDef::_interface_skel (
           this->args_);
 
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _get_component ();
     }
 
   private:
@@ -20619,7 +20261,6 @@ void POA_CORBA::ExtInterfaceDef::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -20654,12 +20295,11 @@ void POA_CORBA::ExtInterfaceDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ExtInterfaceDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -20710,13 +20350,11 @@ const char* POA_CORBA::ExtInterfaceDef::_interface_repository_id (void) const
 void POA_CORBA::ExtInterfaceDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -21010,8 +20648,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -21026,7 +20663,6 @@ void POA_CORBA::AbstractInterfaceDef::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -21063,7 +20699,7 @@ void POA_CORBA::AbstractInterfaceDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -21093,8 +20729,7 @@ void POA_CORBA::AbstractInterfaceDef::_is_a_skel (
           this->args_);
 
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _non_existent ();
     }
 
   private:
@@ -21109,7 +20744,6 @@ void POA_CORBA::AbstractInterfaceDef::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -21144,7 +20778,7 @@ void POA_CORBA::AbstractInterfaceDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -21174,8 +20808,7 @@ void POA_CORBA::AbstractInterfaceDef::_non_existent_skel (
           this->args_);
 
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _repository_id ();
     }
 
   private:
@@ -21190,7 +20823,6 @@ void POA_CORBA::AbstractInterfaceDef::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -21225,7 +20857,7 @@ void POA_CORBA::AbstractInterfaceDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -21235,7 +20867,6 @@ void POA_CORBA::AbstractInterfaceDef::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -21245,8 +20876,9 @@ void POA_CORBA::AbstractInterfaceDef::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::AbstractInterfaceDef * const impl =
@@ -21267,7 +20899,7 @@ void POA_CORBA::AbstractInterfaceDef::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -21298,8 +20930,7 @@ void POA_CORBA::AbstractInterfaceDef::_interface_skel (
           this->args_);
 
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _get_component ();
     }
 
   private:
@@ -21314,7 +20945,6 @@ void POA_CORBA::AbstractInterfaceDef::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -21349,12 +20979,11 @@ void POA_CORBA::AbstractInterfaceDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::AbstractInterfaceDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -21401,13 +21030,11 @@ const char* POA_CORBA::AbstractInterfaceDef::_interface_repository_id (void) con
 void POA_CORBA::AbstractInterfaceDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -21705,8 +21332,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -21721,7 +21347,6 @@ void POA_CORBA::ExtAbstractInterfaceDef::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -21758,7 +21383,7 @@ void POA_CORBA::ExtAbstractInterfaceDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -21788,8 +21413,7 @@ void POA_CORBA::ExtAbstractInterfaceDef::_is_a_skel (
           this->args_);
 
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _non_existent ();
     }
 
   private:
@@ -21804,7 +21428,6 @@ void POA_CORBA::ExtAbstractInterfaceDef::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -21839,7 +21462,7 @@ void POA_CORBA::ExtAbstractInterfaceDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -21869,8 +21492,7 @@ void POA_CORBA::ExtAbstractInterfaceDef::_non_existent_skel (
           this->args_);
 
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _repository_id ();
     }
 
   private:
@@ -21885,7 +21507,6 @@ void POA_CORBA::ExtAbstractInterfaceDef::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -21920,7 +21541,7 @@ void POA_CORBA::ExtAbstractInterfaceDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -21930,7 +21551,6 @@ void POA_CORBA::ExtAbstractInterfaceDef::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -21940,8 +21560,9 @@ void POA_CORBA::ExtAbstractInterfaceDef::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::ExtAbstractInterfaceDef * const impl =
@@ -21962,7 +21583,7 @@ void POA_CORBA::ExtAbstractInterfaceDef::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -21993,8 +21614,7 @@ void POA_CORBA::ExtAbstractInterfaceDef::_interface_skel (
           this->args_);
 
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _get_component ();
     }
 
   private:
@@ -22009,7 +21629,6 @@ void POA_CORBA::ExtAbstractInterfaceDef::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -22044,12 +21663,11 @@ void POA_CORBA::ExtAbstractInterfaceDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ExtAbstractInterfaceDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -22104,13 +21722,11 @@ const char* POA_CORBA::ExtAbstractInterfaceDef::_interface_repository_id (void)
 void POA_CORBA::ExtAbstractInterfaceDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -22404,8 +22020,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -22420,7 +22035,6 @@ void POA_CORBA::LocalInterfaceDef::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -22457,7 +22071,7 @@ void POA_CORBA::LocalInterfaceDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -22487,8 +22101,7 @@ void POA_CORBA::LocalInterfaceDef::_is_a_skel (
           this->args_);
 
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _non_existent ();
     }
 
   private:
@@ -22503,7 +22116,6 @@ void POA_CORBA::LocalInterfaceDef::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -22538,7 +22150,7 @@ void POA_CORBA::LocalInterfaceDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -22568,8 +22180,7 @@ void POA_CORBA::LocalInterfaceDef::_non_existent_skel (
           this->args_);
 
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _repository_id ();
     }
 
   private:
@@ -22584,7 +22195,6 @@ void POA_CORBA::LocalInterfaceDef::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -22619,7 +22229,7 @@ void POA_CORBA::LocalInterfaceDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -22629,7 +22239,6 @@ void POA_CORBA::LocalInterfaceDef::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -22639,8 +22248,9 @@ void POA_CORBA::LocalInterfaceDef::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::LocalInterfaceDef * const impl =
@@ -22661,7 +22271,7 @@ void POA_CORBA::LocalInterfaceDef::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -22692,8 +22302,7 @@ void POA_CORBA::LocalInterfaceDef::_interface_skel (
           this->args_);
 
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _get_component ();
     }
 
   private:
@@ -22708,7 +22317,6 @@ void POA_CORBA::LocalInterfaceDef::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -22743,12 +22351,11 @@ void POA_CORBA::LocalInterfaceDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::LocalInterfaceDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -22795,13 +22402,11 @@ const char* POA_CORBA::LocalInterfaceDef::_interface_repository_id (void) const
 void POA_CORBA::LocalInterfaceDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -23099,8 +22704,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -23115,7 +22719,6 @@ void POA_CORBA::ExtLocalInterfaceDef::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -23152,7 +22755,7 @@ void POA_CORBA::ExtLocalInterfaceDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -23182,8 +22785,7 @@ void POA_CORBA::ExtLocalInterfaceDef::_is_a_skel (
           this->args_);
 
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _non_existent ();
     }
 
   private:
@@ -23198,7 +22800,6 @@ void POA_CORBA::ExtLocalInterfaceDef::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -23233,7 +22834,7 @@ void POA_CORBA::ExtLocalInterfaceDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -23263,8 +22864,7 @@ void POA_CORBA::ExtLocalInterfaceDef::_non_existent_skel (
           this->args_);
 
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _repository_id ();
     }
 
   private:
@@ -23279,7 +22879,6 @@ void POA_CORBA::ExtLocalInterfaceDef::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -23314,7 +22913,7 @@ void POA_CORBA::ExtLocalInterfaceDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -23324,7 +22923,6 @@ void POA_CORBA::ExtLocalInterfaceDef::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -23334,8 +22932,9 @@ void POA_CORBA::ExtLocalInterfaceDef::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::ExtLocalInterfaceDef * const impl =
@@ -23356,7 +22955,7 @@ void POA_CORBA::ExtLocalInterfaceDef::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -23387,8 +22986,7 @@ void POA_CORBA::ExtLocalInterfaceDef::_interface_skel (
           this->args_);
 
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _get_component ();
     }
 
   private:
@@ -23403,7 +23001,6 @@ void POA_CORBA::ExtLocalInterfaceDef::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -23438,12 +23035,11 @@ void POA_CORBA::ExtLocalInterfaceDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ExtLocalInterfaceDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -23498,13 +23094,11 @@ const char* POA_CORBA::ExtLocalInterfaceDef::_interface_repository_id (void) con
 void POA_CORBA::ExtLocalInterfaceDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h
index 4082020639a..a98ed5c6385 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h
@@ -79,53 +79,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::Repository *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -135,7 +127,6 @@ namespace POA_CORBA
 
     virtual ::CORBA::Contained_ptr lookup_id (
         const char * search_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -145,7 +136,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -153,7 +143,6 @@ namespace POA_CORBA
 
     virtual ::CORBA::TypeCode_ptr get_canonical_typecode (
         ::CORBA::TypeCode_ptr tc
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -163,7 +152,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -171,7 +159,6 @@ namespace POA_CORBA
 
     virtual ::CORBA::PrimitiveDef_ptr get_primitive (
         ::CORBA::PrimitiveKind kind
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -181,7 +168,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -189,7 +175,6 @@ namespace POA_CORBA
 
     virtual ::CORBA::StringDef_ptr create_string (
         ::CORBA::ULong bound
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -199,7 +184,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -207,7 +191,6 @@ namespace POA_CORBA
 
     virtual ::CORBA::WstringDef_ptr create_wstring (
         ::CORBA::ULong bound
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -217,7 +200,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -226,7 +208,6 @@ namespace POA_CORBA
     virtual ::CORBA::SequenceDef_ptr create_sequence (
         ::CORBA::ULong bound,
         ::CORBA::IDLType_ptr element_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -236,7 +217,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -245,7 +225,6 @@ namespace POA_CORBA
     virtual ::CORBA::ArrayDef_ptr create_array (
         ::CORBA::ULong length,
         ::CORBA::IDLType_ptr element_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -255,7 +234,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -264,7 +242,6 @@ namespace POA_CORBA
     virtual ::CORBA::FixedDef_ptr create_fixed (
         ::CORBA::UShort digits,
         ::CORBA::Short scale
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -274,7 +251,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -282,7 +258,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -293,7 +268,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -304,7 +278,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -315,7 +288,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -326,7 +298,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -337,7 +308,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -348,7 +318,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -359,7 +328,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -370,7 +338,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -381,7 +348,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -392,7 +358,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -403,7 +368,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -414,7 +378,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -425,7 +388,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -436,7 +398,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -447,7 +408,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -458,7 +418,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -469,7 +428,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -480,7 +438,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -491,7 +448,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -519,53 +475,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::ModuleDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -575,7 +523,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -586,7 +533,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -597,7 +543,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -608,7 +553,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -619,7 +563,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -630,7 +573,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -641,7 +583,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -652,7 +593,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -663,7 +603,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -674,7 +613,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -685,7 +623,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -696,7 +633,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -707,7 +643,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -718,7 +653,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -729,7 +663,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -740,7 +673,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -751,7 +683,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -762,7 +693,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -773,7 +703,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -784,7 +713,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -792,7 +720,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -800,7 +727,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -808,7 +734,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -816,7 +741,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -824,7 +748,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -832,7 +755,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -840,7 +762,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -848,7 +769,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -856,7 +776,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -867,7 +786,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -878,7 +796,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -905,53 +822,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::ConstantDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -960,7 +869,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -970,14 +878,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::IDLType_ptr type_def (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -987,7 +893,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -995,7 +900,6 @@ namespace POA_CORBA
 
     virtual void type_def (
         ::CORBA::IDLType_ptr type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1005,14 +909,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::Any * value (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1022,7 +924,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -1030,7 +931,6 @@ namespace POA_CORBA
 
     virtual void value (
         const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1040,7 +940,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -1048,7 +947,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1059,7 +957,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1067,7 +964,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1075,7 +971,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1083,7 +978,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1091,7 +985,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1099,7 +992,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1107,7 +999,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1115,7 +1006,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1123,7 +1013,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1131,7 +1020,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1142,7 +1030,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1153,7 +1040,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -1181,53 +1067,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::StructDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -1236,7 +1114,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::StructMemberSeq * members (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1246,7 +1123,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -1254,7 +1130,6 @@ namespace POA_CORBA
 
     virtual void members (
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1264,7 +1139,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -1272,7 +1146,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1283,7 +1156,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1291,7 +1163,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1299,7 +1170,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1307,7 +1177,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1315,7 +1184,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1323,7 +1191,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1331,7 +1198,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1339,7 +1205,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1347,7 +1212,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1355,7 +1219,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1366,7 +1229,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1377,7 +1239,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1385,7 +1246,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1396,7 +1256,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1407,7 +1266,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1418,7 +1276,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1429,7 +1286,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1440,7 +1296,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1451,7 +1306,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1462,7 +1316,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1473,7 +1326,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1484,7 +1336,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1495,7 +1346,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1506,7 +1356,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1517,7 +1366,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1528,7 +1376,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1539,7 +1386,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1550,7 +1396,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1561,7 +1406,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1572,7 +1416,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1583,7 +1426,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -1611,53 +1453,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::UnionDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -1666,7 +1500,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::TypeCode_ptr discriminator_type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1676,14 +1509,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::IDLType_ptr discriminator_type_def (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1693,7 +1524,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -1701,7 +1531,6 @@ namespace POA_CORBA
 
     virtual void discriminator_type_def (
         ::CORBA::IDLType_ptr discriminator_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1711,14 +1540,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::UnionMemberSeq * members (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1728,7 +1555,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -1736,7 +1562,6 @@ namespace POA_CORBA
 
     virtual void members (
         const ::CORBA::UnionMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1746,7 +1571,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -1754,7 +1578,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1765,7 +1588,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1773,7 +1595,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1781,7 +1602,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1789,7 +1609,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1797,7 +1616,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1805,7 +1623,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1813,7 +1630,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1821,7 +1637,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1829,7 +1644,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1837,7 +1651,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1848,7 +1661,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1859,7 +1671,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1867,7 +1678,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1878,7 +1688,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1889,7 +1698,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1900,7 +1708,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1911,7 +1718,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1922,7 +1728,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1933,7 +1738,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1944,7 +1748,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1955,7 +1758,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1966,7 +1768,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1977,7 +1778,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1988,7 +1788,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1999,7 +1798,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -2010,7 +1808,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -2021,7 +1818,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -2032,7 +1828,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -2043,7 +1838,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -2054,7 +1848,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -2065,7 +1858,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -2092,53 +1884,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::EnumDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -2147,7 +1931,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::EnumMemberSeq * members (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2157,7 +1940,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -2165,7 +1947,6 @@ namespace POA_CORBA
 
     virtual void members (
         const ::CORBA::EnumMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2175,7 +1956,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -2183,7 +1963,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -2194,7 +1973,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2202,7 +1980,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2210,7 +1987,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2218,7 +1994,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2226,7 +2001,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2234,7 +2008,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2242,7 +2015,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2250,7 +2022,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2258,7 +2029,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2266,7 +2036,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -2277,7 +2046,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -2288,7 +2056,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2296,7 +2063,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -2323,53 +2089,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::AliasDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -2378,7 +2136,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::IDLType_ptr original_type_def (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2388,7 +2145,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -2396,7 +2152,6 @@ namespace POA_CORBA
 
     virtual void original_type_def (
         ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2406,7 +2161,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -2414,7 +2168,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -2425,7 +2178,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2433,7 +2185,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2441,7 +2192,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2449,7 +2199,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2457,7 +2206,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2465,7 +2213,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2473,7 +2220,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2481,7 +2227,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2489,7 +2234,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2497,7 +2241,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -2508,7 +2251,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -2519,7 +2261,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2527,7 +2268,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -2554,53 +2294,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::NativeDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -2610,7 +2342,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -2621,7 +2352,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2629,7 +2359,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2637,7 +2366,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2645,7 +2373,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2653,7 +2380,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2661,7 +2387,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2669,7 +2394,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2677,7 +2401,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2685,7 +2408,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2693,7 +2415,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -2704,7 +2425,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -2715,7 +2435,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2723,7 +2442,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -2750,53 +2468,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::PrimitiveDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -2805,7 +2515,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::PrimitiveKind kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2815,7 +2524,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -2823,7 +2531,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -2834,7 +2541,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2842,7 +2548,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -2869,53 +2574,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::StringDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -2924,7 +2621,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ULong bound (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2934,7 +2630,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -2942,7 +2637,6 @@ namespace POA_CORBA
 
     virtual void bound (
         ::CORBA::ULong bound
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2952,7 +2646,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -2960,7 +2653,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -2971,7 +2663,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2979,7 +2670,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -3006,53 +2696,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::WstringDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -3061,7 +2743,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ULong bound (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3071,7 +2752,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -3079,7 +2759,6 @@ namespace POA_CORBA
 
     virtual void bound (
         ::CORBA::ULong bound
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3089,7 +2768,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -3097,7 +2775,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3108,7 +2785,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -3116,7 +2792,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -3143,53 +2818,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::SequenceDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -3198,7 +2865,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ULong bound (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3208,7 +2874,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -3216,7 +2881,6 @@ namespace POA_CORBA
 
     virtual void bound (
         ::CORBA::ULong bound
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3226,14 +2890,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::TypeCode_ptr element_type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3243,14 +2905,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::IDLType_ptr element_type_def (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3260,7 +2920,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -3268,7 +2927,6 @@ namespace POA_CORBA
 
     virtual void element_type_def (
         ::CORBA::IDLType_ptr element_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3278,7 +2936,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -3286,7 +2943,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3297,7 +2953,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -3305,7 +2960,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -3332,53 +2986,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::ArrayDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -3387,7 +3033,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ULong length (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3397,7 +3042,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -3405,7 +3049,6 @@ namespace POA_CORBA
 
     virtual void length (
         ::CORBA::ULong length
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3415,14 +3058,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::TypeCode_ptr element_type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3432,14 +3073,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::IDLType_ptr element_type_def (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3449,7 +3088,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -3457,7 +3095,6 @@ namespace POA_CORBA
 
     virtual void element_type_def (
         ::CORBA::IDLType_ptr element_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3467,7 +3104,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -3475,7 +3111,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3486,7 +3121,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -3494,7 +3128,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -3522,53 +3155,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::ExceptionDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -3577,7 +3202,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3587,14 +3211,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::StructMemberSeq * members (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3604,7 +3226,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -3612,7 +3233,6 @@ namespace POA_CORBA
 
     virtual void members (
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3622,7 +3242,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -3630,7 +3249,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3641,7 +3259,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -3649,7 +3266,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -3657,7 +3273,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -3665,7 +3280,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -3673,7 +3287,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -3681,7 +3294,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -3689,7 +3301,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -3697,7 +3308,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -3705,7 +3315,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -3713,7 +3322,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3724,7 +3332,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3735,7 +3342,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3746,7 +3352,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3757,7 +3362,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3768,7 +3372,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3779,7 +3382,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3790,7 +3392,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3801,7 +3402,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3812,7 +3412,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3823,7 +3422,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3834,7 +3432,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3845,7 +3442,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3856,7 +3452,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3867,7 +3462,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3878,7 +3472,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3889,7 +3482,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3900,7 +3492,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3911,7 +3502,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3922,7 +3512,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3933,7 +3522,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -3960,53 +3548,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::AttributeDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -4015,7 +3595,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4025,14 +3604,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::IDLType_ptr type_def (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4042,7 +3619,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -4050,7 +3626,6 @@ namespace POA_CORBA
 
     virtual void type_def (
         ::CORBA::IDLType_ptr type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4060,14 +3635,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::AttributeMode mode (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4077,7 +3650,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -4085,7 +3657,6 @@ namespace POA_CORBA
 
     virtual void mode (
         ::CORBA::AttributeMode mode
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4095,7 +3666,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -4103,7 +3673,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -4114,7 +3683,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4122,7 +3690,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4130,7 +3697,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4138,7 +3704,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4146,7 +3711,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4154,7 +3718,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4162,7 +3725,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4170,7 +3732,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4178,7 +3739,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4186,7 +3746,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -4197,7 +3756,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -4208,7 +3766,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -4235,53 +3792,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::ExtAttributeDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -4290,7 +3839,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ExcDescriptionSeq * get_exceptions (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4300,7 +3848,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -4308,7 +3855,6 @@ namespace POA_CORBA
 
     virtual void get_exceptions (
         const ::CORBA::ExcDescriptionSeq & get_exceptions
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4318,14 +3864,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ExcDescriptionSeq * set_exceptions (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4335,7 +3879,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -4343,7 +3886,6 @@ namespace POA_CORBA
 
     virtual void set_exceptions (
         const ::CORBA::ExcDescriptionSeq & set_exceptions
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4353,14 +3895,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ExtAttributeDescription * describe_attribute (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4370,7 +3910,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -4378,7 +3917,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -4389,7 +3927,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4397,7 +3934,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4405,7 +3941,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4413,7 +3948,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4421,7 +3955,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4429,7 +3962,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4437,7 +3969,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4445,7 +3976,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4453,7 +3983,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4461,7 +3990,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -4472,7 +4000,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -4483,7 +4010,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4491,7 +4017,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4499,7 +4024,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4507,7 +4031,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4515,7 +4038,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4523,7 +4045,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -4550,53 +4071,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::OperationDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -4605,7 +4118,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::TypeCode_ptr result (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4615,14 +4127,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::IDLType_ptr result_def (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4632,7 +4142,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -4640,7 +4149,6 @@ namespace POA_CORBA
 
     virtual void result_def (
         ::CORBA::IDLType_ptr result_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4650,14 +4158,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ParDescriptionSeq * params (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4667,7 +4173,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -4675,7 +4180,6 @@ namespace POA_CORBA
 
     virtual void params (
         const ::CORBA::ParDescriptionSeq & params
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4685,14 +4189,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::OperationMode mode (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4702,7 +4204,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -4710,7 +4211,6 @@ namespace POA_CORBA
 
     virtual void mode (
         ::CORBA::OperationMode mode
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4720,14 +4220,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ContextIdSeq * contexts (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4737,7 +4235,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -4745,7 +4242,6 @@ namespace POA_CORBA
 
     virtual void contexts (
         const ::CORBA::ContextIdSeq & contexts
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4755,14 +4251,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ExceptionDefSeq * exceptions (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4772,7 +4266,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -4780,7 +4273,6 @@ namespace POA_CORBA
 
     virtual void exceptions (
         const ::CORBA::ExceptionDefSeq & exceptions
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4790,7 +4282,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -4798,7 +4289,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -4809,7 +4299,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4817,7 +4306,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4825,7 +4313,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4833,7 +4320,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4841,7 +4327,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4849,7 +4334,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4857,7 +4341,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4865,7 +4348,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4873,7 +4355,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4881,7 +4362,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -4892,7 +4372,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -4903,7 +4382,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -4932,53 +4410,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::InterfaceDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -4987,7 +4457,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::InterfaceDefSeq * base_interfaces (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4997,7 +4466,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -5005,7 +4473,6 @@ namespace POA_CORBA
 
     virtual void base_interfaces (
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5015,7 +4482,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -5023,7 +4489,6 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean is_a (
         const char * interface_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5033,14 +4498,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5050,7 +4513,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -5062,7 +4524,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         ::CORBA::AttributeMode mode
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5072,7 +4533,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -5087,7 +4547,6 @@ namespace POA_CORBA
         const ::CORBA::ParDescriptionSeq & params,
         const ::CORBA::ExceptionDefSeq & exceptions,
         const ::CORBA::ContextIdSeq & contexts
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5097,7 +4556,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -5105,7 +4563,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5116,7 +4573,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5127,7 +4583,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5138,7 +4593,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5149,7 +4603,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5160,7 +4613,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5171,7 +4623,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5182,7 +4633,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5193,7 +4643,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5204,7 +4653,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5215,7 +4663,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5226,7 +4673,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5237,7 +4683,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5248,7 +4693,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5259,7 +4703,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5270,7 +4713,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5281,7 +4723,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5292,7 +4733,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5303,7 +4743,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5314,7 +4753,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5322,7 +4760,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5330,7 +4767,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5338,7 +4774,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5346,7 +4781,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5354,7 +4788,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5362,7 +4795,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5370,7 +4802,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5378,7 +4809,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5386,7 +4816,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5397,7 +4826,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5408,7 +4836,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5416,7 +4843,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -5443,53 +4869,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::InterfaceAttrExtension *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -5498,7 +4916,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5508,7 +4925,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -5522,7 +4938,6 @@ namespace POA_CORBA
         ::CORBA::AttributeMode mode,
         const ::CORBA::ExceptionDefSeq & get_exceptions,
         const ::CORBA::ExceptionDefSeq & set_exceptions
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5532,7 +4947,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
   };
 
@@ -5560,53 +4974,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::ExtInterfaceDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -5616,7 +5022,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5627,7 +5032,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5638,7 +5042,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5649,7 +5052,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5660,7 +5062,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5671,7 +5072,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5682,7 +5082,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5693,7 +5092,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5704,7 +5102,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5715,7 +5112,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5726,7 +5122,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5737,7 +5132,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5748,7 +5142,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5759,7 +5152,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5770,7 +5162,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5781,7 +5172,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5792,7 +5182,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5803,7 +5192,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5814,7 +5202,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5825,7 +5212,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5833,7 +5219,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5841,7 +5226,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5849,7 +5233,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5857,7 +5240,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5865,7 +5247,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5873,7 +5254,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5881,7 +5261,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5889,7 +5268,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5897,7 +5275,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5908,7 +5285,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5919,7 +5295,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5927,7 +5302,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5935,7 +5309,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5943,7 +5316,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5954,7 +5326,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5965,7 +5336,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5976,7 +5346,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5987,7 +5356,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5998,7 +5366,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6009,7 +5376,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -6036,53 +5402,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::AbstractInterfaceDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -6092,7 +5450,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6103,7 +5460,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6114,7 +5470,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6125,7 +5480,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6136,7 +5490,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6147,7 +5500,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6158,7 +5510,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6169,7 +5520,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6180,7 +5530,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6191,7 +5540,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6202,7 +5550,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6213,7 +5560,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6224,7 +5570,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6235,7 +5580,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6246,7 +5590,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6257,7 +5600,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6268,7 +5610,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6279,7 +5620,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6290,7 +5630,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6301,7 +5640,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6309,7 +5647,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6317,7 +5654,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6325,7 +5661,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6333,7 +5668,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6341,7 +5675,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6349,7 +5682,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6357,7 +5689,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6365,7 +5696,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6373,7 +5703,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6384,7 +5713,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6395,7 +5723,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6403,7 +5730,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6411,7 +5737,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6419,7 +5744,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6430,7 +5754,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6441,7 +5764,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6452,7 +5774,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6463,7 +5784,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -6491,53 +5811,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::ExtAbstractInterfaceDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -6547,7 +5859,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6558,7 +5869,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6569,7 +5879,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6580,7 +5889,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6591,7 +5899,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6602,7 +5909,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6613,7 +5919,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6624,7 +5929,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6635,7 +5939,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6646,7 +5949,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6657,7 +5959,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6668,7 +5969,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6679,7 +5979,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6690,7 +5989,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6701,7 +5999,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6712,7 +6009,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6723,7 +6019,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6734,7 +6029,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6745,7 +6039,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6756,7 +6049,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6764,7 +6056,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6772,7 +6063,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6780,7 +6070,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6788,7 +6077,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6796,7 +6084,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6804,7 +6091,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6812,7 +6098,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6820,7 +6105,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6828,7 +6112,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6839,7 +6122,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6850,7 +6132,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6858,7 +6139,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6866,7 +6146,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6874,7 +6153,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6885,7 +6163,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6896,7 +6173,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6907,7 +6183,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6918,7 +6193,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6929,7 +6203,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6940,7 +6213,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -6967,53 +6239,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::LocalInterfaceDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -7023,7 +6287,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7034,7 +6297,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7045,7 +6307,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7056,7 +6317,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7067,7 +6327,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7078,7 +6337,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7089,7 +6347,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7100,7 +6357,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7111,7 +6367,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7122,7 +6377,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7133,7 +6387,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7144,7 +6397,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7155,7 +6407,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7166,7 +6417,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7177,7 +6427,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7188,7 +6437,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7199,7 +6447,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7210,7 +6457,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7221,7 +6467,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7232,7 +6477,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7240,7 +6484,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7248,7 +6491,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7256,7 +6498,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7264,7 +6505,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7272,7 +6512,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7280,7 +6519,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7288,7 +6526,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7296,7 +6533,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7304,7 +6540,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7315,7 +6550,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7326,7 +6560,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7334,7 +6567,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7342,7 +6574,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7350,7 +6581,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7361,7 +6591,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7372,7 +6601,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7383,7 +6611,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7394,7 +6621,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -7422,53 +6648,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::ExtLocalInterfaceDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -7478,7 +6696,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7489,7 +6706,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7500,7 +6716,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7511,7 +6726,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7522,7 +6736,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7533,7 +6746,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7544,7 +6756,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7555,7 +6766,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7566,7 +6776,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7577,7 +6786,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7588,7 +6796,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7599,7 +6806,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7610,7 +6816,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7621,7 +6826,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7632,7 +6836,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7643,7 +6846,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7654,7 +6856,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7665,7 +6866,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7676,7 +6876,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7687,7 +6886,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7695,7 +6893,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7703,7 +6900,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7711,7 +6907,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7719,7 +6914,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7727,7 +6921,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7735,7 +6928,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7743,7 +6935,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7751,7 +6942,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7759,7 +6949,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7770,7 +6959,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7781,7 +6969,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7789,7 +6976,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7797,7 +6983,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7805,7 +6990,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7816,7 +7000,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7827,7 +7010,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7838,7 +7020,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7849,7 +7030,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7860,7 +7040,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7871,7 +7050,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.inl
index 302ffa66e28..84f2af6e371 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.inl
@@ -36,7 +36,6 @@ POA_CORBA::Repository::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::Repository *> (servant);
@@ -44,7 +43,6 @@ POA_CORBA::Repository::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -57,7 +55,6 @@ POA_CORBA::Repository::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::Repository *> (servant);
@@ -65,7 +62,6 @@ POA_CORBA::Repository::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -78,7 +74,6 @@ POA_CORBA::Repository::lookup_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::Repository *> (servant);
@@ -86,7 +81,6 @@ POA_CORBA::Repository::lookup_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -99,7 +93,6 @@ POA_CORBA::Repository::contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::Repository *> (servant);
@@ -107,7 +100,6 @@ POA_CORBA::Repository::contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -120,7 +112,6 @@ POA_CORBA::Repository::lookup_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::Repository *> (servant);
@@ -128,7 +119,6 @@ POA_CORBA::Repository::lookup_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -141,7 +131,6 @@ POA_CORBA::Repository::describe_contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::Repository *> (servant);
@@ -149,7 +138,6 @@ POA_CORBA::Repository::describe_contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -162,7 +150,6 @@ POA_CORBA::Repository::create_module_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::Repository *> (servant);
@@ -170,7 +157,6 @@ POA_CORBA::Repository::create_module_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -183,7 +169,6 @@ POA_CORBA::Repository::create_constant_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::Repository *> (servant);
@@ -191,7 +176,6 @@ POA_CORBA::Repository::create_constant_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -204,7 +188,6 @@ POA_CORBA::Repository::create_struct_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::Repository *> (servant);
@@ -212,7 +195,6 @@ POA_CORBA::Repository::create_struct_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -225,7 +207,6 @@ POA_CORBA::Repository::create_union_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::Repository *> (servant);
@@ -233,7 +214,6 @@ POA_CORBA::Repository::create_union_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -246,7 +226,6 @@ POA_CORBA::Repository::create_enum_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::Repository *> (servant);
@@ -254,7 +233,6 @@ POA_CORBA::Repository::create_enum_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -267,7 +245,6 @@ POA_CORBA::Repository::create_alias_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::Repository *> (servant);
@@ -275,7 +252,6 @@ POA_CORBA::Repository::create_alias_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -288,7 +264,6 @@ POA_CORBA::Repository::create_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::Repository *> (servant);
@@ -296,7 +271,6 @@ POA_CORBA::Repository::create_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -309,7 +283,6 @@ POA_CORBA::Repository::create_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::Repository *> (servant);
@@ -317,7 +290,6 @@ POA_CORBA::Repository::create_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -330,7 +302,6 @@ POA_CORBA::Repository::create_value_box_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::Repository *> (servant);
@@ -338,7 +309,6 @@ POA_CORBA::Repository::create_value_box_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -351,7 +321,6 @@ POA_CORBA::Repository::create_exception_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::Repository *> (servant);
@@ -359,7 +328,6 @@ POA_CORBA::Repository::create_exception_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -372,7 +340,6 @@ POA_CORBA::Repository::create_native_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::Repository *> (servant);
@@ -380,7 +347,6 @@ POA_CORBA::Repository::create_native_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -393,7 +359,6 @@ POA_CORBA::Repository::create_abstract_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::Repository *> (servant);
@@ -401,7 +366,6 @@ POA_CORBA::Repository::create_abstract_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -414,7 +378,6 @@ POA_CORBA::Repository::create_local_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::Repository *> (servant);
@@ -422,7 +385,6 @@ POA_CORBA::Repository::create_local_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -435,7 +397,6 @@ POA_CORBA::Repository::create_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::Repository *> (servant);
@@ -443,7 +404,6 @@ POA_CORBA::Repository::create_ext_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -453,7 +413,6 @@ POA_CORBA::ModuleDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -461,7 +420,6 @@ POA_CORBA::ModuleDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -474,7 +432,6 @@ POA_CORBA::ModuleDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -482,7 +439,6 @@ POA_CORBA::ModuleDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -495,7 +451,6 @@ POA_CORBA::ModuleDef::lookup_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -503,7 +458,6 @@ POA_CORBA::ModuleDef::lookup_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -516,7 +470,6 @@ POA_CORBA::ModuleDef::contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -524,7 +477,6 @@ POA_CORBA::ModuleDef::contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -537,7 +489,6 @@ POA_CORBA::ModuleDef::lookup_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -545,7 +496,6 @@ POA_CORBA::ModuleDef::lookup_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -558,7 +508,6 @@ POA_CORBA::ModuleDef::describe_contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -566,7 +515,6 @@ POA_CORBA::ModuleDef::describe_contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -579,7 +527,6 @@ POA_CORBA::ModuleDef::create_module_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -587,7 +534,6 @@ POA_CORBA::ModuleDef::create_module_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -600,7 +546,6 @@ POA_CORBA::ModuleDef::create_constant_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -608,7 +553,6 @@ POA_CORBA::ModuleDef::create_constant_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -621,7 +565,6 @@ POA_CORBA::ModuleDef::create_struct_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -629,7 +572,6 @@ POA_CORBA::ModuleDef::create_struct_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -642,7 +584,6 @@ POA_CORBA::ModuleDef::create_union_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -650,7 +591,6 @@ POA_CORBA::ModuleDef::create_union_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -663,7 +603,6 @@ POA_CORBA::ModuleDef::create_enum_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -671,7 +610,6 @@ POA_CORBA::ModuleDef::create_enum_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -684,7 +622,6 @@ POA_CORBA::ModuleDef::create_alias_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -692,7 +629,6 @@ POA_CORBA::ModuleDef::create_alias_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -705,7 +641,6 @@ POA_CORBA::ModuleDef::create_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -713,7 +648,6 @@ POA_CORBA::ModuleDef::create_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -726,7 +660,6 @@ POA_CORBA::ModuleDef::create_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -734,7 +667,6 @@ POA_CORBA::ModuleDef::create_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -747,7 +679,6 @@ POA_CORBA::ModuleDef::create_value_box_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -755,7 +686,6 @@ POA_CORBA::ModuleDef::create_value_box_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -768,7 +698,6 @@ POA_CORBA::ModuleDef::create_exception_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -776,7 +705,6 @@ POA_CORBA::ModuleDef::create_exception_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -789,7 +717,6 @@ POA_CORBA::ModuleDef::create_native_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -797,7 +724,6 @@ POA_CORBA::ModuleDef::create_native_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -810,7 +736,6 @@ POA_CORBA::ModuleDef::create_abstract_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -818,7 +743,6 @@ POA_CORBA::ModuleDef::create_abstract_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -831,7 +755,6 @@ POA_CORBA::ModuleDef::create_local_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -839,7 +762,6 @@ POA_CORBA::ModuleDef::create_local_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -852,7 +774,6 @@ POA_CORBA::ModuleDef::create_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -860,7 +781,6 @@ POA_CORBA::ModuleDef::create_ext_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -870,7 +790,6 @@ POA_CORBA::ModuleDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -878,7 +797,6 @@ POA_CORBA::ModuleDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -888,7 +806,6 @@ POA_CORBA::ModuleDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -896,7 +813,6 @@ POA_CORBA::ModuleDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -906,7 +822,6 @@ POA_CORBA::ModuleDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -914,7 +829,6 @@ POA_CORBA::ModuleDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -924,7 +838,6 @@ POA_CORBA::ModuleDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -932,7 +845,6 @@ POA_CORBA::ModuleDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -942,7 +854,6 @@ POA_CORBA::ModuleDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -950,7 +861,6 @@ POA_CORBA::ModuleDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -960,7 +870,6 @@ POA_CORBA::ModuleDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -968,7 +877,6 @@ POA_CORBA::ModuleDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -978,7 +886,6 @@ POA_CORBA::ModuleDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -986,7 +893,6 @@ POA_CORBA::ModuleDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -996,7 +902,6 @@ POA_CORBA::ModuleDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -1004,7 +909,6 @@ POA_CORBA::ModuleDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1014,7 +918,6 @@ POA_CORBA::ModuleDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -1022,7 +925,6 @@ POA_CORBA::ModuleDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1035,7 +937,6 @@ POA_CORBA::ModuleDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -1043,7 +944,6 @@ POA_CORBA::ModuleDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1056,7 +956,6 @@ POA_CORBA::ModuleDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -1064,7 +963,6 @@ POA_CORBA::ModuleDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1074,7 +972,6 @@ POA_CORBA::ConstantDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ConstantDef *> (servant);
@@ -1082,7 +979,6 @@ POA_CORBA::ConstantDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1095,7 +991,6 @@ POA_CORBA::ConstantDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ConstantDef *> (servant);
@@ -1103,7 +998,6 @@ POA_CORBA::ConstantDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1113,7 +1007,6 @@ POA_CORBA::ConstantDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ConstantDef *> (servant);
@@ -1121,7 +1014,6 @@ POA_CORBA::ConstantDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1131,7 +1023,6 @@ POA_CORBA::ConstantDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ConstantDef *> (servant);
@@ -1139,7 +1030,6 @@ POA_CORBA::ConstantDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1149,7 +1039,6 @@ POA_CORBA::ConstantDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ConstantDef *> (servant);
@@ -1157,7 +1046,6 @@ POA_CORBA::ConstantDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1167,7 +1055,6 @@ POA_CORBA::ConstantDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ConstantDef *> (servant);
@@ -1175,7 +1062,6 @@ POA_CORBA::ConstantDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1185,7 +1071,6 @@ POA_CORBA::ConstantDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ConstantDef *> (servant);
@@ -1193,7 +1078,6 @@ POA_CORBA::ConstantDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1203,7 +1087,6 @@ POA_CORBA::ConstantDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ConstantDef *> (servant);
@@ -1211,7 +1094,6 @@ POA_CORBA::ConstantDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1221,7 +1103,6 @@ POA_CORBA::ConstantDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ConstantDef *> (servant);
@@ -1229,7 +1110,6 @@ POA_CORBA::ConstantDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1239,7 +1119,6 @@ POA_CORBA::ConstantDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ConstantDef *> (servant);
@@ -1247,7 +1126,6 @@ POA_CORBA::ConstantDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1257,7 +1135,6 @@ POA_CORBA::ConstantDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ConstantDef *> (servant);
@@ -1265,7 +1142,6 @@ POA_CORBA::ConstantDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1278,7 +1154,6 @@ POA_CORBA::ConstantDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ConstantDef *> (servant);
@@ -1286,7 +1161,6 @@ POA_CORBA::ConstantDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1299,7 +1173,6 @@ POA_CORBA::ConstantDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ConstantDef *> (servant);
@@ -1307,7 +1180,6 @@ POA_CORBA::ConstantDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1317,7 +1189,6 @@ POA_CORBA::StructDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1325,7 +1196,6 @@ POA_CORBA::StructDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1338,7 +1208,6 @@ POA_CORBA::StructDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1346,7 +1215,6 @@ POA_CORBA::StructDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1356,7 +1224,6 @@ POA_CORBA::StructDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1364,7 +1231,6 @@ POA_CORBA::StructDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1374,7 +1240,6 @@ POA_CORBA::StructDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1382,7 +1247,6 @@ POA_CORBA::StructDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1392,7 +1256,6 @@ POA_CORBA::StructDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1400,7 +1263,6 @@ POA_CORBA::StructDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1410,7 +1272,6 @@ POA_CORBA::StructDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1418,7 +1279,6 @@ POA_CORBA::StructDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1428,7 +1288,6 @@ POA_CORBA::StructDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1436,7 +1295,6 @@ POA_CORBA::StructDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1446,7 +1304,6 @@ POA_CORBA::StructDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1454,7 +1311,6 @@ POA_CORBA::StructDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1464,7 +1320,6 @@ POA_CORBA::StructDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1472,7 +1327,6 @@ POA_CORBA::StructDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1482,7 +1336,6 @@ POA_CORBA::StructDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1490,7 +1343,6 @@ POA_CORBA::StructDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1500,7 +1352,6 @@ POA_CORBA::StructDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1508,7 +1359,6 @@ POA_CORBA::StructDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1521,7 +1371,6 @@ POA_CORBA::StructDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1529,7 +1378,6 @@ POA_CORBA::StructDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1542,7 +1390,6 @@ POA_CORBA::StructDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1550,7 +1397,6 @@ POA_CORBA::StructDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1560,7 +1406,6 @@ POA_CORBA::StructDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1568,7 +1413,6 @@ POA_CORBA::StructDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1581,7 +1425,6 @@ POA_CORBA::StructDef::lookup_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1589,7 +1432,6 @@ POA_CORBA::StructDef::lookup_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1602,7 +1444,6 @@ POA_CORBA::StructDef::contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1610,7 +1451,6 @@ POA_CORBA::StructDef::contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1623,7 +1463,6 @@ POA_CORBA::StructDef::lookup_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1631,7 +1470,6 @@ POA_CORBA::StructDef::lookup_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1644,7 +1482,6 @@ POA_CORBA::StructDef::describe_contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1652,7 +1489,6 @@ POA_CORBA::StructDef::describe_contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1665,7 +1501,6 @@ POA_CORBA::StructDef::create_module_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1673,7 +1508,6 @@ POA_CORBA::StructDef::create_module_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1686,7 +1520,6 @@ POA_CORBA::StructDef::create_constant_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1694,7 +1527,6 @@ POA_CORBA::StructDef::create_constant_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1707,7 +1539,6 @@ POA_CORBA::StructDef::create_struct_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1715,7 +1546,6 @@ POA_CORBA::StructDef::create_struct_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1728,7 +1558,6 @@ POA_CORBA::StructDef::create_union_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1736,7 +1565,6 @@ POA_CORBA::StructDef::create_union_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1749,7 +1577,6 @@ POA_CORBA::StructDef::create_enum_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1757,7 +1584,6 @@ POA_CORBA::StructDef::create_enum_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1770,7 +1596,6 @@ POA_CORBA::StructDef::create_alias_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1778,7 +1603,6 @@ POA_CORBA::StructDef::create_alias_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1791,7 +1615,6 @@ POA_CORBA::StructDef::create_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1799,7 +1622,6 @@ POA_CORBA::StructDef::create_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1812,7 +1634,6 @@ POA_CORBA::StructDef::create_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1820,7 +1641,6 @@ POA_CORBA::StructDef::create_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1833,7 +1653,6 @@ POA_CORBA::StructDef::create_value_box_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1841,7 +1660,6 @@ POA_CORBA::StructDef::create_value_box_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1854,7 +1672,6 @@ POA_CORBA::StructDef::create_exception_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1862,7 +1679,6 @@ POA_CORBA::StructDef::create_exception_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1875,7 +1691,6 @@ POA_CORBA::StructDef::create_native_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1883,7 +1698,6 @@ POA_CORBA::StructDef::create_native_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1896,7 +1710,6 @@ POA_CORBA::StructDef::create_abstract_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1904,7 +1717,6 @@ POA_CORBA::StructDef::create_abstract_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1917,7 +1729,6 @@ POA_CORBA::StructDef::create_local_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1925,7 +1736,6 @@ POA_CORBA::StructDef::create_local_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1938,7 +1748,6 @@ POA_CORBA::StructDef::create_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1946,7 +1755,6 @@ POA_CORBA::StructDef::create_ext_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1956,7 +1764,6 @@ POA_CORBA::UnionDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -1964,7 +1771,6 @@ POA_CORBA::UnionDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1977,7 +1783,6 @@ POA_CORBA::UnionDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -1985,7 +1790,6 @@ POA_CORBA::UnionDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1995,7 +1799,6 @@ POA_CORBA::UnionDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2003,7 +1806,6 @@ POA_CORBA::UnionDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2013,7 +1815,6 @@ POA_CORBA::UnionDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2021,7 +1822,6 @@ POA_CORBA::UnionDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2031,7 +1831,6 @@ POA_CORBA::UnionDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2039,7 +1838,6 @@ POA_CORBA::UnionDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2049,7 +1847,6 @@ POA_CORBA::UnionDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2057,7 +1854,6 @@ POA_CORBA::UnionDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2067,7 +1863,6 @@ POA_CORBA::UnionDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2075,7 +1870,6 @@ POA_CORBA::UnionDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2085,7 +1879,6 @@ POA_CORBA::UnionDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2093,7 +1886,6 @@ POA_CORBA::UnionDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2103,7 +1895,6 @@ POA_CORBA::UnionDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2111,7 +1902,6 @@ POA_CORBA::UnionDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2121,7 +1911,6 @@ POA_CORBA::UnionDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2129,7 +1918,6 @@ POA_CORBA::UnionDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2139,7 +1927,6 @@ POA_CORBA::UnionDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2147,7 +1934,6 @@ POA_CORBA::UnionDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2160,7 +1946,6 @@ POA_CORBA::UnionDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2168,7 +1953,6 @@ POA_CORBA::UnionDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2181,7 +1965,6 @@ POA_CORBA::UnionDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2189,7 +1972,6 @@ POA_CORBA::UnionDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2199,7 +1981,6 @@ POA_CORBA::UnionDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2207,7 +1988,6 @@ POA_CORBA::UnionDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2220,7 +2000,6 @@ POA_CORBA::UnionDef::lookup_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2228,7 +2007,6 @@ POA_CORBA::UnionDef::lookup_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2241,7 +2019,6 @@ POA_CORBA::UnionDef::contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2249,7 +2026,6 @@ POA_CORBA::UnionDef::contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2262,7 +2038,6 @@ POA_CORBA::UnionDef::lookup_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2270,7 +2045,6 @@ POA_CORBA::UnionDef::lookup_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2283,7 +2057,6 @@ POA_CORBA::UnionDef::describe_contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2291,7 +2064,6 @@ POA_CORBA::UnionDef::describe_contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2304,7 +2076,6 @@ POA_CORBA::UnionDef::create_module_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2312,7 +2083,6 @@ POA_CORBA::UnionDef::create_module_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2325,7 +2095,6 @@ POA_CORBA::UnionDef::create_constant_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2333,7 +2102,6 @@ POA_CORBA::UnionDef::create_constant_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2346,7 +2114,6 @@ POA_CORBA::UnionDef::create_struct_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2354,7 +2121,6 @@ POA_CORBA::UnionDef::create_struct_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2367,7 +2133,6 @@ POA_CORBA::UnionDef::create_union_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2375,7 +2140,6 @@ POA_CORBA::UnionDef::create_union_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2388,7 +2152,6 @@ POA_CORBA::UnionDef::create_enum_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2396,7 +2159,6 @@ POA_CORBA::UnionDef::create_enum_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2409,7 +2171,6 @@ POA_CORBA::UnionDef::create_alias_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2417,7 +2178,6 @@ POA_CORBA::UnionDef::create_alias_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2430,7 +2190,6 @@ POA_CORBA::UnionDef::create_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2438,7 +2197,6 @@ POA_CORBA::UnionDef::create_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2451,7 +2209,6 @@ POA_CORBA::UnionDef::create_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2459,7 +2216,6 @@ POA_CORBA::UnionDef::create_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2472,7 +2228,6 @@ POA_CORBA::UnionDef::create_value_box_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2480,7 +2235,6 @@ POA_CORBA::UnionDef::create_value_box_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2493,7 +2247,6 @@ POA_CORBA::UnionDef::create_exception_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2501,7 +2254,6 @@ POA_CORBA::UnionDef::create_exception_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2514,7 +2266,6 @@ POA_CORBA::UnionDef::create_native_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2522,7 +2273,6 @@ POA_CORBA::UnionDef::create_native_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2535,7 +2285,6 @@ POA_CORBA::UnionDef::create_abstract_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2543,7 +2292,6 @@ POA_CORBA::UnionDef::create_abstract_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2556,7 +2304,6 @@ POA_CORBA::UnionDef::create_local_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2564,7 +2311,6 @@ POA_CORBA::UnionDef::create_local_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2577,7 +2323,6 @@ POA_CORBA::UnionDef::create_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2585,7 +2330,6 @@ POA_CORBA::UnionDef::create_ext_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2595,7 +2339,6 @@ POA_CORBA::EnumDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::EnumDef *> (servant);
@@ -2603,7 +2346,6 @@ POA_CORBA::EnumDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2616,7 +2358,6 @@ POA_CORBA::EnumDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::EnumDef *> (servant);
@@ -2624,7 +2365,6 @@ POA_CORBA::EnumDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2634,7 +2374,6 @@ POA_CORBA::EnumDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::EnumDef *> (servant);
@@ -2642,7 +2381,6 @@ POA_CORBA::EnumDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2652,7 +2390,6 @@ POA_CORBA::EnumDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::EnumDef *> (servant);
@@ -2660,7 +2397,6 @@ POA_CORBA::EnumDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2670,7 +2406,6 @@ POA_CORBA::EnumDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::EnumDef *> (servant);
@@ -2678,7 +2413,6 @@ POA_CORBA::EnumDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2688,7 +2422,6 @@ POA_CORBA::EnumDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::EnumDef *> (servant);
@@ -2696,7 +2429,6 @@ POA_CORBA::EnumDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2706,7 +2438,6 @@ POA_CORBA::EnumDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::EnumDef *> (servant);
@@ -2714,7 +2445,6 @@ POA_CORBA::EnumDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2724,7 +2454,6 @@ POA_CORBA::EnumDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::EnumDef *> (servant);
@@ -2732,7 +2461,6 @@ POA_CORBA::EnumDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2742,7 +2470,6 @@ POA_CORBA::EnumDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::EnumDef *> (servant);
@@ -2750,7 +2477,6 @@ POA_CORBA::EnumDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2760,7 +2486,6 @@ POA_CORBA::EnumDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::EnumDef *> (servant);
@@ -2768,7 +2493,6 @@ POA_CORBA::EnumDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2778,7 +2502,6 @@ POA_CORBA::EnumDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::EnumDef *> (servant);
@@ -2786,7 +2509,6 @@ POA_CORBA::EnumDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2799,7 +2521,6 @@ POA_CORBA::EnumDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::EnumDef *> (servant);
@@ -2807,7 +2528,6 @@ POA_CORBA::EnumDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2820,7 +2540,6 @@ POA_CORBA::EnumDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::EnumDef *> (servant);
@@ -2828,7 +2547,6 @@ POA_CORBA::EnumDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2838,7 +2556,6 @@ POA_CORBA::EnumDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::EnumDef *> (servant);
@@ -2846,7 +2563,6 @@ POA_CORBA::EnumDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2856,7 +2572,6 @@ POA_CORBA::AliasDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::AliasDef *> (servant);
@@ -2864,7 +2579,6 @@ POA_CORBA::AliasDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2877,7 +2591,6 @@ POA_CORBA::AliasDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::AliasDef *> (servant);
@@ -2885,7 +2598,6 @@ POA_CORBA::AliasDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2895,7 +2607,6 @@ POA_CORBA::AliasDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AliasDef *> (servant);
@@ -2903,7 +2614,6 @@ POA_CORBA::AliasDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2913,7 +2623,6 @@ POA_CORBA::AliasDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AliasDef *> (servant);
@@ -2921,7 +2630,6 @@ POA_CORBA::AliasDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2931,7 +2639,6 @@ POA_CORBA::AliasDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AliasDef *> (servant);
@@ -2939,7 +2646,6 @@ POA_CORBA::AliasDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2949,7 +2655,6 @@ POA_CORBA::AliasDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AliasDef *> (servant);
@@ -2957,7 +2662,6 @@ POA_CORBA::AliasDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2967,7 +2671,6 @@ POA_CORBA::AliasDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AliasDef *> (servant);
@@ -2975,7 +2678,6 @@ POA_CORBA::AliasDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2985,7 +2687,6 @@ POA_CORBA::AliasDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AliasDef *> (servant);
@@ -2993,7 +2694,6 @@ POA_CORBA::AliasDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3003,7 +2703,6 @@ POA_CORBA::AliasDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AliasDef *> (servant);
@@ -3011,7 +2710,6 @@ POA_CORBA::AliasDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3021,7 +2719,6 @@ POA_CORBA::AliasDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AliasDef *> (servant);
@@ -3029,7 +2726,6 @@ POA_CORBA::AliasDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3039,7 +2735,6 @@ POA_CORBA::AliasDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AliasDef *> (servant);
@@ -3047,7 +2742,6 @@ POA_CORBA::AliasDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3060,7 +2754,6 @@ POA_CORBA::AliasDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AliasDef *> (servant);
@@ -3068,7 +2761,6 @@ POA_CORBA::AliasDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3081,7 +2773,6 @@ POA_CORBA::AliasDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AliasDef *> (servant);
@@ -3089,7 +2780,6 @@ POA_CORBA::AliasDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3099,7 +2789,6 @@ POA_CORBA::AliasDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::AliasDef *> (servant);
@@ -3107,7 +2796,6 @@ POA_CORBA::AliasDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3117,7 +2805,6 @@ POA_CORBA::NativeDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::NativeDef *> (servant);
@@ -3125,7 +2812,6 @@ POA_CORBA::NativeDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3138,7 +2824,6 @@ POA_CORBA::NativeDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::NativeDef *> (servant);
@@ -3146,7 +2831,6 @@ POA_CORBA::NativeDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3156,7 +2840,6 @@ POA_CORBA::NativeDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::NativeDef *> (servant);
@@ -3164,7 +2847,6 @@ POA_CORBA::NativeDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3174,7 +2856,6 @@ POA_CORBA::NativeDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::NativeDef *> (servant);
@@ -3182,7 +2863,6 @@ POA_CORBA::NativeDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3192,7 +2872,6 @@ POA_CORBA::NativeDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::NativeDef *> (servant);
@@ -3200,7 +2879,6 @@ POA_CORBA::NativeDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3210,7 +2888,6 @@ POA_CORBA::NativeDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::NativeDef *> (servant);
@@ -3218,7 +2895,6 @@ POA_CORBA::NativeDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3228,7 +2904,6 @@ POA_CORBA::NativeDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::NativeDef *> (servant);
@@ -3236,7 +2911,6 @@ POA_CORBA::NativeDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3246,7 +2920,6 @@ POA_CORBA::NativeDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::NativeDef *> (servant);
@@ -3254,7 +2927,6 @@ POA_CORBA::NativeDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3264,7 +2936,6 @@ POA_CORBA::NativeDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::NativeDef *> (servant);
@@ -3272,7 +2943,6 @@ POA_CORBA::NativeDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3282,7 +2952,6 @@ POA_CORBA::NativeDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::NativeDef *> (servant);
@@ -3290,7 +2959,6 @@ POA_CORBA::NativeDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3300,7 +2968,6 @@ POA_CORBA::NativeDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::NativeDef *> (servant);
@@ -3308,7 +2975,6 @@ POA_CORBA::NativeDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3321,7 +2987,6 @@ POA_CORBA::NativeDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::NativeDef *> (servant);
@@ -3329,7 +2994,6 @@ POA_CORBA::NativeDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3342,7 +3006,6 @@ POA_CORBA::NativeDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::NativeDef *> (servant);
@@ -3350,7 +3013,6 @@ POA_CORBA::NativeDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3360,7 +3022,6 @@ POA_CORBA::NativeDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::NativeDef *> (servant);
@@ -3368,7 +3029,6 @@ POA_CORBA::NativeDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3378,7 +3038,6 @@ POA_CORBA::PrimitiveDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::PrimitiveDef *> (servant);
@@ -3386,7 +3045,6 @@ POA_CORBA::PrimitiveDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3399,7 +3057,6 @@ POA_CORBA::PrimitiveDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::PrimitiveDef *> (servant);
@@ -3407,7 +3064,6 @@ POA_CORBA::PrimitiveDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3417,7 +3073,6 @@ POA_CORBA::PrimitiveDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::PrimitiveDef *> (servant);
@@ -3425,7 +3080,6 @@ POA_CORBA::PrimitiveDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3435,7 +3089,6 @@ POA_CORBA::StringDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::StringDef *> (servant);
@@ -3443,7 +3096,6 @@ POA_CORBA::StringDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3456,7 +3108,6 @@ POA_CORBA::StringDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::StringDef *> (servant);
@@ -3464,7 +3115,6 @@ POA_CORBA::StringDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3474,7 +3124,6 @@ POA_CORBA::StringDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::StringDef *> (servant);
@@ -3482,7 +3131,6 @@ POA_CORBA::StringDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3492,7 +3140,6 @@ POA_CORBA::WstringDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::WstringDef *> (servant);
@@ -3500,7 +3147,6 @@ POA_CORBA::WstringDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3513,7 +3159,6 @@ POA_CORBA::WstringDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::WstringDef *> (servant);
@@ -3521,7 +3166,6 @@ POA_CORBA::WstringDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3531,7 +3175,6 @@ POA_CORBA::WstringDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::WstringDef *> (servant);
@@ -3539,7 +3182,6 @@ POA_CORBA::WstringDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3549,7 +3191,6 @@ POA_CORBA::SequenceDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::SequenceDef *> (servant);
@@ -3557,7 +3198,6 @@ POA_CORBA::SequenceDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3570,7 +3210,6 @@ POA_CORBA::SequenceDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::SequenceDef *> (servant);
@@ -3578,7 +3217,6 @@ POA_CORBA::SequenceDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3588,7 +3226,6 @@ POA_CORBA::SequenceDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::SequenceDef *> (servant);
@@ -3596,7 +3233,6 @@ POA_CORBA::SequenceDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3606,7 +3242,6 @@ POA_CORBA::ArrayDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ArrayDef *> (servant);
@@ -3614,7 +3249,6 @@ POA_CORBA::ArrayDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3627,7 +3261,6 @@ POA_CORBA::ArrayDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ArrayDef *> (servant);
@@ -3635,7 +3268,6 @@ POA_CORBA::ArrayDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3645,7 +3277,6 @@ POA_CORBA::ArrayDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::ArrayDef *> (servant);
@@ -3653,7 +3284,6 @@ POA_CORBA::ArrayDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3663,7 +3293,6 @@ POA_CORBA::ExceptionDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -3671,7 +3300,6 @@ POA_CORBA::ExceptionDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3684,7 +3312,6 @@ POA_CORBA::ExceptionDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -3692,7 +3319,6 @@ POA_CORBA::ExceptionDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3702,7 +3328,6 @@ POA_CORBA::ExceptionDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -3710,7 +3335,6 @@ POA_CORBA::ExceptionDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3720,7 +3344,6 @@ POA_CORBA::ExceptionDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -3728,7 +3351,6 @@ POA_CORBA::ExceptionDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3738,7 +3360,6 @@ POA_CORBA::ExceptionDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -3746,7 +3367,6 @@ POA_CORBA::ExceptionDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3756,7 +3376,6 @@ POA_CORBA::ExceptionDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -3764,7 +3383,6 @@ POA_CORBA::ExceptionDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3774,7 +3392,6 @@ POA_CORBA::ExceptionDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -3782,7 +3399,6 @@ POA_CORBA::ExceptionDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3792,7 +3408,6 @@ POA_CORBA::ExceptionDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -3800,7 +3415,6 @@ POA_CORBA::ExceptionDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3810,7 +3424,6 @@ POA_CORBA::ExceptionDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -3818,7 +3431,6 @@ POA_CORBA::ExceptionDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3828,7 +3440,6 @@ POA_CORBA::ExceptionDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -3836,7 +3447,6 @@ POA_CORBA::ExceptionDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3846,7 +3456,6 @@ POA_CORBA::ExceptionDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -3854,7 +3463,6 @@ POA_CORBA::ExceptionDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3867,7 +3475,6 @@ POA_CORBA::ExceptionDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -3875,7 +3482,6 @@ POA_CORBA::ExceptionDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3888,7 +3494,6 @@ POA_CORBA::ExceptionDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -3896,7 +3501,6 @@ POA_CORBA::ExceptionDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3909,7 +3513,6 @@ POA_CORBA::ExceptionDef::lookup_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -3917,7 +3520,6 @@ POA_CORBA::ExceptionDef::lookup_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3930,7 +3532,6 @@ POA_CORBA::ExceptionDef::contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -3938,7 +3539,6 @@ POA_CORBA::ExceptionDef::contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3951,7 +3551,6 @@ POA_CORBA::ExceptionDef::lookup_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -3959,7 +3558,6 @@ POA_CORBA::ExceptionDef::lookup_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3972,7 +3570,6 @@ POA_CORBA::ExceptionDef::describe_contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -3980,7 +3577,6 @@ POA_CORBA::ExceptionDef::describe_contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3993,7 +3589,6 @@ POA_CORBA::ExceptionDef::create_module_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -4001,7 +3596,6 @@ POA_CORBA::ExceptionDef::create_module_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4014,7 +3608,6 @@ POA_CORBA::ExceptionDef::create_constant_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -4022,7 +3615,6 @@ POA_CORBA::ExceptionDef::create_constant_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4035,7 +3627,6 @@ POA_CORBA::ExceptionDef::create_struct_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -4043,7 +3634,6 @@ POA_CORBA::ExceptionDef::create_struct_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4056,7 +3646,6 @@ POA_CORBA::ExceptionDef::create_union_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -4064,7 +3653,6 @@ POA_CORBA::ExceptionDef::create_union_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4077,7 +3665,6 @@ POA_CORBA::ExceptionDef::create_enum_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -4085,7 +3672,6 @@ POA_CORBA::ExceptionDef::create_enum_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4098,7 +3684,6 @@ POA_CORBA::ExceptionDef::create_alias_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -4106,7 +3691,6 @@ POA_CORBA::ExceptionDef::create_alias_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4119,7 +3703,6 @@ POA_CORBA::ExceptionDef::create_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -4127,7 +3710,6 @@ POA_CORBA::ExceptionDef::create_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4140,7 +3722,6 @@ POA_CORBA::ExceptionDef::create_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -4148,7 +3729,6 @@ POA_CORBA::ExceptionDef::create_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4161,7 +3741,6 @@ POA_CORBA::ExceptionDef::create_value_box_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -4169,7 +3748,6 @@ POA_CORBA::ExceptionDef::create_value_box_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4182,7 +3760,6 @@ POA_CORBA::ExceptionDef::create_exception_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -4190,7 +3767,6 @@ POA_CORBA::ExceptionDef::create_exception_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4203,7 +3779,6 @@ POA_CORBA::ExceptionDef::create_native_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -4211,7 +3786,6 @@ POA_CORBA::ExceptionDef::create_native_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4224,7 +3798,6 @@ POA_CORBA::ExceptionDef::create_abstract_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -4232,7 +3805,6 @@ POA_CORBA::ExceptionDef::create_abstract_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4245,7 +3817,6 @@ POA_CORBA::ExceptionDef::create_local_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -4253,7 +3824,6 @@ POA_CORBA::ExceptionDef::create_local_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4266,7 +3836,6 @@ POA_CORBA::ExceptionDef::create_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -4274,7 +3843,6 @@ POA_CORBA::ExceptionDef::create_ext_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4284,7 +3852,6 @@ POA_CORBA::AttributeDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::AttributeDef *> (servant);
@@ -4292,7 +3859,6 @@ POA_CORBA::AttributeDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4305,7 +3871,6 @@ POA_CORBA::AttributeDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::AttributeDef *> (servant);
@@ -4313,7 +3878,6 @@ POA_CORBA::AttributeDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4323,7 +3887,6 @@ POA_CORBA::AttributeDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AttributeDef *> (servant);
@@ -4331,7 +3894,6 @@ POA_CORBA::AttributeDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4341,7 +3903,6 @@ POA_CORBA::AttributeDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AttributeDef *> (servant);
@@ -4349,7 +3910,6 @@ POA_CORBA::AttributeDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4359,7 +3919,6 @@ POA_CORBA::AttributeDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AttributeDef *> (servant);
@@ -4367,7 +3926,6 @@ POA_CORBA::AttributeDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4377,7 +3935,6 @@ POA_CORBA::AttributeDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AttributeDef *> (servant);
@@ -4385,7 +3942,6 @@ POA_CORBA::AttributeDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4395,7 +3951,6 @@ POA_CORBA::AttributeDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AttributeDef *> (servant);
@@ -4403,7 +3958,6 @@ POA_CORBA::AttributeDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4413,7 +3967,6 @@ POA_CORBA::AttributeDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AttributeDef *> (servant);
@@ -4421,7 +3974,6 @@ POA_CORBA::AttributeDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4431,7 +3983,6 @@ POA_CORBA::AttributeDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AttributeDef *> (servant);
@@ -4439,7 +3990,6 @@ POA_CORBA::AttributeDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4449,7 +3999,6 @@ POA_CORBA::AttributeDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AttributeDef *> (servant);
@@ -4457,7 +4006,6 @@ POA_CORBA::AttributeDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4467,7 +4015,6 @@ POA_CORBA::AttributeDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AttributeDef *> (servant);
@@ -4475,7 +4022,6 @@ POA_CORBA::AttributeDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4488,7 +4034,6 @@ POA_CORBA::AttributeDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AttributeDef *> (servant);
@@ -4496,7 +4041,6 @@ POA_CORBA::AttributeDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4509,7 +4053,6 @@ POA_CORBA::AttributeDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AttributeDef *> (servant);
@@ -4517,7 +4060,6 @@ POA_CORBA::AttributeDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4527,7 +4069,6 @@ POA_CORBA::ExtAttributeDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ExtAttributeDef *> (servant);
@@ -4535,7 +4076,6 @@ POA_CORBA::ExtAttributeDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4548,7 +4088,6 @@ POA_CORBA::ExtAttributeDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ExtAttributeDef *> (servant);
@@ -4556,7 +4095,6 @@ POA_CORBA::ExtAttributeDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4566,7 +4104,6 @@ POA_CORBA::ExtAttributeDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAttributeDef *> (servant);
@@ -4574,7 +4111,6 @@ POA_CORBA::ExtAttributeDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4584,7 +4120,6 @@ POA_CORBA::ExtAttributeDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAttributeDef *> (servant);
@@ -4592,7 +4127,6 @@ POA_CORBA::ExtAttributeDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4602,7 +4136,6 @@ POA_CORBA::ExtAttributeDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAttributeDef *> (servant);
@@ -4610,7 +4143,6 @@ POA_CORBA::ExtAttributeDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4620,7 +4152,6 @@ POA_CORBA::ExtAttributeDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAttributeDef *> (servant);
@@ -4628,7 +4159,6 @@ POA_CORBA::ExtAttributeDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4638,7 +4168,6 @@ POA_CORBA::ExtAttributeDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAttributeDef *> (servant);
@@ -4646,7 +4175,6 @@ POA_CORBA::ExtAttributeDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4656,7 +4184,6 @@ POA_CORBA::ExtAttributeDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAttributeDef *> (servant);
@@ -4664,7 +4191,6 @@ POA_CORBA::ExtAttributeDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4674,7 +4200,6 @@ POA_CORBA::ExtAttributeDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAttributeDef *> (servant);
@@ -4682,7 +4207,6 @@ POA_CORBA::ExtAttributeDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4692,7 +4216,6 @@ POA_CORBA::ExtAttributeDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAttributeDef *> (servant);
@@ -4700,7 +4223,6 @@ POA_CORBA::ExtAttributeDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4710,7 +4232,6 @@ POA_CORBA::ExtAttributeDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAttributeDef *> (servant);
@@ -4718,7 +4239,6 @@ POA_CORBA::ExtAttributeDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4731,7 +4251,6 @@ POA_CORBA::ExtAttributeDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAttributeDef *> (servant);
@@ -4739,7 +4258,6 @@ POA_CORBA::ExtAttributeDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4752,7 +4270,6 @@ POA_CORBA::ExtAttributeDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAttributeDef *> (servant);
@@ -4760,7 +4277,6 @@ POA_CORBA::ExtAttributeDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4770,7 +4286,6 @@ POA_CORBA::ExtAttributeDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::AttributeDef * const impl = static_cast<POA_CORBA::ExtAttributeDef *> (servant);
@@ -4778,7 +4293,6 @@ POA_CORBA::ExtAttributeDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4788,7 +4302,6 @@ POA_CORBA::ExtAttributeDef::_get_type_def_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::AttributeDef * const impl = static_cast<POA_CORBA::ExtAttributeDef *> (servant);
@@ -4796,7 +4309,6 @@ POA_CORBA::ExtAttributeDef::_get_type_def_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4806,7 +4318,6 @@ POA_CORBA::ExtAttributeDef::_set_type_def_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::AttributeDef * const impl = static_cast<POA_CORBA::ExtAttributeDef *> (servant);
@@ -4814,7 +4325,6 @@ POA_CORBA::ExtAttributeDef::_set_type_def_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4824,7 +4334,6 @@ POA_CORBA::ExtAttributeDef::_get_mode_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::AttributeDef * const impl = static_cast<POA_CORBA::ExtAttributeDef *> (servant);
@@ -4832,7 +4341,6 @@ POA_CORBA::ExtAttributeDef::_get_mode_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4842,7 +4350,6 @@ POA_CORBA::ExtAttributeDef::_set_mode_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::AttributeDef * const impl = static_cast<POA_CORBA::ExtAttributeDef *> (servant);
@@ -4850,7 +4357,6 @@ POA_CORBA::ExtAttributeDef::_set_mode_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4860,7 +4366,6 @@ POA_CORBA::OperationDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::OperationDef *> (servant);
@@ -4868,7 +4373,6 @@ POA_CORBA::OperationDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4881,7 +4385,6 @@ POA_CORBA::OperationDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::OperationDef *> (servant);
@@ -4889,7 +4392,6 @@ POA_CORBA::OperationDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4899,7 +4401,6 @@ POA_CORBA::OperationDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::OperationDef *> (servant);
@@ -4907,7 +4408,6 @@ POA_CORBA::OperationDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4917,7 +4417,6 @@ POA_CORBA::OperationDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::OperationDef *> (servant);
@@ -4925,7 +4424,6 @@ POA_CORBA::OperationDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4935,7 +4433,6 @@ POA_CORBA::OperationDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::OperationDef *> (servant);
@@ -4943,7 +4440,6 @@ POA_CORBA::OperationDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4953,7 +4449,6 @@ POA_CORBA::OperationDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::OperationDef *> (servant);
@@ -4961,7 +4456,6 @@ POA_CORBA::OperationDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4971,7 +4465,6 @@ POA_CORBA::OperationDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::OperationDef *> (servant);
@@ -4979,7 +4472,6 @@ POA_CORBA::OperationDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4989,7 +4481,6 @@ POA_CORBA::OperationDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::OperationDef *> (servant);
@@ -4997,7 +4488,6 @@ POA_CORBA::OperationDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5007,7 +4497,6 @@ POA_CORBA::OperationDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::OperationDef *> (servant);
@@ -5015,7 +4504,6 @@ POA_CORBA::OperationDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5025,7 +4513,6 @@ POA_CORBA::OperationDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::OperationDef *> (servant);
@@ -5033,7 +4520,6 @@ POA_CORBA::OperationDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5043,7 +4529,6 @@ POA_CORBA::OperationDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::OperationDef *> (servant);
@@ -5051,7 +4536,6 @@ POA_CORBA::OperationDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5064,7 +4548,6 @@ POA_CORBA::OperationDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::OperationDef *> (servant);
@@ -5072,7 +4555,6 @@ POA_CORBA::OperationDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5085,7 +4567,6 @@ POA_CORBA::OperationDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::OperationDef *> (servant);
@@ -5093,7 +4574,6 @@ POA_CORBA::OperationDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5103,7 +4583,6 @@ POA_CORBA::InterfaceDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5111,7 +4590,6 @@ POA_CORBA::InterfaceDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5124,7 +4602,6 @@ POA_CORBA::InterfaceDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5132,7 +4609,6 @@ POA_CORBA::InterfaceDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5145,7 +4621,6 @@ POA_CORBA::InterfaceDef::lookup_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5153,7 +4628,6 @@ POA_CORBA::InterfaceDef::lookup_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5166,7 +4640,6 @@ POA_CORBA::InterfaceDef::contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5174,7 +4647,6 @@ POA_CORBA::InterfaceDef::contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5187,7 +4659,6 @@ POA_CORBA::InterfaceDef::lookup_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5195,7 +4666,6 @@ POA_CORBA::InterfaceDef::lookup_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5208,7 +4678,6 @@ POA_CORBA::InterfaceDef::describe_contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5216,7 +4685,6 @@ POA_CORBA::InterfaceDef::describe_contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5229,7 +4697,6 @@ POA_CORBA::InterfaceDef::create_module_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5237,7 +4704,6 @@ POA_CORBA::InterfaceDef::create_module_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5250,7 +4716,6 @@ POA_CORBA::InterfaceDef::create_constant_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5258,7 +4723,6 @@ POA_CORBA::InterfaceDef::create_constant_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5271,7 +4735,6 @@ POA_CORBA::InterfaceDef::create_struct_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5279,7 +4742,6 @@ POA_CORBA::InterfaceDef::create_struct_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5292,7 +4754,6 @@ POA_CORBA::InterfaceDef::create_union_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5300,7 +4761,6 @@ POA_CORBA::InterfaceDef::create_union_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5313,7 +4773,6 @@ POA_CORBA::InterfaceDef::create_enum_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5321,7 +4780,6 @@ POA_CORBA::InterfaceDef::create_enum_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5334,7 +4792,6 @@ POA_CORBA::InterfaceDef::create_alias_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5342,7 +4799,6 @@ POA_CORBA::InterfaceDef::create_alias_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5355,7 +4811,6 @@ POA_CORBA::InterfaceDef::create_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5363,7 +4818,6 @@ POA_CORBA::InterfaceDef::create_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5376,7 +4830,6 @@ POA_CORBA::InterfaceDef::create_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5384,7 +4837,6 @@ POA_CORBA::InterfaceDef::create_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5397,7 +4849,6 @@ POA_CORBA::InterfaceDef::create_value_box_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5405,7 +4856,6 @@ POA_CORBA::InterfaceDef::create_value_box_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5418,7 +4868,6 @@ POA_CORBA::InterfaceDef::create_exception_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5426,7 +4875,6 @@ POA_CORBA::InterfaceDef::create_exception_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5439,7 +4887,6 @@ POA_CORBA::InterfaceDef::create_native_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5447,7 +4894,6 @@ POA_CORBA::InterfaceDef::create_native_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5460,7 +4906,6 @@ POA_CORBA::InterfaceDef::create_abstract_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5468,7 +4913,6 @@ POA_CORBA::InterfaceDef::create_abstract_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5481,7 +4925,6 @@ POA_CORBA::InterfaceDef::create_local_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5489,7 +4932,6 @@ POA_CORBA::InterfaceDef::create_local_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5502,7 +4944,6 @@ POA_CORBA::InterfaceDef::create_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5510,7 +4951,6 @@ POA_CORBA::InterfaceDef::create_ext_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5520,7 +4960,6 @@ POA_CORBA::InterfaceDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5528,7 +4967,6 @@ POA_CORBA::InterfaceDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5538,7 +4976,6 @@ POA_CORBA::InterfaceDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5546,7 +4983,6 @@ POA_CORBA::InterfaceDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5556,7 +4992,6 @@ POA_CORBA::InterfaceDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5564,7 +4999,6 @@ POA_CORBA::InterfaceDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5574,7 +5008,6 @@ POA_CORBA::InterfaceDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5582,7 +5015,6 @@ POA_CORBA::InterfaceDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5592,7 +5024,6 @@ POA_CORBA::InterfaceDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5600,7 +5031,6 @@ POA_CORBA::InterfaceDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5610,7 +5040,6 @@ POA_CORBA::InterfaceDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5618,7 +5047,6 @@ POA_CORBA::InterfaceDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5628,7 +5056,6 @@ POA_CORBA::InterfaceDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5636,7 +5063,6 @@ POA_CORBA::InterfaceDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5646,7 +5072,6 @@ POA_CORBA::InterfaceDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5654,7 +5079,6 @@ POA_CORBA::InterfaceDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5664,7 +5088,6 @@ POA_CORBA::InterfaceDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5672,7 +5095,6 @@ POA_CORBA::InterfaceDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5685,7 +5107,6 @@ POA_CORBA::InterfaceDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5693,7 +5114,6 @@ POA_CORBA::InterfaceDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5706,7 +5126,6 @@ POA_CORBA::InterfaceDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5714,7 +5133,6 @@ POA_CORBA::InterfaceDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5724,7 +5142,6 @@ POA_CORBA::InterfaceDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5732,7 +5149,6 @@ POA_CORBA::InterfaceDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5742,7 +5158,6 @@ POA_CORBA::ExtInterfaceDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -5750,7 +5165,6 @@ POA_CORBA::ExtInterfaceDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5763,7 +5177,6 @@ POA_CORBA::ExtInterfaceDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -5771,7 +5184,6 @@ POA_CORBA::ExtInterfaceDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5784,7 +5196,6 @@ POA_CORBA::ExtInterfaceDef::lookup_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -5792,7 +5203,6 @@ POA_CORBA::ExtInterfaceDef::lookup_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5805,7 +5215,6 @@ POA_CORBA::ExtInterfaceDef::contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -5813,7 +5222,6 @@ POA_CORBA::ExtInterfaceDef::contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5826,7 +5234,6 @@ POA_CORBA::ExtInterfaceDef::lookup_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -5834,7 +5241,6 @@ POA_CORBA::ExtInterfaceDef::lookup_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5847,7 +5253,6 @@ POA_CORBA::ExtInterfaceDef::describe_contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -5855,7 +5260,6 @@ POA_CORBA::ExtInterfaceDef::describe_contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5868,7 +5272,6 @@ POA_CORBA::ExtInterfaceDef::create_module_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -5876,7 +5279,6 @@ POA_CORBA::ExtInterfaceDef::create_module_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5889,7 +5291,6 @@ POA_CORBA::ExtInterfaceDef::create_constant_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -5897,7 +5298,6 @@ POA_CORBA::ExtInterfaceDef::create_constant_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5910,7 +5310,6 @@ POA_CORBA::ExtInterfaceDef::create_struct_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -5918,7 +5317,6 @@ POA_CORBA::ExtInterfaceDef::create_struct_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5931,7 +5329,6 @@ POA_CORBA::ExtInterfaceDef::create_union_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -5939,7 +5336,6 @@ POA_CORBA::ExtInterfaceDef::create_union_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5952,7 +5348,6 @@ POA_CORBA::ExtInterfaceDef::create_enum_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -5960,7 +5355,6 @@ POA_CORBA::ExtInterfaceDef::create_enum_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5973,7 +5367,6 @@ POA_CORBA::ExtInterfaceDef::create_alias_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -5981,7 +5374,6 @@ POA_CORBA::ExtInterfaceDef::create_alias_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5994,7 +5386,6 @@ POA_CORBA::ExtInterfaceDef::create_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6002,7 +5393,6 @@ POA_CORBA::ExtInterfaceDef::create_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6015,7 +5405,6 @@ POA_CORBA::ExtInterfaceDef::create_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6023,7 +5412,6 @@ POA_CORBA::ExtInterfaceDef::create_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6036,7 +5424,6 @@ POA_CORBA::ExtInterfaceDef::create_value_box_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6044,7 +5431,6 @@ POA_CORBA::ExtInterfaceDef::create_value_box_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6057,7 +5443,6 @@ POA_CORBA::ExtInterfaceDef::create_exception_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6065,7 +5450,6 @@ POA_CORBA::ExtInterfaceDef::create_exception_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6078,7 +5462,6 @@ POA_CORBA::ExtInterfaceDef::create_native_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6086,7 +5469,6 @@ POA_CORBA::ExtInterfaceDef::create_native_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6099,7 +5481,6 @@ POA_CORBA::ExtInterfaceDef::create_abstract_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6107,7 +5488,6 @@ POA_CORBA::ExtInterfaceDef::create_abstract_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6120,7 +5500,6 @@ POA_CORBA::ExtInterfaceDef::create_local_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6128,7 +5507,6 @@ POA_CORBA::ExtInterfaceDef::create_local_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6141,7 +5519,6 @@ POA_CORBA::ExtInterfaceDef::create_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6149,7 +5526,6 @@ POA_CORBA::ExtInterfaceDef::create_ext_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6159,7 +5535,6 @@ POA_CORBA::ExtInterfaceDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6167,7 +5542,6 @@ POA_CORBA::ExtInterfaceDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6177,7 +5551,6 @@ POA_CORBA::ExtInterfaceDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6185,7 +5558,6 @@ POA_CORBA::ExtInterfaceDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6195,7 +5567,6 @@ POA_CORBA::ExtInterfaceDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6203,7 +5574,6 @@ POA_CORBA::ExtInterfaceDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6213,7 +5583,6 @@ POA_CORBA::ExtInterfaceDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6221,7 +5590,6 @@ POA_CORBA::ExtInterfaceDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6231,7 +5599,6 @@ POA_CORBA::ExtInterfaceDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6239,7 +5606,6 @@ POA_CORBA::ExtInterfaceDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6249,7 +5615,6 @@ POA_CORBA::ExtInterfaceDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6257,7 +5622,6 @@ POA_CORBA::ExtInterfaceDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6267,7 +5631,6 @@ POA_CORBA::ExtInterfaceDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6275,7 +5638,6 @@ POA_CORBA::ExtInterfaceDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6285,7 +5647,6 @@ POA_CORBA::ExtInterfaceDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6293,7 +5654,6 @@ POA_CORBA::ExtInterfaceDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6303,7 +5663,6 @@ POA_CORBA::ExtInterfaceDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6311,7 +5670,6 @@ POA_CORBA::ExtInterfaceDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6324,7 +5682,6 @@ POA_CORBA::ExtInterfaceDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6332,7 +5689,6 @@ POA_CORBA::ExtInterfaceDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6345,7 +5701,6 @@ POA_CORBA::ExtInterfaceDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6353,7 +5708,6 @@ POA_CORBA::ExtInterfaceDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6363,7 +5717,6 @@ POA_CORBA::ExtInterfaceDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6371,7 +5724,6 @@ POA_CORBA::ExtInterfaceDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6381,7 +5733,6 @@ POA_CORBA::ExtInterfaceDef::_get_base_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6389,7 +5740,6 @@ POA_CORBA::ExtInterfaceDef::_get_base_interfaces_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6399,7 +5749,6 @@ POA_CORBA::ExtInterfaceDef::_set_base_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6407,7 +5756,6 @@ POA_CORBA::ExtInterfaceDef::_set_base_interfaces_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6420,7 +5768,6 @@ POA_CORBA::ExtInterfaceDef::is_a_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6428,7 +5775,6 @@ POA_CORBA::ExtInterfaceDef::is_a_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6441,7 +5787,6 @@ POA_CORBA::ExtInterfaceDef::describe_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6449,7 +5794,6 @@ POA_CORBA::ExtInterfaceDef::describe_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6462,7 +5806,6 @@ POA_CORBA::ExtInterfaceDef::create_attribute_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6470,7 +5813,6 @@ POA_CORBA::ExtInterfaceDef::create_attribute_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6483,7 +5825,6 @@ POA_CORBA::ExtInterfaceDef::create_operation_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6491,7 +5832,6 @@ POA_CORBA::ExtInterfaceDef::create_operation_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6504,7 +5844,6 @@ POA_CORBA::ExtInterfaceDef::describe_ext_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceAttrExtension * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6512,7 +5851,6 @@ POA_CORBA::ExtInterfaceDef::describe_ext_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6525,7 +5863,6 @@ POA_CORBA::ExtInterfaceDef::create_ext_attribute_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceAttrExtension * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6533,7 +5870,6 @@ POA_CORBA::ExtInterfaceDef::create_ext_attribute_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6543,7 +5879,6 @@ POA_CORBA::AbstractInterfaceDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6551,7 +5886,6 @@ POA_CORBA::AbstractInterfaceDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6564,7 +5898,6 @@ POA_CORBA::AbstractInterfaceDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6572,7 +5905,6 @@ POA_CORBA::AbstractInterfaceDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6585,7 +5917,6 @@ POA_CORBA::AbstractInterfaceDef::lookup_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6593,7 +5924,6 @@ POA_CORBA::AbstractInterfaceDef::lookup_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6606,7 +5936,6 @@ POA_CORBA::AbstractInterfaceDef::contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6614,7 +5943,6 @@ POA_CORBA::AbstractInterfaceDef::contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6627,7 +5955,6 @@ POA_CORBA::AbstractInterfaceDef::lookup_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6635,7 +5962,6 @@ POA_CORBA::AbstractInterfaceDef::lookup_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6648,7 +5974,6 @@ POA_CORBA::AbstractInterfaceDef::describe_contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6656,7 +5981,6 @@ POA_CORBA::AbstractInterfaceDef::describe_contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6669,7 +5993,6 @@ POA_CORBA::AbstractInterfaceDef::create_module_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6677,7 +6000,6 @@ POA_CORBA::AbstractInterfaceDef::create_module_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6690,7 +6012,6 @@ POA_CORBA::AbstractInterfaceDef::create_constant_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6698,7 +6019,6 @@ POA_CORBA::AbstractInterfaceDef::create_constant_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6711,7 +6031,6 @@ POA_CORBA::AbstractInterfaceDef::create_struct_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6719,7 +6038,6 @@ POA_CORBA::AbstractInterfaceDef::create_struct_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6732,7 +6050,6 @@ POA_CORBA::AbstractInterfaceDef::create_union_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6740,7 +6057,6 @@ POA_CORBA::AbstractInterfaceDef::create_union_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6753,7 +6069,6 @@ POA_CORBA::AbstractInterfaceDef::create_enum_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6761,7 +6076,6 @@ POA_CORBA::AbstractInterfaceDef::create_enum_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6774,7 +6088,6 @@ POA_CORBA::AbstractInterfaceDef::create_alias_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6782,7 +6095,6 @@ POA_CORBA::AbstractInterfaceDef::create_alias_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6795,7 +6107,6 @@ POA_CORBA::AbstractInterfaceDef::create_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6803,7 +6114,6 @@ POA_CORBA::AbstractInterfaceDef::create_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6816,7 +6126,6 @@ POA_CORBA::AbstractInterfaceDef::create_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6824,7 +6133,6 @@ POA_CORBA::AbstractInterfaceDef::create_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6837,7 +6145,6 @@ POA_CORBA::AbstractInterfaceDef::create_value_box_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6845,7 +6152,6 @@ POA_CORBA::AbstractInterfaceDef::create_value_box_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6858,7 +6164,6 @@ POA_CORBA::AbstractInterfaceDef::create_exception_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6866,7 +6171,6 @@ POA_CORBA::AbstractInterfaceDef::create_exception_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6879,7 +6183,6 @@ POA_CORBA::AbstractInterfaceDef::create_native_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6887,7 +6190,6 @@ POA_CORBA::AbstractInterfaceDef::create_native_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6900,7 +6202,6 @@ POA_CORBA::AbstractInterfaceDef::create_abstract_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6908,7 +6209,6 @@ POA_CORBA::AbstractInterfaceDef::create_abstract_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6921,7 +6221,6 @@ POA_CORBA::AbstractInterfaceDef::create_local_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6929,7 +6228,6 @@ POA_CORBA::AbstractInterfaceDef::create_local_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6942,7 +6240,6 @@ POA_CORBA::AbstractInterfaceDef::create_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6950,7 +6247,6 @@ POA_CORBA::AbstractInterfaceDef::create_ext_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6960,7 +6256,6 @@ POA_CORBA::AbstractInterfaceDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6968,7 +6263,6 @@ POA_CORBA::AbstractInterfaceDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6978,7 +6272,6 @@ POA_CORBA::AbstractInterfaceDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6986,7 +6279,6 @@ POA_CORBA::AbstractInterfaceDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6996,7 +6288,6 @@ POA_CORBA::AbstractInterfaceDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -7004,7 +6295,6 @@ POA_CORBA::AbstractInterfaceDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7014,7 +6304,6 @@ POA_CORBA::AbstractInterfaceDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -7022,7 +6311,6 @@ POA_CORBA::AbstractInterfaceDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7032,7 +6320,6 @@ POA_CORBA::AbstractInterfaceDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -7040,7 +6327,6 @@ POA_CORBA::AbstractInterfaceDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7050,7 +6336,6 @@ POA_CORBA::AbstractInterfaceDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -7058,7 +6343,6 @@ POA_CORBA::AbstractInterfaceDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7068,7 +6352,6 @@ POA_CORBA::AbstractInterfaceDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -7076,7 +6359,6 @@ POA_CORBA::AbstractInterfaceDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7086,7 +6368,6 @@ POA_CORBA::AbstractInterfaceDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -7094,7 +6375,6 @@ POA_CORBA::AbstractInterfaceDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7104,7 +6384,6 @@ POA_CORBA::AbstractInterfaceDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -7112,7 +6391,6 @@ POA_CORBA::AbstractInterfaceDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7125,7 +6403,6 @@ POA_CORBA::AbstractInterfaceDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -7133,7 +6410,6 @@ POA_CORBA::AbstractInterfaceDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7146,7 +6422,6 @@ POA_CORBA::AbstractInterfaceDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -7154,7 +6429,6 @@ POA_CORBA::AbstractInterfaceDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7164,7 +6438,6 @@ POA_CORBA::AbstractInterfaceDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -7172,7 +6445,6 @@ POA_CORBA::AbstractInterfaceDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7182,7 +6454,6 @@ POA_CORBA::AbstractInterfaceDef::_get_base_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -7190,7 +6461,6 @@ POA_CORBA::AbstractInterfaceDef::_get_base_interfaces_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7200,7 +6470,6 @@ POA_CORBA::AbstractInterfaceDef::_set_base_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -7208,7 +6477,6 @@ POA_CORBA::AbstractInterfaceDef::_set_base_interfaces_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7221,7 +6489,6 @@ POA_CORBA::AbstractInterfaceDef::is_a_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -7229,7 +6496,6 @@ POA_CORBA::AbstractInterfaceDef::is_a_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7242,7 +6508,6 @@ POA_CORBA::AbstractInterfaceDef::describe_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -7250,7 +6515,6 @@ POA_CORBA::AbstractInterfaceDef::describe_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7263,7 +6527,6 @@ POA_CORBA::AbstractInterfaceDef::create_attribute_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -7271,7 +6534,6 @@ POA_CORBA::AbstractInterfaceDef::create_attribute_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7284,7 +6546,6 @@ POA_CORBA::AbstractInterfaceDef::create_operation_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -7292,7 +6553,6 @@ POA_CORBA::AbstractInterfaceDef::create_operation_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7302,7 +6562,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7310,7 +6569,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7323,7 +6581,6 @@ POA_CORBA::ExtAbstractInterfaceDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7331,7 +6588,6 @@ POA_CORBA::ExtAbstractInterfaceDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7344,7 +6600,6 @@ POA_CORBA::ExtAbstractInterfaceDef::lookup_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7352,7 +6607,6 @@ POA_CORBA::ExtAbstractInterfaceDef::lookup_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7365,7 +6619,6 @@ POA_CORBA::ExtAbstractInterfaceDef::contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7373,7 +6626,6 @@ POA_CORBA::ExtAbstractInterfaceDef::contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7386,7 +6638,6 @@ POA_CORBA::ExtAbstractInterfaceDef::lookup_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7394,7 +6645,6 @@ POA_CORBA::ExtAbstractInterfaceDef::lookup_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7407,7 +6657,6 @@ POA_CORBA::ExtAbstractInterfaceDef::describe_contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7415,7 +6664,6 @@ POA_CORBA::ExtAbstractInterfaceDef::describe_contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7428,7 +6676,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_module_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7436,7 +6683,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_module_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7449,7 +6695,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_constant_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7457,7 +6702,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_constant_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7470,7 +6714,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_struct_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7478,7 +6721,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_struct_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7491,7 +6733,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_union_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7499,7 +6740,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_union_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7512,7 +6752,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_enum_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7520,7 +6759,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_enum_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7533,7 +6771,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_alias_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7541,7 +6778,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_alias_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7554,7 +6790,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7562,7 +6797,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7575,7 +6809,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7583,7 +6816,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7596,7 +6828,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_value_box_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7604,7 +6835,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_value_box_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7617,7 +6847,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_exception_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7625,7 +6854,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_exception_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7638,7 +6866,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_native_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7646,7 +6873,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_native_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7659,7 +6885,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_abstract_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7667,7 +6892,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_abstract_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7680,7 +6904,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_local_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7688,7 +6911,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_local_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7701,7 +6923,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7709,7 +6930,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_ext_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7719,7 +6939,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7727,7 +6946,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7737,7 +6955,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7745,7 +6962,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7755,7 +6971,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7763,7 +6978,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7773,7 +6987,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7781,7 +6994,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7791,7 +7003,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7799,7 +7010,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7809,7 +7019,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7817,7 +7026,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7827,7 +7035,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7835,7 +7042,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7845,7 +7051,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7853,7 +7058,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7863,7 +7067,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7871,7 +7074,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7884,7 +7086,6 @@ POA_CORBA::ExtAbstractInterfaceDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7892,7 +7093,6 @@ POA_CORBA::ExtAbstractInterfaceDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7905,7 +7105,6 @@ POA_CORBA::ExtAbstractInterfaceDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7913,7 +7112,6 @@ POA_CORBA::ExtAbstractInterfaceDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7923,7 +7121,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7931,7 +7128,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7941,7 +7137,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_get_base_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7949,7 +7144,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_get_base_interfaces_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7959,7 +7153,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_set_base_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7967,7 +7160,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_set_base_interfaces_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7980,7 +7172,6 @@ POA_CORBA::ExtAbstractInterfaceDef::is_a_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7988,7 +7179,6 @@ POA_CORBA::ExtAbstractInterfaceDef::is_a_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8001,7 +7191,6 @@ POA_CORBA::ExtAbstractInterfaceDef::describe_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -8009,7 +7198,6 @@ POA_CORBA::ExtAbstractInterfaceDef::describe_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8022,7 +7210,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_attribute_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -8030,7 +7217,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_attribute_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8043,7 +7229,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_operation_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -8051,7 +7236,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_operation_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8064,7 +7248,6 @@ POA_CORBA::ExtAbstractInterfaceDef::describe_ext_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceAttrExtension * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -8072,7 +7255,6 @@ POA_CORBA::ExtAbstractInterfaceDef::describe_ext_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8085,7 +7267,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_ext_attribute_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceAttrExtension * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -8093,7 +7274,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_ext_attribute_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8103,7 +7283,6 @@ POA_CORBA::LocalInterfaceDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8111,7 +7290,6 @@ POA_CORBA::LocalInterfaceDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8124,7 +7302,6 @@ POA_CORBA::LocalInterfaceDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8132,7 +7309,6 @@ POA_CORBA::LocalInterfaceDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8145,7 +7321,6 @@ POA_CORBA::LocalInterfaceDef::lookup_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8153,7 +7328,6 @@ POA_CORBA::LocalInterfaceDef::lookup_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8166,7 +7340,6 @@ POA_CORBA::LocalInterfaceDef::contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8174,7 +7347,6 @@ POA_CORBA::LocalInterfaceDef::contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8187,7 +7359,6 @@ POA_CORBA::LocalInterfaceDef::lookup_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8195,7 +7366,6 @@ POA_CORBA::LocalInterfaceDef::lookup_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8208,7 +7378,6 @@ POA_CORBA::LocalInterfaceDef::describe_contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8216,7 +7385,6 @@ POA_CORBA::LocalInterfaceDef::describe_contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8229,7 +7397,6 @@ POA_CORBA::LocalInterfaceDef::create_module_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8237,7 +7404,6 @@ POA_CORBA::LocalInterfaceDef::create_module_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8250,7 +7416,6 @@ POA_CORBA::LocalInterfaceDef::create_constant_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8258,7 +7423,6 @@ POA_CORBA::LocalInterfaceDef::create_constant_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8271,7 +7435,6 @@ POA_CORBA::LocalInterfaceDef::create_struct_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8279,7 +7442,6 @@ POA_CORBA::LocalInterfaceDef::create_struct_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8292,7 +7454,6 @@ POA_CORBA::LocalInterfaceDef::create_union_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8300,7 +7461,6 @@ POA_CORBA::LocalInterfaceDef::create_union_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8313,7 +7473,6 @@ POA_CORBA::LocalInterfaceDef::create_enum_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8321,7 +7480,6 @@ POA_CORBA::LocalInterfaceDef::create_enum_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8334,7 +7492,6 @@ POA_CORBA::LocalInterfaceDef::create_alias_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8342,7 +7499,6 @@ POA_CORBA::LocalInterfaceDef::create_alias_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8355,7 +7511,6 @@ POA_CORBA::LocalInterfaceDef::create_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8363,7 +7518,6 @@ POA_CORBA::LocalInterfaceDef::create_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8376,7 +7530,6 @@ POA_CORBA::LocalInterfaceDef::create_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8384,7 +7537,6 @@ POA_CORBA::LocalInterfaceDef::create_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8397,7 +7549,6 @@ POA_CORBA::LocalInterfaceDef::create_value_box_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8405,7 +7556,6 @@ POA_CORBA::LocalInterfaceDef::create_value_box_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8418,7 +7568,6 @@ POA_CORBA::LocalInterfaceDef::create_exception_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8426,7 +7575,6 @@ POA_CORBA::LocalInterfaceDef::create_exception_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8439,7 +7587,6 @@ POA_CORBA::LocalInterfaceDef::create_native_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8447,7 +7594,6 @@ POA_CORBA::LocalInterfaceDef::create_native_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8460,7 +7606,6 @@ POA_CORBA::LocalInterfaceDef::create_abstract_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8468,7 +7613,6 @@ POA_CORBA::LocalInterfaceDef::create_abstract_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8481,7 +7625,6 @@ POA_CORBA::LocalInterfaceDef::create_local_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8489,7 +7632,6 @@ POA_CORBA::LocalInterfaceDef::create_local_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8502,7 +7644,6 @@ POA_CORBA::LocalInterfaceDef::create_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8510,7 +7651,6 @@ POA_CORBA::LocalInterfaceDef::create_ext_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8520,7 +7660,6 @@ POA_CORBA::LocalInterfaceDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8528,7 +7667,6 @@ POA_CORBA::LocalInterfaceDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8538,7 +7676,6 @@ POA_CORBA::LocalInterfaceDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8546,7 +7683,6 @@ POA_CORBA::LocalInterfaceDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8556,7 +7692,6 @@ POA_CORBA::LocalInterfaceDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8564,7 +7699,6 @@ POA_CORBA::LocalInterfaceDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8574,7 +7708,6 @@ POA_CORBA::LocalInterfaceDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8582,7 +7715,6 @@ POA_CORBA::LocalInterfaceDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8592,7 +7724,6 @@ POA_CORBA::LocalInterfaceDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8600,7 +7731,6 @@ POA_CORBA::LocalInterfaceDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8610,7 +7740,6 @@ POA_CORBA::LocalInterfaceDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8618,7 +7747,6 @@ POA_CORBA::LocalInterfaceDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8628,7 +7756,6 @@ POA_CORBA::LocalInterfaceDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8636,7 +7763,6 @@ POA_CORBA::LocalInterfaceDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8646,7 +7772,6 @@ POA_CORBA::LocalInterfaceDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8654,7 +7779,6 @@ POA_CORBA::LocalInterfaceDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8664,7 +7788,6 @@ POA_CORBA::LocalInterfaceDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8672,7 +7795,6 @@ POA_CORBA::LocalInterfaceDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8685,7 +7807,6 @@ POA_CORBA::LocalInterfaceDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8693,7 +7814,6 @@ POA_CORBA::LocalInterfaceDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8706,7 +7826,6 @@ POA_CORBA::LocalInterfaceDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8714,7 +7833,6 @@ POA_CORBA::LocalInterfaceDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8724,7 +7842,6 @@ POA_CORBA::LocalInterfaceDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8732,7 +7849,6 @@ POA_CORBA::LocalInterfaceDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8742,7 +7858,6 @@ POA_CORBA::LocalInterfaceDef::_get_base_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8750,7 +7865,6 @@ POA_CORBA::LocalInterfaceDef::_get_base_interfaces_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8760,7 +7874,6 @@ POA_CORBA::LocalInterfaceDef::_set_base_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8768,7 +7881,6 @@ POA_CORBA::LocalInterfaceDef::_set_base_interfaces_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8781,7 +7893,6 @@ POA_CORBA::LocalInterfaceDef::is_a_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8789,7 +7900,6 @@ POA_CORBA::LocalInterfaceDef::is_a_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8802,7 +7912,6 @@ POA_CORBA::LocalInterfaceDef::describe_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8810,7 +7919,6 @@ POA_CORBA::LocalInterfaceDef::describe_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8823,7 +7931,6 @@ POA_CORBA::LocalInterfaceDef::create_attribute_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8831,7 +7938,6 @@ POA_CORBA::LocalInterfaceDef::create_attribute_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8844,7 +7950,6 @@ POA_CORBA::LocalInterfaceDef::create_operation_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8852,7 +7957,6 @@ POA_CORBA::LocalInterfaceDef::create_operation_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8862,7 +7966,6 @@ POA_CORBA::ExtLocalInterfaceDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -8870,7 +7973,6 @@ POA_CORBA::ExtLocalInterfaceDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8883,7 +7985,6 @@ POA_CORBA::ExtLocalInterfaceDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -8891,7 +7992,6 @@ POA_CORBA::ExtLocalInterfaceDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8904,7 +8004,6 @@ POA_CORBA::ExtLocalInterfaceDef::lookup_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -8912,7 +8011,6 @@ POA_CORBA::ExtLocalInterfaceDef::lookup_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8925,7 +8023,6 @@ POA_CORBA::ExtLocalInterfaceDef::contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -8933,7 +8030,6 @@ POA_CORBA::ExtLocalInterfaceDef::contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8946,7 +8042,6 @@ POA_CORBA::ExtLocalInterfaceDef::lookup_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -8954,7 +8049,6 @@ POA_CORBA::ExtLocalInterfaceDef::lookup_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8967,7 +8061,6 @@ POA_CORBA::ExtLocalInterfaceDef::describe_contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -8975,7 +8068,6 @@ POA_CORBA::ExtLocalInterfaceDef::describe_contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8988,7 +8080,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_module_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -8996,7 +8087,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_module_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9009,7 +8099,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_constant_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9017,7 +8106,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_constant_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9030,7 +8118,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_struct_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9038,7 +8125,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_struct_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9051,7 +8137,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_union_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9059,7 +8144,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_union_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9072,7 +8156,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_enum_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9080,7 +8163,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_enum_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9093,7 +8175,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_alias_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9101,7 +8182,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_alias_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9114,7 +8194,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9122,7 +8201,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9135,7 +8213,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9143,7 +8220,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9156,7 +8232,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_value_box_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9164,7 +8239,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_value_box_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9177,7 +8251,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_exception_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9185,7 +8258,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_exception_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9198,7 +8270,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_native_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9206,7 +8277,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_native_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9219,7 +8289,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_abstract_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9227,7 +8296,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_abstract_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9240,7 +8308,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_local_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9248,7 +8315,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_local_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9261,7 +8327,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9269,7 +8334,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_ext_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9279,7 +8343,6 @@ POA_CORBA::ExtLocalInterfaceDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9287,7 +8350,6 @@ POA_CORBA::ExtLocalInterfaceDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9297,7 +8359,6 @@ POA_CORBA::ExtLocalInterfaceDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9305,7 +8366,6 @@ POA_CORBA::ExtLocalInterfaceDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9315,7 +8375,6 @@ POA_CORBA::ExtLocalInterfaceDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9323,7 +8382,6 @@ POA_CORBA::ExtLocalInterfaceDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9333,7 +8391,6 @@ POA_CORBA::ExtLocalInterfaceDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9341,7 +8398,6 @@ POA_CORBA::ExtLocalInterfaceDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9351,7 +8407,6 @@ POA_CORBA::ExtLocalInterfaceDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9359,7 +8414,6 @@ POA_CORBA::ExtLocalInterfaceDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9369,7 +8423,6 @@ POA_CORBA::ExtLocalInterfaceDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9377,7 +8430,6 @@ POA_CORBA::ExtLocalInterfaceDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9387,7 +8439,6 @@ POA_CORBA::ExtLocalInterfaceDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9395,7 +8446,6 @@ POA_CORBA::ExtLocalInterfaceDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9405,7 +8455,6 @@ POA_CORBA::ExtLocalInterfaceDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9413,7 +8462,6 @@ POA_CORBA::ExtLocalInterfaceDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9423,7 +8471,6 @@ POA_CORBA::ExtLocalInterfaceDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9431,7 +8478,6 @@ POA_CORBA::ExtLocalInterfaceDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9444,7 +8490,6 @@ POA_CORBA::ExtLocalInterfaceDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9452,7 +8497,6 @@ POA_CORBA::ExtLocalInterfaceDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9465,7 +8509,6 @@ POA_CORBA::ExtLocalInterfaceDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9473,7 +8516,6 @@ POA_CORBA::ExtLocalInterfaceDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9483,7 +8525,6 @@ POA_CORBA::ExtLocalInterfaceDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9491,7 +8532,6 @@ POA_CORBA::ExtLocalInterfaceDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9501,7 +8541,6 @@ POA_CORBA::ExtLocalInterfaceDef::_get_base_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9509,7 +8548,6 @@ POA_CORBA::ExtLocalInterfaceDef::_get_base_interfaces_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9519,7 +8557,6 @@ POA_CORBA::ExtLocalInterfaceDef::_set_base_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9527,7 +8564,6 @@ POA_CORBA::ExtLocalInterfaceDef::_set_base_interfaces_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9540,7 +8576,6 @@ POA_CORBA::ExtLocalInterfaceDef::is_a_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9548,7 +8583,6 @@ POA_CORBA::ExtLocalInterfaceDef::is_a_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9561,7 +8595,6 @@ POA_CORBA::ExtLocalInterfaceDef::describe_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9569,7 +8602,6 @@ POA_CORBA::ExtLocalInterfaceDef::describe_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9582,7 +8614,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_attribute_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9590,7 +8621,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_attribute_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9603,7 +8633,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_operation_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9611,7 +8640,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_operation_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9624,7 +8652,6 @@ POA_CORBA::ExtLocalInterfaceDef::describe_ext_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceAttrExtension * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9632,7 +8659,6 @@ POA_CORBA::ExtLocalInterfaceDef::describe_ext_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9645,7 +8671,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_ext_attribute_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceAttrExtension * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9653,7 +8678,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_ext_attribute_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h
index e316d990dc1..f9dbb974fbf 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h
@@ -80,14 +80,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -97,7 +95,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -108,7 +105,6 @@ namespace POA_CORBA
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -120,7 +116,6 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -134,7 +129,6 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -147,7 +141,6 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -160,7 +153,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -175,7 +167,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -189,7 +180,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -204,7 +194,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -218,7 +207,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -232,7 +220,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -246,7 +233,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -266,7 +252,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -280,7 +265,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -294,7 +278,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -307,7 +290,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -321,7 +303,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -335,7 +316,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -355,7 +335,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -366,7 +345,6 @@ namespace POA_CORBA
 
     ::CORBA::Contained_ptr lookup_id (
         const char * search_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -377,7 +355,6 @@ namespace POA_CORBA
 
     ::CORBA::TypeCode_ptr get_canonical_typecode (
         ::CORBA::TypeCode_ptr tc
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -388,7 +365,6 @@ namespace POA_CORBA
 
     ::CORBA::PrimitiveDef_ptr get_primitive (
         ::CORBA::PrimitiveKind kind
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -399,7 +375,6 @@ namespace POA_CORBA
 
     ::CORBA::StringDef_ptr create_string (
         ::CORBA::ULong bound
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -410,7 +385,6 @@ namespace POA_CORBA
 
     ::CORBA::WstringDef_ptr create_wstring (
         ::CORBA::ULong bound
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -422,7 +396,6 @@ namespace POA_CORBA
     ::CORBA::SequenceDef_ptr create_sequence (
         ::CORBA::ULong bound,
         ::CORBA::IDLType_ptr element_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -434,7 +407,6 @@ namespace POA_CORBA
     ::CORBA::ArrayDef_ptr create_array (
         ::CORBA::ULong length,
         ::CORBA::IDLType_ptr element_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -446,7 +418,6 @@ namespace POA_CORBA
     ::CORBA::FixedDef_ptr create_fixed (
         ::CORBA::UShort digits,
         ::CORBA::Short scale
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -499,14 +470,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -516,7 +485,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -527,7 +495,6 @@ namespace POA_CORBA
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -539,7 +506,6 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -553,7 +519,6 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -566,7 +531,6 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -579,7 +543,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -594,7 +557,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -608,7 +570,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -623,7 +584,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -637,7 +597,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -651,7 +610,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -665,7 +623,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -685,7 +642,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -699,7 +655,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -713,7 +668,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -726,7 +680,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -740,7 +693,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -754,7 +706,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -774,7 +725,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -784,7 +734,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -795,7 +744,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -805,7 +753,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -816,7 +763,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -826,7 +772,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -837,7 +782,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -847,7 +791,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -857,7 +800,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -867,7 +809,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -877,7 +818,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -890,7 +830,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -943,14 +882,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -960,7 +897,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -970,7 +906,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -981,7 +916,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -991,7 +925,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1002,7 +935,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1012,7 +944,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1023,7 +954,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1033,7 +963,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1043,7 +972,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1053,7 +981,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1063,7 +990,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1076,7 +1002,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1086,7 +1011,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1096,7 +1020,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::IDLType_ptr type_def (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1107,7 +1030,6 @@ namespace POA_CORBA
 
     void type_def (
         ::CORBA::IDLType_ptr type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1117,7 +1039,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Any * value (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1128,7 +1049,6 @@ namespace POA_CORBA
 
     void value (
         const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1181,14 +1101,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1198,7 +1116,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1208,7 +1125,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1219,7 +1135,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1229,7 +1144,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1240,7 +1154,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1250,7 +1163,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1261,7 +1173,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1271,7 +1182,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1281,7 +1191,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1291,7 +1200,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1301,7 +1209,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1314,7 +1221,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1324,7 +1230,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1335,7 +1240,6 @@ namespace POA_CORBA
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1347,7 +1251,6 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1361,7 +1264,6 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1374,7 +1276,6 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1387,7 +1288,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1402,7 +1302,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1416,7 +1315,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1431,7 +1329,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1445,7 +1342,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1459,7 +1355,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1473,7 +1368,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1493,7 +1387,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1507,7 +1400,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1521,7 +1413,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1534,7 +1425,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1548,7 +1438,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1562,7 +1451,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1582,7 +1470,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1592,7 +1479,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::StructMemberSeq * members (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1603,7 +1489,6 @@ namespace POA_CORBA
 
     void members (
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1656,14 +1541,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1673,7 +1556,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1683,7 +1565,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1694,7 +1575,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1704,7 +1584,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1715,7 +1594,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1725,7 +1603,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1736,7 +1613,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1746,7 +1622,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1756,7 +1631,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1766,7 +1640,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1776,7 +1649,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1789,7 +1661,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1799,7 +1670,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1810,7 +1680,6 @@ namespace POA_CORBA
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1822,7 +1691,6 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1836,7 +1704,6 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1849,7 +1716,6 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1862,7 +1728,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1877,7 +1742,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1891,7 +1755,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1906,7 +1769,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1920,7 +1782,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1934,7 +1795,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1948,7 +1808,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1968,7 +1827,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1982,7 +1840,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1996,7 +1853,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2009,7 +1865,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2023,7 +1878,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2037,7 +1891,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2057,7 +1910,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2067,7 +1919,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr discriminator_type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2077,7 +1928,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::IDLType_ptr discriminator_type_def (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2088,7 +1938,6 @@ namespace POA_CORBA
 
     void discriminator_type_def (
         ::CORBA::IDLType_ptr discriminator_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2098,7 +1947,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::UnionMemberSeq * members (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2109,7 +1957,6 @@ namespace POA_CORBA
 
     void members (
         const ::CORBA::UnionMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2162,14 +2009,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2179,7 +2024,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2189,7 +2033,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2200,7 +2043,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2210,7 +2052,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2221,7 +2062,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2231,7 +2071,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2242,7 +2081,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2252,7 +2090,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2262,7 +2099,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2272,7 +2108,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2282,7 +2117,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2295,7 +2129,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2305,7 +2138,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2315,7 +2147,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::EnumMemberSeq * members (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2326,7 +2157,6 @@ namespace POA_CORBA
 
     void members (
         const ::CORBA::EnumMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2379,14 +2209,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2396,7 +2224,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2406,7 +2233,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2417,7 +2243,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2427,7 +2252,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2438,7 +2262,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2448,7 +2271,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2459,7 +2281,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2469,7 +2290,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2479,7 +2299,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2489,7 +2308,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2499,7 +2317,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2512,7 +2329,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2522,7 +2338,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2532,7 +2347,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::IDLType_ptr original_type_def (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2543,7 +2357,6 @@ namespace POA_CORBA
 
     void original_type_def (
         ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2596,14 +2409,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2613,7 +2424,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2623,7 +2433,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2634,7 +2443,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2644,7 +2452,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2655,7 +2462,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2665,7 +2471,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2676,7 +2481,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2686,7 +2490,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2696,7 +2499,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2706,7 +2508,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2716,7 +2517,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2729,7 +2529,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2739,7 +2538,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2792,14 +2590,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2809,7 +2605,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2819,7 +2614,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2829,7 +2623,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::PrimitiveKind kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2882,14 +2675,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2899,7 +2690,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2909,7 +2699,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2919,7 +2708,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ULong bound (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2930,7 +2718,6 @@ namespace POA_CORBA
 
     void bound (
         ::CORBA::ULong bound
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2983,14 +2770,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3000,7 +2785,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3010,7 +2794,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3020,7 +2803,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ULong bound (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3031,7 +2813,6 @@ namespace POA_CORBA
 
     void bound (
         ::CORBA::ULong bound
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3084,14 +2865,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3101,7 +2880,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3111,7 +2889,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3121,7 +2898,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ULong bound (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3132,7 +2908,6 @@ namespace POA_CORBA
 
     void bound (
         ::CORBA::ULong bound
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3142,7 +2917,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr element_type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3152,7 +2926,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::IDLType_ptr element_type_def (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3163,7 +2936,6 @@ namespace POA_CORBA
 
     void element_type_def (
         ::CORBA::IDLType_ptr element_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3216,14 +2988,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3233,7 +3003,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3243,7 +3012,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3253,7 +3021,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ULong length (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3264,7 +3031,6 @@ namespace POA_CORBA
 
     void length (
         ::CORBA::ULong length
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3274,7 +3040,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr element_type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3284,7 +3049,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::IDLType_ptr element_type_def (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3295,7 +3059,6 @@ namespace POA_CORBA
 
     void element_type_def (
         ::CORBA::IDLType_ptr element_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3348,14 +3111,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3365,7 +3126,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3375,7 +3135,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3386,7 +3145,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3396,7 +3154,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3407,7 +3164,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3417,7 +3173,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3428,7 +3183,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3438,7 +3192,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3448,7 +3201,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3458,7 +3210,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3468,7 +3219,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3481,7 +3231,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3492,7 +3241,6 @@ namespace POA_CORBA
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3504,7 +3252,6 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3518,7 +3265,6 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3531,7 +3277,6 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3544,7 +3289,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3559,7 +3303,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3573,7 +3316,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3588,7 +3330,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3602,7 +3343,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3616,7 +3356,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3630,7 +3369,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3650,7 +3388,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3664,7 +3401,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3678,7 +3414,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3691,7 +3426,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3705,7 +3439,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3719,7 +3452,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3739,7 +3471,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3749,7 +3480,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3759,7 +3489,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::StructMemberSeq * members (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3770,7 +3499,6 @@ namespace POA_CORBA
 
     void members (
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3823,14 +3551,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3840,7 +3566,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3850,7 +3575,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3861,7 +3585,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3871,7 +3594,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3882,7 +3604,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3892,7 +3613,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3903,7 +3623,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3913,7 +3632,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3923,7 +3641,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3933,7 +3650,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3943,7 +3659,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3956,7 +3671,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3966,7 +3680,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3976,7 +3689,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::IDLType_ptr type_def (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3987,7 +3699,6 @@ namespace POA_CORBA
 
     void type_def (
         ::CORBA::IDLType_ptr type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3997,7 +3708,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::AttributeMode mode (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4008,7 +3718,6 @@ namespace POA_CORBA
 
     void mode (
         ::CORBA::AttributeMode mode
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4061,14 +3770,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4078,7 +3785,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4088,7 +3794,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4099,7 +3804,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4109,7 +3813,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4120,7 +3823,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4130,7 +3832,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4141,7 +3842,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4151,7 +3851,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4161,7 +3860,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4171,7 +3869,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4181,7 +3878,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4194,7 +3890,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4204,7 +3899,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4214,7 +3908,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::IDLType_ptr type_def (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4225,7 +3918,6 @@ namespace POA_CORBA
 
     void type_def (
         ::CORBA::IDLType_ptr type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4235,7 +3927,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::AttributeMode mode (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4246,7 +3937,6 @@ namespace POA_CORBA
 
     void mode (
         ::CORBA::AttributeMode mode
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4256,7 +3946,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ExcDescriptionSeq * get_exceptions (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4267,7 +3956,6 @@ namespace POA_CORBA
 
     void get_exceptions (
         const ::CORBA::ExcDescriptionSeq & get_exceptions
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4277,7 +3965,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ExcDescriptionSeq * set_exceptions (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4288,7 +3975,6 @@ namespace POA_CORBA
 
     void set_exceptions (
         const ::CORBA::ExcDescriptionSeq & set_exceptions
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4298,7 +3984,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ExtAttributeDescription * describe_attribute (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4351,14 +4036,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4368,7 +4051,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4378,7 +4060,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4389,7 +4070,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4399,7 +4079,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4410,7 +4089,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4420,7 +4098,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4431,7 +4108,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4441,7 +4117,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4451,7 +4126,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4461,7 +4135,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4471,7 +4144,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4484,7 +4156,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4494,7 +4165,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr result (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4504,7 +4174,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::IDLType_ptr result_def (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4515,7 +4184,6 @@ namespace POA_CORBA
 
     void result_def (
         ::CORBA::IDLType_ptr result_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4525,7 +4193,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ParDescriptionSeq * params (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4536,7 +4203,6 @@ namespace POA_CORBA
 
     void params (
         const ::CORBA::ParDescriptionSeq & params
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4546,7 +4212,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::OperationMode mode (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4557,7 +4222,6 @@ namespace POA_CORBA
 
     void mode (
         ::CORBA::OperationMode mode
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4567,7 +4231,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ContextIdSeq * contexts (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4578,7 +4241,6 @@ namespace POA_CORBA
 
     void contexts (
         const ::CORBA::ContextIdSeq & contexts
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4588,7 +4250,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ExceptionDefSeq * exceptions (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4599,7 +4260,6 @@ namespace POA_CORBA
 
     void exceptions (
         const ::CORBA::ExceptionDefSeq & exceptions
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4652,14 +4312,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4669,7 +4327,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4680,7 +4337,6 @@ namespace POA_CORBA
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4692,7 +4348,6 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4706,7 +4361,6 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4719,7 +4373,6 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4732,7 +4385,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4747,7 +4399,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4761,7 +4412,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4776,7 +4426,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4790,7 +4439,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4804,7 +4452,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4818,7 +4465,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4838,7 +4484,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4852,7 +4497,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4866,7 +4510,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4879,7 +4522,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4893,7 +4535,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4907,7 +4548,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4927,7 +4567,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4937,7 +4576,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4948,7 +4586,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4958,7 +4595,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4969,7 +4605,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4979,7 +4614,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4990,7 +4624,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5000,7 +4633,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5010,7 +4642,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5020,7 +4651,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5030,7 +4660,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5043,7 +4672,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5053,7 +4681,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5063,7 +4690,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDefSeq * base_interfaces (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5074,7 +4700,6 @@ namespace POA_CORBA
 
     void base_interfaces (
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5085,7 +4710,6 @@ namespace POA_CORBA
 
     ::CORBA::Boolean is_a (
         const char * interface_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5095,7 +4719,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5110,7 +4733,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         ::CORBA::AttributeMode mode
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5128,7 +4750,6 @@ namespace POA_CORBA
         const ::CORBA::ParDescriptionSeq & params,
         const ::CORBA::ExceptionDefSeq & exceptions,
         const ::CORBA::ContextIdSeq & contexts
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5181,14 +4802,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5205,7 +4824,6 @@ namespace POA_CORBA
         ::CORBA::AttributeMode mode,
         const ::CORBA::ExceptionDefSeq & get_exceptions,
         const ::CORBA::ExceptionDefSeq & set_exceptions
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5258,14 +4876,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5275,7 +4891,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5286,7 +4901,6 @@ namespace POA_CORBA
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5298,7 +4912,6 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5312,7 +4925,6 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5325,7 +4937,6 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5338,7 +4949,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5353,7 +4963,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5367,7 +4976,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5382,7 +4990,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5396,7 +5003,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5410,7 +5016,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5424,7 +5029,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5444,7 +5048,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5458,7 +5061,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5472,7 +5074,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5485,7 +5086,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5499,7 +5099,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5513,7 +5112,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5533,7 +5131,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5543,7 +5140,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5554,7 +5150,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5564,7 +5159,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5575,7 +5169,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5585,7 +5178,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5596,7 +5188,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5606,7 +5197,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5616,7 +5206,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5626,7 +5215,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5636,7 +5224,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5649,7 +5236,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5659,7 +5245,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5669,7 +5254,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDefSeq * base_interfaces (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5680,7 +5264,6 @@ namespace POA_CORBA
 
     void base_interfaces (
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5691,7 +5274,6 @@ namespace POA_CORBA
 
     ::CORBA::Boolean is_a (
         const char * interface_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5701,7 +5283,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5716,7 +5297,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         ::CORBA::AttributeMode mode
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5734,7 +5314,6 @@ namespace POA_CORBA
         const ::CORBA::ParDescriptionSeq & params,
         const ::CORBA::ExceptionDefSeq & exceptions,
         const ::CORBA::ContextIdSeq & contexts
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5744,7 +5323,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5761,7 +5339,6 @@ namespace POA_CORBA
         ::CORBA::AttributeMode mode,
         const ::CORBA::ExceptionDefSeq & get_exceptions,
         const ::CORBA::ExceptionDefSeq & set_exceptions
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5814,14 +5391,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5831,7 +5406,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5842,7 +5416,6 @@ namespace POA_CORBA
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5854,7 +5427,6 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5868,7 +5440,6 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5881,7 +5452,6 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5894,7 +5464,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5909,7 +5478,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5923,7 +5491,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5938,7 +5505,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5952,7 +5518,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5966,7 +5531,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5980,7 +5544,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6000,7 +5563,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6014,7 +5576,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6028,7 +5589,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6041,7 +5601,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6055,7 +5614,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6069,7 +5627,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6089,7 +5646,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6099,7 +5655,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6110,7 +5665,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6120,7 +5674,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6131,7 +5684,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6141,7 +5693,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6152,7 +5703,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6162,7 +5712,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6172,7 +5721,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6182,7 +5730,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6192,7 +5739,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6205,7 +5751,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6215,7 +5760,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6225,7 +5769,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDefSeq * base_interfaces (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6236,7 +5779,6 @@ namespace POA_CORBA
 
     void base_interfaces (
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6247,7 +5789,6 @@ namespace POA_CORBA
 
     ::CORBA::Boolean is_a (
         const char * interface_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6257,7 +5798,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6272,7 +5812,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         ::CORBA::AttributeMode mode
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6290,7 +5829,6 @@ namespace POA_CORBA
         const ::CORBA::ParDescriptionSeq & params,
         const ::CORBA::ExceptionDefSeq & exceptions,
         const ::CORBA::ContextIdSeq & contexts
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6343,14 +5881,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6360,7 +5896,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6371,7 +5906,6 @@ namespace POA_CORBA
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6383,7 +5917,6 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6397,7 +5930,6 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6410,7 +5942,6 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6423,7 +5954,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6438,7 +5968,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6452,7 +5981,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6467,7 +5995,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6481,7 +6008,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6495,7 +6021,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6509,7 +6034,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6529,7 +6053,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6543,7 +6066,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6557,7 +6079,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6570,7 +6091,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6584,7 +6104,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6598,7 +6117,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6618,7 +6136,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6628,7 +6145,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6639,7 +6155,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6649,7 +6164,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6660,7 +6174,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6670,7 +6183,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6681,7 +6193,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6691,7 +6202,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6701,7 +6211,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6711,7 +6220,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6721,7 +6229,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6734,7 +6241,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6744,7 +6250,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6754,7 +6259,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDefSeq * base_interfaces (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6765,7 +6269,6 @@ namespace POA_CORBA
 
     void base_interfaces (
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6776,7 +6279,6 @@ namespace POA_CORBA
 
     ::CORBA::Boolean is_a (
         const char * interface_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6786,7 +6288,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6801,7 +6302,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         ::CORBA::AttributeMode mode
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6819,7 +6319,6 @@ namespace POA_CORBA
         const ::CORBA::ParDescriptionSeq & params,
         const ::CORBA::ExceptionDefSeq & exceptions,
         const ::CORBA::ContextIdSeq & contexts
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6829,7 +6328,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6846,7 +6344,6 @@ namespace POA_CORBA
         ::CORBA::AttributeMode mode,
         const ::CORBA::ExceptionDefSeq & get_exceptions,
         const ::CORBA::ExceptionDefSeq & set_exceptions
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6899,14 +6396,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6916,7 +6411,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6927,7 +6421,6 @@ namespace POA_CORBA
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6939,7 +6432,6 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6953,7 +6445,6 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6966,7 +6457,6 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6979,7 +6469,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6994,7 +6483,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7008,7 +6496,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7023,7 +6510,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7037,7 +6523,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7051,7 +6536,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7065,7 +6549,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7085,7 +6568,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7099,7 +6581,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7113,7 +6594,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7126,7 +6606,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7140,7 +6619,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7154,7 +6632,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7174,7 +6651,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7184,7 +6660,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7195,7 +6670,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7205,7 +6679,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7216,7 +6689,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7226,7 +6698,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7237,7 +6708,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7247,7 +6717,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7257,7 +6726,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7267,7 +6735,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7277,7 +6744,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7290,7 +6756,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7300,7 +6765,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7310,7 +6774,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDefSeq * base_interfaces (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7321,7 +6784,6 @@ namespace POA_CORBA
 
     void base_interfaces (
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7332,7 +6794,6 @@ namespace POA_CORBA
 
     ::CORBA::Boolean is_a (
         const char * interface_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7342,7 +6803,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7357,7 +6817,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         ::CORBA::AttributeMode mode
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7375,7 +6834,6 @@ namespace POA_CORBA
         const ::CORBA::ParDescriptionSeq & params,
         const ::CORBA::ExceptionDefSeq & exceptions,
         const ::CORBA::ContextIdSeq & contexts
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7428,14 +6886,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7445,7 +6901,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7456,7 +6911,6 @@ namespace POA_CORBA
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7468,7 +6922,6 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7482,7 +6935,6 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7495,7 +6947,6 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7508,7 +6959,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7523,7 +6973,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7537,7 +6986,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7552,7 +7000,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7566,7 +7013,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7580,7 +7026,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7594,7 +7039,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7614,7 +7058,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7628,7 +7071,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7642,7 +7084,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7655,7 +7096,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7669,7 +7109,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7683,7 +7122,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7703,7 +7141,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7713,7 +7150,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7724,7 +7160,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7734,7 +7169,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7745,7 +7179,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7755,7 +7188,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7766,7 +7198,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7776,7 +7207,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7786,7 +7216,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7796,7 +7225,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7806,7 +7234,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7819,7 +7246,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7829,7 +7255,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7839,7 +7264,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDefSeq * base_interfaces (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7850,7 +7274,6 @@ namespace POA_CORBA
 
     void base_interfaces (
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7861,7 +7284,6 @@ namespace POA_CORBA
 
     ::CORBA::Boolean is_a (
         const char * interface_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7871,7 +7293,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7886,7 +7307,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         ::CORBA::AttributeMode mode
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7904,7 +7324,6 @@ namespace POA_CORBA
         const ::CORBA::ParDescriptionSeq & params,
         const ::CORBA::ExceptionDefSeq & exceptions,
         const ::CORBA::ContextIdSeq & contexts
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7914,7 +7333,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7931,7 +7349,6 @@ namespace POA_CORBA
         ::CORBA::AttributeMode mode,
         const ::CORBA::ExceptionDefSeq & get_exceptions,
         const ::CORBA::ExceptionDefSeq & set_exceptions
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.inl
index 562c27c3fd4..3e42dc06527 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.inl
@@ -128,14 +128,12 @@ POA_CORBA::Repository_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::Repository_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -144,14 +142,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::Repository_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -161,7 +157,6 @@ void POA_CORBA::Repository_tie<T>::destroy  (
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::Repository_tie<T>::lookup  (
     const char * search_name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -169,7 +164,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup (
     search_name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -180,7 +174,6 @@ template <class T> ACE_INLINE
 ::CORBA::ContainedSeq * POA_CORBA::Repository_tie<T>::contents  (
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -189,7 +182,6 @@ template <class T> ACE_INLINE
   return this->ptr_->contents (
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -202,7 +194,6 @@ template <class T> ACE_INLINE
     ::CORBA::Long levels_to_search,
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -213,7 +204,6 @@ template <class T> ACE_INLINE
     levels_to_search,
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -225,7 +215,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -235,7 +224,6 @@ template <class T> ACE_INLINE
     limit_type,
     exclude_inherited,
     max_returned_objs
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -247,7 +235,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -257,7 +244,6 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -271,7 +257,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -283,7 +268,6 @@ template <class T> ACE_INLINE
     version,
     type,
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -296,7 +280,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -307,7 +290,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -321,7 +303,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -333,7 +314,6 @@ template <class T> ACE_INLINE
     version,
     discriminator_type,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -346,7 +326,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -357,7 +336,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -370,7 +348,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -381,7 +358,6 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -394,7 +370,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -405,7 +380,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -424,7 +398,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -441,7 +414,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -454,7 +426,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -465,7 +436,6 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -478,7 +448,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -489,7 +458,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -501,7 +469,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -511,7 +478,6 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -524,7 +490,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -535,7 +500,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -548,7 +512,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -559,7 +522,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -578,7 +540,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -595,7 +556,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -605,7 +565,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::Repository_tie<T>::lookup_id  (
     const char * search_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -613,7 +572,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup_id (
     search_id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -623,7 +581,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::Repository_tie<T>::get_canonical_typecode  (
     ::CORBA::TypeCode_ptr tc
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -631,7 +588,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->get_canonical_typecode (
     tc
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -641,7 +597,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::PrimitiveDef_ptr POA_CORBA::Repository_tie<T>::get_primitive  (
     ::CORBA::PrimitiveKind kind
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -649,7 +604,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->get_primitive (
     kind
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -659,7 +613,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::StringDef_ptr POA_CORBA::Repository_tie<T>::create_string  (
     ::CORBA::ULong bound
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -667,7 +620,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->create_string (
     bound
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -677,7 +629,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::WstringDef_ptr POA_CORBA::Repository_tie<T>::create_wstring  (
     ::CORBA::ULong bound
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -685,7 +636,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->create_wstring (
     bound
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -696,7 +646,6 @@ template <class T> ACE_INLINE
 ::CORBA::SequenceDef_ptr POA_CORBA::Repository_tie<T>::create_sequence  (
     ::CORBA::ULong bound,
     ::CORBA::IDLType_ptr element_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -705,7 +654,6 @@ template <class T> ACE_INLINE
   return this->ptr_->create_sequence (
     bound,
     element_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -716,7 +664,6 @@ template <class T> ACE_INLINE
 ::CORBA::ArrayDef_ptr POA_CORBA::Repository_tie<T>::create_array  (
     ::CORBA::ULong length,
     ::CORBA::IDLType_ptr element_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -725,7 +672,6 @@ template <class T> ACE_INLINE
   return this->ptr_->create_array (
     length,
     element_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -736,7 +682,6 @@ template <class T> ACE_INLINE
 ::CORBA::FixedDef_ptr POA_CORBA::Repository_tie<T>::create_fixed  (
     ::CORBA::UShort digits,
     ::CORBA::Short scale
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -745,7 +690,6 @@ template <class T> ACE_INLINE
   return this->ptr_->create_fixed (
     digits,
     scale
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -847,14 +791,12 @@ POA_CORBA::ModuleDef_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ModuleDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -863,14 +805,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::ModuleDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -880,7 +820,6 @@ void POA_CORBA::ModuleDef_tie<T>::destroy  (
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ModuleDef_tie<T>::lookup  (
     const char * search_name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -888,7 +827,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup (
     search_name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -899,7 +837,6 @@ template <class T> ACE_INLINE
 ::CORBA::ContainedSeq * POA_CORBA::ModuleDef_tie<T>::contents  (
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -908,7 +845,6 @@ template <class T> ACE_INLINE
   return this->ptr_->contents (
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -921,7 +857,6 @@ template <class T> ACE_INLINE
     ::CORBA::Long levels_to_search,
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -932,7 +867,6 @@ template <class T> ACE_INLINE
     levels_to_search,
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -944,7 +878,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -954,7 +887,6 @@ template <class T> ACE_INLINE
     limit_type,
     exclude_inherited,
     max_returned_objs
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -966,7 +898,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -976,7 +907,6 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -990,7 +920,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1002,7 +931,6 @@ template <class T> ACE_INLINE
     version,
     type,
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1015,7 +943,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1026,7 +953,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1040,7 +966,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1052,7 +977,6 @@ template <class T> ACE_INLINE
     version,
     discriminator_type,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1065,7 +989,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1076,7 +999,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1089,7 +1011,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1100,7 +1021,6 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1113,7 +1033,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1124,7 +1043,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1143,7 +1061,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1160,7 +1077,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1173,7 +1089,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1184,7 +1099,6 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1197,7 +1111,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1208,7 +1121,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1220,7 +1132,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1230,7 +1141,6 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1243,7 +1153,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1254,7 +1163,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1267,7 +1175,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1278,7 +1185,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1297,7 +1203,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1314,7 +1219,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1323,14 +1227,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ModuleDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1340,7 +1242,6 @@ char * POA_CORBA::ModuleDef_tie<T>::id  (
 template <class T> ACE_INLINE
 void POA_CORBA::ModuleDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1348,7 +1249,6 @@ void POA_CORBA::ModuleDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1357,14 +1257,12 @@ void POA_CORBA::ModuleDef_tie<T>::id  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ModuleDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1374,7 +1272,6 @@ char * POA_CORBA::ModuleDef_tie<T>::name  (
 template <class T> ACE_INLINE
 void POA_CORBA::ModuleDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1382,7 +1279,6 @@ void POA_CORBA::ModuleDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1391,14 +1287,12 @@ void POA_CORBA::ModuleDef_tie<T>::name  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ModuleDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1408,7 +1302,6 @@ char * POA_CORBA::ModuleDef_tie<T>::version  (
 template <class T> ACE_INLINE
 void POA_CORBA::ModuleDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1416,7 +1309,6 @@ void POA_CORBA::ModuleDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1425,14 +1317,12 @@ void POA_CORBA::ModuleDef_tie<T>::version  (
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ModuleDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1441,14 +1331,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ModuleDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1457,14 +1345,12 @@ char * POA_CORBA::ModuleDef_tie<T>::absolute_name  (
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ModuleDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1473,14 +1359,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ModuleDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1492,7 +1376,6 @@ void POA_CORBA::ModuleDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1502,7 +1385,6 @@ void POA_CORBA::ModuleDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1604,14 +1486,12 @@ POA_CORBA::ConstantDef_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ConstantDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1620,14 +1500,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::ConstantDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1636,14 +1514,12 @@ void POA_CORBA::ConstantDef_tie<T>::destroy  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ConstantDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1653,7 +1529,6 @@ char * POA_CORBA::ConstantDef_tie<T>::id  (
 template <class T> ACE_INLINE
 void POA_CORBA::ConstantDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1661,7 +1536,6 @@ void POA_CORBA::ConstantDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1670,14 +1544,12 @@ void POA_CORBA::ConstantDef_tie<T>::id  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ConstantDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1687,7 +1559,6 @@ char * POA_CORBA::ConstantDef_tie<T>::name  (
 template <class T> ACE_INLINE
 void POA_CORBA::ConstantDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1695,7 +1566,6 @@ void POA_CORBA::ConstantDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1704,14 +1574,12 @@ void POA_CORBA::ConstantDef_tie<T>::name  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ConstantDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1721,7 +1589,6 @@ char * POA_CORBA::ConstantDef_tie<T>::version  (
 template <class T> ACE_INLINE
 void POA_CORBA::ConstantDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1729,7 +1596,6 @@ void POA_CORBA::ConstantDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1738,14 +1604,12 @@ void POA_CORBA::ConstantDef_tie<T>::version  (
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ConstantDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1754,14 +1618,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ConstantDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1770,14 +1632,12 @@ char * POA_CORBA::ConstantDef_tie<T>::absolute_name  (
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ConstantDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1786,14 +1646,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ConstantDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1805,7 +1663,6 @@ void POA_CORBA::ConstantDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1815,7 +1672,6 @@ void POA_CORBA::ConstantDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1824,14 +1680,12 @@ void POA_CORBA::ConstantDef_tie<T>::move  (
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ConstantDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1840,14 +1694,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::IDLType_ptr POA_CORBA::ConstantDef_tie<T>::type_def  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type_def (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1857,7 +1709,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ConstantDef_tie<T>::type_def  (
     ::CORBA::IDLType_ptr type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1865,7 +1716,6 @@ void POA_CORBA::ConstantDef_tie<T>::type_def  (
 {
   this->ptr_->type_def (
     type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1874,14 +1724,12 @@ void POA_CORBA::ConstantDef_tie<T>::type_def  (
 
 template <class T> ACE_INLINE
 ::CORBA::Any * POA_CORBA::ConstantDef_tie<T>::value  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->value (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1891,7 +1739,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ConstantDef_tie<T>::value  (
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1899,7 +1746,6 @@ void POA_CORBA::ConstantDef_tie<T>::value  (
 {
   this->ptr_->value (
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2001,14 +1847,12 @@ POA_CORBA::StructDef_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::StructDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2017,14 +1861,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::StructDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2033,14 +1875,12 @@ void POA_CORBA::StructDef_tie<T>::destroy  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::StructDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2050,7 +1890,6 @@ char * POA_CORBA::StructDef_tie<T>::id  (
 template <class T> ACE_INLINE
 void POA_CORBA::StructDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2058,7 +1897,6 @@ void POA_CORBA::StructDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2067,14 +1905,12 @@ void POA_CORBA::StructDef_tie<T>::id  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::StructDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2084,7 +1920,6 @@ char * POA_CORBA::StructDef_tie<T>::name  (
 template <class T> ACE_INLINE
 void POA_CORBA::StructDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2092,7 +1927,6 @@ void POA_CORBA::StructDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2101,14 +1935,12 @@ void POA_CORBA::StructDef_tie<T>::name  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::StructDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2118,7 +1950,6 @@ char * POA_CORBA::StructDef_tie<T>::version  (
 template <class T> ACE_INLINE
 void POA_CORBA::StructDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2126,7 +1957,6 @@ void POA_CORBA::StructDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2135,14 +1965,12 @@ void POA_CORBA::StructDef_tie<T>::version  (
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::StructDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2151,14 +1979,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::StructDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2167,14 +1993,12 @@ char * POA_CORBA::StructDef_tie<T>::absolute_name  (
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::StructDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2183,14 +2007,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::StructDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2202,7 +2024,6 @@ void POA_CORBA::StructDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2212,7 +2033,6 @@ void POA_CORBA::StructDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2221,14 +2041,12 @@ void POA_CORBA::StructDef_tie<T>::move  (
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::StructDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2238,7 +2056,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::StructDef_tie<T>::lookup  (
     const char * search_name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2246,7 +2063,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup (
     search_name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2257,7 +2073,6 @@ template <class T> ACE_INLINE
 ::CORBA::ContainedSeq * POA_CORBA::StructDef_tie<T>::contents  (
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2266,7 +2081,6 @@ template <class T> ACE_INLINE
   return this->ptr_->contents (
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2279,7 +2093,6 @@ template <class T> ACE_INLINE
     ::CORBA::Long levels_to_search,
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2290,7 +2103,6 @@ template <class T> ACE_INLINE
     levels_to_search,
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2302,7 +2114,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2312,7 +2123,6 @@ template <class T> ACE_INLINE
     limit_type,
     exclude_inherited,
     max_returned_objs
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2324,7 +2134,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2334,7 +2143,6 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2348,7 +2156,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2360,7 +2167,6 @@ template <class T> ACE_INLINE
     version,
     type,
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2373,7 +2179,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2384,7 +2189,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2398,7 +2202,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2410,7 +2213,6 @@ template <class T> ACE_INLINE
     version,
     discriminator_type,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2423,7 +2225,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2434,7 +2235,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2447,7 +2247,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2458,7 +2257,6 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2471,7 +2269,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2482,7 +2279,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2501,7 +2297,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2518,7 +2313,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2531,7 +2325,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2542,7 +2335,6 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2555,7 +2347,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2566,7 +2357,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2578,7 +2368,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2588,7 +2377,6 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2601,7 +2389,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2612,7 +2399,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2625,7 +2411,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2636,7 +2421,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2655,7 +2439,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2672,7 +2455,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2681,14 +2463,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::StructMemberSeq * POA_CORBA::StructDef_tie<T>::members  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->members (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2698,7 +2478,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::StructDef_tie<T>::members  (
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2706,7 +2485,6 @@ void POA_CORBA::StructDef_tie<T>::members  (
 {
   this->ptr_->members (
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2808,14 +2586,12 @@ POA_CORBA::UnionDef_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::UnionDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2824,14 +2600,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::UnionDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2840,14 +2614,12 @@ void POA_CORBA::UnionDef_tie<T>::destroy  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::UnionDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2857,7 +2629,6 @@ char * POA_CORBA::UnionDef_tie<T>::id  (
 template <class T> ACE_INLINE
 void POA_CORBA::UnionDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2865,7 +2636,6 @@ void POA_CORBA::UnionDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2874,14 +2644,12 @@ void POA_CORBA::UnionDef_tie<T>::id  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::UnionDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2891,7 +2659,6 @@ char * POA_CORBA::UnionDef_tie<T>::name  (
 template <class T> ACE_INLINE
 void POA_CORBA::UnionDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2899,7 +2666,6 @@ void POA_CORBA::UnionDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2908,14 +2674,12 @@ void POA_CORBA::UnionDef_tie<T>::name  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::UnionDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2925,7 +2689,6 @@ char * POA_CORBA::UnionDef_tie<T>::version  (
 template <class T> ACE_INLINE
 void POA_CORBA::UnionDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2933,7 +2696,6 @@ void POA_CORBA::UnionDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2942,14 +2704,12 @@ void POA_CORBA::UnionDef_tie<T>::version  (
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::UnionDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2958,14 +2718,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::UnionDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2974,14 +2732,12 @@ char * POA_CORBA::UnionDef_tie<T>::absolute_name  (
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::UnionDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2990,14 +2746,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::UnionDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3009,7 +2763,6 @@ void POA_CORBA::UnionDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3019,7 +2772,6 @@ void POA_CORBA::UnionDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3028,14 +2780,12 @@ void POA_CORBA::UnionDef_tie<T>::move  (
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::UnionDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3045,7 +2795,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::UnionDef_tie<T>::lookup  (
     const char * search_name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3053,7 +2802,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup (
     search_name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3064,7 +2812,6 @@ template <class T> ACE_INLINE
 ::CORBA::ContainedSeq * POA_CORBA::UnionDef_tie<T>::contents  (
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3073,7 +2820,6 @@ template <class T> ACE_INLINE
   return this->ptr_->contents (
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3086,7 +2832,6 @@ template <class T> ACE_INLINE
     ::CORBA::Long levels_to_search,
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3097,7 +2842,6 @@ template <class T> ACE_INLINE
     levels_to_search,
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3109,7 +2853,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3119,7 +2862,6 @@ template <class T> ACE_INLINE
     limit_type,
     exclude_inherited,
     max_returned_objs
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3131,7 +2873,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3141,7 +2882,6 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3155,7 +2895,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3167,7 +2906,6 @@ template <class T> ACE_INLINE
     version,
     type,
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3180,7 +2918,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3191,7 +2928,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3205,7 +2941,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3217,7 +2952,6 @@ template <class T> ACE_INLINE
     version,
     discriminator_type,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3230,7 +2964,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3241,7 +2974,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3254,7 +2986,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3265,7 +2996,6 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3278,7 +3008,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3289,7 +3018,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3308,7 +3036,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3325,7 +3052,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3338,7 +3064,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3349,7 +3074,6 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3362,7 +3086,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3373,7 +3096,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3385,7 +3107,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3395,7 +3116,6 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3408,7 +3128,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3419,7 +3138,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3432,7 +3150,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3443,7 +3160,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3462,7 +3178,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3479,7 +3194,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3488,14 +3202,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::UnionDef_tie<T>::discriminator_type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->discriminator_type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3504,14 +3216,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::IDLType_ptr POA_CORBA::UnionDef_tie<T>::discriminator_type_def  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->discriminator_type_def (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3521,7 +3231,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::UnionDef_tie<T>::discriminator_type_def  (
     ::CORBA::IDLType_ptr discriminator_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3529,7 +3238,6 @@ void POA_CORBA::UnionDef_tie<T>::discriminator_type_def  (
 {
   this->ptr_->discriminator_type_def (
     discriminator_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3538,14 +3246,12 @@ void POA_CORBA::UnionDef_tie<T>::discriminator_type_def  (
 
 template <class T> ACE_INLINE
 ::CORBA::UnionMemberSeq * POA_CORBA::UnionDef_tie<T>::members  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->members (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3555,7 +3261,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::UnionDef_tie<T>::members  (
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3563,7 +3268,6 @@ void POA_CORBA::UnionDef_tie<T>::members  (
 {
   this->ptr_->members (
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3665,14 +3369,12 @@ POA_CORBA::EnumDef_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::EnumDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3681,14 +3383,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::EnumDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3697,14 +3397,12 @@ void POA_CORBA::EnumDef_tie<T>::destroy  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::EnumDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3714,7 +3412,6 @@ char * POA_CORBA::EnumDef_tie<T>::id  (
 template <class T> ACE_INLINE
 void POA_CORBA::EnumDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3722,7 +3419,6 @@ void POA_CORBA::EnumDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3731,14 +3427,12 @@ void POA_CORBA::EnumDef_tie<T>::id  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::EnumDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3748,7 +3442,6 @@ char * POA_CORBA::EnumDef_tie<T>::name  (
 template <class T> ACE_INLINE
 void POA_CORBA::EnumDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3756,7 +3449,6 @@ void POA_CORBA::EnumDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3765,14 +3457,12 @@ void POA_CORBA::EnumDef_tie<T>::name  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::EnumDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3782,7 +3472,6 @@ char * POA_CORBA::EnumDef_tie<T>::version  (
 template <class T> ACE_INLINE
 void POA_CORBA::EnumDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3790,7 +3479,6 @@ void POA_CORBA::EnumDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3799,14 +3487,12 @@ void POA_CORBA::EnumDef_tie<T>::version  (
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::EnumDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3815,14 +3501,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::EnumDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3831,14 +3515,12 @@ char * POA_CORBA::EnumDef_tie<T>::absolute_name  (
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::EnumDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3847,14 +3529,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::EnumDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3866,7 +3546,6 @@ void POA_CORBA::EnumDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3876,7 +3555,6 @@ void POA_CORBA::EnumDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3885,14 +3563,12 @@ void POA_CORBA::EnumDef_tie<T>::move  (
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::EnumDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3901,14 +3577,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::EnumMemberSeq * POA_CORBA::EnumDef_tie<T>::members  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->members (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3918,7 +3592,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::EnumDef_tie<T>::members  (
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3926,7 +3599,6 @@ void POA_CORBA::EnumDef_tie<T>::members  (
 {
   this->ptr_->members (
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4028,14 +3700,12 @@ POA_CORBA::AliasDef_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::AliasDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4044,14 +3714,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::AliasDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4060,14 +3728,12 @@ void POA_CORBA::AliasDef_tie<T>::destroy  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::AliasDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4077,7 +3743,6 @@ char * POA_CORBA::AliasDef_tie<T>::id  (
 template <class T> ACE_INLINE
 void POA_CORBA::AliasDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4085,7 +3750,6 @@ void POA_CORBA::AliasDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4094,14 +3758,12 @@ void POA_CORBA::AliasDef_tie<T>::id  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::AliasDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4111,7 +3773,6 @@ char * POA_CORBA::AliasDef_tie<T>::name  (
 template <class T> ACE_INLINE
 void POA_CORBA::AliasDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4119,7 +3780,6 @@ void POA_CORBA::AliasDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4128,14 +3788,12 @@ void POA_CORBA::AliasDef_tie<T>::name  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::AliasDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4145,7 +3803,6 @@ char * POA_CORBA::AliasDef_tie<T>::version  (
 template <class T> ACE_INLINE
 void POA_CORBA::AliasDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4153,7 +3810,6 @@ void POA_CORBA::AliasDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4162,14 +3818,12 @@ void POA_CORBA::AliasDef_tie<T>::version  (
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::AliasDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4178,14 +3832,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::AliasDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4194,14 +3846,12 @@ char * POA_CORBA::AliasDef_tie<T>::absolute_name  (
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::AliasDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4210,14 +3860,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::AliasDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4229,7 +3877,6 @@ void POA_CORBA::AliasDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4239,7 +3886,6 @@ void POA_CORBA::AliasDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4248,14 +3894,12 @@ void POA_CORBA::AliasDef_tie<T>::move  (
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::AliasDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4264,14 +3908,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::IDLType_ptr POA_CORBA::AliasDef_tie<T>::original_type_def  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->original_type_def (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4281,7 +3923,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::AliasDef_tie<T>::original_type_def  (
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4289,7 +3930,6 @@ void POA_CORBA::AliasDef_tie<T>::original_type_def  (
 {
   this->ptr_->original_type_def (
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4391,14 +4031,12 @@ POA_CORBA::NativeDef_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::NativeDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4407,14 +4045,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::NativeDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4423,14 +4059,12 @@ void POA_CORBA::NativeDef_tie<T>::destroy  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::NativeDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4440,7 +4074,6 @@ char * POA_CORBA::NativeDef_tie<T>::id  (
 template <class T> ACE_INLINE
 void POA_CORBA::NativeDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4448,7 +4081,6 @@ void POA_CORBA::NativeDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4457,14 +4089,12 @@ void POA_CORBA::NativeDef_tie<T>::id  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::NativeDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4474,7 +4104,6 @@ char * POA_CORBA::NativeDef_tie<T>::name  (
 template <class T> ACE_INLINE
 void POA_CORBA::NativeDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4482,7 +4111,6 @@ void POA_CORBA::NativeDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4491,14 +4119,12 @@ void POA_CORBA::NativeDef_tie<T>::name  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::NativeDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4508,7 +4134,6 @@ char * POA_CORBA::NativeDef_tie<T>::version  (
 template <class T> ACE_INLINE
 void POA_CORBA::NativeDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4516,7 +4141,6 @@ void POA_CORBA::NativeDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4525,14 +4149,12 @@ void POA_CORBA::NativeDef_tie<T>::version  (
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::NativeDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4541,14 +4163,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::NativeDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4557,14 +4177,12 @@ char * POA_CORBA::NativeDef_tie<T>::absolute_name  (
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::NativeDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4573,14 +4191,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::NativeDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4592,7 +4208,6 @@ void POA_CORBA::NativeDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4602,7 +4217,6 @@ void POA_CORBA::NativeDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4611,14 +4225,12 @@ void POA_CORBA::NativeDef_tie<T>::move  (
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::NativeDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4720,14 +4332,12 @@ POA_CORBA::PrimitiveDef_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::PrimitiveDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4736,14 +4346,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::PrimitiveDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4752,14 +4360,12 @@ void POA_CORBA::PrimitiveDef_tie<T>::destroy  (
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::PrimitiveDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4768,14 +4374,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::PrimitiveKind POA_CORBA::PrimitiveDef_tie<T>::kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4877,14 +4481,12 @@ POA_CORBA::StringDef_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::StringDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4893,14 +4495,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::StringDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4909,14 +4509,12 @@ void POA_CORBA::StringDef_tie<T>::destroy  (
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::StringDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4925,14 +4523,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::ULong POA_CORBA::StringDef_tie<T>::bound  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->bound (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4942,7 +4538,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::StringDef_tie<T>::bound  (
     ::CORBA::ULong bound
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4950,7 +4545,6 @@ void POA_CORBA::StringDef_tie<T>::bound  (
 {
   this->ptr_->bound (
     bound
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5052,14 +4646,12 @@ POA_CORBA::WstringDef_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::WstringDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5068,14 +4660,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::WstringDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5084,14 +4674,12 @@ void POA_CORBA::WstringDef_tie<T>::destroy  (
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::WstringDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5100,14 +4688,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::ULong POA_CORBA::WstringDef_tie<T>::bound  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->bound (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5117,7 +4703,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::WstringDef_tie<T>::bound  (
     ::CORBA::ULong bound
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5125,7 +4710,6 @@ void POA_CORBA::WstringDef_tie<T>::bound  (
 {
   this->ptr_->bound (
     bound
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5227,14 +4811,12 @@ POA_CORBA::SequenceDef_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::SequenceDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5243,14 +4825,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::SequenceDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5259,14 +4839,12 @@ void POA_CORBA::SequenceDef_tie<T>::destroy  (
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::SequenceDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5275,14 +4853,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::ULong POA_CORBA::SequenceDef_tie<T>::bound  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->bound (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5292,7 +4868,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::SequenceDef_tie<T>::bound  (
     ::CORBA::ULong bound
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5300,7 +4875,6 @@ void POA_CORBA::SequenceDef_tie<T>::bound  (
 {
   this->ptr_->bound (
     bound
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5309,14 +4883,12 @@ void POA_CORBA::SequenceDef_tie<T>::bound  (
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::SequenceDef_tie<T>::element_type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->element_type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5325,14 +4897,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::IDLType_ptr POA_CORBA::SequenceDef_tie<T>::element_type_def  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->element_type_def (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5342,7 +4912,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::SequenceDef_tie<T>::element_type_def  (
     ::CORBA::IDLType_ptr element_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5350,7 +4919,6 @@ void POA_CORBA::SequenceDef_tie<T>::element_type_def  (
 {
   this->ptr_->element_type_def (
     element_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5452,14 +5020,12 @@ POA_CORBA::ArrayDef_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ArrayDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5468,14 +5034,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::ArrayDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5484,14 +5048,12 @@ void POA_CORBA::ArrayDef_tie<T>::destroy  (
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ArrayDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5500,14 +5062,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::ULong POA_CORBA::ArrayDef_tie<T>::length  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->length (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5517,7 +5077,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ArrayDef_tie<T>::length  (
     ::CORBA::ULong length
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5525,7 +5084,6 @@ void POA_CORBA::ArrayDef_tie<T>::length  (
 {
   this->ptr_->length (
     length
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5534,14 +5092,12 @@ void POA_CORBA::ArrayDef_tie<T>::length  (
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ArrayDef_tie<T>::element_type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->element_type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5550,14 +5106,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::IDLType_ptr POA_CORBA::ArrayDef_tie<T>::element_type_def  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->element_type_def (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5567,7 +5121,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ArrayDef_tie<T>::element_type_def  (
     ::CORBA::IDLType_ptr element_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5575,7 +5128,6 @@ void POA_CORBA::ArrayDef_tie<T>::element_type_def  (
 {
   this->ptr_->element_type_def (
     element_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5677,14 +5229,12 @@ POA_CORBA::ExceptionDef_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ExceptionDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5693,14 +5243,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExceptionDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5709,14 +5257,12 @@ void POA_CORBA::ExceptionDef_tie<T>::destroy  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExceptionDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5726,7 +5272,6 @@ char * POA_CORBA::ExceptionDef_tie<T>::id  (
 template <class T> ACE_INLINE
 void POA_CORBA::ExceptionDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5734,7 +5279,6 @@ void POA_CORBA::ExceptionDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5743,14 +5287,12 @@ void POA_CORBA::ExceptionDef_tie<T>::id  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExceptionDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5760,7 +5302,6 @@ char * POA_CORBA::ExceptionDef_tie<T>::name  (
 template <class T> ACE_INLINE
 void POA_CORBA::ExceptionDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5768,7 +5309,6 @@ void POA_CORBA::ExceptionDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5777,14 +5317,12 @@ void POA_CORBA::ExceptionDef_tie<T>::name  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExceptionDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5794,7 +5332,6 @@ char * POA_CORBA::ExceptionDef_tie<T>::version  (
 template <class T> ACE_INLINE
 void POA_CORBA::ExceptionDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5802,7 +5339,6 @@ void POA_CORBA::ExceptionDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5811,14 +5347,12 @@ void POA_CORBA::ExceptionDef_tie<T>::version  (
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ExceptionDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5827,14 +5361,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExceptionDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5843,14 +5375,12 @@ char * POA_CORBA::ExceptionDef_tie<T>::absolute_name  (
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ExceptionDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5859,14 +5389,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ExceptionDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5878,7 +5406,6 @@ void POA_CORBA::ExceptionDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5888,7 +5415,6 @@ void POA_CORBA::ExceptionDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5898,7 +5424,6 @@ void POA_CORBA::ExceptionDef_tie<T>::move  (
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ExceptionDef_tie<T>::lookup  (
     const char * search_name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5906,7 +5431,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup (
     search_name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5917,7 +5441,6 @@ template <class T> ACE_INLINE
 ::CORBA::ContainedSeq * POA_CORBA::ExceptionDef_tie<T>::contents  (
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5926,7 +5449,6 @@ template <class T> ACE_INLINE
   return this->ptr_->contents (
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5939,7 +5461,6 @@ template <class T> ACE_INLINE
     ::CORBA::Long levels_to_search,
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5950,7 +5471,6 @@ template <class T> ACE_INLINE
     levels_to_search,
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5962,7 +5482,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5972,7 +5491,6 @@ template <class T> ACE_INLINE
     limit_type,
     exclude_inherited,
     max_returned_objs
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5984,7 +5502,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5994,7 +5511,6 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6008,7 +5524,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6020,7 +5535,6 @@ template <class T> ACE_INLINE
     version,
     type,
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6033,7 +5547,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6044,7 +5557,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6058,7 +5570,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6070,7 +5581,6 @@ template <class T> ACE_INLINE
     version,
     discriminator_type,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6083,7 +5593,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6094,7 +5603,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6107,7 +5615,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6118,7 +5625,6 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6131,7 +5637,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6142,7 +5647,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6161,7 +5665,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6178,7 +5681,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6191,7 +5693,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6202,7 +5703,6 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6215,7 +5715,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6226,7 +5725,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6238,7 +5736,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6248,7 +5745,6 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6261,7 +5757,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6272,7 +5767,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6285,7 +5779,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6296,7 +5789,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6315,7 +5807,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6332,7 +5823,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6341,14 +5831,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ExceptionDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6357,14 +5845,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::StructMemberSeq * POA_CORBA::ExceptionDef_tie<T>::members  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->members (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6374,7 +5860,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ExceptionDef_tie<T>::members  (
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6382,7 +5867,6 @@ void POA_CORBA::ExceptionDef_tie<T>::members  (
 {
   this->ptr_->members (
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6484,14 +5968,12 @@ POA_CORBA::AttributeDef_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::AttributeDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6500,14 +5982,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::AttributeDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6516,14 +5996,12 @@ void POA_CORBA::AttributeDef_tie<T>::destroy  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::AttributeDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6533,7 +6011,6 @@ char * POA_CORBA::AttributeDef_tie<T>::id  (
 template <class T> ACE_INLINE
 void POA_CORBA::AttributeDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6541,7 +6018,6 @@ void POA_CORBA::AttributeDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6550,14 +6026,12 @@ void POA_CORBA::AttributeDef_tie<T>::id  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::AttributeDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6567,7 +6041,6 @@ char * POA_CORBA::AttributeDef_tie<T>::name  (
 template <class T> ACE_INLINE
 void POA_CORBA::AttributeDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6575,7 +6048,6 @@ void POA_CORBA::AttributeDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6584,14 +6056,12 @@ void POA_CORBA::AttributeDef_tie<T>::name  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::AttributeDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6601,7 +6071,6 @@ char * POA_CORBA::AttributeDef_tie<T>::version  (
 template <class T> ACE_INLINE
 void POA_CORBA::AttributeDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6609,7 +6078,6 @@ void POA_CORBA::AttributeDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6618,14 +6086,12 @@ void POA_CORBA::AttributeDef_tie<T>::version  (
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::AttributeDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6634,14 +6100,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::AttributeDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6650,14 +6114,12 @@ char * POA_CORBA::AttributeDef_tie<T>::absolute_name  (
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::AttributeDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6666,14 +6128,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::AttributeDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6685,7 +6145,6 @@ void POA_CORBA::AttributeDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6695,7 +6154,6 @@ void POA_CORBA::AttributeDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6704,14 +6162,12 @@ void POA_CORBA::AttributeDef_tie<T>::move  (
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::AttributeDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6720,14 +6176,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::IDLType_ptr POA_CORBA::AttributeDef_tie<T>::type_def  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type_def (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6737,7 +6191,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::AttributeDef_tie<T>::type_def  (
     ::CORBA::IDLType_ptr type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6745,7 +6198,6 @@ void POA_CORBA::AttributeDef_tie<T>::type_def  (
 {
   this->ptr_->type_def (
     type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6754,14 +6206,12 @@ void POA_CORBA::AttributeDef_tie<T>::type_def  (
 
 template <class T> ACE_INLINE
 ::CORBA::AttributeMode POA_CORBA::AttributeDef_tie<T>::mode  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->mode (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6771,7 +6221,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::AttributeDef_tie<T>::mode  (
     ::CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6779,7 +6228,6 @@ void POA_CORBA::AttributeDef_tie<T>::mode  (
 {
   this->ptr_->mode (
     mode
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6881,14 +6329,12 @@ POA_CORBA::ExtAttributeDef_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ExtAttributeDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6897,14 +6343,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExtAttributeDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6913,14 +6357,12 @@ void POA_CORBA::ExtAttributeDef_tie<T>::destroy  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtAttributeDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6930,7 +6372,6 @@ char * POA_CORBA::ExtAttributeDef_tie<T>::id  (
 template <class T> ACE_INLINE
 void POA_CORBA::ExtAttributeDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6938,7 +6379,6 @@ void POA_CORBA::ExtAttributeDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6947,14 +6387,12 @@ void POA_CORBA::ExtAttributeDef_tie<T>::id  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtAttributeDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6964,7 +6402,6 @@ char * POA_CORBA::ExtAttributeDef_tie<T>::name  (
 template <class T> ACE_INLINE
 void POA_CORBA::ExtAttributeDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6972,7 +6409,6 @@ void POA_CORBA::ExtAttributeDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6981,14 +6417,12 @@ void POA_CORBA::ExtAttributeDef_tie<T>::name  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtAttributeDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6998,7 +6432,6 @@ char * POA_CORBA::ExtAttributeDef_tie<T>::version  (
 template <class T> ACE_INLINE
 void POA_CORBA::ExtAttributeDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7006,7 +6439,6 @@ void POA_CORBA::ExtAttributeDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7015,14 +6447,12 @@ void POA_CORBA::ExtAttributeDef_tie<T>::version  (
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ExtAttributeDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7031,14 +6461,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtAttributeDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7047,14 +6475,12 @@ char * POA_CORBA::ExtAttributeDef_tie<T>::absolute_name  (
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ExtAttributeDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7063,14 +6489,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ExtAttributeDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7082,7 +6506,6 @@ void POA_CORBA::ExtAttributeDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7092,7 +6515,6 @@ void POA_CORBA::ExtAttributeDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7101,14 +6523,12 @@ void POA_CORBA::ExtAttributeDef_tie<T>::move  (
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ExtAttributeDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7117,14 +6537,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::IDLType_ptr POA_CORBA::ExtAttributeDef_tie<T>::type_def  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type_def (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7134,7 +6552,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ExtAttributeDef_tie<T>::type_def  (
     ::CORBA::IDLType_ptr type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7142,7 +6559,6 @@ void POA_CORBA::ExtAttributeDef_tie<T>::type_def  (
 {
   this->ptr_->type_def (
     type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7151,14 +6567,12 @@ void POA_CORBA::ExtAttributeDef_tie<T>::type_def  (
 
 template <class T> ACE_INLINE
 ::CORBA::AttributeMode POA_CORBA::ExtAttributeDef_tie<T>::mode  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->mode (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7168,7 +6582,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ExtAttributeDef_tie<T>::mode  (
     ::CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7176,7 +6589,6 @@ void POA_CORBA::ExtAttributeDef_tie<T>::mode  (
 {
   this->ptr_->mode (
     mode
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7185,14 +6597,12 @@ void POA_CORBA::ExtAttributeDef_tie<T>::mode  (
 
 template <class T> ACE_INLINE
 ::CORBA::ExcDescriptionSeq * POA_CORBA::ExtAttributeDef_tie<T>::get_exceptions  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->get_exceptions (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7202,7 +6612,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ExtAttributeDef_tie<T>::get_exceptions  (
     const ::CORBA::ExcDescriptionSeq & get_exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7210,7 +6619,6 @@ void POA_CORBA::ExtAttributeDef_tie<T>::get_exceptions  (
 {
   this->ptr_->get_exceptions (
     get_exceptions
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7219,14 +6627,12 @@ void POA_CORBA::ExtAttributeDef_tie<T>::get_exceptions  (
 
 template <class T> ACE_INLINE
 ::CORBA::ExcDescriptionSeq * POA_CORBA::ExtAttributeDef_tie<T>::set_exceptions  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->set_exceptions (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7236,7 +6642,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ExtAttributeDef_tie<T>::set_exceptions  (
     const ::CORBA::ExcDescriptionSeq & set_exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7244,7 +6649,6 @@ void POA_CORBA::ExtAttributeDef_tie<T>::set_exceptions  (
 {
   this->ptr_->set_exceptions (
     set_exceptions
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7253,14 +6657,12 @@ void POA_CORBA::ExtAttributeDef_tie<T>::set_exceptions  (
 
 template <class T> ACE_INLINE
 ::CORBA::ExtAttributeDescription * POA_CORBA::ExtAttributeDef_tie<T>::describe_attribute  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe_attribute (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7362,14 +6764,12 @@ POA_CORBA::OperationDef_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::OperationDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7378,14 +6778,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::OperationDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7394,14 +6792,12 @@ void POA_CORBA::OperationDef_tie<T>::destroy  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::OperationDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7411,7 +6807,6 @@ char * POA_CORBA::OperationDef_tie<T>::id  (
 template <class T> ACE_INLINE
 void POA_CORBA::OperationDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7419,7 +6814,6 @@ void POA_CORBA::OperationDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7428,14 +6822,12 @@ void POA_CORBA::OperationDef_tie<T>::id  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::OperationDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7445,7 +6837,6 @@ char * POA_CORBA::OperationDef_tie<T>::name  (
 template <class T> ACE_INLINE
 void POA_CORBA::OperationDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7453,7 +6844,6 @@ void POA_CORBA::OperationDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7462,14 +6852,12 @@ void POA_CORBA::OperationDef_tie<T>::name  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::OperationDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7479,7 +6867,6 @@ char * POA_CORBA::OperationDef_tie<T>::version  (
 template <class T> ACE_INLINE
 void POA_CORBA::OperationDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7487,7 +6874,6 @@ void POA_CORBA::OperationDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7496,14 +6882,12 @@ void POA_CORBA::OperationDef_tie<T>::version  (
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::OperationDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7512,14 +6896,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::OperationDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7528,14 +6910,12 @@ char * POA_CORBA::OperationDef_tie<T>::absolute_name  (
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::OperationDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7544,14 +6924,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::OperationDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7563,7 +6941,6 @@ void POA_CORBA::OperationDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7573,7 +6950,6 @@ void POA_CORBA::OperationDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7582,14 +6958,12 @@ void POA_CORBA::OperationDef_tie<T>::move  (
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::OperationDef_tie<T>::result  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->result (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7598,14 +6972,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::IDLType_ptr POA_CORBA::OperationDef_tie<T>::result_def  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->result_def (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7615,7 +6987,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::OperationDef_tie<T>::result_def  (
     ::CORBA::IDLType_ptr result_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7623,7 +6994,6 @@ void POA_CORBA::OperationDef_tie<T>::result_def  (
 {
   this->ptr_->result_def (
     result_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7632,14 +7002,12 @@ void POA_CORBA::OperationDef_tie<T>::result_def  (
 
 template <class T> ACE_INLINE
 ::CORBA::ParDescriptionSeq * POA_CORBA::OperationDef_tie<T>::params  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->params (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7649,7 +7017,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::OperationDef_tie<T>::params  (
     const ::CORBA::ParDescriptionSeq & params
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7657,7 +7024,6 @@ void POA_CORBA::OperationDef_tie<T>::params  (
 {
   this->ptr_->params (
     params
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7666,14 +7032,12 @@ void POA_CORBA::OperationDef_tie<T>::params  (
 
 template <class T> ACE_INLINE
 ::CORBA::OperationMode POA_CORBA::OperationDef_tie<T>::mode  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->mode (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7683,7 +7047,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::OperationDef_tie<T>::mode  (
     ::CORBA::OperationMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7691,7 +7054,6 @@ void POA_CORBA::OperationDef_tie<T>::mode  (
 {
   this->ptr_->mode (
     mode
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7700,14 +7062,12 @@ void POA_CORBA::OperationDef_tie<T>::mode  (
 
 template <class T> ACE_INLINE
 ::CORBA::ContextIdSeq * POA_CORBA::OperationDef_tie<T>::contexts  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->contexts (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7717,7 +7077,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::OperationDef_tie<T>::contexts  (
     const ::CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7725,7 +7084,6 @@ void POA_CORBA::OperationDef_tie<T>::contexts  (
 {
   this->ptr_->contexts (
     contexts
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7734,14 +7092,12 @@ void POA_CORBA::OperationDef_tie<T>::contexts  (
 
 template <class T> ACE_INLINE
 ::CORBA::ExceptionDefSeq * POA_CORBA::OperationDef_tie<T>::exceptions  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->exceptions (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7751,7 +7107,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::OperationDef_tie<T>::exceptions  (
     const ::CORBA::ExceptionDefSeq & exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7759,7 +7114,6 @@ void POA_CORBA::OperationDef_tie<T>::exceptions  (
 {
   this->ptr_->exceptions (
     exceptions
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7861,14 +7215,12 @@ POA_CORBA::InterfaceDef_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::InterfaceDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7877,14 +7229,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::InterfaceDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7894,7 +7244,6 @@ void POA_CORBA::InterfaceDef_tie<T>::destroy  (
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::InterfaceDef_tie<T>::lookup  (
     const char * search_name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7902,7 +7251,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup (
     search_name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7913,7 +7261,6 @@ template <class T> ACE_INLINE
 ::CORBA::ContainedSeq * POA_CORBA::InterfaceDef_tie<T>::contents  (
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7922,7 +7269,6 @@ template <class T> ACE_INLINE
   return this->ptr_->contents (
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7935,7 +7281,6 @@ template <class T> ACE_INLINE
     ::CORBA::Long levels_to_search,
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7946,7 +7291,6 @@ template <class T> ACE_INLINE
     levels_to_search,
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7958,7 +7302,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7968,7 +7311,6 @@ template <class T> ACE_INLINE
     limit_type,
     exclude_inherited,
     max_returned_objs
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7980,7 +7322,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7990,7 +7331,6 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8004,7 +7344,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8016,7 +7355,6 @@ template <class T> ACE_INLINE
     version,
     type,
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8029,7 +7367,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8040,7 +7377,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8054,7 +7390,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8066,7 +7401,6 @@ template <class T> ACE_INLINE
     version,
     discriminator_type,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8079,7 +7413,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8090,7 +7423,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8103,7 +7435,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8114,7 +7445,6 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8127,7 +7457,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8138,7 +7467,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8157,7 +7485,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8174,7 +7501,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8187,7 +7513,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8198,7 +7523,6 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8211,7 +7535,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8222,7 +7545,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8234,7 +7556,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8244,7 +7565,6 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8257,7 +7577,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8268,7 +7587,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8281,7 +7599,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8292,7 +7609,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8311,7 +7627,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8328,7 +7643,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8337,14 +7651,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::InterfaceDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -8354,7 +7666,6 @@ char * POA_CORBA::InterfaceDef_tie<T>::id  (
 template <class T> ACE_INLINE
 void POA_CORBA::InterfaceDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8362,7 +7673,6 @@ void POA_CORBA::InterfaceDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8371,14 +7681,12 @@ void POA_CORBA::InterfaceDef_tie<T>::id  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::InterfaceDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -8388,7 +7696,6 @@ char * POA_CORBA::InterfaceDef_tie<T>::name  (
 template <class T> ACE_INLINE
 void POA_CORBA::InterfaceDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8396,7 +7703,6 @@ void POA_CORBA::InterfaceDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8405,14 +7711,12 @@ void POA_CORBA::InterfaceDef_tie<T>::name  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::InterfaceDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -8422,7 +7726,6 @@ char * POA_CORBA::InterfaceDef_tie<T>::version  (
 template <class T> ACE_INLINE
 void POA_CORBA::InterfaceDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8430,7 +7733,6 @@ void POA_CORBA::InterfaceDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8439,14 +7741,12 @@ void POA_CORBA::InterfaceDef_tie<T>::version  (
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::InterfaceDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -8455,14 +7755,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::InterfaceDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -8471,14 +7769,12 @@ char * POA_CORBA::InterfaceDef_tie<T>::absolute_name  (
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::InterfaceDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -8487,14 +7783,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::InterfaceDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -8506,7 +7800,6 @@ void POA_CORBA::InterfaceDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8516,7 +7809,6 @@ void POA_CORBA::InterfaceDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8525,14 +7817,12 @@ void POA_CORBA::InterfaceDef_tie<T>::move  (
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::InterfaceDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -8541,14 +7831,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDefSeq * POA_CORBA::InterfaceDef_tie<T>::base_interfaces  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->base_interfaces (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -8558,7 +7846,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::InterfaceDef_tie<T>::base_interfaces  (
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8566,7 +7853,6 @@ void POA_CORBA::InterfaceDef_tie<T>::base_interfaces  (
 {
   this->ptr_->base_interfaces (
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8576,7 +7862,6 @@ void POA_CORBA::InterfaceDef_tie<T>::base_interfaces  (
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::InterfaceDef_tie<T>::is_a  (
     const char * interface_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8584,7 +7869,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->is_a (
     interface_id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8593,14 +7877,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::InterfaceDef_tie<T>::describe_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -8614,7 +7896,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     ::CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8626,7 +7907,6 @@ template <class T> ACE_INLINE
     version,
     type,
     mode
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8643,7 +7923,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ParDescriptionSeq & params,
     const ::CORBA::ExceptionDefSeq & exceptions,
     const ::CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8658,7 +7937,6 @@ template <class T> ACE_INLINE
     params,
     exceptions,
     contexts
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8760,14 +8038,12 @@ POA_CORBA::InterfaceAttrExtension_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * POA_CORBA::InterfaceAttrExtension_tie<T>::describe_ext_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe_ext_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -8783,7 +8059,6 @@ template <class T> ACE_INLINE
     ::CORBA::AttributeMode mode,
     const ::CORBA::ExceptionDefSeq & get_exceptions,
     const ::CORBA::ExceptionDefSeq & set_exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8797,7 +8072,6 @@ template <class T> ACE_INLINE
     mode,
     get_exceptions,
     set_exceptions
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8899,14 +8173,12 @@ POA_CORBA::ExtInterfaceDef_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ExtInterfaceDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -8915,14 +8187,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExtInterfaceDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -8932,7 +8202,6 @@ void POA_CORBA::ExtInterfaceDef_tie<T>::destroy  (
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ExtInterfaceDef_tie<T>::lookup  (
     const char * search_name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8940,7 +8209,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup (
     search_name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8951,7 +8219,6 @@ template <class T> ACE_INLINE
 ::CORBA::ContainedSeq * POA_CORBA::ExtInterfaceDef_tie<T>::contents  (
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8960,7 +8227,6 @@ template <class T> ACE_INLINE
   return this->ptr_->contents (
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8973,7 +8239,6 @@ template <class T> ACE_INLINE
     ::CORBA::Long levels_to_search,
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8984,7 +8249,6 @@ template <class T> ACE_INLINE
     levels_to_search,
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8996,7 +8260,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9006,7 +8269,6 @@ template <class T> ACE_INLINE
     limit_type,
     exclude_inherited,
     max_returned_objs
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -9018,7 +8280,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9028,7 +8289,6 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -9042,7 +8302,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9054,7 +8313,6 @@ template <class T> ACE_INLINE
     version,
     type,
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -9067,7 +8325,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9078,7 +8335,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -9092,7 +8348,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9104,7 +8359,6 @@ template <class T> ACE_INLINE
     version,
     discriminator_type,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -9117,7 +8371,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9128,7 +8381,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -9141,7 +8393,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9152,7 +8403,6 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -9165,7 +8415,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9176,7 +8425,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -9195,7 +8443,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9212,7 +8459,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -9225,7 +8471,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9236,7 +8481,6 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -9249,7 +8493,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9260,7 +8503,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -9272,7 +8514,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9282,7 +8523,6 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -9295,7 +8535,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9306,7 +8545,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -9319,7 +8557,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9330,7 +8567,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -9349,7 +8585,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9366,7 +8601,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -9375,14 +8609,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtInterfaceDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -9392,7 +8624,6 @@ char * POA_CORBA::ExtInterfaceDef_tie<T>::id  (
 template <class T> ACE_INLINE
 void POA_CORBA::ExtInterfaceDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9400,7 +8631,6 @@ void POA_CORBA::ExtInterfaceDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -9409,14 +8639,12 @@ void POA_CORBA::ExtInterfaceDef_tie<T>::id  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtInterfaceDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -9426,7 +8654,6 @@ char * POA_CORBA::ExtInterfaceDef_tie<T>::name  (
 template <class T> ACE_INLINE
 void POA_CORBA::ExtInterfaceDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9434,7 +8661,6 @@ void POA_CORBA::ExtInterfaceDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -9443,14 +8669,12 @@ void POA_CORBA::ExtInterfaceDef_tie<T>::name  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtInterfaceDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -9460,7 +8684,6 @@ char * POA_CORBA::ExtInterfaceDef_tie<T>::version  (
 template <class T> ACE_INLINE
 void POA_CORBA::ExtInterfaceDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9468,7 +8691,6 @@ void POA_CORBA::ExtInterfaceDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -9477,14 +8699,12 @@ void POA_CORBA::ExtInterfaceDef_tie<T>::version  (
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ExtInterfaceDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -9493,14 +8713,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtInterfaceDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -9509,14 +8727,12 @@ char * POA_CORBA::ExtInterfaceDef_tie<T>::absolute_name  (
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ExtInterfaceDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -9525,14 +8741,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ExtInterfaceDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -9544,7 +8758,6 @@ void POA_CORBA::ExtInterfaceDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9554,7 +8767,6 @@ void POA_CORBA::ExtInterfaceDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -9563,14 +8775,12 @@ void POA_CORBA::ExtInterfaceDef_tie<T>::move  (
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ExtInterfaceDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -9579,14 +8789,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDefSeq * POA_CORBA::ExtInterfaceDef_tie<T>::base_interfaces  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->base_interfaces (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -9596,7 +8804,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ExtInterfaceDef_tie<T>::base_interfaces  (
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9604,7 +8811,6 @@ void POA_CORBA::ExtInterfaceDef_tie<T>::base_interfaces  (
 {
   this->ptr_->base_interfaces (
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -9614,7 +8820,6 @@ void POA_CORBA::ExtInterfaceDef_tie<T>::base_interfaces  (
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ExtInterfaceDef_tie<T>::is_a  (
     const char * interface_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9622,7 +8827,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->is_a (
     interface_id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -9631,14 +8835,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::ExtInterfaceDef_tie<T>::describe_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -9652,7 +8854,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     ::CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9664,7 +8865,6 @@ template <class T> ACE_INLINE
     version,
     type,
     mode
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -9681,7 +8881,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ParDescriptionSeq & params,
     const ::CORBA::ExceptionDefSeq & exceptions,
     const ::CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9696,7 +8895,6 @@ template <class T> ACE_INLINE
     params,
     exceptions,
     contexts
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -9705,14 +8903,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * POA_CORBA::ExtInterfaceDef_tie<T>::describe_ext_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe_ext_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -9728,7 +8924,6 @@ template <class T> ACE_INLINE
     ::CORBA::AttributeMode mode,
     const ::CORBA::ExceptionDefSeq & get_exceptions,
     const ::CORBA::ExceptionDefSeq & set_exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9742,7 +8937,6 @@ template <class T> ACE_INLINE
     mode,
     get_exceptions,
     set_exceptions
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -9844,14 +9038,12 @@ POA_CORBA::AbstractInterfaceDef_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::AbstractInterfaceDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -9860,14 +9052,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::AbstractInterfaceDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -9877,7 +9067,6 @@ void POA_CORBA::AbstractInterfaceDef_tie<T>::destroy  (
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::lookup  (
     const char * search_name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9885,7 +9074,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup (
     search_name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -9896,7 +9084,6 @@ template <class T> ACE_INLINE
 ::CORBA::ContainedSeq * POA_CORBA::AbstractInterfaceDef_tie<T>::contents  (
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9905,7 +9092,6 @@ template <class T> ACE_INLINE
   return this->ptr_->contents (
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -9918,7 +9104,6 @@ template <class T> ACE_INLINE
     ::CORBA::Long levels_to_search,
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9929,7 +9114,6 @@ template <class T> ACE_INLINE
     levels_to_search,
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -9941,7 +9125,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9951,7 +9134,6 @@ template <class T> ACE_INLINE
     limit_type,
     exclude_inherited,
     max_returned_objs
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -9963,7 +9145,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9973,7 +9154,6 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -9987,7 +9167,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9999,7 +9178,6 @@ template <class T> ACE_INLINE
     version,
     type,
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -10012,7 +9190,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10023,7 +9200,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -10037,7 +9213,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10049,7 +9224,6 @@ template <class T> ACE_INLINE
     version,
     discriminator_type,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -10062,7 +9236,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10073,7 +9246,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -10086,7 +9258,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10097,7 +9268,6 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -10110,7 +9280,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10121,7 +9290,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -10140,7 +9308,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10157,7 +9324,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -10170,7 +9336,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10181,7 +9346,6 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -10194,7 +9358,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10205,7 +9368,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -10217,7 +9379,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10227,7 +9388,6 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -10240,7 +9400,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10251,7 +9410,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -10264,7 +9422,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10275,7 +9432,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -10294,7 +9450,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10311,7 +9466,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -10320,14 +9474,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::AbstractInterfaceDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -10337,7 +9489,6 @@ char * POA_CORBA::AbstractInterfaceDef_tie<T>::id  (
 template <class T> ACE_INLINE
 void POA_CORBA::AbstractInterfaceDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10345,7 +9496,6 @@ void POA_CORBA::AbstractInterfaceDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -10354,14 +9504,12 @@ void POA_CORBA::AbstractInterfaceDef_tie<T>::id  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::AbstractInterfaceDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -10371,7 +9519,6 @@ char * POA_CORBA::AbstractInterfaceDef_tie<T>::name  (
 template <class T> ACE_INLINE
 void POA_CORBA::AbstractInterfaceDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10379,7 +9526,6 @@ void POA_CORBA::AbstractInterfaceDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -10388,14 +9534,12 @@ void POA_CORBA::AbstractInterfaceDef_tie<T>::name  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::AbstractInterfaceDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -10405,7 +9549,6 @@ char * POA_CORBA::AbstractInterfaceDef_tie<T>::version  (
 template <class T> ACE_INLINE
 void POA_CORBA::AbstractInterfaceDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10413,7 +9556,6 @@ void POA_CORBA::AbstractInterfaceDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -10422,14 +9564,12 @@ void POA_CORBA::AbstractInterfaceDef_tie<T>::version  (
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -10438,14 +9578,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::AbstractInterfaceDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -10454,14 +9592,12 @@ char * POA_CORBA::AbstractInterfaceDef_tie<T>::absolute_name  (
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -10470,14 +9606,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::AbstractInterfaceDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -10489,7 +9623,6 @@ void POA_CORBA::AbstractInterfaceDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10499,7 +9632,6 @@ void POA_CORBA::AbstractInterfaceDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -10508,14 +9640,12 @@ void POA_CORBA::AbstractInterfaceDef_tie<T>::move  (
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -10524,14 +9654,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDefSeq * POA_CORBA::AbstractInterfaceDef_tie<T>::base_interfaces  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->base_interfaces (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -10541,7 +9669,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::AbstractInterfaceDef_tie<T>::base_interfaces  (
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10549,7 +9676,6 @@ void POA_CORBA::AbstractInterfaceDef_tie<T>::base_interfaces  (
 {
   this->ptr_->base_interfaces (
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -10559,7 +9685,6 @@ void POA_CORBA::AbstractInterfaceDef_tie<T>::base_interfaces  (
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::AbstractInterfaceDef_tie<T>::is_a  (
     const char * interface_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10567,7 +9692,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->is_a (
     interface_id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -10576,14 +9700,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::AbstractInterfaceDef_tie<T>::describe_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -10597,7 +9719,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     ::CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10609,7 +9730,6 @@ template <class T> ACE_INLINE
     version,
     type,
     mode
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -10626,7 +9746,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ParDescriptionSeq & params,
     const ::CORBA::ExceptionDefSeq & exceptions,
     const ::CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10641,7 +9760,6 @@ template <class T> ACE_INLINE
     params,
     exceptions,
     contexts
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -10743,14 +9861,12 @@ POA_CORBA::ExtAbstractInterfaceDef_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ExtAbstractInterfaceDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -10759,14 +9875,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -10776,7 +9890,6 @@ void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::destroy  (
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ExtAbstractInterfaceDef_tie<T>::lookup  (
     const char * search_name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10784,7 +9897,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup (
     search_name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -10795,7 +9907,6 @@ template <class T> ACE_INLINE
 ::CORBA::ContainedSeq * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::contents  (
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10804,7 +9915,6 @@ template <class T> ACE_INLINE
   return this->ptr_->contents (
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -10817,7 +9927,6 @@ template <class T> ACE_INLINE
     ::CORBA::Long levels_to_search,
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10828,7 +9937,6 @@ template <class T> ACE_INLINE
     levels_to_search,
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -10840,7 +9948,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10850,7 +9957,6 @@ template <class T> ACE_INLINE
     limit_type,
     exclude_inherited,
     max_returned_objs
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -10862,7 +9968,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10872,7 +9977,6 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -10886,7 +9990,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10898,7 +10001,6 @@ template <class T> ACE_INLINE
     version,
     type,
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -10911,7 +10013,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10922,7 +10023,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -10936,7 +10036,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10948,7 +10047,6 @@ template <class T> ACE_INLINE
     version,
     discriminator_type,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -10961,7 +10059,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10972,7 +10069,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -10985,7 +10081,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10996,7 +10091,6 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -11009,7 +10103,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11020,7 +10113,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -11039,7 +10131,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11056,7 +10147,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -11069,7 +10159,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11080,7 +10169,6 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -11093,7 +10181,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11104,7 +10191,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -11116,7 +10202,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11126,7 +10211,6 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -11139,7 +10223,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11150,7 +10233,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -11163,7 +10245,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11174,7 +10255,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -11193,7 +10273,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11210,7 +10289,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -11219,14 +10297,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -11236,7 +10312,6 @@ char * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::id  (
 template <class T> ACE_INLINE
 void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11244,7 +10319,6 @@ void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -11253,14 +10327,12 @@ void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::id  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -11270,7 +10342,6 @@ char * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::name  (
 template <class T> ACE_INLINE
 void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11278,7 +10349,6 @@ void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -11287,14 +10357,12 @@ void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::name  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -11304,7 +10372,6 @@ char * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::version  (
 template <class T> ACE_INLINE
 void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11312,7 +10379,6 @@ void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -11321,14 +10387,12 @@ void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::version  (
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ExtAbstractInterfaceDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -11337,14 +10401,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -11353,14 +10415,12 @@ char * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::absolute_name  (
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ExtAbstractInterfaceDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -11369,14 +10429,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -11388,7 +10446,6 @@ void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11398,7 +10455,6 @@ void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -11407,14 +10463,12 @@ void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::move  (
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ExtAbstractInterfaceDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -11423,14 +10477,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDefSeq * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::base_interfaces  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->base_interfaces (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -11440,7 +10492,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::base_interfaces  (
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11448,7 +10499,6 @@ void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::base_interfaces  (
 {
   this->ptr_->base_interfaces (
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -11458,7 +10508,6 @@ void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::base_interfaces  (
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ExtAbstractInterfaceDef_tie<T>::is_a  (
     const char * interface_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11466,7 +10515,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->is_a (
     interface_id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -11475,14 +10523,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::describe_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -11496,7 +10542,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     ::CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11508,7 +10553,6 @@ template <class T> ACE_INLINE
     version,
     type,
     mode
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -11525,7 +10569,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ParDescriptionSeq & params,
     const ::CORBA::ExceptionDefSeq & exceptions,
     const ::CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11540,7 +10583,6 @@ template <class T> ACE_INLINE
     params,
     exceptions,
     contexts
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -11549,14 +10591,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::describe_ext_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe_ext_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -11572,7 +10612,6 @@ template <class T> ACE_INLINE
     ::CORBA::AttributeMode mode,
     const ::CORBA::ExceptionDefSeq & get_exceptions,
     const ::CORBA::ExceptionDefSeq & set_exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11586,7 +10625,6 @@ template <class T> ACE_INLINE
     mode,
     get_exceptions,
     set_exceptions
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -11688,14 +10726,12 @@ POA_CORBA::LocalInterfaceDef_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::LocalInterfaceDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -11704,14 +10740,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::LocalInterfaceDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -11721,7 +10755,6 @@ void POA_CORBA::LocalInterfaceDef_tie<T>::destroy  (
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::LocalInterfaceDef_tie<T>::lookup  (
     const char * search_name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11729,7 +10762,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup (
     search_name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -11740,7 +10772,6 @@ template <class T> ACE_INLINE
 ::CORBA::ContainedSeq * POA_CORBA::LocalInterfaceDef_tie<T>::contents  (
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11749,7 +10780,6 @@ template <class T> ACE_INLINE
   return this->ptr_->contents (
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -11762,7 +10792,6 @@ template <class T> ACE_INLINE
     ::CORBA::Long levels_to_search,
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11773,7 +10802,6 @@ template <class T> ACE_INLINE
     levels_to_search,
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -11785,7 +10813,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11795,7 +10822,6 @@ template <class T> ACE_INLINE
     limit_type,
     exclude_inherited,
     max_returned_objs
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -11807,7 +10833,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11817,7 +10842,6 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -11831,7 +10855,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11843,7 +10866,6 @@ template <class T> ACE_INLINE
     version,
     type,
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -11856,7 +10878,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11867,7 +10888,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -11881,7 +10901,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11893,7 +10912,6 @@ template <class T> ACE_INLINE
     version,
     discriminator_type,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -11906,7 +10924,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11917,7 +10934,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -11930,7 +10946,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11941,7 +10956,6 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -11954,7 +10968,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11965,7 +10978,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -11984,7 +10996,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12001,7 +11012,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -12014,7 +11024,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12025,7 +11034,6 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -12038,7 +11046,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12049,7 +11056,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -12061,7 +11067,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12071,7 +11076,6 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -12084,7 +11088,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12095,7 +11098,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -12108,7 +11110,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12119,7 +11120,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -12138,7 +11138,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12155,7 +11154,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -12164,14 +11162,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::LocalInterfaceDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -12181,7 +11177,6 @@ char * POA_CORBA::LocalInterfaceDef_tie<T>::id  (
 template <class T> ACE_INLINE
 void POA_CORBA::LocalInterfaceDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12189,7 +11184,6 @@ void POA_CORBA::LocalInterfaceDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -12198,14 +11192,12 @@ void POA_CORBA::LocalInterfaceDef_tie<T>::id  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::LocalInterfaceDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -12215,7 +11207,6 @@ char * POA_CORBA::LocalInterfaceDef_tie<T>::name  (
 template <class T> ACE_INLINE
 void POA_CORBA::LocalInterfaceDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12223,7 +11214,6 @@ void POA_CORBA::LocalInterfaceDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -12232,14 +11222,12 @@ void POA_CORBA::LocalInterfaceDef_tie<T>::name  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::LocalInterfaceDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -12249,7 +11237,6 @@ char * POA_CORBA::LocalInterfaceDef_tie<T>::version  (
 template <class T> ACE_INLINE
 void POA_CORBA::LocalInterfaceDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12257,7 +11244,6 @@ void POA_CORBA::LocalInterfaceDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -12266,14 +11252,12 @@ void POA_CORBA::LocalInterfaceDef_tie<T>::version  (
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::LocalInterfaceDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -12282,14 +11266,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::LocalInterfaceDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -12298,14 +11280,12 @@ char * POA_CORBA::LocalInterfaceDef_tie<T>::absolute_name  (
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::LocalInterfaceDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -12314,14 +11294,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::LocalInterfaceDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -12333,7 +11311,6 @@ void POA_CORBA::LocalInterfaceDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12343,7 +11320,6 @@ void POA_CORBA::LocalInterfaceDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -12352,14 +11328,12 @@ void POA_CORBA::LocalInterfaceDef_tie<T>::move  (
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::LocalInterfaceDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -12368,14 +11342,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDefSeq * POA_CORBA::LocalInterfaceDef_tie<T>::base_interfaces  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->base_interfaces (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -12385,7 +11357,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::LocalInterfaceDef_tie<T>::base_interfaces  (
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12393,7 +11364,6 @@ void POA_CORBA::LocalInterfaceDef_tie<T>::base_interfaces  (
 {
   this->ptr_->base_interfaces (
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -12403,7 +11373,6 @@ void POA_CORBA::LocalInterfaceDef_tie<T>::base_interfaces  (
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::LocalInterfaceDef_tie<T>::is_a  (
     const char * interface_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12411,7 +11380,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->is_a (
     interface_id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -12420,14 +11388,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::LocalInterfaceDef_tie<T>::describe_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -12441,7 +11407,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     ::CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12453,7 +11418,6 @@ template <class T> ACE_INLINE
     version,
     type,
     mode
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -12470,7 +11434,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ParDescriptionSeq & params,
     const ::CORBA::ExceptionDefSeq & exceptions,
     const ::CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12485,7 +11448,6 @@ template <class T> ACE_INLINE
     params,
     exceptions,
     contexts
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -12587,14 +11549,12 @@ POA_CORBA::ExtLocalInterfaceDef_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ExtLocalInterfaceDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -12603,14 +11563,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExtLocalInterfaceDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -12620,7 +11578,6 @@ void POA_CORBA::ExtLocalInterfaceDef_tie<T>::destroy  (
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ExtLocalInterfaceDef_tie<T>::lookup  (
     const char * search_name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12628,7 +11585,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup (
     search_name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -12639,7 +11595,6 @@ template <class T> ACE_INLINE
 ::CORBA::ContainedSeq * POA_CORBA::ExtLocalInterfaceDef_tie<T>::contents  (
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12648,7 +11603,6 @@ template <class T> ACE_INLINE
   return this->ptr_->contents (
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -12661,7 +11615,6 @@ template <class T> ACE_INLINE
     ::CORBA::Long levels_to_search,
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12672,7 +11625,6 @@ template <class T> ACE_INLINE
     levels_to_search,
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -12684,7 +11636,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12694,7 +11645,6 @@ template <class T> ACE_INLINE
     limit_type,
     exclude_inherited,
     max_returned_objs
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -12706,7 +11656,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12716,7 +11665,6 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -12730,7 +11678,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12742,7 +11689,6 @@ template <class T> ACE_INLINE
     version,
     type,
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -12755,7 +11701,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12766,7 +11711,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -12780,7 +11724,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12792,7 +11735,6 @@ template <class T> ACE_INLINE
     version,
     discriminator_type,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -12805,7 +11747,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12816,7 +11757,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -12829,7 +11769,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12840,7 +11779,6 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -12853,7 +11791,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12864,7 +11801,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -12883,7 +11819,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12900,7 +11835,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -12913,7 +11847,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12924,7 +11857,6 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -12937,7 +11869,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12948,7 +11879,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -12960,7 +11890,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12970,7 +11899,6 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -12983,7 +11911,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12994,7 +11921,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -13007,7 +11933,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -13018,7 +11943,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -13037,7 +11961,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -13054,7 +11977,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -13063,14 +11985,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtLocalInterfaceDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -13080,7 +12000,6 @@ char * POA_CORBA::ExtLocalInterfaceDef_tie<T>::id  (
 template <class T> ACE_INLINE
 void POA_CORBA::ExtLocalInterfaceDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -13088,7 +12007,6 @@ void POA_CORBA::ExtLocalInterfaceDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -13097,14 +12015,12 @@ void POA_CORBA::ExtLocalInterfaceDef_tie<T>::id  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtLocalInterfaceDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -13114,7 +12030,6 @@ char * POA_CORBA::ExtLocalInterfaceDef_tie<T>::name  (
 template <class T> ACE_INLINE
 void POA_CORBA::ExtLocalInterfaceDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -13122,7 +12037,6 @@ void POA_CORBA::ExtLocalInterfaceDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -13131,14 +12045,12 @@ void POA_CORBA::ExtLocalInterfaceDef_tie<T>::name  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtLocalInterfaceDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -13148,7 +12060,6 @@ char * POA_CORBA::ExtLocalInterfaceDef_tie<T>::version  (
 template <class T> ACE_INLINE
 void POA_CORBA::ExtLocalInterfaceDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -13156,7 +12067,6 @@ void POA_CORBA::ExtLocalInterfaceDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -13165,14 +12075,12 @@ void POA_CORBA::ExtLocalInterfaceDef_tie<T>::version  (
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ExtLocalInterfaceDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -13181,14 +12089,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtLocalInterfaceDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -13197,14 +12103,12 @@ char * POA_CORBA::ExtLocalInterfaceDef_tie<T>::absolute_name  (
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ExtLocalInterfaceDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -13213,14 +12117,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ExtLocalInterfaceDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -13232,7 +12134,6 @@ void POA_CORBA::ExtLocalInterfaceDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -13242,7 +12143,6 @@ void POA_CORBA::ExtLocalInterfaceDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -13251,14 +12151,12 @@ void POA_CORBA::ExtLocalInterfaceDef_tie<T>::move  (
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ExtLocalInterfaceDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -13267,14 +12165,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDefSeq * POA_CORBA::ExtLocalInterfaceDef_tie<T>::base_interfaces  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->base_interfaces (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -13284,7 +12180,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ExtLocalInterfaceDef_tie<T>::base_interfaces  (
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -13292,7 +12187,6 @@ void POA_CORBA::ExtLocalInterfaceDef_tie<T>::base_interfaces  (
 {
   this->ptr_->base_interfaces (
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -13302,7 +12196,6 @@ void POA_CORBA::ExtLocalInterfaceDef_tie<T>::base_interfaces  (
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ExtLocalInterfaceDef_tie<T>::is_a  (
     const char * interface_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -13310,7 +12203,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->is_a (
     interface_id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -13319,14 +12211,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::ExtLocalInterfaceDef_tie<T>::describe_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -13340,7 +12230,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     ::CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -13352,7 +12241,6 @@ template <class T> ACE_INLINE
     version,
     type,
     mode
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -13369,7 +12257,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ParDescriptionSeq & params,
     const ::CORBA::ExceptionDefSeq & exceptions,
     const ::CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -13384,7 +12271,6 @@ template <class T> ACE_INLINE
     params,
     exceptions,
     contexts
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -13393,14 +12279,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * POA_CORBA::ExtLocalInterfaceDef_tie<T>::describe_ext_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe_ext_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -13416,7 +12300,6 @@ template <class T> ACE_INLINE
     ::CORBA::AttributeMode mode,
     const ::CORBA::ExceptionDefSeq & get_exceptions,
     const ::CORBA::ExceptionDefSeq & set_exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -13430,7 +12313,6 @@ template <class T> ACE_INLINE
     mode,
     get_exceptions,
     set_exceptions
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp
index f9aee1d5cef..2395fcd77f5 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp
@@ -1341,8 +1341,7 @@ namespace POA_CORBA
 
         retval =
           this->servant_-> _is_a (
-            arg_1
-            ACE_ENV_ARG_PARAMETER);
+            arg_1);
       }
 
     private:
@@ -1359,7 +1358,6 @@ void POA_CORBA::ComponentIR::EventDef::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -1396,7 +1394,7 @@ void POA_CORBA::ComponentIR::EventDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -1428,8 +1426,7 @@ void POA_CORBA::ComponentIR::EventDef::_is_a_skel (
             this->args_);
 
         retval =
-          this->servant_-> _non_existent (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _non_existent ();
       }
 
     private:
@@ -1446,7 +1443,6 @@ void POA_CORBA::ComponentIR::EventDef::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -1481,7 +1477,7 @@ void POA_CORBA::ComponentIR::EventDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -1513,8 +1509,7 @@ void POA_CORBA::ComponentIR::EventDef::_non_existent_skel (
             this->args_);
 
         retval =
-          this->servant_-> _repository_id (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _repository_id ();
       }
 
     private:
@@ -1531,7 +1526,6 @@ void POA_CORBA::ComponentIR::EventDef::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -1566,7 +1560,7 @@ void POA_CORBA::ComponentIR::EventDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -1576,7 +1570,6 @@ void POA_CORBA::ComponentIR::EventDef::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -1586,8 +1579,9 @@ void POA_CORBA::ComponentIR::EventDef::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::ComponentIR::EventDef * const impl =
@@ -1608,7 +1602,7 @@ void POA_CORBA::ComponentIR::EventDef::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -1641,8 +1635,7 @@ void POA_CORBA::ComponentIR::EventDef::_interface_skel (
             this->args_);
 
         retval =
-          this->servant_-> _get_component (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _get_component ();
       }
 
     private:
@@ -1659,7 +1652,6 @@ void POA_CORBA::ComponentIR::EventDef::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -1694,12 +1686,11 @@ void POA_CORBA::ComponentIR::EventDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::EventDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -1750,13 +1741,11 @@ const char* POA_CORBA::ComponentIR::EventDef::_interface_repository_id (void) co
 void POA_CORBA::ComponentIR::EventDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -2055,8 +2044,7 @@ POA_CORBA::ComponentIR::Container::~Container (void)
             , arg_2
             , arg_3
             , arg_4
-            , arg_5
-            ACE_ENV_ARG_PARAMETER);
+            , arg_5);
       }
 
     private:
@@ -2076,7 +2064,6 @@ void POA_CORBA::ComponentIR::Container::create_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -2121,7 +2108,7 @@ void POA_CORBA::ComponentIR::Container::create_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -2202,8 +2189,7 @@ void POA_CORBA::ComponentIR::Container::create_component_skel (
             , arg_4
             , arg_5
             , arg_6
-            , arg_7
-            ACE_ENV_ARG_PARAMETER);
+            , arg_7);
       }
 
     private:
@@ -2223,7 +2209,6 @@ void POA_CORBA::ComponentIR::Container::create_home_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -2272,7 +2257,7 @@ void POA_CORBA::ComponentIR::Container::create_home_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -2374,8 +2359,7 @@ void POA_CORBA::ComponentIR::Container::create_home_skel (
             , arg_7
             , arg_8
             , arg_9
-            , arg_10
-            ACE_ENV_ARG_PARAMETER);
+            , arg_10);
       }
 
     private:
@@ -2395,7 +2379,6 @@ void POA_CORBA::ComponentIR::Container::create_event_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -2450,7 +2433,7 @@ void POA_CORBA::ComponentIR::Container::create_event_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -2494,8 +2477,7 @@ namespace POA_CORBA
 
         retval =
           this->servant_-> _is_a (
-            arg_1
-            ACE_ENV_ARG_PARAMETER);
+            arg_1);
       }
 
     private:
@@ -2512,7 +2494,6 @@ void POA_CORBA::ComponentIR::Container::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -2549,7 +2530,7 @@ void POA_CORBA::ComponentIR::Container::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -2581,8 +2562,7 @@ void POA_CORBA::ComponentIR::Container::_is_a_skel (
             this->args_);
 
         retval =
-          this->servant_-> _non_existent (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _non_existent ();
       }
 
     private:
@@ -2599,7 +2579,6 @@ void POA_CORBA::ComponentIR::Container::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -2634,7 +2613,7 @@ void POA_CORBA::ComponentIR::Container::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -2666,8 +2645,7 @@ void POA_CORBA::ComponentIR::Container::_non_existent_skel (
             this->args_);
 
         retval =
-          this->servant_-> _repository_id (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _repository_id ();
       }
 
     private:
@@ -2684,7 +2662,6 @@ void POA_CORBA::ComponentIR::Container::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -2719,7 +2696,7 @@ void POA_CORBA::ComponentIR::Container::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -2729,7 +2706,6 @@ void POA_CORBA::ComponentIR::Container::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -2739,8 +2715,9 @@ void POA_CORBA::ComponentIR::Container::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::ComponentIR::Container * const impl =
@@ -2761,7 +2738,7 @@ void POA_CORBA::ComponentIR::Container::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -2794,8 +2771,7 @@ void POA_CORBA::ComponentIR::Container::_interface_skel (
             this->args_);
 
         retval =
-          this->servant_-> _get_component (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _get_component ();
       }
 
     private:
@@ -2812,7 +2788,6 @@ void POA_CORBA::ComponentIR::Container::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -2847,12 +2822,11 @@ void POA_CORBA::ComponentIR::Container::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::Container::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -2887,13 +2861,11 @@ const char* POA_CORBA::ComponentIR::Container::_interface_repository_id (void) c
 void POA_CORBA::ComponentIR::Container::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -3184,8 +3156,7 @@ namespace POA_CORBA
 
         retval =
           this->servant_-> _is_a (
-            arg_1
-            ACE_ENV_ARG_PARAMETER);
+            arg_1);
       }
 
     private:
@@ -3202,7 +3173,6 @@ void POA_CORBA::ComponentIR::ModuleDef::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -3239,7 +3209,7 @@ void POA_CORBA::ComponentIR::ModuleDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -3271,8 +3241,7 @@ void POA_CORBA::ComponentIR::ModuleDef::_is_a_skel (
             this->args_);
 
         retval =
-          this->servant_-> _non_existent (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _non_existent ();
       }
 
     private:
@@ -3289,7 +3258,6 @@ void POA_CORBA::ComponentIR::ModuleDef::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -3324,7 +3292,7 @@ void POA_CORBA::ComponentIR::ModuleDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -3356,8 +3324,7 @@ void POA_CORBA::ComponentIR::ModuleDef::_non_existent_skel (
             this->args_);
 
         retval =
-          this->servant_-> _repository_id (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _repository_id ();
       }
 
     private:
@@ -3374,7 +3341,6 @@ void POA_CORBA::ComponentIR::ModuleDef::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -3409,7 +3375,7 @@ void POA_CORBA::ComponentIR::ModuleDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -3419,7 +3385,6 @@ void POA_CORBA::ComponentIR::ModuleDef::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -3429,8 +3394,9 @@ void POA_CORBA::ComponentIR::ModuleDef::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::ComponentIR::ModuleDef * const impl =
@@ -3451,7 +3417,7 @@ void POA_CORBA::ComponentIR::ModuleDef::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -3484,8 +3450,7 @@ void POA_CORBA::ComponentIR::ModuleDef::_interface_skel (
             this->args_);
 
         retval =
-          this->servant_-> _get_component (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _get_component ();
       }
 
     private:
@@ -3502,7 +3467,6 @@ void POA_CORBA::ComponentIR::ModuleDef::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -3537,12 +3501,11 @@ void POA_CORBA::ComponentIR::ModuleDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::ModuleDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -3589,13 +3552,11 @@ const char* POA_CORBA::ComponentIR::ModuleDef::_interface_repository_id (void) c
 void POA_CORBA::ComponentIR::ModuleDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -3884,8 +3845,7 @@ namespace POA_CORBA
 
         retval =
           this->servant_-> _is_a (
-            arg_1
-            ACE_ENV_ARG_PARAMETER);
+            arg_1);
       }
 
     private:
@@ -3902,7 +3862,6 @@ void POA_CORBA::ComponentIR::Repository::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -3939,7 +3898,7 @@ void POA_CORBA::ComponentIR::Repository::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -3971,8 +3930,7 @@ void POA_CORBA::ComponentIR::Repository::_is_a_skel (
             this->args_);
 
         retval =
-          this->servant_-> _non_existent (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _non_existent ();
       }
 
     private:
@@ -3989,7 +3947,6 @@ void POA_CORBA::ComponentIR::Repository::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -4024,7 +3981,7 @@ void POA_CORBA::ComponentIR::Repository::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -4056,8 +4013,7 @@ void POA_CORBA::ComponentIR::Repository::_non_existent_skel (
             this->args_);
 
         retval =
-          this->servant_-> _repository_id (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _repository_id ();
       }
 
     private:
@@ -4074,7 +4030,6 @@ void POA_CORBA::ComponentIR::Repository::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -4109,7 +4064,7 @@ void POA_CORBA::ComponentIR::Repository::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -4119,7 +4074,6 @@ void POA_CORBA::ComponentIR::Repository::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -4129,8 +4083,9 @@ void POA_CORBA::ComponentIR::Repository::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::ComponentIR::Repository * const impl =
@@ -4151,7 +4106,7 @@ void POA_CORBA::ComponentIR::Repository::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -4184,8 +4139,7 @@ void POA_CORBA::ComponentIR::Repository::_interface_skel (
             this->args_);
 
         retval =
-          this->servant_-> _get_component (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _get_component ();
       }
 
     private:
@@ -4202,7 +4156,6 @@ void POA_CORBA::ComponentIR::Repository::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -4237,12 +4190,11 @@ void POA_CORBA::ComponentIR::Repository::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::Repository::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -4285,13 +4237,11 @@ const char* POA_CORBA::ComponentIR::Repository::_interface_repository_id (void)
 void POA_CORBA::ComponentIR::Repository::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -4546,8 +4496,7 @@ POA_CORBA::ComponentIR::ProvidesDef::~ProvidesDef (void)
             this->args_);
 
         retval =
-          this->servant_->interface_type (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_->interface_type ();
       }
 
     private:
@@ -4567,7 +4516,6 @@ void POA_CORBA::ComponentIR::ProvidesDef::_get_interface_type_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -4602,7 +4550,7 @@ void POA_CORBA::ComponentIR::ProvidesDef::_get_interface_type_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -4635,8 +4583,7 @@ void POA_CORBA::ComponentIR::ProvidesDef::_get_interface_type_skel (
             1);
 
         this->servant_->interface_type (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
       }
 
     private:
@@ -4656,7 +4603,6 @@ void POA_CORBA::ComponentIR::ProvidesDef::_set_interface_type_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -4693,7 +4639,7 @@ void POA_CORBA::ComponentIR::ProvidesDef::_set_interface_type_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -4737,8 +4683,7 @@ namespace POA_CORBA
 
         retval =
           this->servant_-> _is_a (
-            arg_1
-            ACE_ENV_ARG_PARAMETER);
+            arg_1);
       }
 
     private:
@@ -4755,7 +4700,6 @@ void POA_CORBA::ComponentIR::ProvidesDef::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -4792,7 +4736,7 @@ void POA_CORBA::ComponentIR::ProvidesDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -4824,8 +4768,7 @@ void POA_CORBA::ComponentIR::ProvidesDef::_is_a_skel (
             this->args_);
 
         retval =
-          this->servant_-> _non_existent (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _non_existent ();
       }
 
     private:
@@ -4842,7 +4785,6 @@ void POA_CORBA::ComponentIR::ProvidesDef::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -4877,7 +4819,7 @@ void POA_CORBA::ComponentIR::ProvidesDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -4909,8 +4851,7 @@ void POA_CORBA::ComponentIR::ProvidesDef::_non_existent_skel (
             this->args_);
 
         retval =
-          this->servant_-> _repository_id (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _repository_id ();
       }
 
     private:
@@ -4927,7 +4868,6 @@ void POA_CORBA::ComponentIR::ProvidesDef::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -4962,7 +4902,7 @@ void POA_CORBA::ComponentIR::ProvidesDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -4972,7 +4912,6 @@ void POA_CORBA::ComponentIR::ProvidesDef::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -4982,8 +4921,9 @@ void POA_CORBA::ComponentIR::ProvidesDef::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::ComponentIR::ProvidesDef * const impl =
@@ -5004,7 +4944,7 @@ void POA_CORBA::ComponentIR::ProvidesDef::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -5037,8 +4977,7 @@ void POA_CORBA::ComponentIR::ProvidesDef::_interface_skel (
             this->args_);
 
         retval =
-          this->servant_-> _get_component (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _get_component ();
       }
 
     private:
@@ -5055,7 +4994,6 @@ void POA_CORBA::ComponentIR::ProvidesDef::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -5090,12 +5028,11 @@ void POA_CORBA::ComponentIR::ProvidesDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::ProvidesDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -5130,13 +5067,11 @@ const char* POA_CORBA::ComponentIR::ProvidesDef::_interface_repository_id (void)
 void POA_CORBA::ComponentIR::ProvidesDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -5393,8 +5328,7 @@ POA_CORBA::ComponentIR::UsesDef::~UsesDef (void)
             this->args_);
 
         retval =
-          this->servant_->interface_type (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_->interface_type ();
       }
 
     private:
@@ -5414,7 +5348,6 @@ void POA_CORBA::ComponentIR::UsesDef::_get_interface_type_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -5449,7 +5382,7 @@ void POA_CORBA::ComponentIR::UsesDef::_get_interface_type_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -5482,8 +5415,7 @@ void POA_CORBA::ComponentIR::UsesDef::_get_interface_type_skel (
             1);
 
         this->servant_->interface_type (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
       }
 
     private:
@@ -5503,7 +5435,6 @@ void POA_CORBA::ComponentIR::UsesDef::_set_interface_type_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -5540,7 +5471,7 @@ void POA_CORBA::ComponentIR::UsesDef::_set_interface_type_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -5572,8 +5503,7 @@ void POA_CORBA::ComponentIR::UsesDef::_set_interface_type_skel (
             this->args_);
 
         retval =
-          this->servant_->is_multiple (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_->is_multiple ();
       }
 
     private:
@@ -5593,7 +5523,6 @@ void POA_CORBA::ComponentIR::UsesDef::_get_is_multiple_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -5628,7 +5557,7 @@ void POA_CORBA::ComponentIR::UsesDef::_get_is_multiple_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -5661,8 +5590,7 @@ void POA_CORBA::ComponentIR::UsesDef::_get_is_multiple_skel (
             1);
 
         this->servant_->is_multiple (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
       }
 
     private:
@@ -5682,7 +5610,6 @@ void POA_CORBA::ComponentIR::UsesDef::_set_is_multiple_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -5719,7 +5646,7 @@ void POA_CORBA::ComponentIR::UsesDef::_set_is_multiple_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -5763,8 +5690,7 @@ namespace POA_CORBA
 
         retval =
           this->servant_-> _is_a (
-            arg_1
-            ACE_ENV_ARG_PARAMETER);
+            arg_1);
       }
 
     private:
@@ -5781,7 +5707,6 @@ void POA_CORBA::ComponentIR::UsesDef::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -5818,7 +5743,7 @@ void POA_CORBA::ComponentIR::UsesDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -5850,8 +5775,7 @@ void POA_CORBA::ComponentIR::UsesDef::_is_a_skel (
             this->args_);
 
         retval =
-          this->servant_-> _non_existent (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _non_existent ();
       }
 
     private:
@@ -5868,7 +5792,6 @@ void POA_CORBA::ComponentIR::UsesDef::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -5903,7 +5826,7 @@ void POA_CORBA::ComponentIR::UsesDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -5935,8 +5858,7 @@ void POA_CORBA::ComponentIR::UsesDef::_non_existent_skel (
             this->args_);
 
         retval =
-          this->servant_-> _repository_id (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _repository_id ();
       }
 
     private:
@@ -5953,7 +5875,6 @@ void POA_CORBA::ComponentIR::UsesDef::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -5988,7 +5909,7 @@ void POA_CORBA::ComponentIR::UsesDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -5998,7 +5919,6 @@ void POA_CORBA::ComponentIR::UsesDef::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -6008,8 +5928,9 @@ void POA_CORBA::ComponentIR::UsesDef::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::ComponentIR::UsesDef * const impl =
@@ -6030,7 +5951,7 @@ void POA_CORBA::ComponentIR::UsesDef::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -6063,8 +5984,7 @@ void POA_CORBA::ComponentIR::UsesDef::_interface_skel (
             this->args_);
 
         retval =
-          this->servant_-> _get_component (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _get_component ();
       }
 
     private:
@@ -6081,7 +6001,6 @@ void POA_CORBA::ComponentIR::UsesDef::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -6116,12 +6035,11 @@ void POA_CORBA::ComponentIR::UsesDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::UsesDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -6156,13 +6074,11 @@ const char* POA_CORBA::ComponentIR::UsesDef::_interface_repository_id (void) con
 void POA_CORBA::ComponentIR::UsesDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -6418,8 +6334,7 @@ POA_CORBA::ComponentIR::EventPortDef::~EventPortDef (void)
             this->args_);
 
         retval =
-          this->servant_->event (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_->event ();
       }
 
     private:
@@ -6439,7 +6354,6 @@ void POA_CORBA::ComponentIR::EventPortDef::_get_event_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -6474,7 +6388,7 @@ void POA_CORBA::ComponentIR::EventPortDef::_get_event_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -6507,8 +6421,7 @@ void POA_CORBA::ComponentIR::EventPortDef::_get_event_skel (
             1);
 
         this->servant_->event (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
       }
 
     private:
@@ -6528,7 +6441,6 @@ void POA_CORBA::ComponentIR::EventPortDef::_set_event_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -6565,7 +6477,7 @@ void POA_CORBA::ComponentIR::EventPortDef::_set_event_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -6604,8 +6516,7 @@ void POA_CORBA::ComponentIR::EventPortDef::_set_event_skel (
 
         retval =
           this->servant_->is_a (
-            arg_1
-            ACE_ENV_ARG_PARAMETER);
+            arg_1);
       }
 
     private:
@@ -6625,7 +6536,6 @@ void POA_CORBA::ComponentIR::EventPortDef::is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -6662,7 +6572,7 @@ void POA_CORBA::ComponentIR::EventPortDef::is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -6706,8 +6616,7 @@ namespace POA_CORBA
 
         retval =
           this->servant_-> _is_a (
-            arg_1
-            ACE_ENV_ARG_PARAMETER);
+            arg_1);
       }
 
     private:
@@ -6724,7 +6633,6 @@ void POA_CORBA::ComponentIR::EventPortDef::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -6761,7 +6669,7 @@ void POA_CORBA::ComponentIR::EventPortDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -6793,8 +6701,7 @@ void POA_CORBA::ComponentIR::EventPortDef::_is_a_skel (
             this->args_);
 
         retval =
-          this->servant_-> _non_existent (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _non_existent ();
       }
 
     private:
@@ -6811,7 +6718,6 @@ void POA_CORBA::ComponentIR::EventPortDef::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -6846,7 +6752,7 @@ void POA_CORBA::ComponentIR::EventPortDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -6878,8 +6784,7 @@ void POA_CORBA::ComponentIR::EventPortDef::_non_existent_skel (
             this->args_);
 
         retval =
-          this->servant_-> _repository_id (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _repository_id ();
       }
 
     private:
@@ -6896,7 +6801,6 @@ void POA_CORBA::ComponentIR::EventPortDef::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -6931,7 +6835,7 @@ void POA_CORBA::ComponentIR::EventPortDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -6941,7 +6845,6 @@ void POA_CORBA::ComponentIR::EventPortDef::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -6951,8 +6854,9 @@ void POA_CORBA::ComponentIR::EventPortDef::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::ComponentIR::EventPortDef * const impl =
@@ -6973,7 +6877,7 @@ void POA_CORBA::ComponentIR::EventPortDef::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -7006,8 +6910,7 @@ void POA_CORBA::ComponentIR::EventPortDef::_interface_skel (
             this->args_);
 
         retval =
-          this->servant_-> _get_component (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _get_component ();
       }
 
     private:
@@ -7024,7 +6927,6 @@ void POA_CORBA::ComponentIR::EventPortDef::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -7059,12 +6961,11 @@ void POA_CORBA::ComponentIR::EventPortDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::EventPortDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -7099,13 +7000,11 @@ const char* POA_CORBA::ComponentIR::EventPortDef::_interface_repository_id (void
 void POA_CORBA::ComponentIR::EventPortDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -7374,8 +7273,7 @@ namespace POA_CORBA
 
         retval =
           this->servant_-> _is_a (
-            arg_1
-            ACE_ENV_ARG_PARAMETER);
+            arg_1);
       }
 
     private:
@@ -7392,7 +7290,6 @@ void POA_CORBA::ComponentIR::EmitsDef::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -7429,7 +7326,7 @@ void POA_CORBA::ComponentIR::EmitsDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -7461,8 +7358,7 @@ void POA_CORBA::ComponentIR::EmitsDef::_is_a_skel (
             this->args_);
 
         retval =
-          this->servant_-> _non_existent (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _non_existent ();
       }
 
     private:
@@ -7479,7 +7375,6 @@ void POA_CORBA::ComponentIR::EmitsDef::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -7514,7 +7409,7 @@ void POA_CORBA::ComponentIR::EmitsDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -7546,8 +7441,7 @@ void POA_CORBA::ComponentIR::EmitsDef::_non_existent_skel (
             this->args_);
 
         retval =
-          this->servant_-> _repository_id (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _repository_id ();
       }
 
     private:
@@ -7564,7 +7458,6 @@ void POA_CORBA::ComponentIR::EmitsDef::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -7599,7 +7492,7 @@ void POA_CORBA::ComponentIR::EmitsDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -7609,7 +7502,6 @@ void POA_CORBA::ComponentIR::EmitsDef::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -7619,8 +7511,9 @@ void POA_CORBA::ComponentIR::EmitsDef::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::ComponentIR::EmitsDef * const impl =
@@ -7641,7 +7534,7 @@ void POA_CORBA::ComponentIR::EmitsDef::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -7674,8 +7567,7 @@ void POA_CORBA::ComponentIR::EmitsDef::_interface_skel (
             this->args_);
 
         retval =
-          this->servant_-> _get_component (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _get_component ();
       }
 
     private:
@@ -7692,7 +7584,6 @@ void POA_CORBA::ComponentIR::EmitsDef::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -7727,12 +7618,11 @@ void POA_CORBA::ComponentIR::EmitsDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::EmitsDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -7771,13 +7661,11 @@ const char* POA_CORBA::ComponentIR::EmitsDef::_interface_repository_id (void) co
 void POA_CORBA::ComponentIR::EmitsDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -8046,8 +7934,7 @@ namespace POA_CORBA
 
         retval =
           this->servant_-> _is_a (
-            arg_1
-            ACE_ENV_ARG_PARAMETER);
+            arg_1);
       }
 
     private:
@@ -8064,7 +7951,6 @@ void POA_CORBA::ComponentIR::PublishesDef::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -8101,7 +7987,7 @@ void POA_CORBA::ComponentIR::PublishesDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -8133,8 +8019,7 @@ void POA_CORBA::ComponentIR::PublishesDef::_is_a_skel (
             this->args_);
 
         retval =
-          this->servant_-> _non_existent (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _non_existent ();
       }
 
     private:
@@ -8151,7 +8036,6 @@ void POA_CORBA::ComponentIR::PublishesDef::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -8186,7 +8070,7 @@ void POA_CORBA::ComponentIR::PublishesDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -8218,8 +8102,7 @@ void POA_CORBA::ComponentIR::PublishesDef::_non_existent_skel (
             this->args_);
 
         retval =
-          this->servant_-> _repository_id (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _repository_id ();
       }
 
     private:
@@ -8236,7 +8119,6 @@ void POA_CORBA::ComponentIR::PublishesDef::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -8271,7 +8153,7 @@ void POA_CORBA::ComponentIR::PublishesDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -8281,7 +8163,6 @@ void POA_CORBA::ComponentIR::PublishesDef::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -8291,8 +8172,9 @@ void POA_CORBA::ComponentIR::PublishesDef::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::ComponentIR::PublishesDef * const impl =
@@ -8313,7 +8195,7 @@ void POA_CORBA::ComponentIR::PublishesDef::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -8346,8 +8228,7 @@ void POA_CORBA::ComponentIR::PublishesDef::_interface_skel (
             this->args_);
 
         retval =
-          this->servant_-> _get_component (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _get_component ();
       }
 
     private:
@@ -8364,7 +8245,6 @@ void POA_CORBA::ComponentIR::PublishesDef::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -8399,12 +8279,11 @@ void POA_CORBA::ComponentIR::PublishesDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::PublishesDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -8443,13 +8322,11 @@ const char* POA_CORBA::ComponentIR::PublishesDef::_interface_repository_id (void
 void POA_CORBA::ComponentIR::PublishesDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -8718,8 +8595,7 @@ namespace POA_CORBA
 
         retval =
           this->servant_-> _is_a (
-            arg_1
-            ACE_ENV_ARG_PARAMETER);
+            arg_1);
       }
 
     private:
@@ -8736,7 +8612,6 @@ void POA_CORBA::ComponentIR::ConsumesDef::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -8773,7 +8648,7 @@ void POA_CORBA::ComponentIR::ConsumesDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -8805,8 +8680,7 @@ void POA_CORBA::ComponentIR::ConsumesDef::_is_a_skel (
             this->args_);
 
         retval =
-          this->servant_-> _non_existent (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _non_existent ();
       }
 
     private:
@@ -8823,7 +8697,6 @@ void POA_CORBA::ComponentIR::ConsumesDef::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -8858,7 +8731,7 @@ void POA_CORBA::ComponentIR::ConsumesDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -8890,8 +8763,7 @@ void POA_CORBA::ComponentIR::ConsumesDef::_non_existent_skel (
             this->args_);
 
         retval =
-          this->servant_-> _repository_id (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _repository_id ();
       }
 
     private:
@@ -8908,7 +8780,6 @@ void POA_CORBA::ComponentIR::ConsumesDef::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -8943,7 +8814,7 @@ void POA_CORBA::ComponentIR::ConsumesDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -8953,7 +8824,6 @@ void POA_CORBA::ComponentIR::ConsumesDef::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -8963,8 +8833,9 @@ void POA_CORBA::ComponentIR::ConsumesDef::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::ComponentIR::ConsumesDef * const impl =
@@ -8985,7 +8856,7 @@ void POA_CORBA::ComponentIR::ConsumesDef::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -9018,8 +8889,7 @@ void POA_CORBA::ComponentIR::ConsumesDef::_interface_skel (
             this->args_);
 
         retval =
-          this->servant_-> _get_component (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _get_component ();
       }
 
     private:
@@ -9036,7 +8906,6 @@ void POA_CORBA::ComponentIR::ConsumesDef::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -9071,12 +8940,11 @@ void POA_CORBA::ComponentIR::ConsumesDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::ConsumesDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -9115,13 +8983,11 @@ const char* POA_CORBA::ComponentIR::ConsumesDef::_interface_repository_id (void)
 void POA_CORBA::ComponentIR::ConsumesDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -9419,8 +9285,7 @@ POA_CORBA::ComponentIR::ComponentDef::~ComponentDef (void)
             this->args_);
 
         retval =
-          this->servant_->base_component (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_->base_component ();
       }
 
     private:
@@ -9440,7 +9305,6 @@ void POA_CORBA::ComponentIR::ComponentDef::_get_base_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -9475,7 +9339,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_get_base_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -9508,8 +9372,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_get_base_component_skel (
             1);
 
         this->servant_->base_component (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
       }
 
     private:
@@ -9529,7 +9392,6 @@ void POA_CORBA::ComponentIR::ComponentDef::_set_base_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -9566,7 +9428,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_set_base_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -9598,8 +9460,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_set_base_component_skel (
             this->args_);
 
         retval =
-          this->servant_->supported_interfaces (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_->supported_interfaces ();
       }
 
     private:
@@ -9619,7 +9480,6 @@ void POA_CORBA::ComponentIR::ComponentDef::_get_supported_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -9654,7 +9514,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_get_supported_interfaces_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -9687,8 +9547,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_get_supported_interfaces_skel (
             1);
 
         this->servant_->supported_interfaces (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
       }
 
     private:
@@ -9708,7 +9567,6 @@ void POA_CORBA::ComponentIR::ComponentDef::_set_supported_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -9745,7 +9603,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_set_supported_interfaces_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -9805,8 +9663,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_set_supported_interfaces_skel (
             arg_1
             , arg_2
             , arg_3
-            , arg_4
-            ACE_ENV_ARG_PARAMETER);
+            , arg_4);
       }
 
     private:
@@ -9826,7 +9683,6 @@ void POA_CORBA::ComponentIR::ComponentDef::create_provides_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -9869,7 +9725,7 @@ void POA_CORBA::ComponentIR::ComponentDef::create_provides_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -9936,8 +9792,7 @@ void POA_CORBA::ComponentIR::ComponentDef::create_provides_skel (
             , arg_2
             , arg_3
             , arg_4
-            , arg_5
-            ACE_ENV_ARG_PARAMETER);
+            , arg_5);
       }
 
     private:
@@ -9957,7 +9812,6 @@ void POA_CORBA::ComponentIR::ComponentDef::create_uses_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -10002,7 +9856,7 @@ void POA_CORBA::ComponentIR::ComponentDef::create_uses_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -10062,8 +9916,7 @@ void POA_CORBA::ComponentIR::ComponentDef::create_uses_skel (
             arg_1
             , arg_2
             , arg_3
-            , arg_4
-            ACE_ENV_ARG_PARAMETER);
+            , arg_4);
       }
 
     private:
@@ -10083,7 +9936,6 @@ void POA_CORBA::ComponentIR::ComponentDef::create_emits_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -10126,7 +9978,7 @@ void POA_CORBA::ComponentIR::ComponentDef::create_emits_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -10186,8 +10038,7 @@ void POA_CORBA::ComponentIR::ComponentDef::create_emits_skel (
             arg_1
             , arg_2
             , arg_3
-            , arg_4
-            ACE_ENV_ARG_PARAMETER);
+            , arg_4);
       }
 
     private:
@@ -10207,7 +10058,6 @@ void POA_CORBA::ComponentIR::ComponentDef::create_publishes_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -10250,7 +10100,7 @@ void POA_CORBA::ComponentIR::ComponentDef::create_publishes_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -10310,8 +10160,7 @@ void POA_CORBA::ComponentIR::ComponentDef::create_publishes_skel (
             arg_1
             , arg_2
             , arg_3
-            , arg_4
-            ACE_ENV_ARG_PARAMETER);
+            , arg_4);
       }
 
     private:
@@ -10331,7 +10180,6 @@ void POA_CORBA::ComponentIR::ComponentDef::create_consumes_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -10374,7 +10222,7 @@ void POA_CORBA::ComponentIR::ComponentDef::create_consumes_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -10418,8 +10266,7 @@ namespace POA_CORBA
 
         retval =
           this->servant_-> _is_a (
-            arg_1
-            ACE_ENV_ARG_PARAMETER);
+            arg_1);
       }
 
     private:
@@ -10436,7 +10283,6 @@ void POA_CORBA::ComponentIR::ComponentDef::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -10473,7 +10319,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -10505,8 +10351,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_is_a_skel (
             this->args_);
 
         retval =
-          this->servant_-> _non_existent (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _non_existent ();
       }
 
     private:
@@ -10523,7 +10368,6 @@ void POA_CORBA::ComponentIR::ComponentDef::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -10558,7 +10402,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -10590,8 +10434,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_non_existent_skel (
             this->args_);
 
         retval =
-          this->servant_-> _repository_id (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _repository_id ();
       }
 
     private:
@@ -10608,7 +10451,6 @@ void POA_CORBA::ComponentIR::ComponentDef::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -10643,7 +10485,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -10653,7 +10495,6 @@ void POA_CORBA::ComponentIR::ComponentDef::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -10663,8 +10504,9 @@ void POA_CORBA::ComponentIR::ComponentDef::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::ComponentIR::ComponentDef * const impl =
@@ -10685,7 +10527,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -10718,8 +10560,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_interface_skel (
             this->args_);
 
         retval =
-          this->servant_-> _get_component (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _get_component ();
       }
 
     private:
@@ -10736,7 +10577,6 @@ void POA_CORBA::ComponentIR::ComponentDef::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -10771,12 +10611,11 @@ void POA_CORBA::ComponentIR::ComponentDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::ComponentDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -10831,13 +10670,11 @@ const char* POA_CORBA::ComponentIR::ComponentDef::_interface_repository_id (void
 void POA_CORBA::ComponentIR::ComponentDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -11169,8 +11006,7 @@ namespace POA_CORBA
 
         retval =
           this->servant_-> _is_a (
-            arg_1
-            ACE_ENV_ARG_PARAMETER);
+            arg_1);
       }
 
     private:
@@ -11187,7 +11023,6 @@ void POA_CORBA::ComponentIR::FactoryDef::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -11224,7 +11059,7 @@ void POA_CORBA::ComponentIR::FactoryDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -11256,8 +11091,7 @@ void POA_CORBA::ComponentIR::FactoryDef::_is_a_skel (
             this->args_);
 
         retval =
-          this->servant_-> _non_existent (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _non_existent ();
       }
 
     private:
@@ -11274,7 +11108,6 @@ void POA_CORBA::ComponentIR::FactoryDef::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -11309,7 +11142,7 @@ void POA_CORBA::ComponentIR::FactoryDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -11341,8 +11174,7 @@ void POA_CORBA::ComponentIR::FactoryDef::_non_existent_skel (
             this->args_);
 
         retval =
-          this->servant_-> _repository_id (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _repository_id ();
       }
 
     private:
@@ -11359,7 +11191,6 @@ void POA_CORBA::ComponentIR::FactoryDef::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -11394,7 +11225,7 @@ void POA_CORBA::ComponentIR::FactoryDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -11404,7 +11235,6 @@ void POA_CORBA::ComponentIR::FactoryDef::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -11414,8 +11244,9 @@ void POA_CORBA::ComponentIR::FactoryDef::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::ComponentIR::FactoryDef * const impl =
@@ -11436,7 +11267,7 @@ void POA_CORBA::ComponentIR::FactoryDef::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -11469,8 +11300,7 @@ void POA_CORBA::ComponentIR::FactoryDef::_interface_skel (
             this->args_);
 
         retval =
-          this->servant_-> _get_component (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _get_component ();
       }
 
     private:
@@ -11487,7 +11317,6 @@ void POA_CORBA::ComponentIR::FactoryDef::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -11522,12 +11351,11 @@ void POA_CORBA::ComponentIR::FactoryDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::FactoryDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -11566,13 +11394,11 @@ const char* POA_CORBA::ComponentIR::FactoryDef::_interface_repository_id (void)
 void POA_CORBA::ComponentIR::FactoryDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -11904,8 +11730,7 @@ namespace POA_CORBA
 
         retval =
           this->servant_-> _is_a (
-            arg_1
-            ACE_ENV_ARG_PARAMETER);
+            arg_1);
       }
 
     private:
@@ -11922,7 +11747,6 @@ void POA_CORBA::ComponentIR::FinderDef::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -11959,7 +11783,7 @@ void POA_CORBA::ComponentIR::FinderDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -11991,8 +11815,7 @@ void POA_CORBA::ComponentIR::FinderDef::_is_a_skel (
             this->args_);
 
         retval =
-          this->servant_-> _non_existent (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _non_existent ();
       }
 
     private:
@@ -12009,7 +11832,6 @@ void POA_CORBA::ComponentIR::FinderDef::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -12044,7 +11866,7 @@ void POA_CORBA::ComponentIR::FinderDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -12076,8 +11898,7 @@ void POA_CORBA::ComponentIR::FinderDef::_non_existent_skel (
             this->args_);
 
         retval =
-          this->servant_-> _repository_id (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _repository_id ();
       }
 
     private:
@@ -12094,7 +11915,6 @@ void POA_CORBA::ComponentIR::FinderDef::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -12129,7 +11949,7 @@ void POA_CORBA::ComponentIR::FinderDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -12139,7 +11959,6 @@ void POA_CORBA::ComponentIR::FinderDef::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -12149,8 +11968,9 @@ void POA_CORBA::ComponentIR::FinderDef::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::ComponentIR::FinderDef * const impl =
@@ -12171,7 +11991,7 @@ void POA_CORBA::ComponentIR::FinderDef::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -12204,8 +12024,7 @@ void POA_CORBA::ComponentIR::FinderDef::_interface_skel (
             this->args_);
 
         retval =
-          this->servant_-> _get_component (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _get_component ();
       }
 
     private:
@@ -12222,7 +12041,6 @@ void POA_CORBA::ComponentIR::FinderDef::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -12257,12 +12075,11 @@ void POA_CORBA::ComponentIR::FinderDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::FinderDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -12301,13 +12118,11 @@ const char* POA_CORBA::ComponentIR::FinderDef::_interface_repository_id (void) c
 void POA_CORBA::ComponentIR::FinderDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -12607,8 +12422,7 @@ POA_CORBA::ComponentIR::HomeDef::~HomeDef (void)
             this->args_);
 
         retval =
-          this->servant_->base_home (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_->base_home ();
       }
 
     private:
@@ -12628,7 +12442,6 @@ void POA_CORBA::ComponentIR::HomeDef::_get_base_home_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -12663,7 +12476,7 @@ void POA_CORBA::ComponentIR::HomeDef::_get_base_home_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -12696,8 +12509,7 @@ void POA_CORBA::ComponentIR::HomeDef::_get_base_home_skel (
             1);
 
         this->servant_->base_home (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
       }
 
     private:
@@ -12717,7 +12529,6 @@ void POA_CORBA::ComponentIR::HomeDef::_set_base_home_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -12754,7 +12565,7 @@ void POA_CORBA::ComponentIR::HomeDef::_set_base_home_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -12786,8 +12597,7 @@ void POA_CORBA::ComponentIR::HomeDef::_set_base_home_skel (
             this->args_);
 
         retval =
-          this->servant_->supported_interfaces (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_->supported_interfaces ();
       }
 
     private:
@@ -12807,7 +12617,6 @@ void POA_CORBA::ComponentIR::HomeDef::_get_supported_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -12842,7 +12651,7 @@ void POA_CORBA::ComponentIR::HomeDef::_get_supported_interfaces_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -12875,8 +12684,7 @@ void POA_CORBA::ComponentIR::HomeDef::_get_supported_interfaces_skel (
             1);
 
         this->servant_->supported_interfaces (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
       }
 
     private:
@@ -12896,7 +12704,6 @@ void POA_CORBA::ComponentIR::HomeDef::_set_supported_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -12933,7 +12740,7 @@ void POA_CORBA::ComponentIR::HomeDef::_set_supported_interfaces_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -12965,8 +12772,7 @@ void POA_CORBA::ComponentIR::HomeDef::_set_supported_interfaces_skel (
             this->args_);
 
         retval =
-          this->servant_->managed_component (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_->managed_component ();
       }
 
     private:
@@ -12986,7 +12792,6 @@ void POA_CORBA::ComponentIR::HomeDef::_get_managed_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -13021,7 +12826,7 @@ void POA_CORBA::ComponentIR::HomeDef::_get_managed_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -13054,8 +12859,7 @@ void POA_CORBA::ComponentIR::HomeDef::_get_managed_component_skel (
             1);
 
         this->servant_->managed_component (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
       }
 
     private:
@@ -13075,7 +12879,6 @@ void POA_CORBA::ComponentIR::HomeDef::_set_managed_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -13112,7 +12915,7 @@ void POA_CORBA::ComponentIR::HomeDef::_set_managed_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -13144,8 +12947,7 @@ void POA_CORBA::ComponentIR::HomeDef::_set_managed_component_skel (
             this->args_);
 
         retval =
-          this->servant_->primary_key (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_->primary_key ();
       }
 
     private:
@@ -13165,7 +12967,6 @@ void POA_CORBA::ComponentIR::HomeDef::_get_primary_key_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -13200,7 +13001,7 @@ void POA_CORBA::ComponentIR::HomeDef::_get_primary_key_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -13233,8 +13034,7 @@ void POA_CORBA::ComponentIR::HomeDef::_get_primary_key_skel (
             1);
 
         this->servant_->primary_key (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
       }
 
     private:
@@ -13254,7 +13054,6 @@ void POA_CORBA::ComponentIR::HomeDef::_set_primary_key_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -13291,7 +13090,7 @@ void POA_CORBA::ComponentIR::HomeDef::_set_primary_key_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -13358,8 +13157,7 @@ void POA_CORBA::ComponentIR::HomeDef::_set_primary_key_skel (
             , arg_2
             , arg_3
             , arg_4
-            , arg_5
-            ACE_ENV_ARG_PARAMETER);
+            , arg_5);
       }
 
     private:
@@ -13379,7 +13177,6 @@ void POA_CORBA::ComponentIR::HomeDef::create_factory_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -13424,7 +13221,7 @@ void POA_CORBA::ComponentIR::HomeDef::create_factory_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -13491,8 +13288,7 @@ void POA_CORBA::ComponentIR::HomeDef::create_factory_skel (
             , arg_2
             , arg_3
             , arg_4
-            , arg_5
-            ACE_ENV_ARG_PARAMETER);
+            , arg_5);
       }
 
     private:
@@ -13512,7 +13308,6 @@ void POA_CORBA::ComponentIR::HomeDef::create_finder_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -13557,7 +13352,7 @@ void POA_CORBA::ComponentIR::HomeDef::create_finder_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -13601,8 +13396,7 @@ namespace POA_CORBA
 
         retval =
           this->servant_-> _is_a (
-            arg_1
-            ACE_ENV_ARG_PARAMETER);
+            arg_1);
       }
 
     private:
@@ -13619,7 +13413,6 @@ void POA_CORBA::ComponentIR::HomeDef::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -13656,7 +13449,7 @@ void POA_CORBA::ComponentIR::HomeDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -13688,8 +13481,7 @@ void POA_CORBA::ComponentIR::HomeDef::_is_a_skel (
             this->args_);
 
         retval =
-          this->servant_-> _non_existent (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _non_existent ();
       }
 
     private:
@@ -13706,7 +13498,6 @@ void POA_CORBA::ComponentIR::HomeDef::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -13741,7 +13532,7 @@ void POA_CORBA::ComponentIR::HomeDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
@@ -13773,8 +13564,7 @@ void POA_CORBA::ComponentIR::HomeDef::_non_existent_skel (
             this->args_);
 
         retval =
-          this->servant_-> _repository_id (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _repository_id ();
       }
 
     private:
@@ -13791,7 +13581,6 @@ void POA_CORBA::ComponentIR::HomeDef::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -13826,7 +13615,7 @@ void POA_CORBA::ComponentIR::HomeDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -13836,7 +13625,6 @@ void POA_CORBA::ComponentIR::HomeDef::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -13846,8 +13634,9 @@ void POA_CORBA::ComponentIR::HomeDef::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::ComponentIR::HomeDef * const impl =
@@ -13868,7 +13657,7 @@ void POA_CORBA::ComponentIR::HomeDef::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -13901,8 +13690,7 @@ void POA_CORBA::ComponentIR::HomeDef::_interface_skel (
             this->args_);
 
         retval =
-          this->servant_-> _get_component (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->servant_-> _get_component ();
       }
 
     private:
@@ -13919,7 +13707,6 @@ void POA_CORBA::ComponentIR::HomeDef::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -13954,12 +13741,11 @@ void POA_CORBA::ComponentIR::HomeDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::HomeDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -14014,13 +13800,11 @@ const char* POA_CORBA::ComponentIR::HomeDef::_interface_repository_id (void) con
 void POA_CORBA::ComponentIR::HomeDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h
index 096de121f5f..a1ad147d576 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h
@@ -85,53 +85,45 @@ namespace POA_CORBA
 
       virtual ::CORBA::Boolean _is_a (
           const char* logical_type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void _is_a_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _non_existent_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _interface_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _component_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _repository_id_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
-          ACE_ENV_ARG_DECL
         );
 
       ::CORBA::ComponentIR::EventDef *_this (
 
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       virtual const char* _interface_repository_id (void) const;
@@ -141,7 +133,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -152,7 +143,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -163,7 +153,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -174,7 +163,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -185,7 +173,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -196,7 +183,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -207,7 +193,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -218,7 +203,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -229,7 +213,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -240,7 +223,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -251,7 +233,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -262,7 +243,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -273,7 +253,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -284,7 +263,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -295,7 +273,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -306,7 +283,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -317,7 +293,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -328,7 +303,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -339,7 +313,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -350,7 +323,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -358,7 +330,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -366,7 +337,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -374,7 +344,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -382,7 +351,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -390,7 +358,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -398,7 +365,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -406,7 +372,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -414,7 +379,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -422,7 +386,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -433,7 +396,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -444,7 +406,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -452,7 +413,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -460,7 +420,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -468,7 +427,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -476,7 +434,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -484,7 +441,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -492,7 +448,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -500,7 +455,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -508,7 +462,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -516,7 +469,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -524,7 +476,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -532,7 +483,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -540,7 +490,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -548,7 +497,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -556,7 +504,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -564,7 +511,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -575,7 +521,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -586,7 +531,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -597,7 +541,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -608,7 +551,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -619,7 +561,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -627,7 +568,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -635,7 +575,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -646,7 +585,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -657,7 +595,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
     };
 
@@ -684,53 +621,45 @@ namespace POA_CORBA
 
       virtual ::CORBA::Boolean _is_a (
           const char* logical_type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void _is_a_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _non_existent_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _interface_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _component_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _repository_id_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
-          ACE_ENV_ARG_DECL
         );
 
       ::CORBA::ComponentIR::Container *_this (
 
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       virtual const char* _interface_repository_id (void) const;
@@ -744,7 +673,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::ComponentIR::ComponentDef_ptr base_component,
           const ::CORBA::InterfaceDefSeq & supports_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -754,7 +682,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -768,7 +695,6 @@ namespace POA_CORBA
           ::CORBA::ComponentIR::ComponentDef_ptr managed_component,
           const ::CORBA::InterfaceDefSeq & supports_interfaces,
           ::CORBA::ValueDef_ptr primary_key
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -778,7 +704,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -795,7 +720,6 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::ExtInitializerSeq & initializers
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -805,7 +729,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void
@@ -813,7 +736,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -824,7 +746,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -835,7 +756,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -846,7 +766,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -857,7 +776,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -868,7 +786,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -879,7 +796,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -890,7 +806,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -901,7 +816,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -912,7 +826,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -923,7 +836,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -934,7 +846,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -945,7 +856,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -956,7 +866,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -967,7 +876,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -978,7 +886,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -989,7 +896,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1000,7 +906,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1011,7 +916,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1022,7 +926,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
     };
 
@@ -1050,53 +953,45 @@ namespace POA_CORBA
 
       virtual ::CORBA::Boolean _is_a (
           const char* logical_type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void _is_a_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _non_existent_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _interface_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _component_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _repository_id_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
-          ACE_ENV_ARG_DECL
         );
 
       ::CORBA::ComponentIR::ModuleDef *_this (
 
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       virtual const char* _interface_repository_id (void) const;
@@ -1106,7 +1001,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1117,7 +1011,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1128,7 +1021,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1139,7 +1031,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1150,7 +1041,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1161,7 +1051,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1172,7 +1061,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1183,7 +1071,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1194,7 +1081,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1205,7 +1091,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1216,7 +1101,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1227,7 +1111,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1238,7 +1121,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1249,7 +1131,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1260,7 +1141,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1271,7 +1151,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1282,7 +1161,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1293,7 +1171,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1304,7 +1181,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1315,7 +1191,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -1323,7 +1198,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -1331,7 +1205,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -1339,7 +1212,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -1347,7 +1219,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -1355,7 +1226,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -1363,7 +1233,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -1371,7 +1240,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -1379,7 +1247,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -1387,7 +1254,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1398,7 +1264,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1409,7 +1274,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1420,7 +1284,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1431,7 +1294,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1442,7 +1304,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
     };
 
@@ -1470,53 +1331,45 @@ namespace POA_CORBA
 
       virtual ::CORBA::Boolean _is_a (
           const char* logical_type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void _is_a_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _non_existent_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _interface_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _component_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _repository_id_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
-          ACE_ENV_ARG_DECL
         );
 
       ::CORBA::ComponentIR::Repository *_this (
 
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       virtual const char* _interface_repository_id (void) const;
@@ -1526,7 +1379,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1537,7 +1389,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1548,7 +1399,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1559,7 +1409,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1570,7 +1419,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1581,7 +1429,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1592,7 +1439,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1603,7 +1449,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1614,7 +1459,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1625,7 +1469,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1636,7 +1479,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1647,7 +1489,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1658,7 +1499,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1669,7 +1509,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1680,7 +1519,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1691,7 +1529,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1702,7 +1539,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1713,7 +1549,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1724,7 +1559,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1735,7 +1569,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1746,7 +1579,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1757,7 +1589,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1768,7 +1599,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1779,7 +1609,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1790,7 +1619,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1801,7 +1629,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1812,7 +1639,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1823,7 +1649,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1834,7 +1659,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1845,7 +1669,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1856,7 +1679,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
     };
 
@@ -1883,53 +1705,45 @@ namespace POA_CORBA
 
       virtual ::CORBA::Boolean _is_a (
           const char* logical_type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void _is_a_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _non_existent_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _interface_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _component_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _repository_id_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
-          ACE_ENV_ARG_DECL
         );
 
       ::CORBA::ComponentIR::ProvidesDef *_this (
 
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       virtual const char* _interface_repository_id (void) const;
@@ -1938,7 +1752,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/operation_sh.cpp:45
 
       virtual ::CORBA::InterfaceDef_ptr interface_type (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1948,7 +1761,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -1956,7 +1768,6 @@ namespace POA_CORBA
 
       virtual void interface_type (
           ::CORBA::InterfaceDef_ptr interface_type
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1966,7 +1777,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void
@@ -1974,7 +1784,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1985,7 +1794,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -1993,7 +1801,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2001,7 +1808,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2009,7 +1815,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2017,7 +1822,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2025,7 +1829,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2033,7 +1836,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2041,7 +1843,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2049,7 +1850,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2057,7 +1857,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -2068,7 +1867,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -2079,7 +1877,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
     };
 
@@ -2106,53 +1903,45 @@ namespace POA_CORBA
 
       virtual ::CORBA::Boolean _is_a (
           const char* logical_type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void _is_a_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _non_existent_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _interface_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _component_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _repository_id_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
-          ACE_ENV_ARG_DECL
         );
 
       ::CORBA::ComponentIR::UsesDef *_this (
 
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       virtual const char* _interface_repository_id (void) const;
@@ -2161,7 +1950,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/operation_sh.cpp:45
 
       virtual ::CORBA::InterfaceDef_ptr interface_type (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2171,7 +1959,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -2179,7 +1966,6 @@ namespace POA_CORBA
 
       virtual void interface_type (
           ::CORBA::InterfaceDef_ptr interface_type
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2189,14 +1975,12 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/operation_sh.cpp:45
 
       virtual ::CORBA::Boolean is_multiple (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2206,7 +1990,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -2214,7 +1997,6 @@ namespace POA_CORBA
 
       virtual void is_multiple (
           ::CORBA::Boolean is_multiple
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2224,7 +2006,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void
@@ -2232,7 +2013,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -2243,7 +2023,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2251,7 +2030,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2259,7 +2037,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2267,7 +2044,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2275,7 +2051,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2283,7 +2058,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2291,7 +2065,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2299,7 +2072,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2307,7 +2079,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2315,7 +2086,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -2326,7 +2096,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -2337,7 +2106,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
     };
 
@@ -2364,53 +2132,45 @@ namespace POA_CORBA
 
       virtual ::CORBA::Boolean _is_a (
           const char* logical_type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void _is_a_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _non_existent_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _interface_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _component_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _repository_id_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
-          ACE_ENV_ARG_DECL
         );
 
       ::CORBA::ComponentIR::EventPortDef *_this (
 
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       virtual const char* _interface_repository_id (void) const;
@@ -2419,7 +2179,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/operation_sh.cpp:45
 
       virtual ::CORBA::ComponentIR::EventDef_ptr event (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2429,7 +2188,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -2437,7 +2195,6 @@ namespace POA_CORBA
 
       virtual void event (
           ::CORBA::ComponentIR::EventDef_ptr event
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2447,7 +2204,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -2455,7 +2211,6 @@ namespace POA_CORBA
 
       virtual ::CORBA::Boolean is_a (
           const char * event_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2465,7 +2220,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void
@@ -2473,7 +2227,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -2484,7 +2237,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2492,7 +2244,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2500,7 +2251,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2508,7 +2258,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2516,7 +2265,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2524,7 +2272,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2532,7 +2279,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2540,7 +2286,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2548,7 +2293,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2556,7 +2300,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -2567,7 +2310,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -2578,7 +2320,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
     };
 
@@ -2605,53 +2346,45 @@ namespace POA_CORBA
 
       virtual ::CORBA::Boolean _is_a (
           const char* logical_type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void _is_a_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _non_existent_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _interface_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _component_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _repository_id_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
-          ACE_ENV_ARG_DECL
         );
 
       ::CORBA::ComponentIR::EmitsDef *_this (
 
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       virtual const char* _interface_repository_id (void) const;
@@ -2661,7 +2394,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -2672,7 +2404,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2680,7 +2411,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2688,7 +2418,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2696,7 +2425,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2704,7 +2432,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2712,7 +2439,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2720,7 +2446,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2728,7 +2453,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2736,7 +2460,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2744,7 +2467,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -2755,7 +2477,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -2766,7 +2487,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2774,7 +2494,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2782,7 +2501,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -2793,7 +2511,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
     };
 
@@ -2820,53 +2537,45 @@ namespace POA_CORBA
 
       virtual ::CORBA::Boolean _is_a (
           const char* logical_type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void _is_a_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _non_existent_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _interface_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _component_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _repository_id_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
-          ACE_ENV_ARG_DECL
         );
 
       ::CORBA::ComponentIR::PublishesDef *_this (
 
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       virtual const char* _interface_repository_id (void) const;
@@ -2876,7 +2585,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -2887,7 +2595,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2895,7 +2602,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2903,7 +2609,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2911,7 +2616,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2919,7 +2623,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2927,7 +2630,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2935,7 +2637,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2943,7 +2644,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2951,7 +2651,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2959,7 +2658,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -2970,7 +2668,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -2981,7 +2678,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2989,7 +2685,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2997,7 +2692,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3008,7 +2702,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
     };
 
@@ -3035,53 +2728,45 @@ namespace POA_CORBA
 
       virtual ::CORBA::Boolean _is_a (
           const char* logical_type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void _is_a_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _non_existent_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _interface_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _component_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _repository_id_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
-          ACE_ENV_ARG_DECL
         );
 
       ::CORBA::ComponentIR::ConsumesDef *_this (
 
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       virtual const char* _interface_repository_id (void) const;
@@ -3091,7 +2776,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3102,7 +2786,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3110,7 +2793,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3118,7 +2800,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3126,7 +2807,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3134,7 +2814,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3142,7 +2821,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3150,7 +2828,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3158,7 +2835,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3166,7 +2842,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3174,7 +2849,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3185,7 +2859,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3196,7 +2869,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3204,7 +2876,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3212,7 +2883,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3223,7 +2893,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
     };
 
@@ -3250,53 +2919,45 @@ namespace POA_CORBA
 
       virtual ::CORBA::Boolean _is_a (
           const char* logical_type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void _is_a_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _non_existent_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _interface_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _component_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _repository_id_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
-          ACE_ENV_ARG_DECL
         );
 
       ::CORBA::ComponentIR::ComponentDef *_this (
 
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       virtual const char* _interface_repository_id (void) const;
@@ -3305,7 +2966,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/operation_sh.cpp:45
 
       virtual ::CORBA::ComponentIR::ComponentDef_ptr base_component (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3315,7 +2975,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -3323,7 +2982,6 @@ namespace POA_CORBA
 
       virtual void base_component (
           ::CORBA::ComponentIR::ComponentDef_ptr base_component
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3333,14 +2991,12 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/operation_sh.cpp:45
 
       virtual ::CORBA::InterfaceDefSeq * supported_interfaces (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3350,7 +3006,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -3358,7 +3013,6 @@ namespace POA_CORBA
 
       virtual void supported_interfaces (
           const ::CORBA::InterfaceDefSeq & supported_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3368,7 +3022,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -3379,7 +3032,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::InterfaceDef_ptr interface_type
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3389,7 +3041,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -3401,7 +3052,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::InterfaceDef_ptr interface_type,
           ::CORBA::Boolean is_multiple
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3411,7 +3061,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -3422,7 +3071,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::ComponentIR::EventDef_ptr event
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3432,7 +3080,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -3443,7 +3090,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::ComponentIR::EventDef_ptr event
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3453,7 +3099,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -3464,7 +3109,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::ComponentIR::EventDef_ptr event
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3474,7 +3118,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void
@@ -3482,7 +3125,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3493,7 +3135,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3504,7 +3145,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3515,7 +3155,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3526,7 +3165,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3537,7 +3175,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3548,7 +3185,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3559,7 +3195,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3570,7 +3205,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3581,7 +3215,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3592,7 +3225,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3603,7 +3235,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3614,7 +3245,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3625,7 +3255,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3636,7 +3265,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3647,7 +3275,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3658,7 +3285,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3669,7 +3295,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3680,7 +3305,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3691,7 +3315,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3699,7 +3322,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3707,7 +3329,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3715,7 +3336,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3723,7 +3343,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3731,7 +3350,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3739,7 +3357,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3747,7 +3364,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3755,7 +3371,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3763,7 +3378,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3774,7 +3388,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3785,7 +3398,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3793,7 +3405,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3801,7 +3412,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3809,7 +3419,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3820,7 +3429,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3831,7 +3439,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3842,7 +3449,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3853,7 +3459,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3864,7 +3469,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3875,7 +3479,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
     };
 
@@ -3902,53 +3505,45 @@ namespace POA_CORBA
 
       virtual ::CORBA::Boolean _is_a (
           const char* logical_type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void _is_a_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _non_existent_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _interface_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _component_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _repository_id_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
-          ACE_ENV_ARG_DECL
         );
 
       ::CORBA::ComponentIR::FactoryDef *_this (
 
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       virtual const char* _interface_repository_id (void) const;
@@ -3958,7 +3553,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3969,7 +3563,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3977,7 +3570,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3985,7 +3577,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3993,7 +3584,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4001,7 +3591,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4009,7 +3598,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4017,7 +3605,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4025,7 +3612,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4033,7 +3619,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4041,7 +3626,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4052,7 +3636,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4063,7 +3646,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4071,7 +3653,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4079,7 +3660,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4087,7 +3667,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4095,7 +3674,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4103,7 +3681,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4111,7 +3688,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4119,7 +3695,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4127,7 +3702,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4135,7 +3709,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4143,7 +3716,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4151,7 +3723,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
     };
 
@@ -4178,53 +3749,45 @@ namespace POA_CORBA
 
       virtual ::CORBA::Boolean _is_a (
           const char* logical_type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void _is_a_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _non_existent_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _interface_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _component_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _repository_id_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
-          ACE_ENV_ARG_DECL
         );
 
       ::CORBA::ComponentIR::FinderDef *_this (
 
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       virtual const char* _interface_repository_id (void) const;
@@ -4234,7 +3797,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4245,7 +3807,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4253,7 +3814,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4261,7 +3821,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4269,7 +3828,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4277,7 +3835,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4285,7 +3842,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4293,7 +3849,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4301,7 +3856,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4309,7 +3863,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4317,7 +3870,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4328,7 +3880,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4339,7 +3890,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4347,7 +3897,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4355,7 +3904,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4363,7 +3911,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4371,7 +3918,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4379,7 +3925,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4387,7 +3932,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4395,7 +3939,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4403,7 +3946,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4411,7 +3953,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4419,7 +3960,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4427,7 +3967,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
     };
 
@@ -4454,53 +3993,45 @@ namespace POA_CORBA
 
       virtual ::CORBA::Boolean _is_a (
           const char* logical_type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void _is_a_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _non_existent_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _interface_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _component_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _repository_id_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
-          ACE_ENV_ARG_DECL
         );
 
       ::CORBA::ComponentIR::HomeDef *_this (
 
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       virtual const char* _interface_repository_id (void) const;
@@ -4509,7 +4040,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/operation_sh.cpp:45
 
       virtual ::CORBA::ComponentIR::HomeDef_ptr base_home (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4519,7 +4049,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -4527,7 +4056,6 @@ namespace POA_CORBA
 
       virtual void base_home (
           ::CORBA::ComponentIR::HomeDef_ptr base_home
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4537,14 +4065,12 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/operation_sh.cpp:45
 
       virtual ::CORBA::InterfaceDefSeq * supported_interfaces (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4554,7 +4080,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -4562,7 +4087,6 @@ namespace POA_CORBA
 
       virtual void supported_interfaces (
           const ::CORBA::InterfaceDefSeq & supported_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4572,14 +4096,12 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/operation_sh.cpp:45
 
       virtual ::CORBA::ComponentIR::ComponentDef_ptr managed_component (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4589,7 +4111,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -4597,7 +4118,6 @@ namespace POA_CORBA
 
       virtual void managed_component (
           ::CORBA::ComponentIR::ComponentDef_ptr managed_component
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4607,14 +4127,12 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/operation_sh.cpp:45
 
       virtual ::CORBA::ValueDef_ptr primary_key (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4624,7 +4142,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -4632,7 +4149,6 @@ namespace POA_CORBA
 
       virtual void primary_key (
           ::CORBA::ValueDef_ptr primary_key
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4642,7 +4158,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -4654,7 +4169,6 @@ namespace POA_CORBA
           const char * version,
           const ::CORBA::ParDescriptionSeq & params,
           const ::CORBA::ExceptionDefSeq & exceptions
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4664,7 +4178,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -4676,7 +4189,6 @@ namespace POA_CORBA
           const char * version,
           const ::CORBA::ParDescriptionSeq & params,
           const ::CORBA::ExceptionDefSeq & exceptions
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4686,7 +4198,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void
@@ -4694,7 +4205,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4705,7 +4215,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4716,7 +4225,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4727,7 +4235,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4738,7 +4245,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4749,7 +4255,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4760,7 +4265,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4771,7 +4275,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4782,7 +4285,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4793,7 +4295,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4804,7 +4305,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4815,7 +4315,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4826,7 +4325,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4837,7 +4335,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4848,7 +4345,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4859,7 +4355,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4870,7 +4365,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4881,7 +4375,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4892,7 +4385,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4903,7 +4395,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4911,7 +4402,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4919,7 +4409,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4927,7 +4416,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4935,7 +4423,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4943,7 +4430,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4951,7 +4437,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4959,7 +4444,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4967,7 +4451,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4975,7 +4458,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4986,7 +4468,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4997,7 +4478,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -5005,7 +4485,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -5013,7 +4492,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -5021,7 +4499,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -5032,7 +4509,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -5043,7 +4519,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -5054,7 +4529,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -5065,7 +4539,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -5076,7 +4549,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -5087,7 +4559,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
     };
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.inl
index 86e5fd82676..06f6e8026d7 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.inl
@@ -36,7 +36,6 @@ POA_CORBA::ComponentIR::EventDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -44,7 +43,6 @@ POA_CORBA::ComponentIR::EventDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -57,7 +55,6 @@ POA_CORBA::ComponentIR::EventDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -65,7 +62,6 @@ POA_CORBA::ComponentIR::EventDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -78,7 +74,6 @@ POA_CORBA::ComponentIR::EventDef::lookup_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -86,7 +81,6 @@ POA_CORBA::ComponentIR::EventDef::lookup_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -99,7 +93,6 @@ POA_CORBA::ComponentIR::EventDef::contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -107,7 +100,6 @@ POA_CORBA::ComponentIR::EventDef::contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -120,7 +112,6 @@ POA_CORBA::ComponentIR::EventDef::lookup_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -128,7 +119,6 @@ POA_CORBA::ComponentIR::EventDef::lookup_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -141,7 +131,6 @@ POA_CORBA::ComponentIR::EventDef::describe_contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -149,7 +138,6 @@ POA_CORBA::ComponentIR::EventDef::describe_contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -162,7 +150,6 @@ POA_CORBA::ComponentIR::EventDef::create_module_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -170,7 +157,6 @@ POA_CORBA::ComponentIR::EventDef::create_module_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -183,7 +169,6 @@ POA_CORBA::ComponentIR::EventDef::create_constant_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -191,7 +176,6 @@ POA_CORBA::ComponentIR::EventDef::create_constant_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -204,7 +188,6 @@ POA_CORBA::ComponentIR::EventDef::create_struct_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -212,7 +195,6 @@ POA_CORBA::ComponentIR::EventDef::create_struct_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -225,7 +207,6 @@ POA_CORBA::ComponentIR::EventDef::create_union_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -233,7 +214,6 @@ POA_CORBA::ComponentIR::EventDef::create_union_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -246,7 +226,6 @@ POA_CORBA::ComponentIR::EventDef::create_enum_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -254,7 +233,6 @@ POA_CORBA::ComponentIR::EventDef::create_enum_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -267,7 +245,6 @@ POA_CORBA::ComponentIR::EventDef::create_alias_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -275,7 +252,6 @@ POA_CORBA::ComponentIR::EventDef::create_alias_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -288,7 +264,6 @@ POA_CORBA::ComponentIR::EventDef::create_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -296,7 +271,6 @@ POA_CORBA::ComponentIR::EventDef::create_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -309,7 +283,6 @@ POA_CORBA::ComponentIR::EventDef::create_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -317,7 +290,6 @@ POA_CORBA::ComponentIR::EventDef::create_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -330,7 +302,6 @@ POA_CORBA::ComponentIR::EventDef::create_value_box_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -338,7 +309,6 @@ POA_CORBA::ComponentIR::EventDef::create_value_box_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -351,7 +321,6 @@ POA_CORBA::ComponentIR::EventDef::create_exception_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -359,7 +328,6 @@ POA_CORBA::ComponentIR::EventDef::create_exception_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -372,7 +340,6 @@ POA_CORBA::ComponentIR::EventDef::create_native_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -380,7 +347,6 @@ POA_CORBA::ComponentIR::EventDef::create_native_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -393,7 +359,6 @@ POA_CORBA::ComponentIR::EventDef::create_abstract_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -401,7 +366,6 @@ POA_CORBA::ComponentIR::EventDef::create_abstract_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -414,7 +378,6 @@ POA_CORBA::ComponentIR::EventDef::create_local_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -422,7 +385,6 @@ POA_CORBA::ComponentIR::EventDef::create_local_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -435,7 +397,6 @@ POA_CORBA::ComponentIR::EventDef::create_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -443,7 +404,6 @@ POA_CORBA::ComponentIR::EventDef::create_ext_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -453,7 +413,6 @@ POA_CORBA::ComponentIR::EventDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -461,7 +420,6 @@ POA_CORBA::ComponentIR::EventDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -471,7 +429,6 @@ POA_CORBA::ComponentIR::EventDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -479,7 +436,6 @@ POA_CORBA::ComponentIR::EventDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -489,7 +445,6 @@ POA_CORBA::ComponentIR::EventDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -497,7 +452,6 @@ POA_CORBA::ComponentIR::EventDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -507,7 +461,6 @@ POA_CORBA::ComponentIR::EventDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -515,7 +468,6 @@ POA_CORBA::ComponentIR::EventDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -525,7 +477,6 @@ POA_CORBA::ComponentIR::EventDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -533,7 +484,6 @@ POA_CORBA::ComponentIR::EventDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -543,7 +493,6 @@ POA_CORBA::ComponentIR::EventDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -551,7 +500,6 @@ POA_CORBA::ComponentIR::EventDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -561,7 +509,6 @@ POA_CORBA::ComponentIR::EventDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -569,7 +516,6 @@ POA_CORBA::ComponentIR::EventDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -579,7 +525,6 @@ POA_CORBA::ComponentIR::EventDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -587,7 +532,6 @@ POA_CORBA::ComponentIR::EventDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -597,7 +541,6 @@ POA_CORBA::ComponentIR::EventDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -605,7 +548,6 @@ POA_CORBA::ComponentIR::EventDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -618,7 +560,6 @@ POA_CORBA::ComponentIR::EventDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -626,7 +567,6 @@ POA_CORBA::ComponentIR::EventDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -639,7 +579,6 @@ POA_CORBA::ComponentIR::EventDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -647,7 +586,6 @@ POA_CORBA::ComponentIR::EventDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -657,7 +595,6 @@ POA_CORBA::ComponentIR::EventDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -665,7 +602,6 @@ POA_CORBA::ComponentIR::EventDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -675,7 +611,6 @@ POA_CORBA::ComponentIR::EventDef::_get_supported_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -683,7 +618,6 @@ POA_CORBA::ComponentIR::EventDef::_get_supported_interfaces_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -693,7 +627,6 @@ POA_CORBA::ComponentIR::EventDef::_set_supported_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -701,7 +634,6 @@ POA_CORBA::ComponentIR::EventDef::_set_supported_interfaces_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -711,7 +643,6 @@ POA_CORBA::ComponentIR::EventDef::_get_initializers_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -719,7 +650,6 @@ POA_CORBA::ComponentIR::EventDef::_get_initializers_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -729,7 +659,6 @@ POA_CORBA::ComponentIR::EventDef::_set_initializers_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -737,7 +666,6 @@ POA_CORBA::ComponentIR::EventDef::_set_initializers_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -747,7 +675,6 @@ POA_CORBA::ComponentIR::EventDef::_get_base_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -755,7 +682,6 @@ POA_CORBA::ComponentIR::EventDef::_get_base_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -765,7 +691,6 @@ POA_CORBA::ComponentIR::EventDef::_set_base_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -773,7 +698,6 @@ POA_CORBA::ComponentIR::EventDef::_set_base_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -783,7 +707,6 @@ POA_CORBA::ComponentIR::EventDef::_get_abstract_base_values_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -791,7 +714,6 @@ POA_CORBA::ComponentIR::EventDef::_get_abstract_base_values_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -801,7 +723,6 @@ POA_CORBA::ComponentIR::EventDef::_set_abstract_base_values_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -809,7 +730,6 @@ POA_CORBA::ComponentIR::EventDef::_set_abstract_base_values_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -819,7 +739,6 @@ POA_CORBA::ComponentIR::EventDef::_get_is_abstract_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -827,7 +746,6 @@ POA_CORBA::ComponentIR::EventDef::_get_is_abstract_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -837,7 +755,6 @@ POA_CORBA::ComponentIR::EventDef::_set_is_abstract_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -845,7 +762,6 @@ POA_CORBA::ComponentIR::EventDef::_set_is_abstract_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -855,7 +771,6 @@ POA_CORBA::ComponentIR::EventDef::_get_is_custom_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -863,7 +778,6 @@ POA_CORBA::ComponentIR::EventDef::_get_is_custom_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -873,7 +787,6 @@ POA_CORBA::ComponentIR::EventDef::_set_is_custom_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -881,7 +794,6 @@ POA_CORBA::ComponentIR::EventDef::_set_is_custom_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -891,7 +803,6 @@ POA_CORBA::ComponentIR::EventDef::_get_is_truncatable_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -899,7 +810,6 @@ POA_CORBA::ComponentIR::EventDef::_get_is_truncatable_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -909,7 +819,6 @@ POA_CORBA::ComponentIR::EventDef::_set_is_truncatable_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -917,7 +826,6 @@ POA_CORBA::ComponentIR::EventDef::_set_is_truncatable_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -930,7 +838,6 @@ POA_CORBA::ComponentIR::EventDef::is_a_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -938,7 +845,6 @@ POA_CORBA::ComponentIR::EventDef::is_a_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -951,7 +857,6 @@ POA_CORBA::ComponentIR::EventDef::describe_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -959,7 +864,6 @@ POA_CORBA::ComponentIR::EventDef::describe_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -972,7 +876,6 @@ POA_CORBA::ComponentIR::EventDef::create_value_member_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -980,7 +883,6 @@ POA_CORBA::ComponentIR::EventDef::create_value_member_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -993,7 +895,6 @@ POA_CORBA::ComponentIR::EventDef::create_attribute_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -1001,7 +902,6 @@ POA_CORBA::ComponentIR::EventDef::create_attribute_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1014,7 +914,6 @@ POA_CORBA::ComponentIR::EventDef::create_operation_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -1022,7 +921,6 @@ POA_CORBA::ComponentIR::EventDef::create_operation_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1032,7 +930,6 @@ POA_CORBA::ComponentIR::EventDef::_get_ext_initializers_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ExtValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -1040,7 +937,6 @@ POA_CORBA::ComponentIR::EventDef::_get_ext_initializers_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1050,7 +946,6 @@ POA_CORBA::ComponentIR::EventDef::_set_ext_initializers_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ExtValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -1058,7 +953,6 @@ POA_CORBA::ComponentIR::EventDef::_set_ext_initializers_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1071,7 +965,6 @@ POA_CORBA::ComponentIR::EventDef::describe_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ExtValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -1079,7 +972,6 @@ POA_CORBA::ComponentIR::EventDef::describe_ext_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1092,7 +984,6 @@ POA_CORBA::ComponentIR::EventDef::create_ext_attribute_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ExtValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -1100,7 +991,6 @@ POA_CORBA::ComponentIR::EventDef::create_ext_attribute_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1110,7 +1000,6 @@ POA_CORBA::ComponentIR::Container::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -1118,7 +1007,6 @@ POA_CORBA::ComponentIR::Container::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1131,7 +1019,6 @@ POA_CORBA::ComponentIR::Container::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -1139,7 +1026,6 @@ POA_CORBA::ComponentIR::Container::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1152,7 +1038,6 @@ POA_CORBA::ComponentIR::Container::lookup_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -1160,7 +1045,6 @@ POA_CORBA::ComponentIR::Container::lookup_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1173,7 +1057,6 @@ POA_CORBA::ComponentIR::Container::contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -1181,7 +1064,6 @@ POA_CORBA::ComponentIR::Container::contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1194,7 +1076,6 @@ POA_CORBA::ComponentIR::Container::lookup_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -1202,7 +1083,6 @@ POA_CORBA::ComponentIR::Container::lookup_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1215,7 +1095,6 @@ POA_CORBA::ComponentIR::Container::describe_contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -1223,7 +1102,6 @@ POA_CORBA::ComponentIR::Container::describe_contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1236,7 +1114,6 @@ POA_CORBA::ComponentIR::Container::create_module_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -1244,7 +1121,6 @@ POA_CORBA::ComponentIR::Container::create_module_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1257,7 +1133,6 @@ POA_CORBA::ComponentIR::Container::create_constant_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -1265,7 +1140,6 @@ POA_CORBA::ComponentIR::Container::create_constant_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1278,7 +1152,6 @@ POA_CORBA::ComponentIR::Container::create_struct_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -1286,7 +1159,6 @@ POA_CORBA::ComponentIR::Container::create_struct_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1299,7 +1171,6 @@ POA_CORBA::ComponentIR::Container::create_union_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -1307,7 +1178,6 @@ POA_CORBA::ComponentIR::Container::create_union_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1320,7 +1190,6 @@ POA_CORBA::ComponentIR::Container::create_enum_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -1328,7 +1197,6 @@ POA_CORBA::ComponentIR::Container::create_enum_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1341,7 +1209,6 @@ POA_CORBA::ComponentIR::Container::create_alias_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -1349,7 +1216,6 @@ POA_CORBA::ComponentIR::Container::create_alias_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1362,7 +1228,6 @@ POA_CORBA::ComponentIR::Container::create_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -1370,7 +1235,6 @@ POA_CORBA::ComponentIR::Container::create_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1383,7 +1247,6 @@ POA_CORBA::ComponentIR::Container::create_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -1391,7 +1254,6 @@ POA_CORBA::ComponentIR::Container::create_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1404,7 +1266,6 @@ POA_CORBA::ComponentIR::Container::create_value_box_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -1412,7 +1273,6 @@ POA_CORBA::ComponentIR::Container::create_value_box_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1425,7 +1285,6 @@ POA_CORBA::ComponentIR::Container::create_exception_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -1433,7 +1292,6 @@ POA_CORBA::ComponentIR::Container::create_exception_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1446,7 +1304,6 @@ POA_CORBA::ComponentIR::Container::create_native_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -1454,7 +1311,6 @@ POA_CORBA::ComponentIR::Container::create_native_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1467,7 +1323,6 @@ POA_CORBA::ComponentIR::Container::create_abstract_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -1475,7 +1330,6 @@ POA_CORBA::ComponentIR::Container::create_abstract_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1488,7 +1342,6 @@ POA_CORBA::ComponentIR::Container::create_local_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -1496,7 +1349,6 @@ POA_CORBA::ComponentIR::Container::create_local_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1509,7 +1361,6 @@ POA_CORBA::ComponentIR::Container::create_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -1517,7 +1368,6 @@ POA_CORBA::ComponentIR::Container::create_ext_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1527,7 +1377,6 @@ POA_CORBA::ComponentIR::ModuleDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1535,7 +1384,6 @@ POA_CORBA::ComponentIR::ModuleDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1548,7 +1396,6 @@ POA_CORBA::ComponentIR::ModuleDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1556,7 +1403,6 @@ POA_CORBA::ComponentIR::ModuleDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1569,7 +1415,6 @@ POA_CORBA::ComponentIR::ModuleDef::lookup_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1577,7 +1422,6 @@ POA_CORBA::ComponentIR::ModuleDef::lookup_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1590,7 +1434,6 @@ POA_CORBA::ComponentIR::ModuleDef::contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1598,7 +1441,6 @@ POA_CORBA::ComponentIR::ModuleDef::contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1611,7 +1453,6 @@ POA_CORBA::ComponentIR::ModuleDef::lookup_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1619,7 +1460,6 @@ POA_CORBA::ComponentIR::ModuleDef::lookup_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1632,7 +1472,6 @@ POA_CORBA::ComponentIR::ModuleDef::describe_contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1640,7 +1479,6 @@ POA_CORBA::ComponentIR::ModuleDef::describe_contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1653,7 +1491,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_module_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1661,7 +1498,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_module_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1674,7 +1510,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_constant_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1682,7 +1517,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_constant_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1695,7 +1529,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_struct_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1703,7 +1536,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_struct_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1716,7 +1548,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_union_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1724,7 +1555,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_union_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1737,7 +1567,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_enum_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1745,7 +1574,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_enum_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1758,7 +1586,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_alias_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1766,7 +1593,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_alias_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1779,7 +1605,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1787,7 +1612,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1800,7 +1624,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1808,7 +1631,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1821,7 +1643,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_value_box_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1829,7 +1650,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_value_box_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1842,7 +1662,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_exception_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1850,7 +1669,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_exception_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1863,7 +1681,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_native_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1871,7 +1688,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_native_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1884,7 +1700,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_abstract_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1892,7 +1707,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_abstract_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1905,7 +1719,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_local_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1913,7 +1726,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_local_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1926,7 +1738,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1934,7 +1745,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_ext_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1944,7 +1754,6 @@ POA_CORBA::ComponentIR::ModuleDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1952,7 +1761,6 @@ POA_CORBA::ComponentIR::ModuleDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1962,7 +1770,6 @@ POA_CORBA::ComponentIR::ModuleDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1970,7 +1777,6 @@ POA_CORBA::ComponentIR::ModuleDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1980,7 +1786,6 @@ POA_CORBA::ComponentIR::ModuleDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1988,7 +1793,6 @@ POA_CORBA::ComponentIR::ModuleDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1998,7 +1802,6 @@ POA_CORBA::ComponentIR::ModuleDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -2006,7 +1809,6 @@ POA_CORBA::ComponentIR::ModuleDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2016,7 +1818,6 @@ POA_CORBA::ComponentIR::ModuleDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -2024,7 +1825,6 @@ POA_CORBA::ComponentIR::ModuleDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2034,7 +1834,6 @@ POA_CORBA::ComponentIR::ModuleDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -2042,7 +1841,6 @@ POA_CORBA::ComponentIR::ModuleDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2052,7 +1850,6 @@ POA_CORBA::ComponentIR::ModuleDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -2060,7 +1857,6 @@ POA_CORBA::ComponentIR::ModuleDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2070,7 +1866,6 @@ POA_CORBA::ComponentIR::ModuleDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -2078,7 +1873,6 @@ POA_CORBA::ComponentIR::ModuleDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2088,7 +1882,6 @@ POA_CORBA::ComponentIR::ModuleDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -2096,7 +1889,6 @@ POA_CORBA::ComponentIR::ModuleDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2109,7 +1901,6 @@ POA_CORBA::ComponentIR::ModuleDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -2117,7 +1908,6 @@ POA_CORBA::ComponentIR::ModuleDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2130,7 +1920,6 @@ POA_CORBA::ComponentIR::ModuleDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -2138,7 +1927,6 @@ POA_CORBA::ComponentIR::ModuleDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2151,7 +1939,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_component_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ComponentIR::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -2159,7 +1946,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_component_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2172,7 +1958,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_home_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ComponentIR::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -2180,7 +1965,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_home_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2193,7 +1977,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_event_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ComponentIR::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -2201,7 +1984,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_event_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2211,7 +1993,6 @@ POA_CORBA::ComponentIR::Repository::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2219,7 +2000,6 @@ POA_CORBA::ComponentIR::Repository::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2232,7 +2012,6 @@ POA_CORBA::ComponentIR::Repository::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2240,7 +2019,6 @@ POA_CORBA::ComponentIR::Repository::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2253,7 +2031,6 @@ POA_CORBA::ComponentIR::Repository::lookup_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2261,7 +2038,6 @@ POA_CORBA::ComponentIR::Repository::lookup_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2274,7 +2050,6 @@ POA_CORBA::ComponentIR::Repository::contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2282,7 +2057,6 @@ POA_CORBA::ComponentIR::Repository::contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2295,7 +2069,6 @@ POA_CORBA::ComponentIR::Repository::lookup_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2303,7 +2076,6 @@ POA_CORBA::ComponentIR::Repository::lookup_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2316,7 +2088,6 @@ POA_CORBA::ComponentIR::Repository::describe_contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2324,7 +2095,6 @@ POA_CORBA::ComponentIR::Repository::describe_contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2337,7 +2107,6 @@ POA_CORBA::ComponentIR::Repository::create_module_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2345,7 +2114,6 @@ POA_CORBA::ComponentIR::Repository::create_module_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2358,7 +2126,6 @@ POA_CORBA::ComponentIR::Repository::create_constant_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2366,7 +2133,6 @@ POA_CORBA::ComponentIR::Repository::create_constant_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2379,7 +2145,6 @@ POA_CORBA::ComponentIR::Repository::create_struct_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2387,7 +2152,6 @@ POA_CORBA::ComponentIR::Repository::create_struct_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2400,7 +2164,6 @@ POA_CORBA::ComponentIR::Repository::create_union_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2408,7 +2171,6 @@ POA_CORBA::ComponentIR::Repository::create_union_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2421,7 +2183,6 @@ POA_CORBA::ComponentIR::Repository::create_enum_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2429,7 +2190,6 @@ POA_CORBA::ComponentIR::Repository::create_enum_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2442,7 +2202,6 @@ POA_CORBA::ComponentIR::Repository::create_alias_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2450,7 +2209,6 @@ POA_CORBA::ComponentIR::Repository::create_alias_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2463,7 +2221,6 @@ POA_CORBA::ComponentIR::Repository::create_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2471,7 +2228,6 @@ POA_CORBA::ComponentIR::Repository::create_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2484,7 +2240,6 @@ POA_CORBA::ComponentIR::Repository::create_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2492,7 +2247,6 @@ POA_CORBA::ComponentIR::Repository::create_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2505,7 +2259,6 @@ POA_CORBA::ComponentIR::Repository::create_value_box_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2513,7 +2266,6 @@ POA_CORBA::ComponentIR::Repository::create_value_box_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2526,7 +2278,6 @@ POA_CORBA::ComponentIR::Repository::create_exception_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2534,7 +2285,6 @@ POA_CORBA::ComponentIR::Repository::create_exception_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2547,7 +2297,6 @@ POA_CORBA::ComponentIR::Repository::create_native_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2555,7 +2304,6 @@ POA_CORBA::ComponentIR::Repository::create_native_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2568,7 +2316,6 @@ POA_CORBA::ComponentIR::Repository::create_abstract_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2576,7 +2323,6 @@ POA_CORBA::ComponentIR::Repository::create_abstract_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2589,7 +2335,6 @@ POA_CORBA::ComponentIR::Repository::create_local_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2597,7 +2342,6 @@ POA_CORBA::ComponentIR::Repository::create_local_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2610,7 +2354,6 @@ POA_CORBA::ComponentIR::Repository::create_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2618,7 +2361,6 @@ POA_CORBA::ComponentIR::Repository::create_ext_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2631,7 +2373,6 @@ POA_CORBA::ComponentIR::Repository::lookup_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Repository * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2639,7 +2380,6 @@ POA_CORBA::ComponentIR::Repository::lookup_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2652,7 +2392,6 @@ POA_CORBA::ComponentIR::Repository::get_canonical_typecode_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Repository * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2660,7 +2399,6 @@ POA_CORBA::ComponentIR::Repository::get_canonical_typecode_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2673,7 +2411,6 @@ POA_CORBA::ComponentIR::Repository::get_primitive_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Repository * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2681,7 +2418,6 @@ POA_CORBA::ComponentIR::Repository::get_primitive_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2694,7 +2430,6 @@ POA_CORBA::ComponentIR::Repository::create_string_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Repository * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2702,7 +2437,6 @@ POA_CORBA::ComponentIR::Repository::create_string_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2715,7 +2449,6 @@ POA_CORBA::ComponentIR::Repository::create_wstring_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Repository * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2723,7 +2456,6 @@ POA_CORBA::ComponentIR::Repository::create_wstring_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2736,7 +2468,6 @@ POA_CORBA::ComponentIR::Repository::create_sequence_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Repository * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2744,7 +2475,6 @@ POA_CORBA::ComponentIR::Repository::create_sequence_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2757,7 +2487,6 @@ POA_CORBA::ComponentIR::Repository::create_array_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Repository * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2765,7 +2494,6 @@ POA_CORBA::ComponentIR::Repository::create_array_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2778,7 +2506,6 @@ POA_CORBA::ComponentIR::Repository::create_fixed_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Repository * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2786,7 +2513,6 @@ POA_CORBA::ComponentIR::Repository::create_fixed_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2799,7 +2525,6 @@ POA_CORBA::ComponentIR::Repository::create_component_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ComponentIR::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2807,7 +2532,6 @@ POA_CORBA::ComponentIR::Repository::create_component_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2820,7 +2544,6 @@ POA_CORBA::ComponentIR::Repository::create_home_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ComponentIR::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2828,7 +2551,6 @@ POA_CORBA::ComponentIR::Repository::create_home_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2841,7 +2563,6 @@ POA_CORBA::ComponentIR::Repository::create_event_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ComponentIR::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2849,7 +2570,6 @@ POA_CORBA::ComponentIR::Repository::create_event_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2859,7 +2579,6 @@ POA_CORBA::ComponentIR::ProvidesDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
@@ -2867,7 +2586,6 @@ POA_CORBA::ComponentIR::ProvidesDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2880,7 +2598,6 @@ POA_CORBA::ComponentIR::ProvidesDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
@@ -2888,7 +2605,6 @@ POA_CORBA::ComponentIR::ProvidesDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2898,7 +2614,6 @@ POA_CORBA::ComponentIR::ProvidesDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
@@ -2906,7 +2621,6 @@ POA_CORBA::ComponentIR::ProvidesDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2916,7 +2630,6 @@ POA_CORBA::ComponentIR::ProvidesDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
@@ -2924,7 +2637,6 @@ POA_CORBA::ComponentIR::ProvidesDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2934,7 +2646,6 @@ POA_CORBA::ComponentIR::ProvidesDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
@@ -2942,7 +2653,6 @@ POA_CORBA::ComponentIR::ProvidesDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2952,7 +2662,6 @@ POA_CORBA::ComponentIR::ProvidesDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
@@ -2960,7 +2669,6 @@ POA_CORBA::ComponentIR::ProvidesDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2970,7 +2678,6 @@ POA_CORBA::ComponentIR::ProvidesDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
@@ -2978,7 +2685,6 @@ POA_CORBA::ComponentIR::ProvidesDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2988,7 +2694,6 @@ POA_CORBA::ComponentIR::ProvidesDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
@@ -2996,7 +2701,6 @@ POA_CORBA::ComponentIR::ProvidesDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3006,7 +2710,6 @@ POA_CORBA::ComponentIR::ProvidesDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
@@ -3014,7 +2717,6 @@ POA_CORBA::ComponentIR::ProvidesDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3024,7 +2726,6 @@ POA_CORBA::ComponentIR::ProvidesDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
@@ -3032,7 +2733,6 @@ POA_CORBA::ComponentIR::ProvidesDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3042,7 +2742,6 @@ POA_CORBA::ComponentIR::ProvidesDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
@@ -3050,7 +2749,6 @@ POA_CORBA::ComponentIR::ProvidesDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3063,7 +2761,6 @@ POA_CORBA::ComponentIR::ProvidesDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
@@ -3071,7 +2768,6 @@ POA_CORBA::ComponentIR::ProvidesDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3084,7 +2780,6 @@ POA_CORBA::ComponentIR::ProvidesDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
@@ -3092,7 +2787,6 @@ POA_CORBA::ComponentIR::ProvidesDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3102,7 +2796,6 @@ POA_CORBA::ComponentIR::UsesDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
@@ -3110,7 +2803,6 @@ POA_CORBA::ComponentIR::UsesDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3123,7 +2815,6 @@ POA_CORBA::ComponentIR::UsesDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
@@ -3131,7 +2822,6 @@ POA_CORBA::ComponentIR::UsesDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3141,7 +2831,6 @@ POA_CORBA::ComponentIR::UsesDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
@@ -3149,7 +2838,6 @@ POA_CORBA::ComponentIR::UsesDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3159,7 +2847,6 @@ POA_CORBA::ComponentIR::UsesDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
@@ -3167,7 +2854,6 @@ POA_CORBA::ComponentIR::UsesDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3177,7 +2863,6 @@ POA_CORBA::ComponentIR::UsesDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
@@ -3185,7 +2870,6 @@ POA_CORBA::ComponentIR::UsesDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3195,7 +2879,6 @@ POA_CORBA::ComponentIR::UsesDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
@@ -3203,7 +2886,6 @@ POA_CORBA::ComponentIR::UsesDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3213,7 +2895,6 @@ POA_CORBA::ComponentIR::UsesDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
@@ -3221,7 +2902,6 @@ POA_CORBA::ComponentIR::UsesDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3231,7 +2911,6 @@ POA_CORBA::ComponentIR::UsesDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
@@ -3239,7 +2918,6 @@ POA_CORBA::ComponentIR::UsesDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3249,7 +2927,6 @@ POA_CORBA::ComponentIR::UsesDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
@@ -3257,7 +2934,6 @@ POA_CORBA::ComponentIR::UsesDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3267,7 +2943,6 @@ POA_CORBA::ComponentIR::UsesDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
@@ -3275,7 +2950,6 @@ POA_CORBA::ComponentIR::UsesDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3285,7 +2959,6 @@ POA_CORBA::ComponentIR::UsesDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
@@ -3293,7 +2966,6 @@ POA_CORBA::ComponentIR::UsesDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3306,7 +2978,6 @@ POA_CORBA::ComponentIR::UsesDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
@@ -3314,7 +2985,6 @@ POA_CORBA::ComponentIR::UsesDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3327,7 +2997,6 @@ POA_CORBA::ComponentIR::UsesDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
@@ -3335,7 +3004,6 @@ POA_CORBA::ComponentIR::UsesDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3345,7 +3013,6 @@ POA_CORBA::ComponentIR::EventPortDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
@@ -3353,7 +3020,6 @@ POA_CORBA::ComponentIR::EventPortDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3366,7 +3032,6 @@ POA_CORBA::ComponentIR::EventPortDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
@@ -3374,7 +3039,6 @@ POA_CORBA::ComponentIR::EventPortDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3384,7 +3048,6 @@ POA_CORBA::ComponentIR::EventPortDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
@@ -3392,7 +3055,6 @@ POA_CORBA::ComponentIR::EventPortDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3402,7 +3064,6 @@ POA_CORBA::ComponentIR::EventPortDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
@@ -3410,7 +3071,6 @@ POA_CORBA::ComponentIR::EventPortDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3420,7 +3080,6 @@ POA_CORBA::ComponentIR::EventPortDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
@@ -3428,7 +3087,6 @@ POA_CORBA::ComponentIR::EventPortDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3438,7 +3096,6 @@ POA_CORBA::ComponentIR::EventPortDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
@@ -3446,7 +3103,6 @@ POA_CORBA::ComponentIR::EventPortDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3456,7 +3112,6 @@ POA_CORBA::ComponentIR::EventPortDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
@@ -3464,7 +3119,6 @@ POA_CORBA::ComponentIR::EventPortDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3474,7 +3128,6 @@ POA_CORBA::ComponentIR::EventPortDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
@@ -3482,7 +3135,6 @@ POA_CORBA::ComponentIR::EventPortDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3492,7 +3144,6 @@ POA_CORBA::ComponentIR::EventPortDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
@@ -3500,7 +3151,6 @@ POA_CORBA::ComponentIR::EventPortDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3510,7 +3160,6 @@ POA_CORBA::ComponentIR::EventPortDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
@@ -3518,7 +3167,6 @@ POA_CORBA::ComponentIR::EventPortDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3528,7 +3176,6 @@ POA_CORBA::ComponentIR::EventPortDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
@@ -3536,7 +3183,6 @@ POA_CORBA::ComponentIR::EventPortDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3549,7 +3195,6 @@ POA_CORBA::ComponentIR::EventPortDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
@@ -3557,7 +3202,6 @@ POA_CORBA::ComponentIR::EventPortDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3570,7 +3214,6 @@ POA_CORBA::ComponentIR::EventPortDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
@@ -3578,7 +3221,6 @@ POA_CORBA::ComponentIR::EventPortDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3588,7 +3230,6 @@ POA_CORBA::ComponentIR::EmitsDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
@@ -3596,7 +3237,6 @@ POA_CORBA::ComponentIR::EmitsDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3609,7 +3249,6 @@ POA_CORBA::ComponentIR::EmitsDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
@@ -3617,7 +3256,6 @@ POA_CORBA::ComponentIR::EmitsDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3627,7 +3265,6 @@ POA_CORBA::ComponentIR::EmitsDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
@@ -3635,7 +3272,6 @@ POA_CORBA::ComponentIR::EmitsDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3645,7 +3281,6 @@ POA_CORBA::ComponentIR::EmitsDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
@@ -3653,7 +3288,6 @@ POA_CORBA::ComponentIR::EmitsDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3663,7 +3297,6 @@ POA_CORBA::ComponentIR::EmitsDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
@@ -3671,7 +3304,6 @@ POA_CORBA::ComponentIR::EmitsDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3681,7 +3313,6 @@ POA_CORBA::ComponentIR::EmitsDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
@@ -3689,7 +3320,6 @@ POA_CORBA::ComponentIR::EmitsDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3699,7 +3329,6 @@ POA_CORBA::ComponentIR::EmitsDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
@@ -3707,7 +3336,6 @@ POA_CORBA::ComponentIR::EmitsDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3717,7 +3345,6 @@ POA_CORBA::ComponentIR::EmitsDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
@@ -3725,7 +3352,6 @@ POA_CORBA::ComponentIR::EmitsDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3735,7 +3361,6 @@ POA_CORBA::ComponentIR::EmitsDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
@@ -3743,7 +3368,6 @@ POA_CORBA::ComponentIR::EmitsDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3753,7 +3377,6 @@ POA_CORBA::ComponentIR::EmitsDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
@@ -3761,7 +3384,6 @@ POA_CORBA::ComponentIR::EmitsDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3771,7 +3393,6 @@ POA_CORBA::ComponentIR::EmitsDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
@@ -3779,7 +3400,6 @@ POA_CORBA::ComponentIR::EmitsDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3792,7 +3412,6 @@ POA_CORBA::ComponentIR::EmitsDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
@@ -3800,7 +3419,6 @@ POA_CORBA::ComponentIR::EmitsDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3813,7 +3431,6 @@ POA_CORBA::ComponentIR::EmitsDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
@@ -3821,7 +3438,6 @@ POA_CORBA::ComponentIR::EmitsDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3831,7 +3447,6 @@ POA_CORBA::ComponentIR::EmitsDef::_get_event_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ComponentIR::EventPortDef * const impl = static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
@@ -3839,7 +3454,6 @@ POA_CORBA::ComponentIR::EmitsDef::_get_event_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3849,7 +3463,6 @@ POA_CORBA::ComponentIR::EmitsDef::_set_event_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ComponentIR::EventPortDef * const impl = static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
@@ -3857,7 +3470,6 @@ POA_CORBA::ComponentIR::EmitsDef::_set_event_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3870,7 +3482,6 @@ POA_CORBA::ComponentIR::EmitsDef::is_a_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ComponentIR::EventPortDef * const impl = static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
@@ -3878,7 +3489,6 @@ POA_CORBA::ComponentIR::EmitsDef::is_a_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3888,7 +3498,6 @@ POA_CORBA::ComponentIR::PublishesDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
@@ -3896,7 +3505,6 @@ POA_CORBA::ComponentIR::PublishesDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3909,7 +3517,6 @@ POA_CORBA::ComponentIR::PublishesDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
@@ -3917,7 +3524,6 @@ POA_CORBA::ComponentIR::PublishesDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3927,7 +3533,6 @@ POA_CORBA::ComponentIR::PublishesDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
@@ -3935,7 +3540,6 @@ POA_CORBA::ComponentIR::PublishesDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3945,7 +3549,6 @@ POA_CORBA::ComponentIR::PublishesDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
@@ -3953,7 +3556,6 @@ POA_CORBA::ComponentIR::PublishesDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3963,7 +3565,6 @@ POA_CORBA::ComponentIR::PublishesDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
@@ -3971,7 +3572,6 @@ POA_CORBA::ComponentIR::PublishesDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3981,7 +3581,6 @@ POA_CORBA::ComponentIR::PublishesDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
@@ -3989,7 +3588,6 @@ POA_CORBA::ComponentIR::PublishesDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3999,7 +3597,6 @@ POA_CORBA::ComponentIR::PublishesDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
@@ -4007,7 +3604,6 @@ POA_CORBA::ComponentIR::PublishesDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4017,7 +3613,6 @@ POA_CORBA::ComponentIR::PublishesDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
@@ -4025,7 +3620,6 @@ POA_CORBA::ComponentIR::PublishesDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4035,7 +3629,6 @@ POA_CORBA::ComponentIR::PublishesDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
@@ -4043,7 +3636,6 @@ POA_CORBA::ComponentIR::PublishesDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4053,7 +3645,6 @@ POA_CORBA::ComponentIR::PublishesDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
@@ -4061,7 +3652,6 @@ POA_CORBA::ComponentIR::PublishesDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4071,7 +3661,6 @@ POA_CORBA::ComponentIR::PublishesDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
@@ -4079,7 +3668,6 @@ POA_CORBA::ComponentIR::PublishesDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4092,7 +3680,6 @@ POA_CORBA::ComponentIR::PublishesDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
@@ -4100,7 +3687,6 @@ POA_CORBA::ComponentIR::PublishesDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4113,7 +3699,6 @@ POA_CORBA::ComponentIR::PublishesDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
@@ -4121,7 +3706,6 @@ POA_CORBA::ComponentIR::PublishesDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4131,7 +3715,6 @@ POA_CORBA::ComponentIR::PublishesDef::_get_event_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ComponentIR::EventPortDef * const impl = static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
@@ -4139,7 +3722,6 @@ POA_CORBA::ComponentIR::PublishesDef::_get_event_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4149,7 +3731,6 @@ POA_CORBA::ComponentIR::PublishesDef::_set_event_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ComponentIR::EventPortDef * const impl = static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
@@ -4157,7 +3738,6 @@ POA_CORBA::ComponentIR::PublishesDef::_set_event_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4170,7 +3750,6 @@ POA_CORBA::ComponentIR::PublishesDef::is_a_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ComponentIR::EventPortDef * const impl = static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
@@ -4178,7 +3757,6 @@ POA_CORBA::ComponentIR::PublishesDef::is_a_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4188,7 +3766,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
@@ -4196,7 +3773,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4209,7 +3785,6 @@ POA_CORBA::ComponentIR::ConsumesDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
@@ -4217,7 +3792,6 @@ POA_CORBA::ComponentIR::ConsumesDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4227,7 +3801,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
@@ -4235,7 +3808,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4245,7 +3817,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
@@ -4253,7 +3824,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4263,7 +3833,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
@@ -4271,7 +3840,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4281,7 +3849,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
@@ -4289,7 +3856,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4299,7 +3865,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
@@ -4307,7 +3872,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4317,7 +3881,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
@@ -4325,7 +3888,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4335,7 +3897,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
@@ -4343,7 +3904,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4353,7 +3913,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
@@ -4361,7 +3920,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4371,7 +3929,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
@@ -4379,7 +3936,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4392,7 +3948,6 @@ POA_CORBA::ComponentIR::ConsumesDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
@@ -4400,7 +3955,6 @@ POA_CORBA::ComponentIR::ConsumesDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4413,7 +3967,6 @@ POA_CORBA::ComponentIR::ConsumesDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
@@ -4421,7 +3974,6 @@ POA_CORBA::ComponentIR::ConsumesDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4431,7 +3983,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_get_event_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ComponentIR::EventPortDef * const impl = static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
@@ -4439,7 +3990,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_get_event_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4449,7 +3999,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_set_event_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ComponentIR::EventPortDef * const impl = static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
@@ -4457,7 +4006,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_set_event_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4470,7 +4018,6 @@ POA_CORBA::ComponentIR::ConsumesDef::is_a_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ComponentIR::EventPortDef * const impl = static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
@@ -4478,7 +4025,6 @@ POA_CORBA::ComponentIR::ConsumesDef::is_a_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4488,7 +4034,6 @@ POA_CORBA::ComponentIR::ComponentDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4496,7 +4041,6 @@ POA_CORBA::ComponentIR::ComponentDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4509,7 +4053,6 @@ POA_CORBA::ComponentIR::ComponentDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4517,7 +4060,6 @@ POA_CORBA::ComponentIR::ComponentDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4530,7 +4072,6 @@ POA_CORBA::ComponentIR::ComponentDef::lookup_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4538,7 +4079,6 @@ POA_CORBA::ComponentIR::ComponentDef::lookup_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4551,7 +4091,6 @@ POA_CORBA::ComponentIR::ComponentDef::contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4559,7 +4098,6 @@ POA_CORBA::ComponentIR::ComponentDef::contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4572,7 +4110,6 @@ POA_CORBA::ComponentIR::ComponentDef::lookup_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4580,7 +4117,6 @@ POA_CORBA::ComponentIR::ComponentDef::lookup_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4593,7 +4129,6 @@ POA_CORBA::ComponentIR::ComponentDef::describe_contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4601,7 +4136,6 @@ POA_CORBA::ComponentIR::ComponentDef::describe_contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4614,7 +4148,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_module_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4622,7 +4155,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_module_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4635,7 +4167,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_constant_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4643,7 +4174,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_constant_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4656,7 +4186,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_struct_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4664,7 +4193,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_struct_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4677,7 +4205,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_union_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4685,7 +4212,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_union_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4698,7 +4224,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_enum_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4706,7 +4231,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_enum_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4719,7 +4243,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_alias_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4727,7 +4250,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_alias_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4740,7 +4262,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4748,7 +4269,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4761,7 +4281,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4769,7 +4288,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4782,7 +4300,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_value_box_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4790,7 +4307,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_value_box_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4803,7 +4319,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_exception_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4811,7 +4326,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_exception_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4824,7 +4338,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_native_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4832,7 +4345,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_native_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4845,7 +4357,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_abstract_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4853,7 +4364,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_abstract_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4866,7 +4376,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_local_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4874,7 +4383,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_local_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4887,7 +4395,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4895,7 +4402,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_ext_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4905,7 +4411,6 @@ POA_CORBA::ComponentIR::ComponentDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4913,7 +4418,6 @@ POA_CORBA::ComponentIR::ComponentDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4923,7 +4427,6 @@ POA_CORBA::ComponentIR::ComponentDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4931,7 +4434,6 @@ POA_CORBA::ComponentIR::ComponentDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4941,7 +4443,6 @@ POA_CORBA::ComponentIR::ComponentDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4949,7 +4450,6 @@ POA_CORBA::ComponentIR::ComponentDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4959,7 +4459,6 @@ POA_CORBA::ComponentIR::ComponentDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4967,7 +4466,6 @@ POA_CORBA::ComponentIR::ComponentDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4977,7 +4475,6 @@ POA_CORBA::ComponentIR::ComponentDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4985,7 +4482,6 @@ POA_CORBA::ComponentIR::ComponentDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4995,7 +4491,6 @@ POA_CORBA::ComponentIR::ComponentDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -5003,7 +4498,6 @@ POA_CORBA::ComponentIR::ComponentDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5013,7 +4507,6 @@ POA_CORBA::ComponentIR::ComponentDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -5021,7 +4514,6 @@ POA_CORBA::ComponentIR::ComponentDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5031,7 +4523,6 @@ POA_CORBA::ComponentIR::ComponentDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -5039,7 +4530,6 @@ POA_CORBA::ComponentIR::ComponentDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5049,7 +4539,6 @@ POA_CORBA::ComponentIR::ComponentDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -5057,7 +4546,6 @@ POA_CORBA::ComponentIR::ComponentDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5070,7 +4558,6 @@ POA_CORBA::ComponentIR::ComponentDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -5078,7 +4565,6 @@ POA_CORBA::ComponentIR::ComponentDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5091,7 +4577,6 @@ POA_CORBA::ComponentIR::ComponentDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -5099,7 +4584,6 @@ POA_CORBA::ComponentIR::ComponentDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5109,7 +4593,6 @@ POA_CORBA::ComponentIR::ComponentDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -5117,7 +4600,6 @@ POA_CORBA::ComponentIR::ComponentDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5127,7 +4609,6 @@ POA_CORBA::ComponentIR::ComponentDef::_get_base_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -5135,7 +4616,6 @@ POA_CORBA::ComponentIR::ComponentDef::_get_base_interfaces_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5145,7 +4625,6 @@ POA_CORBA::ComponentIR::ComponentDef::_set_base_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -5153,7 +4632,6 @@ POA_CORBA::ComponentIR::ComponentDef::_set_base_interfaces_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5166,7 +4644,6 @@ POA_CORBA::ComponentIR::ComponentDef::is_a_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -5174,7 +4651,6 @@ POA_CORBA::ComponentIR::ComponentDef::is_a_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5187,7 +4663,6 @@ POA_CORBA::ComponentIR::ComponentDef::describe_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -5195,7 +4670,6 @@ POA_CORBA::ComponentIR::ComponentDef::describe_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5208,7 +4682,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_attribute_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -5216,7 +4689,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_attribute_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5229,7 +4701,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_operation_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -5237,7 +4708,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_operation_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5250,7 +4720,6 @@ POA_CORBA::ComponentIR::ComponentDef::describe_ext_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceAttrExtension * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -5258,7 +4727,6 @@ POA_CORBA::ComponentIR::ComponentDef::describe_ext_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5271,7 +4739,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_ext_attribute_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceAttrExtension * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -5279,7 +4746,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_ext_attribute_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5289,7 +4755,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5297,7 +4762,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5310,7 +4774,6 @@ POA_CORBA::ComponentIR::FactoryDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5318,7 +4781,6 @@ POA_CORBA::ComponentIR::FactoryDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5328,7 +4790,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5336,7 +4797,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5346,7 +4806,6 @@ POA_CORBA::ComponentIR::FactoryDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5354,7 +4813,6 @@ POA_CORBA::ComponentIR::FactoryDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5364,7 +4822,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5372,7 +4829,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5382,7 +4838,6 @@ POA_CORBA::ComponentIR::FactoryDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5390,7 +4845,6 @@ POA_CORBA::ComponentIR::FactoryDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5400,7 +4854,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5408,7 +4861,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5418,7 +4870,6 @@ POA_CORBA::ComponentIR::FactoryDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5426,7 +4877,6 @@ POA_CORBA::ComponentIR::FactoryDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5436,7 +4886,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5444,7 +4893,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5454,7 +4902,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5462,7 +4909,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5472,7 +4918,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5480,7 +4925,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5493,7 +4937,6 @@ POA_CORBA::ComponentIR::FactoryDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5501,7 +4944,6 @@ POA_CORBA::ComponentIR::FactoryDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5514,7 +4956,6 @@ POA_CORBA::ComponentIR::FactoryDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5522,7 +4963,6 @@ POA_CORBA::ComponentIR::FactoryDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5532,7 +4972,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_result_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5540,7 +4979,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_result_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5550,7 +4988,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_result_def_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5558,7 +4995,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_result_def_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5568,7 +5004,6 @@ POA_CORBA::ComponentIR::FactoryDef::_set_result_def_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5576,7 +5011,6 @@ POA_CORBA::ComponentIR::FactoryDef::_set_result_def_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5586,7 +5020,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_params_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5594,7 +5027,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_params_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5604,7 +5036,6 @@ POA_CORBA::ComponentIR::FactoryDef::_set_params_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5612,7 +5043,6 @@ POA_CORBA::ComponentIR::FactoryDef::_set_params_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5622,7 +5052,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_mode_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5630,7 +5059,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_mode_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5640,7 +5068,6 @@ POA_CORBA::ComponentIR::FactoryDef::_set_mode_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5648,7 +5075,6 @@ POA_CORBA::ComponentIR::FactoryDef::_set_mode_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5658,7 +5084,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_contexts_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5666,7 +5091,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_contexts_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5676,7 +5100,6 @@ POA_CORBA::ComponentIR::FactoryDef::_set_contexts_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5684,7 +5107,6 @@ POA_CORBA::ComponentIR::FactoryDef::_set_contexts_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5694,7 +5116,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_exceptions_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5702,7 +5123,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_exceptions_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5712,7 +5132,6 @@ POA_CORBA::ComponentIR::FactoryDef::_set_exceptions_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5720,7 +5139,6 @@ POA_CORBA::ComponentIR::FactoryDef::_set_exceptions_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5730,7 +5148,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -5738,7 +5155,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5751,7 +5167,6 @@ POA_CORBA::ComponentIR::FinderDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -5759,7 +5174,6 @@ POA_CORBA::ComponentIR::FinderDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5769,7 +5183,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -5777,7 +5190,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5787,7 +5199,6 @@ POA_CORBA::ComponentIR::FinderDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -5795,7 +5206,6 @@ POA_CORBA::ComponentIR::FinderDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5805,7 +5215,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -5813,7 +5222,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5823,7 +5231,6 @@ POA_CORBA::ComponentIR::FinderDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -5831,7 +5238,6 @@ POA_CORBA::ComponentIR::FinderDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5841,7 +5247,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -5849,7 +5254,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5859,7 +5263,6 @@ POA_CORBA::ComponentIR::FinderDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -5867,7 +5270,6 @@ POA_CORBA::ComponentIR::FinderDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5877,7 +5279,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -5885,7 +5286,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5895,7 +5295,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -5903,7 +5302,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5913,7 +5311,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -5921,7 +5318,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5934,7 +5330,6 @@ POA_CORBA::ComponentIR::FinderDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -5942,7 +5337,6 @@ POA_CORBA::ComponentIR::FinderDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5955,7 +5349,6 @@ POA_CORBA::ComponentIR::FinderDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -5963,7 +5356,6 @@ POA_CORBA::ComponentIR::FinderDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5973,7 +5365,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_result_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -5981,7 +5372,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_result_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5991,7 +5381,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_result_def_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -5999,7 +5388,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_result_def_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6009,7 +5397,6 @@ POA_CORBA::ComponentIR::FinderDef::_set_result_def_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -6017,7 +5404,6 @@ POA_CORBA::ComponentIR::FinderDef::_set_result_def_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6027,7 +5413,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_params_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -6035,7 +5420,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_params_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6045,7 +5429,6 @@ POA_CORBA::ComponentIR::FinderDef::_set_params_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -6053,7 +5436,6 @@ POA_CORBA::ComponentIR::FinderDef::_set_params_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6063,7 +5445,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_mode_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -6071,7 +5452,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_mode_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6081,7 +5461,6 @@ POA_CORBA::ComponentIR::FinderDef::_set_mode_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -6089,7 +5468,6 @@ POA_CORBA::ComponentIR::FinderDef::_set_mode_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6099,7 +5477,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_contexts_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -6107,7 +5484,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_contexts_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6117,7 +5493,6 @@ POA_CORBA::ComponentIR::FinderDef::_set_contexts_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -6125,7 +5500,6 @@ POA_CORBA::ComponentIR::FinderDef::_set_contexts_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6135,7 +5509,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_exceptions_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -6143,7 +5516,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_exceptions_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6153,7 +5525,6 @@ POA_CORBA::ComponentIR::FinderDef::_set_exceptions_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -6161,7 +5532,6 @@ POA_CORBA::ComponentIR::FinderDef::_set_exceptions_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6171,7 +5541,6 @@ POA_CORBA::ComponentIR::HomeDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6179,7 +5548,6 @@ POA_CORBA::ComponentIR::HomeDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6192,7 +5560,6 @@ POA_CORBA::ComponentIR::HomeDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6200,7 +5567,6 @@ POA_CORBA::ComponentIR::HomeDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6213,7 +5579,6 @@ POA_CORBA::ComponentIR::HomeDef::lookup_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6221,7 +5586,6 @@ POA_CORBA::ComponentIR::HomeDef::lookup_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6234,7 +5598,6 @@ POA_CORBA::ComponentIR::HomeDef::contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6242,7 +5605,6 @@ POA_CORBA::ComponentIR::HomeDef::contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6255,7 +5617,6 @@ POA_CORBA::ComponentIR::HomeDef::lookup_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6263,7 +5624,6 @@ POA_CORBA::ComponentIR::HomeDef::lookup_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6276,7 +5636,6 @@ POA_CORBA::ComponentIR::HomeDef::describe_contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6284,7 +5643,6 @@ POA_CORBA::ComponentIR::HomeDef::describe_contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6297,7 +5655,6 @@ POA_CORBA::ComponentIR::HomeDef::create_module_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6305,7 +5662,6 @@ POA_CORBA::ComponentIR::HomeDef::create_module_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6318,7 +5674,6 @@ POA_CORBA::ComponentIR::HomeDef::create_constant_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6326,7 +5681,6 @@ POA_CORBA::ComponentIR::HomeDef::create_constant_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6339,7 +5693,6 @@ POA_CORBA::ComponentIR::HomeDef::create_struct_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6347,7 +5700,6 @@ POA_CORBA::ComponentIR::HomeDef::create_struct_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6360,7 +5712,6 @@ POA_CORBA::ComponentIR::HomeDef::create_union_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6368,7 +5719,6 @@ POA_CORBA::ComponentIR::HomeDef::create_union_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6381,7 +5731,6 @@ POA_CORBA::ComponentIR::HomeDef::create_enum_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6389,7 +5738,6 @@ POA_CORBA::ComponentIR::HomeDef::create_enum_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6402,7 +5750,6 @@ POA_CORBA::ComponentIR::HomeDef::create_alias_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6410,7 +5757,6 @@ POA_CORBA::ComponentIR::HomeDef::create_alias_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6423,7 +5769,6 @@ POA_CORBA::ComponentIR::HomeDef::create_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6431,7 +5776,6 @@ POA_CORBA::ComponentIR::HomeDef::create_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6444,7 +5788,6 @@ POA_CORBA::ComponentIR::HomeDef::create_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6452,7 +5795,6 @@ POA_CORBA::ComponentIR::HomeDef::create_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6465,7 +5807,6 @@ POA_CORBA::ComponentIR::HomeDef::create_value_box_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6473,7 +5814,6 @@ POA_CORBA::ComponentIR::HomeDef::create_value_box_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6486,7 +5826,6 @@ POA_CORBA::ComponentIR::HomeDef::create_exception_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6494,7 +5833,6 @@ POA_CORBA::ComponentIR::HomeDef::create_exception_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6507,7 +5845,6 @@ POA_CORBA::ComponentIR::HomeDef::create_native_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6515,7 +5852,6 @@ POA_CORBA::ComponentIR::HomeDef::create_native_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6528,7 +5864,6 @@ POA_CORBA::ComponentIR::HomeDef::create_abstract_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6536,7 +5871,6 @@ POA_CORBA::ComponentIR::HomeDef::create_abstract_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6549,7 +5883,6 @@ POA_CORBA::ComponentIR::HomeDef::create_local_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6557,7 +5890,6 @@ POA_CORBA::ComponentIR::HomeDef::create_local_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6570,7 +5902,6 @@ POA_CORBA::ComponentIR::HomeDef::create_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6578,7 +5909,6 @@ POA_CORBA::ComponentIR::HomeDef::create_ext_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6588,7 +5918,6 @@ POA_CORBA::ComponentIR::HomeDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6596,7 +5925,6 @@ POA_CORBA::ComponentIR::HomeDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6606,7 +5934,6 @@ POA_CORBA::ComponentIR::HomeDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6614,7 +5941,6 @@ POA_CORBA::ComponentIR::HomeDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6624,7 +5950,6 @@ POA_CORBA::ComponentIR::HomeDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6632,7 +5957,6 @@ POA_CORBA::ComponentIR::HomeDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6642,7 +5966,6 @@ POA_CORBA::ComponentIR::HomeDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6650,7 +5973,6 @@ POA_CORBA::ComponentIR::HomeDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6660,7 +5982,6 @@ POA_CORBA::ComponentIR::HomeDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6668,7 +5989,6 @@ POA_CORBA::ComponentIR::HomeDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6678,7 +5998,6 @@ POA_CORBA::ComponentIR::HomeDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6686,7 +6005,6 @@ POA_CORBA::ComponentIR::HomeDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6696,7 +6014,6 @@ POA_CORBA::ComponentIR::HomeDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6704,7 +6021,6 @@ POA_CORBA::ComponentIR::HomeDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6714,7 +6030,6 @@ POA_CORBA::ComponentIR::HomeDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6722,7 +6037,6 @@ POA_CORBA::ComponentIR::HomeDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6732,7 +6046,6 @@ POA_CORBA::ComponentIR::HomeDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6740,7 +6053,6 @@ POA_CORBA::ComponentIR::HomeDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6753,7 +6065,6 @@ POA_CORBA::ComponentIR::HomeDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6761,7 +6072,6 @@ POA_CORBA::ComponentIR::HomeDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6774,7 +6084,6 @@ POA_CORBA::ComponentIR::HomeDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6782,7 +6091,6 @@ POA_CORBA::ComponentIR::HomeDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6792,7 +6100,6 @@ POA_CORBA::ComponentIR::HomeDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6800,7 +6107,6 @@ POA_CORBA::ComponentIR::HomeDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6810,7 +6116,6 @@ POA_CORBA::ComponentIR::HomeDef::_get_base_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6818,7 +6123,6 @@ POA_CORBA::ComponentIR::HomeDef::_get_base_interfaces_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6828,7 +6132,6 @@ POA_CORBA::ComponentIR::HomeDef::_set_base_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6836,7 +6139,6 @@ POA_CORBA::ComponentIR::HomeDef::_set_base_interfaces_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6849,7 +6151,6 @@ POA_CORBA::ComponentIR::HomeDef::is_a_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6857,7 +6158,6 @@ POA_CORBA::ComponentIR::HomeDef::is_a_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6870,7 +6170,6 @@ POA_CORBA::ComponentIR::HomeDef::describe_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6878,7 +6177,6 @@ POA_CORBA::ComponentIR::HomeDef::describe_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6891,7 +6189,6 @@ POA_CORBA::ComponentIR::HomeDef::create_attribute_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6899,7 +6196,6 @@ POA_CORBA::ComponentIR::HomeDef::create_attribute_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6912,7 +6208,6 @@ POA_CORBA::ComponentIR::HomeDef::create_operation_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6920,7 +6215,6 @@ POA_CORBA::ComponentIR::HomeDef::create_operation_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6933,7 +6227,6 @@ POA_CORBA::ComponentIR::HomeDef::describe_ext_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceAttrExtension * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6941,7 +6234,6 @@ POA_CORBA::ComponentIR::HomeDef::describe_ext_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6954,7 +6246,6 @@ POA_CORBA::ComponentIR::HomeDef::create_ext_attribute_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceAttrExtension * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6962,7 +6253,6 @@ POA_CORBA::ComponentIR::HomeDef::create_ext_attribute_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h
index 0ab0e5470dc..cabe0a4db2b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h
@@ -86,14 +86,12 @@ namespace POA_CORBA
       void _is_owner ( ::CORBA::Boolean b);
       // overridden ServantBase operations
       PortableServer::POA_ptr _default_POA (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -103,7 +101,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -114,7 +111,6 @@ namespace POA_CORBA
 
       ::CORBA::Contained_ptr lookup (
           const char * search_name
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -126,7 +122,6 @@ namespace POA_CORBA
       ::CORBA::ContainedSeq * contents (
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -140,7 +135,6 @@ namespace POA_CORBA
           ::CORBA::Long levels_to_search,
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -153,7 +147,6 @@ namespace POA_CORBA
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited,
           ::CORBA::Long max_returned_objs
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -166,7 +159,6 @@ namespace POA_CORBA
           const char * id,
           const char * name,
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -181,7 +173,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr type,
           const ::CORBA::Any & value
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -195,7 +186,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::StructMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -210,7 +200,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr discriminator_type,
           const ::CORBA::UnionMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -224,7 +213,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::EnumMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -238,7 +226,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::IDLType_ptr original_type
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -252,7 +239,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::InterfaceDefSeq & base_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -272,7 +258,6 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::InitializerSeq & initializers
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -286,7 +271,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::IDLType_ptr original_type_def
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -300,7 +284,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::StructMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -313,7 +296,6 @@ namespace POA_CORBA
           const char * id,
           const char * name,
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -327,7 +309,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -341,7 +322,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::InterfaceDefSeq & base_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -361,7 +341,6 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::ExtInitializerSeq & initializers
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -371,7 +350,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * id (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -382,7 +360,6 @@ namespace POA_CORBA
 
       void id (
           const char * id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -392,7 +369,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -403,7 +379,6 @@ namespace POA_CORBA
 
       void name (
           const char * name
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -413,7 +388,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * version (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -424,7 +398,6 @@ namespace POA_CORBA
 
       void version (
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -434,7 +407,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Container_ptr defined_in (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -444,7 +416,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * absolute_name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -454,7 +425,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Repository_ptr containing_repository (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -464,7 +434,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained::Description * describe (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -477,7 +446,6 @@ namespace POA_CORBA
           ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -487,7 +455,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::TypeCode_ptr type (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -497,7 +464,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::InterfaceDefSeq * supported_interfaces (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -508,7 +474,6 @@ namespace POA_CORBA
 
       void supported_interfaces (
           const ::CORBA::InterfaceDefSeq & supported_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -518,7 +483,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::InitializerSeq * initializers (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -529,7 +493,6 @@ namespace POA_CORBA
 
       void initializers (
           const ::CORBA::InitializerSeq & initializers
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -539,7 +502,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ValueDef_ptr base_value (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -550,7 +512,6 @@ namespace POA_CORBA
 
       void base_value (
           ::CORBA::ValueDef_ptr base_value
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -560,7 +521,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ValueDefSeq * abstract_base_values (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -571,7 +531,6 @@ namespace POA_CORBA
 
       void abstract_base_values (
           const ::CORBA::ValueDefSeq & abstract_base_values
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -581,7 +540,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Boolean is_abstract (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -592,7 +550,6 @@ namespace POA_CORBA
 
       void is_abstract (
           ::CORBA::Boolean is_abstract
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -602,7 +559,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Boolean is_custom (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -613,7 +569,6 @@ namespace POA_CORBA
 
       void is_custom (
           ::CORBA::Boolean is_custom
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -623,7 +578,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Boolean is_truncatable (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -634,7 +588,6 @@ namespace POA_CORBA
 
       void is_truncatable (
           ::CORBA::Boolean is_truncatable
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -645,7 +598,6 @@ namespace POA_CORBA
 
       ::CORBA::Boolean is_a (
           const char * id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -655,7 +607,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ValueDef::FullValueDescription * describe_value (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -670,7 +621,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr type,
           ::CORBA::Visibility access
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -685,7 +635,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr type,
           ::CORBA::AttributeMode mode
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -703,7 +652,6 @@ namespace POA_CORBA
           const ::CORBA::ParDescriptionSeq & params,
           const ::CORBA::ExceptionDefSeq & exceptions,
           const ::CORBA::ContextIdSeq & contexts
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -713,7 +661,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ExtInitializerSeq * ext_initializers (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -724,7 +671,6 @@ namespace POA_CORBA
 
       void ext_initializers (
           const ::CORBA::ExtInitializerSeq & ext_initializers
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -734,7 +680,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ExtValueDef::ExtFullValueDescription * describe_ext_value (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -751,7 +696,6 @@ namespace POA_CORBA
           ::CORBA::AttributeMode mode,
           const ::CORBA::ExceptionDefSeq & get_exceptions,
           const ::CORBA::ExceptionDefSeq & set_exceptions
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -804,14 +748,12 @@ namespace POA_CORBA
       void _is_owner ( ::CORBA::Boolean b);
       // overridden ServantBase operations
       PortableServer::POA_ptr _default_POA (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -821,7 +763,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -832,7 +773,6 @@ namespace POA_CORBA
 
       ::CORBA::Contained_ptr lookup (
           const char * search_name
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -844,7 +784,6 @@ namespace POA_CORBA
       ::CORBA::ContainedSeq * contents (
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -858,7 +797,6 @@ namespace POA_CORBA
           ::CORBA::Long levels_to_search,
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -871,7 +809,6 @@ namespace POA_CORBA
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited,
           ::CORBA::Long max_returned_objs
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -884,7 +821,6 @@ namespace POA_CORBA
           const char * id,
           const char * name,
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -899,7 +835,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr type,
           const ::CORBA::Any & value
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -913,7 +848,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::StructMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -928,7 +862,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr discriminator_type,
           const ::CORBA::UnionMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -942,7 +875,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::EnumMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -956,7 +888,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::IDLType_ptr original_type
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -970,7 +901,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::InterfaceDefSeq & base_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -990,7 +920,6 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::InitializerSeq & initializers
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1004,7 +933,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::IDLType_ptr original_type_def
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1018,7 +946,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::StructMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1031,7 +958,6 @@ namespace POA_CORBA
           const char * id,
           const char * name,
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1045,7 +971,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1059,7 +984,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::InterfaceDefSeq & base_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1079,7 +1003,6 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::ExtInitializerSeq & initializers
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1094,7 +1017,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::ComponentIR::ComponentDef_ptr base_component,
           const ::CORBA::InterfaceDefSeq & supports_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1111,7 +1033,6 @@ namespace POA_CORBA
           ::CORBA::ComponentIR::ComponentDef_ptr managed_component,
           const ::CORBA::InterfaceDefSeq & supports_interfaces,
           ::CORBA::ValueDef_ptr primary_key
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1131,7 +1052,6 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::ExtInitializerSeq & initializers
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1184,14 +1104,12 @@ namespace POA_CORBA
       void _is_owner ( ::CORBA::Boolean b);
       // overridden ServantBase operations
       PortableServer::POA_ptr _default_POA (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1201,7 +1119,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1212,7 +1129,6 @@ namespace POA_CORBA
 
       ::CORBA::Contained_ptr lookup (
           const char * search_name
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1224,7 +1140,6 @@ namespace POA_CORBA
       ::CORBA::ContainedSeq * contents (
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1238,7 +1153,6 @@ namespace POA_CORBA
           ::CORBA::Long levels_to_search,
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1251,7 +1165,6 @@ namespace POA_CORBA
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited,
           ::CORBA::Long max_returned_objs
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1264,7 +1177,6 @@ namespace POA_CORBA
           const char * id,
           const char * name,
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1279,7 +1191,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr type,
           const ::CORBA::Any & value
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1293,7 +1204,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::StructMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1308,7 +1218,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr discriminator_type,
           const ::CORBA::UnionMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1322,7 +1231,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::EnumMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1336,7 +1244,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::IDLType_ptr original_type
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1350,7 +1257,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::InterfaceDefSeq & base_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1370,7 +1276,6 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::InitializerSeq & initializers
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1384,7 +1289,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::IDLType_ptr original_type_def
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1398,7 +1302,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::StructMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1411,7 +1314,6 @@ namespace POA_CORBA
           const char * id,
           const char * name,
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1425,7 +1327,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1439,7 +1340,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::InterfaceDefSeq & base_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1459,7 +1359,6 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::ExtInitializerSeq & initializers
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1469,7 +1368,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * id (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1480,7 +1378,6 @@ namespace POA_CORBA
 
       void id (
           const char * id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1490,7 +1387,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1501,7 +1397,6 @@ namespace POA_CORBA
 
       void name (
           const char * name
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1511,7 +1406,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * version (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1522,7 +1416,6 @@ namespace POA_CORBA
 
       void version (
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1532,7 +1425,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Container_ptr defined_in (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1542,7 +1434,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * absolute_name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1552,7 +1443,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Repository_ptr containing_repository (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1562,7 +1452,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained::Description * describe (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1575,7 +1464,6 @@ namespace POA_CORBA
           ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1590,7 +1478,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::ComponentIR::ComponentDef_ptr base_component,
           const ::CORBA::InterfaceDefSeq & supports_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1607,7 +1494,6 @@ namespace POA_CORBA
           ::CORBA::ComponentIR::ComponentDef_ptr managed_component,
           const ::CORBA::InterfaceDefSeq & supports_interfaces,
           ::CORBA::ValueDef_ptr primary_key
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1627,7 +1513,6 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::ExtInitializerSeq & initializers
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1680,14 +1565,12 @@ namespace POA_CORBA
       void _is_owner ( ::CORBA::Boolean b);
       // overridden ServantBase operations
       PortableServer::POA_ptr _default_POA (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1697,7 +1580,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1708,7 +1590,6 @@ namespace POA_CORBA
 
       ::CORBA::Contained_ptr lookup (
           const char * search_name
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1720,7 +1601,6 @@ namespace POA_CORBA
       ::CORBA::ContainedSeq * contents (
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1734,7 +1614,6 @@ namespace POA_CORBA
           ::CORBA::Long levels_to_search,
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1747,7 +1626,6 @@ namespace POA_CORBA
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited,
           ::CORBA::Long max_returned_objs
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1760,7 +1638,6 @@ namespace POA_CORBA
           const char * id,
           const char * name,
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1775,7 +1652,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr type,
           const ::CORBA::Any & value
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1789,7 +1665,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::StructMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1804,7 +1679,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr discriminator_type,
           const ::CORBA::UnionMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1818,7 +1692,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::EnumMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1832,7 +1705,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::IDLType_ptr original_type
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1846,7 +1718,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::InterfaceDefSeq & base_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1866,7 +1737,6 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::InitializerSeq & initializers
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1880,7 +1750,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::IDLType_ptr original_type_def
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1894,7 +1763,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::StructMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1907,7 +1775,6 @@ namespace POA_CORBA
           const char * id,
           const char * name,
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1921,7 +1788,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1935,7 +1801,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::InterfaceDefSeq & base_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1955,7 +1820,6 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::ExtInitializerSeq & initializers
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1966,7 +1830,6 @@ namespace POA_CORBA
 
       ::CORBA::Contained_ptr lookup_id (
           const char * search_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1977,7 +1840,6 @@ namespace POA_CORBA
 
       ::CORBA::TypeCode_ptr get_canonical_typecode (
           ::CORBA::TypeCode_ptr tc
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1988,7 +1850,6 @@ namespace POA_CORBA
 
       ::CORBA::PrimitiveDef_ptr get_primitive (
           ::CORBA::PrimitiveKind kind
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1999,7 +1860,6 @@ namespace POA_CORBA
 
       ::CORBA::StringDef_ptr create_string (
           ::CORBA::ULong bound
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2010,7 +1870,6 @@ namespace POA_CORBA
 
       ::CORBA::WstringDef_ptr create_wstring (
           ::CORBA::ULong bound
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2022,7 +1881,6 @@ namespace POA_CORBA
       ::CORBA::SequenceDef_ptr create_sequence (
           ::CORBA::ULong bound,
           ::CORBA::IDLType_ptr element_type
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2034,7 +1892,6 @@ namespace POA_CORBA
       ::CORBA::ArrayDef_ptr create_array (
           ::CORBA::ULong length,
           ::CORBA::IDLType_ptr element_type
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2046,7 +1903,6 @@ namespace POA_CORBA
       ::CORBA::FixedDef_ptr create_fixed (
           ::CORBA::UShort digits,
           ::CORBA::Short scale
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2061,7 +1917,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::ComponentIR::ComponentDef_ptr base_component,
           const ::CORBA::InterfaceDefSeq & supports_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2078,7 +1933,6 @@ namespace POA_CORBA
           ::CORBA::ComponentIR::ComponentDef_ptr managed_component,
           const ::CORBA::InterfaceDefSeq & supports_interfaces,
           ::CORBA::ValueDef_ptr primary_key
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2098,7 +1952,6 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::ExtInitializerSeq & initializers
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2151,14 +2004,12 @@ namespace POA_CORBA
       void _is_owner ( ::CORBA::Boolean b);
       // overridden ServantBase operations
       PortableServer::POA_ptr _default_POA (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2168,7 +2019,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2178,7 +2028,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * id (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2189,7 +2038,6 @@ namespace POA_CORBA
 
       void id (
           const char * id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2199,7 +2047,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2210,7 +2057,6 @@ namespace POA_CORBA
 
       void name (
           const char * name
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2220,7 +2066,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * version (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2231,7 +2076,6 @@ namespace POA_CORBA
 
       void version (
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2241,7 +2085,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Container_ptr defined_in (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2251,7 +2094,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * absolute_name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2261,7 +2103,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Repository_ptr containing_repository (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2271,7 +2112,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained::Description * describe (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2284,7 +2124,6 @@ namespace POA_CORBA
           ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2294,7 +2133,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::InterfaceDef_ptr interface_type (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2305,7 +2143,6 @@ namespace POA_CORBA
 
       void interface_type (
           ::CORBA::InterfaceDef_ptr interface_type
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2358,14 +2195,12 @@ namespace POA_CORBA
       void _is_owner ( ::CORBA::Boolean b);
       // overridden ServantBase operations
       PortableServer::POA_ptr _default_POA (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2375,7 +2210,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2385,7 +2219,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * id (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2396,7 +2229,6 @@ namespace POA_CORBA
 
       void id (
           const char * id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2406,7 +2238,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2417,7 +2248,6 @@ namespace POA_CORBA
 
       void name (
           const char * name
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2427,7 +2257,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * version (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2438,7 +2267,6 @@ namespace POA_CORBA
 
       void version (
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2448,7 +2276,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Container_ptr defined_in (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2458,7 +2285,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * absolute_name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2468,7 +2294,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Repository_ptr containing_repository (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2478,7 +2303,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained::Description * describe (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2491,7 +2315,6 @@ namespace POA_CORBA
           ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2501,7 +2324,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::InterfaceDef_ptr interface_type (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2512,7 +2334,6 @@ namespace POA_CORBA
 
       void interface_type (
           ::CORBA::InterfaceDef_ptr interface_type
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2522,7 +2343,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Boolean is_multiple (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2533,7 +2353,6 @@ namespace POA_CORBA
 
       void is_multiple (
           ::CORBA::Boolean is_multiple
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2586,14 +2405,12 @@ namespace POA_CORBA
       void _is_owner ( ::CORBA::Boolean b);
       // overridden ServantBase operations
       PortableServer::POA_ptr _default_POA (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2603,7 +2420,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2613,7 +2429,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * id (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2624,7 +2439,6 @@ namespace POA_CORBA
 
       void id (
           const char * id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2634,7 +2448,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2645,7 +2458,6 @@ namespace POA_CORBA
 
       void name (
           const char * name
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2655,7 +2467,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * version (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2666,7 +2477,6 @@ namespace POA_CORBA
 
       void version (
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2676,7 +2486,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Container_ptr defined_in (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2686,7 +2495,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * absolute_name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2696,7 +2504,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Repository_ptr containing_repository (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2706,7 +2513,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained::Description * describe (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2719,7 +2525,6 @@ namespace POA_CORBA
           ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2729,7 +2534,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ComponentIR::EventDef_ptr event (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2740,7 +2544,6 @@ namespace POA_CORBA
 
       void event (
           ::CORBA::ComponentIR::EventDef_ptr event
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2751,7 +2554,6 @@ namespace POA_CORBA
 
       ::CORBA::Boolean is_a (
           const char * event_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2804,14 +2606,12 @@ namespace POA_CORBA
       void _is_owner ( ::CORBA::Boolean b);
       // overridden ServantBase operations
       PortableServer::POA_ptr _default_POA (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2821,7 +2621,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2831,7 +2630,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * id (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2842,7 +2640,6 @@ namespace POA_CORBA
 
       void id (
           const char * id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2852,7 +2649,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2863,7 +2659,6 @@ namespace POA_CORBA
 
       void name (
           const char * name
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2873,7 +2668,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * version (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2884,7 +2678,6 @@ namespace POA_CORBA
 
       void version (
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2894,7 +2687,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Container_ptr defined_in (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2904,7 +2696,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * absolute_name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2914,7 +2705,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Repository_ptr containing_repository (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2924,7 +2714,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained::Description * describe (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2937,7 +2726,6 @@ namespace POA_CORBA
           ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2947,7 +2735,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ComponentIR::EventDef_ptr event (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2958,7 +2745,6 @@ namespace POA_CORBA
 
       void event (
           ::CORBA::ComponentIR::EventDef_ptr event
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2969,7 +2755,6 @@ namespace POA_CORBA
 
       ::CORBA::Boolean is_a (
           const char * event_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3022,14 +2807,12 @@ namespace POA_CORBA
       void _is_owner ( ::CORBA::Boolean b);
       // overridden ServantBase operations
       PortableServer::POA_ptr _default_POA (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3039,7 +2822,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3049,7 +2831,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * id (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3060,7 +2841,6 @@ namespace POA_CORBA
 
       void id (
           const char * id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3070,7 +2850,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3081,7 +2860,6 @@ namespace POA_CORBA
 
       void name (
           const char * name
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3091,7 +2869,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * version (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3102,7 +2879,6 @@ namespace POA_CORBA
 
       void version (
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3112,7 +2888,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Container_ptr defined_in (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3122,7 +2897,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * absolute_name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3132,7 +2906,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Repository_ptr containing_repository (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3142,7 +2915,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained::Description * describe (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3155,7 +2927,6 @@ namespace POA_CORBA
           ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3165,7 +2936,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ComponentIR::EventDef_ptr event (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3176,7 +2946,6 @@ namespace POA_CORBA
 
       void event (
           ::CORBA::ComponentIR::EventDef_ptr event
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3187,7 +2956,6 @@ namespace POA_CORBA
 
       ::CORBA::Boolean is_a (
           const char * event_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3240,14 +3008,12 @@ namespace POA_CORBA
       void _is_owner ( ::CORBA::Boolean b);
       // overridden ServantBase operations
       PortableServer::POA_ptr _default_POA (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3257,7 +3023,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3267,7 +3032,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * id (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3278,7 +3042,6 @@ namespace POA_CORBA
 
       void id (
           const char * id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3288,7 +3051,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3299,7 +3061,6 @@ namespace POA_CORBA
 
       void name (
           const char * name
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3309,7 +3070,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * version (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3320,7 +3080,6 @@ namespace POA_CORBA
 
       void version (
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3330,7 +3089,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Container_ptr defined_in (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3340,7 +3098,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * absolute_name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3350,7 +3107,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Repository_ptr containing_repository (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3360,7 +3116,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained::Description * describe (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3373,7 +3128,6 @@ namespace POA_CORBA
           ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3383,7 +3137,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ComponentIR::EventDef_ptr event (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3394,7 +3147,6 @@ namespace POA_CORBA
 
       void event (
           ::CORBA::ComponentIR::EventDef_ptr event
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3405,7 +3157,6 @@ namespace POA_CORBA
 
       ::CORBA::Boolean is_a (
           const char * event_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3458,14 +3209,12 @@ namespace POA_CORBA
       void _is_owner ( ::CORBA::Boolean b);
       // overridden ServantBase operations
       PortableServer::POA_ptr _default_POA (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3475,7 +3224,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3486,7 +3234,6 @@ namespace POA_CORBA
 
       ::CORBA::Contained_ptr lookup (
           const char * search_name
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3498,7 +3245,6 @@ namespace POA_CORBA
       ::CORBA::ContainedSeq * contents (
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3512,7 +3258,6 @@ namespace POA_CORBA
           ::CORBA::Long levels_to_search,
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3525,7 +3270,6 @@ namespace POA_CORBA
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited,
           ::CORBA::Long max_returned_objs
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3538,7 +3282,6 @@ namespace POA_CORBA
           const char * id,
           const char * name,
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3553,7 +3296,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr type,
           const ::CORBA::Any & value
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3567,7 +3309,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::StructMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3582,7 +3323,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr discriminator_type,
           const ::CORBA::UnionMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3596,7 +3336,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::EnumMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3610,7 +3349,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::IDLType_ptr original_type
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3624,7 +3362,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::InterfaceDefSeq & base_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3644,7 +3381,6 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::InitializerSeq & initializers
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3658,7 +3394,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::IDLType_ptr original_type_def
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3672,7 +3407,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::StructMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3685,7 +3419,6 @@ namespace POA_CORBA
           const char * id,
           const char * name,
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3699,7 +3432,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3713,7 +3445,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::InterfaceDefSeq & base_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3733,7 +3464,6 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::ExtInitializerSeq & initializers
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3743,7 +3473,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * id (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3754,7 +3483,6 @@ namespace POA_CORBA
 
       void id (
           const char * id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3764,7 +3492,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3775,7 +3502,6 @@ namespace POA_CORBA
 
       void name (
           const char * name
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3785,7 +3511,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * version (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3796,7 +3521,6 @@ namespace POA_CORBA
 
       void version (
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3806,7 +3530,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Container_ptr defined_in (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3816,7 +3539,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * absolute_name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3826,7 +3548,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Repository_ptr containing_repository (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3836,7 +3557,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained::Description * describe (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3849,7 +3569,6 @@ namespace POA_CORBA
           ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3859,7 +3578,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::TypeCode_ptr type (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3869,7 +3587,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::InterfaceDefSeq * base_interfaces (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3880,7 +3597,6 @@ namespace POA_CORBA
 
       void base_interfaces (
           const ::CORBA::InterfaceDefSeq & base_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3891,7 +3607,6 @@ namespace POA_CORBA
 
       ::CORBA::Boolean is_a (
           const char * interface_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3901,7 +3616,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3916,7 +3630,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr type,
           ::CORBA::AttributeMode mode
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3934,7 +3647,6 @@ namespace POA_CORBA
           const ::CORBA::ParDescriptionSeq & params,
           const ::CORBA::ExceptionDefSeq & exceptions,
           const ::CORBA::ContextIdSeq & contexts
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3944,7 +3656,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3961,7 +3672,6 @@ namespace POA_CORBA
           ::CORBA::AttributeMode mode,
           const ::CORBA::ExceptionDefSeq & get_exceptions,
           const ::CORBA::ExceptionDefSeq & set_exceptions
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3971,7 +3681,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ComponentIR::ComponentDef_ptr base_component (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3982,7 +3691,6 @@ namespace POA_CORBA
 
       void base_component (
           ::CORBA::ComponentIR::ComponentDef_ptr base_component
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3992,7 +3700,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::InterfaceDefSeq * supported_interfaces (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4003,7 +3710,6 @@ namespace POA_CORBA
 
       void supported_interfaces (
           const ::CORBA::InterfaceDefSeq & supported_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4017,7 +3723,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::InterfaceDef_ptr interface_type
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4032,7 +3737,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::InterfaceDef_ptr interface_type,
           ::CORBA::Boolean is_multiple
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4046,7 +3750,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::ComponentIR::EventDef_ptr event
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4060,7 +3763,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::ComponentIR::EventDef_ptr event
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4074,7 +3776,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::ComponentIR::EventDef_ptr event
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4127,14 +3828,12 @@ namespace POA_CORBA
       void _is_owner ( ::CORBA::Boolean b);
       // overridden ServantBase operations
       PortableServer::POA_ptr _default_POA (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4144,7 +3843,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4154,7 +3852,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * id (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4165,7 +3862,6 @@ namespace POA_CORBA
 
       void id (
           const char * id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4175,7 +3871,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4186,7 +3881,6 @@ namespace POA_CORBA
 
       void name (
           const char * name
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4196,7 +3890,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * version (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4207,7 +3900,6 @@ namespace POA_CORBA
 
       void version (
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4217,7 +3909,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Container_ptr defined_in (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4227,7 +3918,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * absolute_name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4237,7 +3927,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Repository_ptr containing_repository (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4247,7 +3936,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained::Description * describe (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4260,7 +3948,6 @@ namespace POA_CORBA
           ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4270,7 +3957,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::TypeCode_ptr result (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4280,7 +3966,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::IDLType_ptr result_def (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4291,7 +3976,6 @@ namespace POA_CORBA
 
       void result_def (
           ::CORBA::IDLType_ptr result_def
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4301,7 +3985,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ParDescriptionSeq * params (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4312,7 +3995,6 @@ namespace POA_CORBA
 
       void params (
           const ::CORBA::ParDescriptionSeq & params
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4322,7 +4004,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::OperationMode mode (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4333,7 +4014,6 @@ namespace POA_CORBA
 
       void mode (
           ::CORBA::OperationMode mode
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4343,7 +4023,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ContextIdSeq * contexts (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4354,7 +4033,6 @@ namespace POA_CORBA
 
       void contexts (
           const ::CORBA::ContextIdSeq & contexts
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4364,7 +4042,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ExceptionDefSeq * exceptions (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4375,7 +4052,6 @@ namespace POA_CORBA
 
       void exceptions (
           const ::CORBA::ExceptionDefSeq & exceptions
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4428,14 +4104,12 @@ namespace POA_CORBA
       void _is_owner ( ::CORBA::Boolean b);
       // overridden ServantBase operations
       PortableServer::POA_ptr _default_POA (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4445,7 +4119,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4455,7 +4128,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * id (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4466,7 +4138,6 @@ namespace POA_CORBA
 
       void id (
           const char * id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4476,7 +4147,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4487,7 +4157,6 @@ namespace POA_CORBA
 
       void name (
           const char * name
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4497,7 +4166,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * version (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4508,7 +4176,6 @@ namespace POA_CORBA
 
       void version (
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4518,7 +4185,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Container_ptr defined_in (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4528,7 +4194,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * absolute_name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4538,7 +4203,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Repository_ptr containing_repository (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4548,7 +4212,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained::Description * describe (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4561,7 +4224,6 @@ namespace POA_CORBA
           ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4571,7 +4233,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::TypeCode_ptr result (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4581,7 +4242,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::IDLType_ptr result_def (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4592,7 +4252,6 @@ namespace POA_CORBA
 
       void result_def (
           ::CORBA::IDLType_ptr result_def
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4602,7 +4261,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ParDescriptionSeq * params (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4613,7 +4271,6 @@ namespace POA_CORBA
 
       void params (
           const ::CORBA::ParDescriptionSeq & params
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4623,7 +4280,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::OperationMode mode (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4634,7 +4290,6 @@ namespace POA_CORBA
 
       void mode (
           ::CORBA::OperationMode mode
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4644,7 +4299,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ContextIdSeq * contexts (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4655,7 +4309,6 @@ namespace POA_CORBA
 
       void contexts (
           const ::CORBA::ContextIdSeq & contexts
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4665,7 +4318,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ExceptionDefSeq * exceptions (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4676,7 +4328,6 @@ namespace POA_CORBA
 
       void exceptions (
           const ::CORBA::ExceptionDefSeq & exceptions
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4729,14 +4380,12 @@ namespace POA_CORBA
       void _is_owner ( ::CORBA::Boolean b);
       // overridden ServantBase operations
       PortableServer::POA_ptr _default_POA (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4746,7 +4395,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4757,7 +4405,6 @@ namespace POA_CORBA
 
       ::CORBA::Contained_ptr lookup (
           const char * search_name
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4769,7 +4416,6 @@ namespace POA_CORBA
       ::CORBA::ContainedSeq * contents (
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4783,7 +4429,6 @@ namespace POA_CORBA
           ::CORBA::Long levels_to_search,
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4796,7 +4441,6 @@ namespace POA_CORBA
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited,
           ::CORBA::Long max_returned_objs
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4809,7 +4453,6 @@ namespace POA_CORBA
           const char * id,
           const char * name,
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4824,7 +4467,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr type,
           const ::CORBA::Any & value
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4838,7 +4480,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::StructMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4853,7 +4494,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr discriminator_type,
           const ::CORBA::UnionMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4867,7 +4507,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::EnumMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4881,7 +4520,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::IDLType_ptr original_type
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4895,7 +4533,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::InterfaceDefSeq & base_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4915,7 +4552,6 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::InitializerSeq & initializers
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4929,7 +4565,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::IDLType_ptr original_type_def
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4943,7 +4578,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::StructMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4956,7 +4590,6 @@ namespace POA_CORBA
           const char * id,
           const char * name,
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4970,7 +4603,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4984,7 +4616,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::InterfaceDefSeq & base_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5004,7 +4635,6 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::ExtInitializerSeq & initializers
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5014,7 +4644,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * id (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5025,7 +4654,6 @@ namespace POA_CORBA
 
       void id (
           const char * id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5035,7 +4663,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5046,7 +4673,6 @@ namespace POA_CORBA
 
       void name (
           const char * name
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5056,7 +4682,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * version (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5067,7 +4692,6 @@ namespace POA_CORBA
 
       void version (
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5077,7 +4701,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Container_ptr defined_in (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5087,7 +4710,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * absolute_name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5097,7 +4719,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Repository_ptr containing_repository (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5107,7 +4728,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained::Description * describe (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5120,7 +4740,6 @@ namespace POA_CORBA
           ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5130,7 +4749,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::TypeCode_ptr type (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5140,7 +4758,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::InterfaceDefSeq * base_interfaces (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5151,7 +4768,6 @@ namespace POA_CORBA
 
       void base_interfaces (
           const ::CORBA::InterfaceDefSeq & base_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5162,7 +4778,6 @@ namespace POA_CORBA
 
       ::CORBA::Boolean is_a (
           const char * interface_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5172,7 +4787,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5187,7 +4801,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr type,
           ::CORBA::AttributeMode mode
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5205,7 +4818,6 @@ namespace POA_CORBA
           const ::CORBA::ParDescriptionSeq & params,
           const ::CORBA::ExceptionDefSeq & exceptions,
           const ::CORBA::ContextIdSeq & contexts
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5215,7 +4827,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5232,7 +4843,6 @@ namespace POA_CORBA
           ::CORBA::AttributeMode mode,
           const ::CORBA::ExceptionDefSeq & get_exceptions,
           const ::CORBA::ExceptionDefSeq & set_exceptions
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5242,7 +4852,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ComponentIR::HomeDef_ptr base_home (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5253,7 +4862,6 @@ namespace POA_CORBA
 
       void base_home (
           ::CORBA::ComponentIR::HomeDef_ptr base_home
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5263,7 +4871,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::InterfaceDefSeq * supported_interfaces (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5274,7 +4881,6 @@ namespace POA_CORBA
 
       void supported_interfaces (
           const ::CORBA::InterfaceDefSeq & supported_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5284,7 +4890,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ComponentIR::ComponentDef_ptr managed_component (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5295,7 +4900,6 @@ namespace POA_CORBA
 
       void managed_component (
           ::CORBA::ComponentIR::ComponentDef_ptr managed_component
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5305,7 +4909,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ValueDef_ptr primary_key (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5316,7 +4919,6 @@ namespace POA_CORBA
 
       void primary_key (
           ::CORBA::ValueDef_ptr primary_key
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5331,7 +4933,6 @@ namespace POA_CORBA
           const char * version,
           const ::CORBA::ParDescriptionSeq & params,
           const ::CORBA::ExceptionDefSeq & exceptions
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5346,7 +4947,6 @@ namespace POA_CORBA
           const char * version,
           const ::CORBA::ParDescriptionSeq & params,
           const ::CORBA::ExceptionDefSeq & exceptions
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.inl
index e5d13d91b94..677f509e0a4 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.inl
@@ -128,14 +128,12 @@ POA_CORBA::ComponentIR::EventDef_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::EventDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -144,14 +142,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -161,7 +157,6 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::destroy  (
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::lookup  (
     const char * search_name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -169,7 +164,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup (
     search_name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -180,7 +174,6 @@ template <class T> ACE_INLINE
 ::CORBA::ContainedSeq * POA_CORBA::ComponentIR::EventDef_tie<T>::contents  (
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -189,7 +182,6 @@ template <class T> ACE_INLINE
   return this->ptr_->contents (
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -202,7 +194,6 @@ template <class T> ACE_INLINE
     ::CORBA::Long levels_to_search,
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -213,7 +204,6 @@ template <class T> ACE_INLINE
     levels_to_search,
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -225,7 +215,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -235,7 +224,6 @@ template <class T> ACE_INLINE
     limit_type,
     exclude_inherited,
     max_returned_objs
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -247,7 +235,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -257,7 +244,6 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -271,7 +257,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -283,7 +268,6 @@ template <class T> ACE_INLINE
     version,
     type,
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -296,7 +280,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -307,7 +290,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -321,7 +303,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -333,7 +314,6 @@ template <class T> ACE_INLINE
     version,
     discriminator_type,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -346,7 +326,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -357,7 +336,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -370,7 +348,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -381,7 +358,6 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -394,7 +370,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -405,7 +380,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -424,7 +398,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -441,7 +414,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -454,7 +426,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -465,7 +436,6 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -478,7 +448,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -489,7 +458,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -501,7 +469,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -511,7 +478,6 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -524,7 +490,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -535,7 +500,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -548,7 +512,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -559,7 +522,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -578,7 +540,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -595,7 +556,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -604,14 +564,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::EventDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -621,7 +579,6 @@ char * POA_CORBA::ComponentIR::EventDef_tie<T>::id  (
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -629,7 +586,6 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -638,14 +594,12 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::id  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::EventDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -655,7 +609,6 @@ char * POA_CORBA::ComponentIR::EventDef_tie<T>::name  (
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -663,7 +616,6 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -672,14 +624,12 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::name  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::EventDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -689,7 +639,6 @@ char * POA_CORBA::ComponentIR::EventDef_tie<T>::version  (
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -697,7 +646,6 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -706,14 +654,12 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::version  (
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -722,14 +668,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::EventDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -738,14 +682,12 @@ char * POA_CORBA::ComponentIR::EventDef_tie<T>::absolute_name  (
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -754,14 +696,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ComponentIR::EventDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -773,7 +713,6 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -783,7 +722,6 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -792,14 +730,12 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::move  (
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -808,14 +744,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDefSeq * POA_CORBA::ComponentIR::EventDef_tie<T>::supported_interfaces  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->supported_interfaces (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -825,7 +759,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventDef_tie<T>::supported_interfaces  (
     const ::CORBA::InterfaceDefSeq & supported_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -833,7 +766,6 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::supported_interfaces  (
 {
   this->ptr_->supported_interfaces (
     supported_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -842,14 +774,12 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::supported_interfaces  (
 
 template <class T> ACE_INLINE
 ::CORBA::InitializerSeq * POA_CORBA::ComponentIR::EventDef_tie<T>::initializers  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->initializers (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -859,7 +789,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventDef_tie<T>::initializers  (
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -867,7 +796,6 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::initializers  (
 {
   this->ptr_->initializers (
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -876,14 +804,12 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::initializers  (
 
 template <class T> ACE_INLINE
 ::CORBA::ValueDef_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::base_value  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->base_value (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -893,7 +819,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventDef_tie<T>::base_value  (
     ::CORBA::ValueDef_ptr base_value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -901,7 +826,6 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::base_value  (
 {
   this->ptr_->base_value (
     base_value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -910,14 +834,12 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::base_value  (
 
 template <class T> ACE_INLINE
 ::CORBA::ValueDefSeq * POA_CORBA::ComponentIR::EventDef_tie<T>::abstract_base_values  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->abstract_base_values (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -927,7 +849,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventDef_tie<T>::abstract_base_values  (
     const ::CORBA::ValueDefSeq & abstract_base_values
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -935,7 +856,6 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::abstract_base_values  (
 {
   this->ptr_->abstract_base_values (
     abstract_base_values
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -944,14 +864,12 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::abstract_base_values  (
 
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ComponentIR::EventDef_tie<T>::is_abstract  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->is_abstract (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -961,7 +879,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventDef_tie<T>::is_abstract  (
     ::CORBA::Boolean is_abstract
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -969,7 +886,6 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::is_abstract  (
 {
   this->ptr_->is_abstract (
     is_abstract
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -978,14 +894,12 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::is_abstract  (
 
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ComponentIR::EventDef_tie<T>::is_custom  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->is_custom (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -995,7 +909,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventDef_tie<T>::is_custom  (
     ::CORBA::Boolean is_custom
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1003,7 +916,6 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::is_custom  (
 {
   this->ptr_->is_custom (
     is_custom
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1012,14 +924,12 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::is_custom  (
 
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ComponentIR::EventDef_tie<T>::is_truncatable  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->is_truncatable (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1029,7 +939,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventDef_tie<T>::is_truncatable  (
     ::CORBA::Boolean is_truncatable
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1037,7 +946,6 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::is_truncatable  (
 {
   this->ptr_->is_truncatable (
     is_truncatable
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1047,7 +955,6 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::is_truncatable  (
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ComponentIR::EventDef_tie<T>::is_a  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1055,7 +962,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->is_a (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1064,14 +970,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::ValueDef::FullValueDescription * POA_CORBA::ComponentIR::EventDef_tie<T>::describe_value  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe_value (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1085,7 +989,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     ::CORBA::Visibility access
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1097,7 +1000,6 @@ template <class T> ACE_INLINE
     version,
     type,
     access
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1111,7 +1013,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     ::CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1123,7 +1024,6 @@ template <class T> ACE_INLINE
     version,
     type,
     mode
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1140,7 +1040,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ParDescriptionSeq & params,
     const ::CORBA::ExceptionDefSeq & exceptions,
     const ::CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1155,7 +1054,6 @@ template <class T> ACE_INLINE
     params,
     exceptions,
     contexts
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1164,14 +1062,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::ExtInitializerSeq * POA_CORBA::ComponentIR::EventDef_tie<T>::ext_initializers  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->ext_initializers (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1181,7 +1077,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventDef_tie<T>::ext_initializers  (
     const ::CORBA::ExtInitializerSeq & ext_initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1189,7 +1084,6 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::ext_initializers  (
 {
   this->ptr_->ext_initializers (
     ext_initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1198,14 +1092,12 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::ext_initializers  (
 
 template <class T> ACE_INLINE
 ::CORBA::ExtValueDef::ExtFullValueDescription * POA_CORBA::ComponentIR::EventDef_tie<T>::describe_ext_value  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe_ext_value (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1221,7 +1113,6 @@ template <class T> ACE_INLINE
     ::CORBA::AttributeMode mode,
     const ::CORBA::ExceptionDefSeq & get_exceptions,
     const ::CORBA::ExceptionDefSeq & set_exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1235,7 +1126,6 @@ template <class T> ACE_INLINE
     mode,
     get_exceptions,
     set_exceptions
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1337,14 +1227,12 @@ POA_CORBA::ComponentIR::Container_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::Container_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1353,14 +1241,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::Container_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1370,7 +1256,6 @@ void POA_CORBA::ComponentIR::Container_tie<T>::destroy  (
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ComponentIR::Container_tie<T>::lookup  (
     const char * search_name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1378,7 +1263,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup (
     search_name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1389,7 +1273,6 @@ template <class T> ACE_INLINE
 ::CORBA::ContainedSeq * POA_CORBA::ComponentIR::Container_tie<T>::contents  (
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1398,7 +1281,6 @@ template <class T> ACE_INLINE
   return this->ptr_->contents (
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1411,7 +1293,6 @@ template <class T> ACE_INLINE
     ::CORBA::Long levels_to_search,
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1422,7 +1303,6 @@ template <class T> ACE_INLINE
     levels_to_search,
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1434,7 +1314,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1444,7 +1323,6 @@ template <class T> ACE_INLINE
     limit_type,
     exclude_inherited,
     max_returned_objs
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1456,7 +1334,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1466,7 +1343,6 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1480,7 +1356,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1492,7 +1367,6 @@ template <class T> ACE_INLINE
     version,
     type,
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1505,7 +1379,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1516,7 +1389,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1530,7 +1402,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1542,7 +1413,6 @@ template <class T> ACE_INLINE
     version,
     discriminator_type,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1555,7 +1425,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1566,7 +1435,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1579,7 +1447,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1590,7 +1457,6 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1603,7 +1469,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1614,7 +1479,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1633,7 +1497,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1650,7 +1513,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1663,7 +1525,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1674,7 +1535,6 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1687,7 +1547,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1698,7 +1557,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1710,7 +1568,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1720,7 +1577,6 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1733,7 +1589,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1744,7 +1599,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1757,7 +1611,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1768,7 +1621,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1787,7 +1639,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1804,7 +1655,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1818,7 +1668,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::ComponentIR::ComponentDef_ptr base_component,
     const ::CORBA::InterfaceDefSeq & supports_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1830,7 +1679,6 @@ template <class T> ACE_INLINE
     version,
     base_component,
     supports_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1846,7 +1694,6 @@ template <class T> ACE_INLINE
     ::CORBA::ComponentIR::ComponentDef_ptr managed_component,
     const ::CORBA::InterfaceDefSeq & supports_interfaces,
     ::CORBA::ValueDef_ptr primary_key
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1860,7 +1707,6 @@ template <class T> ACE_INLINE
     managed_component,
     supports_interfaces,
     primary_key
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1879,7 +1725,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1896,7 +1741,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1998,14 +1842,12 @@ POA_CORBA::ComponentIR::ModuleDef_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::ModuleDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2014,14 +1856,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ModuleDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2031,7 +1871,6 @@ void POA_CORBA::ComponentIR::ModuleDef_tie<T>::destroy  (
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ComponentIR::ModuleDef_tie<T>::lookup  (
     const char * search_name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2039,7 +1878,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup (
     search_name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2050,7 +1888,6 @@ template <class T> ACE_INLINE
 ::CORBA::ContainedSeq * POA_CORBA::ComponentIR::ModuleDef_tie<T>::contents  (
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2059,7 +1896,6 @@ template <class T> ACE_INLINE
   return this->ptr_->contents (
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2072,7 +1908,6 @@ template <class T> ACE_INLINE
     ::CORBA::Long levels_to_search,
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2083,7 +1918,6 @@ template <class T> ACE_INLINE
     levels_to_search,
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2095,7 +1929,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2105,7 +1938,6 @@ template <class T> ACE_INLINE
     limit_type,
     exclude_inherited,
     max_returned_objs
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2117,7 +1949,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2127,7 +1958,6 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2141,7 +1971,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2153,7 +1982,6 @@ template <class T> ACE_INLINE
     version,
     type,
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2166,7 +1994,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2177,7 +2004,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2191,7 +2017,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2203,7 +2028,6 @@ template <class T> ACE_INLINE
     version,
     discriminator_type,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2216,7 +2040,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2227,7 +2050,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2240,7 +2062,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2251,7 +2072,6 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2264,7 +2084,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2275,7 +2094,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2294,7 +2112,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2311,7 +2128,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2324,7 +2140,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2335,7 +2150,6 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2348,7 +2162,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2359,7 +2172,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2371,7 +2183,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2381,7 +2192,6 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2394,7 +2204,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2405,7 +2214,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2418,7 +2226,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2429,7 +2236,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2448,7 +2254,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2465,7 +2270,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2474,14 +2278,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ModuleDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2491,7 +2293,6 @@ char * POA_CORBA::ComponentIR::ModuleDef_tie<T>::id  (
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ModuleDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2499,7 +2300,6 @@ void POA_CORBA::ComponentIR::ModuleDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2508,14 +2308,12 @@ void POA_CORBA::ComponentIR::ModuleDef_tie<T>::id  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ModuleDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2525,7 +2323,6 @@ char * POA_CORBA::ComponentIR::ModuleDef_tie<T>::name  (
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ModuleDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2533,7 +2330,6 @@ void POA_CORBA::ComponentIR::ModuleDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2542,14 +2338,12 @@ void POA_CORBA::ComponentIR::ModuleDef_tie<T>::name  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ModuleDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2559,7 +2353,6 @@ char * POA_CORBA::ComponentIR::ModuleDef_tie<T>::version  (
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ModuleDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2567,7 +2360,6 @@ void POA_CORBA::ComponentIR::ModuleDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2576,14 +2368,12 @@ void POA_CORBA::ComponentIR::ModuleDef_tie<T>::version  (
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ComponentIR::ModuleDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2592,14 +2382,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ModuleDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2608,14 +2396,12 @@ char * POA_CORBA::ComponentIR::ModuleDef_tie<T>::absolute_name  (
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ComponentIR::ModuleDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2624,14 +2410,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ComponentIR::ModuleDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2643,7 +2427,6 @@ void POA_CORBA::ComponentIR::ModuleDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2653,7 +2436,6 @@ void POA_CORBA::ComponentIR::ModuleDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2667,7 +2449,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::ComponentIR::ComponentDef_ptr base_component,
     const ::CORBA::InterfaceDefSeq & supports_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2679,7 +2460,6 @@ template <class T> ACE_INLINE
     version,
     base_component,
     supports_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2695,7 +2475,6 @@ template <class T> ACE_INLINE
     ::CORBA::ComponentIR::ComponentDef_ptr managed_component,
     const ::CORBA::InterfaceDefSeq & supports_interfaces,
     ::CORBA::ValueDef_ptr primary_key
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2709,7 +2488,6 @@ template <class T> ACE_INLINE
     managed_component,
     supports_interfaces,
     primary_key
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2728,7 +2506,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2745,7 +2522,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2847,14 +2623,12 @@ POA_CORBA::ComponentIR::Repository_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::Repository_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2863,14 +2637,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::Repository_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2880,7 +2652,6 @@ void POA_CORBA::ComponentIR::Repository_tie<T>::destroy  (
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ComponentIR::Repository_tie<T>::lookup  (
     const char * search_name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2888,7 +2659,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup (
     search_name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2899,7 +2669,6 @@ template <class T> ACE_INLINE
 ::CORBA::ContainedSeq * POA_CORBA::ComponentIR::Repository_tie<T>::contents  (
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2908,7 +2677,6 @@ template <class T> ACE_INLINE
   return this->ptr_->contents (
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2921,7 +2689,6 @@ template <class T> ACE_INLINE
     ::CORBA::Long levels_to_search,
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2932,7 +2699,6 @@ template <class T> ACE_INLINE
     levels_to_search,
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2944,7 +2710,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2954,7 +2719,6 @@ template <class T> ACE_INLINE
     limit_type,
     exclude_inherited,
     max_returned_objs
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2966,7 +2730,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2976,7 +2739,6 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2990,7 +2752,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3002,7 +2763,6 @@ template <class T> ACE_INLINE
     version,
     type,
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3015,7 +2775,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3026,7 +2785,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3040,7 +2798,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3052,7 +2809,6 @@ template <class T> ACE_INLINE
     version,
     discriminator_type,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3065,7 +2821,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3076,7 +2831,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3089,7 +2843,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3100,7 +2853,6 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3113,7 +2865,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3124,7 +2875,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3143,7 +2893,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3160,7 +2909,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3173,7 +2921,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3184,7 +2931,6 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3197,7 +2943,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3208,7 +2953,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3220,7 +2964,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3230,7 +2973,6 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3243,7 +2985,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3254,7 +2995,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3267,7 +3007,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3278,7 +3017,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3297,7 +3035,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3314,7 +3051,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3324,7 +3060,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ComponentIR::Repository_tie<T>::lookup_id  (
     const char * search_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3332,7 +3067,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup_id (
     search_id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3342,7 +3076,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ComponentIR::Repository_tie<T>::get_canonical_typecode  (
     ::CORBA::TypeCode_ptr tc
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3350,7 +3083,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->get_canonical_typecode (
     tc
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3360,7 +3092,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::PrimitiveDef_ptr POA_CORBA::ComponentIR::Repository_tie<T>::get_primitive  (
     ::CORBA::PrimitiveKind kind
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3368,7 +3099,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->get_primitive (
     kind
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3378,7 +3108,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::StringDef_ptr POA_CORBA::ComponentIR::Repository_tie<T>::create_string  (
     ::CORBA::ULong bound
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3386,7 +3115,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->create_string (
     bound
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3396,7 +3124,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 ::CORBA::WstringDef_ptr POA_CORBA::ComponentIR::Repository_tie<T>::create_wstring  (
     ::CORBA::ULong bound
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3404,7 +3131,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->create_wstring (
     bound
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3415,7 +3141,6 @@ template <class T> ACE_INLINE
 ::CORBA::SequenceDef_ptr POA_CORBA::ComponentIR::Repository_tie<T>::create_sequence  (
     ::CORBA::ULong bound,
     ::CORBA::IDLType_ptr element_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3424,7 +3149,6 @@ template <class T> ACE_INLINE
   return this->ptr_->create_sequence (
     bound,
     element_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3435,7 +3159,6 @@ template <class T> ACE_INLINE
 ::CORBA::ArrayDef_ptr POA_CORBA::ComponentIR::Repository_tie<T>::create_array  (
     ::CORBA::ULong length,
     ::CORBA::IDLType_ptr element_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3444,7 +3167,6 @@ template <class T> ACE_INLINE
   return this->ptr_->create_array (
     length,
     element_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3455,7 +3177,6 @@ template <class T> ACE_INLINE
 ::CORBA::FixedDef_ptr POA_CORBA::ComponentIR::Repository_tie<T>::create_fixed  (
     ::CORBA::UShort digits,
     ::CORBA::Short scale
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3464,7 +3185,6 @@ template <class T> ACE_INLINE
   return this->ptr_->create_fixed (
     digits,
     scale
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3478,7 +3198,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::ComponentIR::ComponentDef_ptr base_component,
     const ::CORBA::InterfaceDefSeq & supports_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3490,7 +3209,6 @@ template <class T> ACE_INLINE
     version,
     base_component,
     supports_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3506,7 +3224,6 @@ template <class T> ACE_INLINE
     ::CORBA::ComponentIR::ComponentDef_ptr managed_component,
     const ::CORBA::InterfaceDefSeq & supports_interfaces,
     ::CORBA::ValueDef_ptr primary_key
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3520,7 +3237,6 @@ template <class T> ACE_INLINE
     managed_component,
     supports_interfaces,
     primary_key
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3539,7 +3255,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3556,7 +3271,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3658,14 +3372,12 @@ POA_CORBA::ComponentIR::ProvidesDef_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::ProvidesDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3674,14 +3386,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3690,14 +3400,12 @@ void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::destroy  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ProvidesDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3707,7 +3415,6 @@ char * POA_CORBA::ComponentIR::ProvidesDef_tie<T>::id  (
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3715,7 +3422,6 @@ void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3724,14 +3430,12 @@ void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::id  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ProvidesDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3741,7 +3445,6 @@ char * POA_CORBA::ComponentIR::ProvidesDef_tie<T>::name  (
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3749,7 +3452,6 @@ void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3758,14 +3460,12 @@ void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::name  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ProvidesDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3775,7 +3475,6 @@ char * POA_CORBA::ComponentIR::ProvidesDef_tie<T>::version  (
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3783,7 +3482,6 @@ void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3792,14 +3490,12 @@ void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::version  (
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ComponentIR::ProvidesDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3808,14 +3504,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ProvidesDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3824,14 +3518,12 @@ char * POA_CORBA::ComponentIR::ProvidesDef_tie<T>::absolute_name  (
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ComponentIR::ProvidesDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3840,14 +3532,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ComponentIR::ProvidesDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3859,7 +3549,6 @@ void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3869,7 +3558,6 @@ void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3878,14 +3566,12 @@ void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::move  (
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDef_ptr POA_CORBA::ComponentIR::ProvidesDef_tie<T>::interface_type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->interface_type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3895,7 +3581,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::interface_type  (
     ::CORBA::InterfaceDef_ptr interface_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3903,7 +3588,6 @@ void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::interface_type  (
 {
   this->ptr_->interface_type (
     interface_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4005,14 +3689,12 @@ POA_CORBA::ComponentIR::UsesDef_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::UsesDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4021,14 +3703,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::UsesDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4037,14 +3717,12 @@ void POA_CORBA::ComponentIR::UsesDef_tie<T>::destroy  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::UsesDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4054,7 +3732,6 @@ char * POA_CORBA::ComponentIR::UsesDef_tie<T>::id  (
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::UsesDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4062,7 +3739,6 @@ void POA_CORBA::ComponentIR::UsesDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4071,14 +3747,12 @@ void POA_CORBA::ComponentIR::UsesDef_tie<T>::id  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::UsesDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4088,7 +3762,6 @@ char * POA_CORBA::ComponentIR::UsesDef_tie<T>::name  (
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::UsesDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4096,7 +3769,6 @@ void POA_CORBA::ComponentIR::UsesDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4105,14 +3777,12 @@ void POA_CORBA::ComponentIR::UsesDef_tie<T>::name  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::UsesDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4122,7 +3792,6 @@ char * POA_CORBA::ComponentIR::UsesDef_tie<T>::version  (
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::UsesDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4130,7 +3799,6 @@ void POA_CORBA::ComponentIR::UsesDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4139,14 +3807,12 @@ void POA_CORBA::ComponentIR::UsesDef_tie<T>::version  (
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ComponentIR::UsesDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4155,14 +3821,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::UsesDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4171,14 +3835,12 @@ char * POA_CORBA::ComponentIR::UsesDef_tie<T>::absolute_name  (
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ComponentIR::UsesDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4187,14 +3849,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ComponentIR::UsesDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4206,7 +3866,6 @@ void POA_CORBA::ComponentIR::UsesDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4216,7 +3875,6 @@ void POA_CORBA::ComponentIR::UsesDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4225,14 +3883,12 @@ void POA_CORBA::ComponentIR::UsesDef_tie<T>::move  (
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDef_ptr POA_CORBA::ComponentIR::UsesDef_tie<T>::interface_type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->interface_type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4242,7 +3898,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::UsesDef_tie<T>::interface_type  (
     ::CORBA::InterfaceDef_ptr interface_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4250,7 +3905,6 @@ void POA_CORBA::ComponentIR::UsesDef_tie<T>::interface_type  (
 {
   this->ptr_->interface_type (
     interface_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4259,14 +3913,12 @@ void POA_CORBA::ComponentIR::UsesDef_tie<T>::interface_type  (
 
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ComponentIR::UsesDef_tie<T>::is_multiple  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->is_multiple (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4276,7 +3928,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::UsesDef_tie<T>::is_multiple  (
     ::CORBA::Boolean is_multiple
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4284,7 +3935,6 @@ void POA_CORBA::ComponentIR::UsesDef_tie<T>::is_multiple  (
 {
   this->ptr_->is_multiple (
     is_multiple
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4386,14 +4036,12 @@ POA_CORBA::ComponentIR::EventPortDef_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::EventPortDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4402,14 +4050,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventPortDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4418,14 +4064,12 @@ void POA_CORBA::ComponentIR::EventPortDef_tie<T>::destroy  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::EventPortDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4435,7 +4079,6 @@ char * POA_CORBA::ComponentIR::EventPortDef_tie<T>::id  (
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventPortDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4443,7 +4086,6 @@ void POA_CORBA::ComponentIR::EventPortDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4452,14 +4094,12 @@ void POA_CORBA::ComponentIR::EventPortDef_tie<T>::id  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::EventPortDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4469,7 +4109,6 @@ char * POA_CORBA::ComponentIR::EventPortDef_tie<T>::name  (
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventPortDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4477,7 +4116,6 @@ void POA_CORBA::ComponentIR::EventPortDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4486,14 +4124,12 @@ void POA_CORBA::ComponentIR::EventPortDef_tie<T>::name  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::EventPortDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4503,7 +4139,6 @@ char * POA_CORBA::ComponentIR::EventPortDef_tie<T>::version  (
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventPortDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4511,7 +4146,6 @@ void POA_CORBA::ComponentIR::EventPortDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4520,14 +4154,12 @@ void POA_CORBA::ComponentIR::EventPortDef_tie<T>::version  (
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ComponentIR::EventPortDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4536,14 +4168,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::EventPortDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4552,14 +4182,12 @@ char * POA_CORBA::ComponentIR::EventPortDef_tie<T>::absolute_name  (
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ComponentIR::EventPortDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4568,14 +4196,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ComponentIR::EventPortDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4587,7 +4213,6 @@ void POA_CORBA::ComponentIR::EventPortDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4597,7 +4222,6 @@ void POA_CORBA::ComponentIR::EventPortDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4606,14 +4230,12 @@ void POA_CORBA::ComponentIR::EventPortDef_tie<T>::move  (
 
 template <class T> ACE_INLINE
 ::CORBA::ComponentIR::EventDef_ptr POA_CORBA::ComponentIR::EventPortDef_tie<T>::event  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->event (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4623,7 +4245,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventPortDef_tie<T>::event  (
     ::CORBA::ComponentIR::EventDef_ptr event
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4631,7 +4252,6 @@ void POA_CORBA::ComponentIR::EventPortDef_tie<T>::event  (
 {
   this->ptr_->event (
     event
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4641,7 +4261,6 @@ void POA_CORBA::ComponentIR::EventPortDef_tie<T>::event  (
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ComponentIR::EventPortDef_tie<T>::is_a  (
     const char * event_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4649,7 +4268,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->is_a (
     event_id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4751,14 +4369,12 @@ POA_CORBA::ComponentIR::EmitsDef_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::EmitsDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4767,14 +4383,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EmitsDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4783,14 +4397,12 @@ void POA_CORBA::ComponentIR::EmitsDef_tie<T>::destroy  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::EmitsDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4800,7 +4412,6 @@ char * POA_CORBA::ComponentIR::EmitsDef_tie<T>::id  (
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EmitsDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4808,7 +4419,6 @@ void POA_CORBA::ComponentIR::EmitsDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4817,14 +4427,12 @@ void POA_CORBA::ComponentIR::EmitsDef_tie<T>::id  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::EmitsDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4834,7 +4442,6 @@ char * POA_CORBA::ComponentIR::EmitsDef_tie<T>::name  (
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EmitsDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4842,7 +4449,6 @@ void POA_CORBA::ComponentIR::EmitsDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4851,14 +4457,12 @@ void POA_CORBA::ComponentIR::EmitsDef_tie<T>::name  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::EmitsDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4868,7 +4472,6 @@ char * POA_CORBA::ComponentIR::EmitsDef_tie<T>::version  (
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EmitsDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4876,7 +4479,6 @@ void POA_CORBA::ComponentIR::EmitsDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4885,14 +4487,12 @@ void POA_CORBA::ComponentIR::EmitsDef_tie<T>::version  (
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ComponentIR::EmitsDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4901,14 +4501,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::EmitsDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4917,14 +4515,12 @@ char * POA_CORBA::ComponentIR::EmitsDef_tie<T>::absolute_name  (
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ComponentIR::EmitsDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4933,14 +4529,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ComponentIR::EmitsDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4952,7 +4546,6 @@ void POA_CORBA::ComponentIR::EmitsDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4962,7 +4555,6 @@ void POA_CORBA::ComponentIR::EmitsDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4971,14 +4563,12 @@ void POA_CORBA::ComponentIR::EmitsDef_tie<T>::move  (
 
 template <class T> ACE_INLINE
 ::CORBA::ComponentIR::EventDef_ptr POA_CORBA::ComponentIR::EmitsDef_tie<T>::event  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->event (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4988,7 +4578,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EmitsDef_tie<T>::event  (
     ::CORBA::ComponentIR::EventDef_ptr event
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4996,7 +4585,6 @@ void POA_CORBA::ComponentIR::EmitsDef_tie<T>::event  (
 {
   this->ptr_->event (
     event
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5006,7 +4594,6 @@ void POA_CORBA::ComponentIR::EmitsDef_tie<T>::event  (
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ComponentIR::EmitsDef_tie<T>::is_a  (
     const char * event_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5014,7 +4601,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->is_a (
     event_id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5116,14 +4702,12 @@ POA_CORBA::ComponentIR::PublishesDef_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::PublishesDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5132,14 +4716,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::PublishesDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5148,14 +4730,12 @@ void POA_CORBA::ComponentIR::PublishesDef_tie<T>::destroy  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::PublishesDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5165,7 +4745,6 @@ char * POA_CORBA::ComponentIR::PublishesDef_tie<T>::id  (
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::PublishesDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5173,7 +4752,6 @@ void POA_CORBA::ComponentIR::PublishesDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5182,14 +4760,12 @@ void POA_CORBA::ComponentIR::PublishesDef_tie<T>::id  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::PublishesDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5199,7 +4775,6 @@ char * POA_CORBA::ComponentIR::PublishesDef_tie<T>::name  (
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::PublishesDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5207,7 +4782,6 @@ void POA_CORBA::ComponentIR::PublishesDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5216,14 +4790,12 @@ void POA_CORBA::ComponentIR::PublishesDef_tie<T>::name  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::PublishesDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5233,7 +4805,6 @@ char * POA_CORBA::ComponentIR::PublishesDef_tie<T>::version  (
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::PublishesDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5241,7 +4812,6 @@ void POA_CORBA::ComponentIR::PublishesDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5250,14 +4820,12 @@ void POA_CORBA::ComponentIR::PublishesDef_tie<T>::version  (
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ComponentIR::PublishesDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5266,14 +4834,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::PublishesDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5282,14 +4848,12 @@ char * POA_CORBA::ComponentIR::PublishesDef_tie<T>::absolute_name  (
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ComponentIR::PublishesDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5298,14 +4862,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ComponentIR::PublishesDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5317,7 +4879,6 @@ void POA_CORBA::ComponentIR::PublishesDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5327,7 +4888,6 @@ void POA_CORBA::ComponentIR::PublishesDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5336,14 +4896,12 @@ void POA_CORBA::ComponentIR::PublishesDef_tie<T>::move  (
 
 template <class T> ACE_INLINE
 ::CORBA::ComponentIR::EventDef_ptr POA_CORBA::ComponentIR::PublishesDef_tie<T>::event  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->event (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5353,7 +4911,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::PublishesDef_tie<T>::event  (
     ::CORBA::ComponentIR::EventDef_ptr event
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5361,7 +4918,6 @@ void POA_CORBA::ComponentIR::PublishesDef_tie<T>::event  (
 {
   this->ptr_->event (
     event
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5371,7 +4927,6 @@ void POA_CORBA::ComponentIR::PublishesDef_tie<T>::event  (
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ComponentIR::PublishesDef_tie<T>::is_a  (
     const char * event_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5379,7 +4934,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->is_a (
     event_id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5481,14 +5035,12 @@ POA_CORBA::ComponentIR::ConsumesDef_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::ConsumesDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5497,14 +5049,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5513,14 +5063,12 @@ void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::destroy  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ConsumesDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5530,7 +5078,6 @@ char * POA_CORBA::ComponentIR::ConsumesDef_tie<T>::id  (
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5538,7 +5085,6 @@ void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5547,14 +5093,12 @@ void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::id  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ConsumesDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5564,7 +5108,6 @@ char * POA_CORBA::ComponentIR::ConsumesDef_tie<T>::name  (
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5572,7 +5115,6 @@ void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5581,14 +5123,12 @@ void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::name  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ConsumesDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5598,7 +5138,6 @@ char * POA_CORBA::ComponentIR::ConsumesDef_tie<T>::version  (
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5606,7 +5145,6 @@ void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5615,14 +5153,12 @@ void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::version  (
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ComponentIR::ConsumesDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5631,14 +5167,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ConsumesDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5647,14 +5181,12 @@ char * POA_CORBA::ComponentIR::ConsumesDef_tie<T>::absolute_name  (
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ComponentIR::ConsumesDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5663,14 +5195,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ComponentIR::ConsumesDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5682,7 +5212,6 @@ void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5692,7 +5221,6 @@ void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5701,14 +5229,12 @@ void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::move  (
 
 template <class T> ACE_INLINE
 ::CORBA::ComponentIR::EventDef_ptr POA_CORBA::ComponentIR::ConsumesDef_tie<T>::event  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->event (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5718,7 +5244,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::event  (
     ::CORBA::ComponentIR::EventDef_ptr event
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5726,7 +5251,6 @@ void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::event  (
 {
   this->ptr_->event (
     event
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5736,7 +5260,6 @@ void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::event  (
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ComponentIR::ConsumesDef_tie<T>::is_a  (
     const char * event_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5744,7 +5267,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->is_a (
     event_id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5846,14 +5368,12 @@ POA_CORBA::ComponentIR::ComponentDef_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::ComponentDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5862,14 +5382,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ComponentDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5879,7 +5397,6 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::destroy  (
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::lookup  (
     const char * search_name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5887,7 +5404,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup (
     search_name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5898,7 +5414,6 @@ template <class T> ACE_INLINE
 ::CORBA::ContainedSeq * POA_CORBA::ComponentIR::ComponentDef_tie<T>::contents  (
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5907,7 +5422,6 @@ template <class T> ACE_INLINE
   return this->ptr_->contents (
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5920,7 +5434,6 @@ template <class T> ACE_INLINE
     ::CORBA::Long levels_to_search,
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5931,7 +5444,6 @@ template <class T> ACE_INLINE
     levels_to_search,
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5943,7 +5455,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5953,7 +5464,6 @@ template <class T> ACE_INLINE
     limit_type,
     exclude_inherited,
     max_returned_objs
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5965,7 +5475,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5975,7 +5484,6 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5989,7 +5497,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6001,7 +5508,6 @@ template <class T> ACE_INLINE
     version,
     type,
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6014,7 +5520,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6025,7 +5530,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6039,7 +5543,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6051,7 +5554,6 @@ template <class T> ACE_INLINE
     version,
     discriminator_type,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6064,7 +5566,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6075,7 +5576,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6088,7 +5588,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6099,7 +5598,6 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6112,7 +5610,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6123,7 +5620,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6142,7 +5638,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6159,7 +5654,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6172,7 +5666,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6183,7 +5676,6 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6196,7 +5688,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6207,7 +5698,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6219,7 +5709,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6229,7 +5718,6 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6242,7 +5730,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6253,7 +5740,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6266,7 +5752,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6277,7 +5762,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6296,7 +5780,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6313,7 +5796,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6322,14 +5804,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ComponentDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6339,7 +5819,6 @@ char * POA_CORBA::ComponentIR::ComponentDef_tie<T>::id  (
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ComponentDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6347,7 +5826,6 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6356,14 +5834,12 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::id  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ComponentDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6373,7 +5849,6 @@ char * POA_CORBA::ComponentIR::ComponentDef_tie<T>::name  (
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ComponentDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6381,7 +5856,6 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6390,14 +5864,12 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::name  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ComponentDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6407,7 +5879,6 @@ char * POA_CORBA::ComponentIR::ComponentDef_tie<T>::version  (
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ComponentDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6415,7 +5886,6 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6424,14 +5894,12 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::version  (
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6440,14 +5908,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ComponentDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6456,14 +5922,12 @@ char * POA_CORBA::ComponentIR::ComponentDef_tie<T>::absolute_name  (
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6472,14 +5936,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ComponentIR::ComponentDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6491,7 +5953,6 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6501,7 +5962,6 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6510,14 +5970,12 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::move  (
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6526,14 +5984,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDefSeq * POA_CORBA::ComponentIR::ComponentDef_tie<T>::base_interfaces  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->base_interfaces (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6543,7 +5999,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ComponentDef_tie<T>::base_interfaces  (
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6551,7 +6006,6 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::base_interfaces  (
 {
   this->ptr_->base_interfaces (
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6561,7 +6015,6 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::base_interfaces  (
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ComponentIR::ComponentDef_tie<T>::is_a  (
     const char * interface_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6569,7 +6022,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->is_a (
     interface_id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6578,14 +6030,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::ComponentIR::ComponentDef_tie<T>::describe_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6599,7 +6049,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     ::CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6611,7 +6060,6 @@ template <class T> ACE_INLINE
     version,
     type,
     mode
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6628,7 +6076,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ParDescriptionSeq & params,
     const ::CORBA::ExceptionDefSeq & exceptions,
     const ::CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6643,7 +6090,6 @@ template <class T> ACE_INLINE
     params,
     exceptions,
     contexts
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6652,14 +6098,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * POA_CORBA::ComponentIR::ComponentDef_tie<T>::describe_ext_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe_ext_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6675,7 +6119,6 @@ template <class T> ACE_INLINE
     ::CORBA::AttributeMode mode,
     const ::CORBA::ExceptionDefSeq & get_exceptions,
     const ::CORBA::ExceptionDefSeq & set_exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6689,7 +6132,6 @@ template <class T> ACE_INLINE
     mode,
     get_exceptions,
     set_exceptions
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6698,14 +6140,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::ComponentIR::ComponentDef_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::base_component  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->base_component (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6715,7 +6155,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ComponentDef_tie<T>::base_component  (
     ::CORBA::ComponentIR::ComponentDef_ptr base_component
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6723,7 +6162,6 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::base_component  (
 {
   this->ptr_->base_component (
     base_component
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6732,14 +6170,12 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::base_component  (
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDefSeq * POA_CORBA::ComponentIR::ComponentDef_tie<T>::supported_interfaces  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->supported_interfaces (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6749,7 +6185,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ComponentDef_tie<T>::supported_interfaces  (
     const ::CORBA::InterfaceDefSeq & supported_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6757,7 +6192,6 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::supported_interfaces  (
 {
   this->ptr_->supported_interfaces (
     supported_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6770,7 +6204,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::InterfaceDef_ptr interface_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6781,7 +6214,6 @@ template <class T> ACE_INLINE
     name,
     version,
     interface_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6795,7 +6227,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::InterfaceDef_ptr interface_type,
     ::CORBA::Boolean is_multiple
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6807,7 +6238,6 @@ template <class T> ACE_INLINE
     version,
     interface_type,
     is_multiple
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6820,7 +6250,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::ComponentIR::EventDef_ptr event
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6831,7 +6260,6 @@ template <class T> ACE_INLINE
     name,
     version,
     event
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6844,7 +6272,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::ComponentIR::EventDef_ptr event
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6855,7 +6282,6 @@ template <class T> ACE_INLINE
     name,
     version,
     event
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6868,7 +6294,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::ComponentIR::EventDef_ptr event
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6879,7 +6304,6 @@ template <class T> ACE_INLINE
     name,
     version,
     event
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6981,14 +6405,12 @@ POA_CORBA::ComponentIR::FactoryDef_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::FactoryDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6997,14 +6419,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FactoryDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7013,14 +6433,12 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::destroy  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::FactoryDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7030,7 +6448,6 @@ char * POA_CORBA::ComponentIR::FactoryDef_tie<T>::id  (
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FactoryDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7038,7 +6455,6 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7047,14 +6463,12 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::id  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::FactoryDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7064,7 +6478,6 @@ char * POA_CORBA::ComponentIR::FactoryDef_tie<T>::name  (
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FactoryDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7072,7 +6485,6 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7081,14 +6493,12 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::name  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::FactoryDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7098,7 +6508,6 @@ char * POA_CORBA::ComponentIR::FactoryDef_tie<T>::version  (
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FactoryDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7106,7 +6515,6 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7115,14 +6523,12 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::version  (
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ComponentIR::FactoryDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7131,14 +6537,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::FactoryDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7147,14 +6551,12 @@ char * POA_CORBA::ComponentIR::FactoryDef_tie<T>::absolute_name  (
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ComponentIR::FactoryDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7163,14 +6565,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ComponentIR::FactoryDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7182,7 +6582,6 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7192,7 +6591,6 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7201,14 +6599,12 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::move  (
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ComponentIR::FactoryDef_tie<T>::result  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->result (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7217,14 +6613,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::IDLType_ptr POA_CORBA::ComponentIR::FactoryDef_tie<T>::result_def  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->result_def (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7234,7 +6628,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FactoryDef_tie<T>::result_def  (
     ::CORBA::IDLType_ptr result_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7242,7 +6635,6 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::result_def  (
 {
   this->ptr_->result_def (
     result_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7251,14 +6643,12 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::result_def  (
 
 template <class T> ACE_INLINE
 ::CORBA::ParDescriptionSeq * POA_CORBA::ComponentIR::FactoryDef_tie<T>::params  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->params (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7268,7 +6658,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FactoryDef_tie<T>::params  (
     const ::CORBA::ParDescriptionSeq & params
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7276,7 +6665,6 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::params  (
 {
   this->ptr_->params (
     params
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7285,14 +6673,12 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::params  (
 
 template <class T> ACE_INLINE
 ::CORBA::OperationMode POA_CORBA::ComponentIR::FactoryDef_tie<T>::mode  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->mode (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7302,7 +6688,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FactoryDef_tie<T>::mode  (
     ::CORBA::OperationMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7310,7 +6695,6 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::mode  (
 {
   this->ptr_->mode (
     mode
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7319,14 +6703,12 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::mode  (
 
 template <class T> ACE_INLINE
 ::CORBA::ContextIdSeq * POA_CORBA::ComponentIR::FactoryDef_tie<T>::contexts  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->contexts (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7336,7 +6718,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FactoryDef_tie<T>::contexts  (
     const ::CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7344,7 +6725,6 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::contexts  (
 {
   this->ptr_->contexts (
     contexts
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7353,14 +6733,12 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::contexts  (
 
 template <class T> ACE_INLINE
 ::CORBA::ExceptionDefSeq * POA_CORBA::ComponentIR::FactoryDef_tie<T>::exceptions  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->exceptions (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7370,7 +6748,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FactoryDef_tie<T>::exceptions  (
     const ::CORBA::ExceptionDefSeq & exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7378,7 +6755,6 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::exceptions  (
 {
   this->ptr_->exceptions (
     exceptions
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7480,14 +6856,12 @@ POA_CORBA::ComponentIR::FinderDef_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::FinderDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7496,14 +6870,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FinderDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7512,14 +6884,12 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::destroy  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::FinderDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7529,7 +6899,6 @@ char * POA_CORBA::ComponentIR::FinderDef_tie<T>::id  (
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FinderDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7537,7 +6906,6 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7546,14 +6914,12 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::id  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::FinderDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7563,7 +6929,6 @@ char * POA_CORBA::ComponentIR::FinderDef_tie<T>::name  (
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FinderDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7571,7 +6936,6 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7580,14 +6944,12 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::name  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::FinderDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7597,7 +6959,6 @@ char * POA_CORBA::ComponentIR::FinderDef_tie<T>::version  (
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FinderDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7605,7 +6966,6 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7614,14 +6974,12 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::version  (
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ComponentIR::FinderDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7630,14 +6988,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::FinderDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7646,14 +7002,12 @@ char * POA_CORBA::ComponentIR::FinderDef_tie<T>::absolute_name  (
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ComponentIR::FinderDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7662,14 +7016,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ComponentIR::FinderDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7681,7 +7033,6 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7691,7 +7042,6 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7700,14 +7050,12 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::move  (
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ComponentIR::FinderDef_tie<T>::result  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->result (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7716,14 +7064,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::IDLType_ptr POA_CORBA::ComponentIR::FinderDef_tie<T>::result_def  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->result_def (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7733,7 +7079,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FinderDef_tie<T>::result_def  (
     ::CORBA::IDLType_ptr result_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7741,7 +7086,6 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::result_def  (
 {
   this->ptr_->result_def (
     result_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7750,14 +7094,12 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::result_def  (
 
 template <class T> ACE_INLINE
 ::CORBA::ParDescriptionSeq * POA_CORBA::ComponentIR::FinderDef_tie<T>::params  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->params (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7767,7 +7109,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FinderDef_tie<T>::params  (
     const ::CORBA::ParDescriptionSeq & params
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7775,7 +7116,6 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::params  (
 {
   this->ptr_->params (
     params
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7784,14 +7124,12 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::params  (
 
 template <class T> ACE_INLINE
 ::CORBA::OperationMode POA_CORBA::ComponentIR::FinderDef_tie<T>::mode  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->mode (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7801,7 +7139,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FinderDef_tie<T>::mode  (
     ::CORBA::OperationMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7809,7 +7146,6 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::mode  (
 {
   this->ptr_->mode (
     mode
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7818,14 +7154,12 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::mode  (
 
 template <class T> ACE_INLINE
 ::CORBA::ContextIdSeq * POA_CORBA::ComponentIR::FinderDef_tie<T>::contexts  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->contexts (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7835,7 +7169,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FinderDef_tie<T>::contexts  (
     const ::CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7843,7 +7176,6 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::contexts  (
 {
   this->ptr_->contexts (
     contexts
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7852,14 +7184,12 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::contexts  (
 
 template <class T> ACE_INLINE
 ::CORBA::ExceptionDefSeq * POA_CORBA::ComponentIR::FinderDef_tie<T>::exceptions  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->exceptions (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7869,7 +7199,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FinderDef_tie<T>::exceptions  (
     const ::CORBA::ExceptionDefSeq & exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7877,7 +7206,6 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::exceptions  (
 {
   this->ptr_->exceptions (
     exceptions
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7979,14 +7307,12 @@ POA_CORBA::ComponentIR::HomeDef_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::HomeDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7995,14 +7321,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::HomeDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -8012,7 +7336,6 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::destroy  (
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::lookup  (
     const char * search_name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8020,7 +7343,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup (
     search_name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8031,7 +7353,6 @@ template <class T> ACE_INLINE
 ::CORBA::ContainedSeq * POA_CORBA::ComponentIR::HomeDef_tie<T>::contents  (
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8040,7 +7361,6 @@ template <class T> ACE_INLINE
   return this->ptr_->contents (
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8053,7 +7373,6 @@ template <class T> ACE_INLINE
     ::CORBA::Long levels_to_search,
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8064,7 +7383,6 @@ template <class T> ACE_INLINE
     levels_to_search,
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8076,7 +7394,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8086,7 +7403,6 @@ template <class T> ACE_INLINE
     limit_type,
     exclude_inherited,
     max_returned_objs
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8098,7 +7414,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8108,7 +7423,6 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8122,7 +7436,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8134,7 +7447,6 @@ template <class T> ACE_INLINE
     version,
     type,
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8147,7 +7459,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8158,7 +7469,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8172,7 +7482,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8184,7 +7493,6 @@ template <class T> ACE_INLINE
     version,
     discriminator_type,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8197,7 +7505,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8208,7 +7515,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8221,7 +7527,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8232,7 +7537,6 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8245,7 +7549,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8256,7 +7559,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8275,7 +7577,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8292,7 +7593,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8305,7 +7605,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8316,7 +7615,6 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8329,7 +7627,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8340,7 +7637,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8352,7 +7648,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8362,7 +7657,6 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8375,7 +7669,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8386,7 +7679,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8399,7 +7691,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8410,7 +7701,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8429,7 +7719,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8446,7 +7735,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8455,14 +7743,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::HomeDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -8472,7 +7758,6 @@ char * POA_CORBA::ComponentIR::HomeDef_tie<T>::id  (
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::HomeDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8480,7 +7765,6 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8489,14 +7773,12 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::id  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::HomeDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -8506,7 +7788,6 @@ char * POA_CORBA::ComponentIR::HomeDef_tie<T>::name  (
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::HomeDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8514,7 +7795,6 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8523,14 +7803,12 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::name  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::HomeDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -8540,7 +7818,6 @@ char * POA_CORBA::ComponentIR::HomeDef_tie<T>::version  (
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::HomeDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8548,7 +7825,6 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8557,14 +7833,12 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::version  (
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -8573,14 +7847,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::HomeDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -8589,14 +7861,12 @@ char * POA_CORBA::ComponentIR::HomeDef_tie<T>::absolute_name  (
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -8605,14 +7875,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ComponentIR::HomeDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -8624,7 +7892,6 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8634,7 +7901,6 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8643,14 +7909,12 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::move  (
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -8659,14 +7923,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDefSeq * POA_CORBA::ComponentIR::HomeDef_tie<T>::base_interfaces  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->base_interfaces (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -8676,7 +7938,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::HomeDef_tie<T>::base_interfaces  (
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8684,7 +7945,6 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::base_interfaces  (
 {
   this->ptr_->base_interfaces (
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8694,7 +7954,6 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::base_interfaces  (
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ComponentIR::HomeDef_tie<T>::is_a  (
     const char * interface_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8702,7 +7961,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->is_a (
     interface_id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8711,14 +7969,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::ComponentIR::HomeDef_tie<T>::describe_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -8732,7 +7988,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     ::CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8744,7 +7999,6 @@ template <class T> ACE_INLINE
     version,
     type,
     mode
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8761,7 +8015,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ParDescriptionSeq & params,
     const ::CORBA::ExceptionDefSeq & exceptions,
     const ::CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8776,7 +8029,6 @@ template <class T> ACE_INLINE
     params,
     exceptions,
     contexts
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8785,14 +8037,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * POA_CORBA::ComponentIR::HomeDef_tie<T>::describe_ext_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe_ext_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -8808,7 +8058,6 @@ template <class T> ACE_INLINE
     ::CORBA::AttributeMode mode,
     const ::CORBA::ExceptionDefSeq & get_exceptions,
     const ::CORBA::ExceptionDefSeq & set_exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8822,7 +8071,6 @@ template <class T> ACE_INLINE
     mode,
     get_exceptions,
     set_exceptions
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8831,14 +8079,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::ComponentIR::HomeDef_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::base_home  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->base_home (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -8848,7 +8094,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::HomeDef_tie<T>::base_home  (
     ::CORBA::ComponentIR::HomeDef_ptr base_home
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8856,7 +8101,6 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::base_home  (
 {
   this->ptr_->base_home (
     base_home
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8865,14 +8109,12 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::base_home  (
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDefSeq * POA_CORBA::ComponentIR::HomeDef_tie<T>::supported_interfaces  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->supported_interfaces (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -8882,7 +8124,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::HomeDef_tie<T>::supported_interfaces  (
     const ::CORBA::InterfaceDefSeq & supported_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8890,7 +8131,6 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::supported_interfaces  (
 {
   this->ptr_->supported_interfaces (
     supported_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8899,14 +8139,12 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::supported_interfaces  (
 
 template <class T> ACE_INLINE
 ::CORBA::ComponentIR::ComponentDef_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::managed_component  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->managed_component (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -8916,7 +8154,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::HomeDef_tie<T>::managed_component  (
     ::CORBA::ComponentIR::ComponentDef_ptr managed_component
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8924,7 +8161,6 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::managed_component  (
 {
   this->ptr_->managed_component (
     managed_component
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8933,14 +8169,12 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::managed_component  (
 
 template <class T> ACE_INLINE
 ::CORBA::ValueDef_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::primary_key  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->primary_key (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -8950,7 +8184,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::HomeDef_tie<T>::primary_key  (
     ::CORBA::ValueDef_ptr primary_key
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8958,7 +8191,6 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::primary_key  (
 {
   this->ptr_->primary_key (
     primary_key
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8972,7 +8204,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::ParDescriptionSeq & params,
     const ::CORBA::ExceptionDefSeq & exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8984,7 +8215,6 @@ template <class T> ACE_INLINE
     version,
     params,
     exceptions
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8998,7 +8228,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::ParDescriptionSeq & params,
     const ::CORBA::ExceptionDefSeq & exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9010,7 +8239,6 @@ template <class T> ACE_INLINE
     version,
     params,
     exceptions
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp
index 4d391c38a93..8cf4f9103dd 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp
@@ -1090,8 +1090,7 @@ POA_CORBA::FixedDef::~FixedDef (void)
           this->args_);
 
       retval =
-        this->servant_->digits (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->digits ();
     }
 
   private:
@@ -1109,7 +1108,6 @@ void POA_CORBA::FixedDef::_get_digits_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -1144,7 +1142,7 @@ void POA_CORBA::FixedDef::_get_digits_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -1175,8 +1173,7 @@ void POA_CORBA::FixedDef::_get_digits_skel (
           1);
 
       this->servant_->digits (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
+        arg_1);
     }
 
   private:
@@ -1194,7 +1191,6 @@ void POA_CORBA::FixedDef::_set_digits_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -1231,7 +1227,7 @@ void POA_CORBA::FixedDef::_set_digits_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -1261,8 +1257,7 @@ void POA_CORBA::FixedDef::_set_digits_skel (
           this->args_);
 
       retval =
-        this->servant_->scale (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->scale ();
     }
 
   private:
@@ -1280,7 +1275,6 @@ void POA_CORBA::FixedDef::_get_scale_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -1315,7 +1309,7 @@ void POA_CORBA::FixedDef::_get_scale_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -1346,8 +1340,7 @@ void POA_CORBA::FixedDef::_get_scale_skel (
           1);
 
       this->servant_->scale (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
+        arg_1);
     }
 
   private:
@@ -1365,7 +1358,6 @@ void POA_CORBA::FixedDef::_set_scale_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -1402,7 +1394,7 @@ void POA_CORBA::FixedDef::_set_scale_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -1444,8 +1436,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -1460,7 +1451,6 @@ void POA_CORBA::FixedDef::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -1497,7 +1487,7 @@ void POA_CORBA::FixedDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -1527,8 +1517,7 @@ void POA_CORBA::FixedDef::_is_a_skel (
           this->args_);
 
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _non_existent ();
     }
 
   private:
@@ -1543,7 +1532,6 @@ void POA_CORBA::FixedDef::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -1578,7 +1566,7 @@ void POA_CORBA::FixedDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -1608,8 +1596,7 @@ void POA_CORBA::FixedDef::_non_existent_skel (
           this->args_);
 
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _repository_id ();
     }
 
   private:
@@ -1624,7 +1611,6 @@ void POA_CORBA::FixedDef::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -1659,7 +1645,7 @@ void POA_CORBA::FixedDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -1669,7 +1655,6 @@ void POA_CORBA::FixedDef::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -1679,8 +1664,9 @@ void POA_CORBA::FixedDef::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::FixedDef * const impl =
@@ -1701,7 +1687,7 @@ void POA_CORBA::FixedDef::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -1732,8 +1718,7 @@ void POA_CORBA::FixedDef::_interface_skel (
           this->args_);
 
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _get_component ();
     }
 
   private:
@@ -1748,7 +1733,6 @@ void POA_CORBA::FixedDef::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -1783,12 +1767,11 @@ void POA_CORBA::FixedDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::FixedDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -1823,13 +1806,11 @@ const char* POA_CORBA::FixedDef::_interface_repository_id (void) const
 void POA_CORBA::FixedDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -2085,8 +2066,7 @@ POA_CORBA::ValueMemberDef::~ValueMemberDef (void)
           this->args_);
 
       retval =
-        this->servant_->type (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->type ();
     }
 
   private:
@@ -2104,7 +2084,6 @@ void POA_CORBA::ValueMemberDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -2139,7 +2118,7 @@ void POA_CORBA::ValueMemberDef::_get_type_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -2169,8 +2148,7 @@ void POA_CORBA::ValueMemberDef::_get_type_skel (
           this->args_);
 
       retval =
-        this->servant_->type_def (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->type_def ();
     }
 
   private:
@@ -2188,7 +2166,6 @@ void POA_CORBA::ValueMemberDef::_get_type_def_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -2223,7 +2200,7 @@ void POA_CORBA::ValueMemberDef::_get_type_def_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -2254,8 +2231,7 @@ void POA_CORBA::ValueMemberDef::_get_type_def_skel (
           1);
 
       this->servant_->type_def (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
+        arg_1);
     }
 
   private:
@@ -2273,7 +2249,6 @@ void POA_CORBA::ValueMemberDef::_set_type_def_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -2310,7 +2285,7 @@ void POA_CORBA::ValueMemberDef::_set_type_def_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -2340,8 +2315,7 @@ void POA_CORBA::ValueMemberDef::_set_type_def_skel (
           this->args_);
 
       retval =
-        this->servant_->access (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->access ();
     }
 
   private:
@@ -2359,7 +2333,6 @@ void POA_CORBA::ValueMemberDef::_get_access_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -2394,7 +2367,7 @@ void POA_CORBA::ValueMemberDef::_get_access_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -2425,8 +2398,7 @@ void POA_CORBA::ValueMemberDef::_get_access_skel (
           1);
 
       this->servant_->access (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
+        arg_1);
     }
 
   private:
@@ -2444,7 +2416,6 @@ void POA_CORBA::ValueMemberDef::_set_access_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -2481,7 +2452,7 @@ void POA_CORBA::ValueMemberDef::_set_access_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -2523,8 +2494,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -2539,7 +2509,6 @@ void POA_CORBA::ValueMemberDef::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -2576,7 +2545,7 @@ void POA_CORBA::ValueMemberDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -2606,8 +2575,7 @@ void POA_CORBA::ValueMemberDef::_is_a_skel (
           this->args_);
 
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _non_existent ();
     }
 
   private:
@@ -2622,7 +2590,6 @@ void POA_CORBA::ValueMemberDef::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -2657,7 +2624,7 @@ void POA_CORBA::ValueMemberDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -2687,8 +2654,7 @@ void POA_CORBA::ValueMemberDef::_non_existent_skel (
           this->args_);
 
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _repository_id ();
     }
 
   private:
@@ -2703,7 +2669,6 @@ void POA_CORBA::ValueMemberDef::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -2738,7 +2703,7 @@ void POA_CORBA::ValueMemberDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -2748,7 +2713,6 @@ void POA_CORBA::ValueMemberDef::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -2758,8 +2722,9 @@ void POA_CORBA::ValueMemberDef::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::ValueMemberDef * const impl =
@@ -2780,7 +2745,7 @@ void POA_CORBA::ValueMemberDef::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -2811,8 +2776,7 @@ void POA_CORBA::ValueMemberDef::_interface_skel (
           this->args_);
 
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _get_component ();
     }
 
   private:
@@ -2827,7 +2791,6 @@ void POA_CORBA::ValueMemberDef::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -2862,12 +2825,11 @@ void POA_CORBA::ValueMemberDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ValueMemberDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -2902,13 +2864,11 @@ const char* POA_CORBA::ValueMemberDef::_interface_repository_id (void) const
 void POA_CORBA::ValueMemberDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -3204,8 +3164,7 @@ POA_CORBA::ValueDef::~ValueDef (void)
           this->args_);
 
       retval =
-        this->servant_->supported_interfaces (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->supported_interfaces ();
     }
 
   private:
@@ -3223,7 +3182,6 @@ void POA_CORBA::ValueDef::_get_supported_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -3258,7 +3216,7 @@ void POA_CORBA::ValueDef::_get_supported_interfaces_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -3289,8 +3247,7 @@ void POA_CORBA::ValueDef::_get_supported_interfaces_skel (
           1);
 
       this->servant_->supported_interfaces (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
+        arg_1);
     }
 
   private:
@@ -3308,7 +3265,6 @@ void POA_CORBA::ValueDef::_set_supported_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -3345,7 +3301,7 @@ void POA_CORBA::ValueDef::_set_supported_interfaces_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -3375,8 +3331,7 @@ void POA_CORBA::ValueDef::_set_supported_interfaces_skel (
           this->args_);
 
       retval =
-        this->servant_->initializers (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->initializers ();
     }
 
   private:
@@ -3394,7 +3349,6 @@ void POA_CORBA::ValueDef::_get_initializers_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -3429,7 +3383,7 @@ void POA_CORBA::ValueDef::_get_initializers_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -3460,8 +3414,7 @@ void POA_CORBA::ValueDef::_get_initializers_skel (
           1);
 
       this->servant_->initializers (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
+        arg_1);
     }
 
   private:
@@ -3479,7 +3432,6 @@ void POA_CORBA::ValueDef::_set_initializers_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -3516,7 +3468,7 @@ void POA_CORBA::ValueDef::_set_initializers_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -3546,8 +3498,7 @@ void POA_CORBA::ValueDef::_set_initializers_skel (
           this->args_);
 
       retval =
-        this->servant_->base_value (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->base_value ();
     }
 
   private:
@@ -3565,7 +3516,6 @@ void POA_CORBA::ValueDef::_get_base_value_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -3600,7 +3550,7 @@ void POA_CORBA::ValueDef::_get_base_value_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -3631,8 +3581,7 @@ void POA_CORBA::ValueDef::_get_base_value_skel (
           1);
 
       this->servant_->base_value (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
+        arg_1);
     }
 
   private:
@@ -3650,7 +3599,6 @@ void POA_CORBA::ValueDef::_set_base_value_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -3687,7 +3635,7 @@ void POA_CORBA::ValueDef::_set_base_value_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -3717,8 +3665,7 @@ void POA_CORBA::ValueDef::_set_base_value_skel (
           this->args_);
 
       retval =
-        this->servant_->abstract_base_values (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->abstract_base_values ();
     }
 
   private:
@@ -3736,7 +3683,6 @@ void POA_CORBA::ValueDef::_get_abstract_base_values_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -3771,7 +3717,7 @@ void POA_CORBA::ValueDef::_get_abstract_base_values_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -3802,8 +3748,7 @@ void POA_CORBA::ValueDef::_get_abstract_base_values_skel (
           1);
 
       this->servant_->abstract_base_values (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
+        arg_1);
     }
 
   private:
@@ -3821,7 +3766,6 @@ void POA_CORBA::ValueDef::_set_abstract_base_values_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -3858,7 +3802,7 @@ void POA_CORBA::ValueDef::_set_abstract_base_values_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -3888,8 +3832,7 @@ void POA_CORBA::ValueDef::_set_abstract_base_values_skel (
           this->args_);
 
       retval =
-        this->servant_->is_abstract (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->is_abstract ();
     }
 
   private:
@@ -3907,7 +3850,6 @@ void POA_CORBA::ValueDef::_get_is_abstract_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -3942,7 +3884,7 @@ void POA_CORBA::ValueDef::_get_is_abstract_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -3973,8 +3915,7 @@ void POA_CORBA::ValueDef::_get_is_abstract_skel (
           1);
 
       this->servant_->is_abstract (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
+        arg_1);
     }
 
   private:
@@ -3992,7 +3933,6 @@ void POA_CORBA::ValueDef::_set_is_abstract_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -4029,7 +3969,7 @@ void POA_CORBA::ValueDef::_set_is_abstract_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -4059,8 +3999,7 @@ void POA_CORBA::ValueDef::_set_is_abstract_skel (
           this->args_);
 
       retval =
-        this->servant_->is_custom (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->is_custom ();
     }
 
   private:
@@ -4078,7 +4017,6 @@ void POA_CORBA::ValueDef::_get_is_custom_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -4113,7 +4051,7 @@ void POA_CORBA::ValueDef::_get_is_custom_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -4144,8 +4082,7 @@ void POA_CORBA::ValueDef::_get_is_custom_skel (
           1);
 
       this->servant_->is_custom (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
+        arg_1);
     }
 
   private:
@@ -4163,7 +4100,6 @@ void POA_CORBA::ValueDef::_set_is_custom_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -4200,7 +4136,7 @@ void POA_CORBA::ValueDef::_set_is_custom_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -4230,8 +4166,7 @@ void POA_CORBA::ValueDef::_set_is_custom_skel (
           this->args_);
 
       retval =
-        this->servant_->is_truncatable (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->is_truncatable ();
     }
 
   private:
@@ -4249,7 +4184,6 @@ void POA_CORBA::ValueDef::_get_is_truncatable_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -4284,7 +4218,7 @@ void POA_CORBA::ValueDef::_get_is_truncatable_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -4315,8 +4249,7 @@ void POA_CORBA::ValueDef::_get_is_truncatable_skel (
           1);
 
       this->servant_->is_truncatable (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
+        arg_1);
     }
 
   private:
@@ -4334,7 +4267,6 @@ void POA_CORBA::ValueDef::_set_is_truncatable_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -4371,7 +4303,7 @@ void POA_CORBA::ValueDef::_set_is_truncatable_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -4408,8 +4340,7 @@ void POA_CORBA::ValueDef::_set_is_truncatable_skel (
 
       retval =
         this->servant_->is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -4427,7 +4358,6 @@ void POA_CORBA::ValueDef::is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -4464,7 +4394,7 @@ void POA_CORBA::ValueDef::is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -4494,8 +4424,7 @@ void POA_CORBA::ValueDef::is_a_skel (
           this->args_);
 
       retval =
-        this->servant_->describe_value (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->describe_value ();
     }
 
   private:
@@ -4513,7 +4442,6 @@ void POA_CORBA::ValueDef::describe_value_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -4548,7 +4476,7 @@ void POA_CORBA::ValueDef::describe_value_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -4613,8 +4541,7 @@ void POA_CORBA::ValueDef::describe_value_skel (
           , arg_2
           , arg_3
           , arg_4
-          , arg_5
-          ACE_ENV_ARG_PARAMETER);
+          , arg_5);
     }
 
   private:
@@ -4632,7 +4559,6 @@ void POA_CORBA::ValueDef::create_value_member_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -4677,7 +4603,7 @@ void POA_CORBA::ValueDef::create_value_member_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -4742,8 +4668,7 @@ void POA_CORBA::ValueDef::create_value_member_skel (
           , arg_2
           , arg_3
           , arg_4
-          , arg_5
-          ACE_ENV_ARG_PARAMETER);
+          , arg_5);
     }
 
   private:
@@ -4761,7 +4686,6 @@ void POA_CORBA::ValueDef::create_attribute_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -4806,7 +4730,7 @@ void POA_CORBA::ValueDef::create_attribute_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -4892,8 +4816,7 @@ void POA_CORBA::ValueDef::create_attribute_skel (
           , arg_5
           , arg_6
           , arg_7
-          , arg_8
-          ACE_ENV_ARG_PARAMETER);
+          , arg_8);
     }
 
   private:
@@ -4911,7 +4834,6 @@ void POA_CORBA::ValueDef::create_operation_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -4962,7 +4884,7 @@ void POA_CORBA::ValueDef::create_operation_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -5004,8 +4926,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -5020,7 +4941,6 @@ void POA_CORBA::ValueDef::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -5057,7 +4977,7 @@ void POA_CORBA::ValueDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -5087,8 +5007,7 @@ void POA_CORBA::ValueDef::_is_a_skel (
           this->args_);
 
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _non_existent ();
     }
 
   private:
@@ -5103,7 +5022,6 @@ void POA_CORBA::ValueDef::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -5138,7 +5056,7 @@ void POA_CORBA::ValueDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -5168,8 +5086,7 @@ void POA_CORBA::ValueDef::_non_existent_skel (
           this->args_);
 
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _repository_id ();
     }
 
   private:
@@ -5184,7 +5101,6 @@ void POA_CORBA::ValueDef::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -5219,7 +5135,7 @@ void POA_CORBA::ValueDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -5229,7 +5145,6 @@ void POA_CORBA::ValueDef::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -5239,8 +5154,9 @@ void POA_CORBA::ValueDef::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::ValueDef * const impl =
@@ -5261,7 +5177,7 @@ void POA_CORBA::ValueDef::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -5292,8 +5208,7 @@ void POA_CORBA::ValueDef::_interface_skel (
           this->args_);
 
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _get_component ();
     }
 
   private:
@@ -5308,7 +5223,6 @@ void POA_CORBA::ValueDef::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -5343,12 +5257,11 @@ void POA_CORBA::ValueDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ValueDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -5391,13 +5304,11 @@ const char* POA_CORBA::ValueDef::_interface_repository_id (void) const
 void POA_CORBA::ValueDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -5698,8 +5609,7 @@ POA_CORBA::ExtValueDef::~ExtValueDef (void)
           this->args_);
 
       retval =
-        this->servant_->ext_initializers (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->ext_initializers ();
     }
 
   private:
@@ -5717,7 +5627,6 @@ void POA_CORBA::ExtValueDef::_get_ext_initializers_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -5752,7 +5661,7 @@ void POA_CORBA::ExtValueDef::_get_ext_initializers_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -5783,8 +5692,7 @@ void POA_CORBA::ExtValueDef::_get_ext_initializers_skel (
           1);
 
       this->servant_->ext_initializers (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
+        arg_1);
     }
 
   private:
@@ -5802,7 +5710,6 @@ void POA_CORBA::ExtValueDef::_set_ext_initializers_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -5839,7 +5746,7 @@ void POA_CORBA::ExtValueDef::_set_ext_initializers_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -5869,8 +5776,7 @@ void POA_CORBA::ExtValueDef::_set_ext_initializers_skel (
           this->args_);
 
       retval =
-        this->servant_->describe_ext_value (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->describe_ext_value ();
     }
 
   private:
@@ -5888,7 +5794,6 @@ void POA_CORBA::ExtValueDef::describe_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -5923,7 +5828,7 @@ void POA_CORBA::ExtValueDef::describe_ext_value_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -6002,8 +5907,7 @@ void POA_CORBA::ExtValueDef::describe_ext_value_skel (
           , arg_4
           , arg_5
           , arg_6
-          , arg_7
-          ACE_ENV_ARG_PARAMETER);
+          , arg_7);
     }
 
   private:
@@ -6021,7 +5925,6 @@ void POA_CORBA::ExtValueDef::create_ext_attribute_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -6070,7 +5973,7 @@ void POA_CORBA::ExtValueDef::create_ext_attribute_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -6112,8 +6015,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -6128,7 +6030,6 @@ void POA_CORBA::ExtValueDef::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -6165,7 +6066,7 @@ void POA_CORBA::ExtValueDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -6195,8 +6096,7 @@ void POA_CORBA::ExtValueDef::_is_a_skel (
           this->args_);
 
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _non_existent ();
     }
 
   private:
@@ -6211,7 +6111,6 @@ void POA_CORBA::ExtValueDef::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -6246,7 +6145,7 @@ void POA_CORBA::ExtValueDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -6276,8 +6175,7 @@ void POA_CORBA::ExtValueDef::_non_existent_skel (
           this->args_);
 
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _repository_id ();
     }
 
   private:
@@ -6292,7 +6190,6 @@ void POA_CORBA::ExtValueDef::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -6327,7 +6224,7 @@ void POA_CORBA::ExtValueDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -6337,7 +6234,6 @@ void POA_CORBA::ExtValueDef::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -6347,8 +6243,9 @@ void POA_CORBA::ExtValueDef::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::ExtValueDef * const impl =
@@ -6369,7 +6266,7 @@ void POA_CORBA::ExtValueDef::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -6400,8 +6297,7 @@ void POA_CORBA::ExtValueDef::_interface_skel (
           this->args_);
 
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _get_component ();
     }
 
   private:
@@ -6416,7 +6312,6 @@ void POA_CORBA::ExtValueDef::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -6451,12 +6346,11 @@ void POA_CORBA::ExtValueDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ExtValueDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -6503,13 +6397,11 @@ const char* POA_CORBA::ExtValueDef::_interface_repository_id (void) const
 void POA_CORBA::ExtValueDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
@@ -6765,8 +6657,7 @@ POA_CORBA::ValueBoxDef::~ValueBoxDef (void)
           this->args_);
 
       retval =
-        this->servant_->original_type_def (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_->original_type_def ();
     }
 
   private:
@@ -6784,7 +6675,6 @@ void POA_CORBA::ValueBoxDef::_get_original_type_def_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -6819,7 +6709,7 @@ void POA_CORBA::ValueBoxDef::_get_original_type_def_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -6850,8 +6740,7 @@ void POA_CORBA::ValueBoxDef::_get_original_type_def_skel (
           1);
 
       this->servant_->original_type_def (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
+        arg_1);
     }
 
   private:
@@ -6869,7 +6758,6 @@ void POA_CORBA::ValueBoxDef::_set_original_type_def_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -6906,7 +6794,7 @@ void POA_CORBA::ValueBoxDef::_set_original_type_def_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -6948,8 +6836,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
+          arg_1);
     }
 
   private:
@@ -6964,7 +6851,6 @@ void POA_CORBA::ValueBoxDef::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -7001,7 +6887,7 @@ void POA_CORBA::ValueBoxDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -7031,8 +6917,7 @@ void POA_CORBA::ValueBoxDef::_is_a_skel (
           this->args_);
 
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _non_existent ();
     }
 
   private:
@@ -7047,7 +6932,6 @@ void POA_CORBA::ValueBoxDef::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -7082,7 +6966,7 @@ void POA_CORBA::ValueBoxDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }namespace POA_CORBA
 {
 
@@ -7112,8 +6996,7 @@ void POA_CORBA::ValueBoxDef::_non_existent_skel (
           this->args_);
 
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _repository_id ();
     }
 
   private:
@@ -7128,7 +7011,6 @@ void POA_CORBA::ValueBoxDef::_repository_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -7163,7 +7045,7 @@ void POA_CORBA::ValueBoxDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 // TAO_IDL - Generated from
@@ -7173,7 +7055,6 @@ void POA_CORBA::ValueBoxDef::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -7183,8 +7064,9 @@ void POA_CORBA::ValueBoxDef::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::ValueBoxDef * const impl =
@@ -7205,7 +7087,7 @@ void POA_CORBA::ValueBoxDef::_interface_skel (
 
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
@@ -7236,8 +7118,7 @@ void POA_CORBA::ValueBoxDef::_interface_skel (
           this->args_);
 
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_-> _get_component ();
     }
 
   private:
@@ -7252,7 +7133,6 @@ void POA_CORBA::ValueBoxDef::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -7287,12 +7167,11 @@ void POA_CORBA::ValueBoxDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ValueBoxDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -7335,13 +7214,11 @@ const char* POA_CORBA::ValueBoxDef::_interface_repository_id (void) const
 void POA_CORBA::ValueBoxDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h
index 3cb3af272e8..0178b28a129 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h
@@ -80,53 +80,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::FixedDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -135,7 +127,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::UShort digits (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -145,7 +136,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -153,7 +143,6 @@ namespace POA_CORBA
 
     virtual void digits (
         ::CORBA::UShort digits
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -163,14 +152,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::Short scale (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -180,7 +167,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -188,7 +174,6 @@ namespace POA_CORBA
 
     virtual void scale (
         ::CORBA::Short scale
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -198,7 +183,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -206,7 +190,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -217,7 +200,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -225,7 +207,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -252,53 +233,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::ValueMemberDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -307,7 +280,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -317,14 +289,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::IDLType_ptr type_def (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -334,7 +304,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -342,7 +311,6 @@ namespace POA_CORBA
 
     virtual void type_def (
         ::CORBA::IDLType_ptr type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -352,14 +320,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::Visibility access (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -369,7 +335,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -377,7 +342,6 @@ namespace POA_CORBA
 
     virtual void access (
         ::CORBA::Visibility access
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -387,7 +351,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -395,7 +358,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -406,7 +368,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -414,7 +375,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -422,7 +382,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -430,7 +389,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -438,7 +396,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -446,7 +403,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -454,7 +410,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -462,7 +417,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -470,7 +424,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -478,7 +431,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -489,7 +441,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -500,7 +451,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -529,53 +479,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::ValueDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -584,7 +526,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::InterfaceDefSeq * supported_interfaces (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -594,7 +535,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -602,7 +542,6 @@ namespace POA_CORBA
 
     virtual void supported_interfaces (
         const ::CORBA::InterfaceDefSeq & supported_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -612,14 +551,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::InitializerSeq * initializers (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -629,7 +566,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -637,7 +573,6 @@ namespace POA_CORBA
 
     virtual void initializers (
         const ::CORBA::InitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -647,14 +582,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ValueDef_ptr base_value (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -664,7 +597,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -672,7 +604,6 @@ namespace POA_CORBA
 
     virtual void base_value (
         ::CORBA::ValueDef_ptr base_value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -682,14 +613,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ValueDefSeq * abstract_base_values (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -699,7 +628,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -707,7 +635,6 @@ namespace POA_CORBA
 
     virtual void abstract_base_values (
         const ::CORBA::ValueDefSeq & abstract_base_values
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -717,14 +644,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::Boolean is_abstract (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -734,7 +659,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -742,7 +666,6 @@ namespace POA_CORBA
 
     virtual void is_abstract (
         ::CORBA::Boolean is_abstract
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -752,14 +675,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::Boolean is_custom (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -769,7 +690,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -777,7 +697,6 @@ namespace POA_CORBA
 
     virtual void is_custom (
         ::CORBA::Boolean is_custom
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -787,14 +706,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::Boolean is_truncatable (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -804,7 +721,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -812,7 +728,6 @@ namespace POA_CORBA
 
     virtual void is_truncatable (
         ::CORBA::Boolean is_truncatable
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -822,7 +737,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -830,7 +744,6 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean is_a (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -840,14 +753,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ValueDef::FullValueDescription * describe_value (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -857,7 +768,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -869,7 +779,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         ::CORBA::Visibility access
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -879,7 +788,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -891,7 +799,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         ::CORBA::AttributeMode mode
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -901,7 +808,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -916,7 +822,6 @@ namespace POA_CORBA
         const ::CORBA::ParDescriptionSeq & params,
         const ::CORBA::ExceptionDefSeq & exceptions,
         const ::CORBA::ContextIdSeq & contexts
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -926,7 +831,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -934,7 +838,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -945,7 +848,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -956,7 +858,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -967,7 +868,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -978,7 +878,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -989,7 +888,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1000,7 +898,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1011,7 +908,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1022,7 +918,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1033,7 +928,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1044,7 +938,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1055,7 +948,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1066,7 +958,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1077,7 +968,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1088,7 +978,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1099,7 +988,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1110,7 +998,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1121,7 +1008,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1132,7 +1018,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1143,7 +1028,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1151,7 +1035,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1159,7 +1042,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1167,7 +1049,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1175,7 +1056,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1183,7 +1063,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1191,7 +1070,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1199,7 +1077,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1207,7 +1084,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1215,7 +1091,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1226,7 +1101,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1237,7 +1111,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1245,7 +1118,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -1272,53 +1144,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::ExtValueDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -1327,7 +1191,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ExtInitializerSeq * ext_initializers (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1337,7 +1200,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -1345,7 +1207,6 @@ namespace POA_CORBA
 
     virtual void ext_initializers (
         const ::CORBA::ExtInitializerSeq & ext_initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1355,14 +1216,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ExtValueDef::ExtFullValueDescription * describe_ext_value (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1372,7 +1231,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -1386,7 +1244,6 @@ namespace POA_CORBA
         ::CORBA::AttributeMode mode,
         const ::CORBA::ExceptionDefSeq & get_exceptions,
         const ::CORBA::ExceptionDefSeq & set_exceptions
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1396,7 +1253,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -1404,7 +1260,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1415,7 +1270,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1426,7 +1280,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1437,7 +1290,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1448,7 +1300,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1459,7 +1310,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1470,7 +1320,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1481,7 +1330,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1492,7 +1340,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1503,7 +1350,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1514,7 +1360,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1525,7 +1370,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1536,7 +1380,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1547,7 +1390,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1558,7 +1400,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1569,7 +1410,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1580,7 +1420,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1591,7 +1430,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1602,7 +1440,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1613,7 +1450,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1621,7 +1457,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1629,7 +1464,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1637,7 +1471,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1645,7 +1478,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1653,7 +1485,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1661,7 +1492,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1669,7 +1499,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1677,7 +1506,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1685,7 +1513,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1696,7 +1523,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1707,7 +1533,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1715,7 +1540,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1723,7 +1547,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1731,7 +1554,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1739,7 +1561,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1747,7 +1568,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1755,7 +1575,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1763,7 +1582,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1771,7 +1589,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1779,7 +1596,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1787,7 +1603,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1795,7 +1610,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1803,7 +1617,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1811,7 +1624,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1819,7 +1631,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1827,7 +1638,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1838,7 +1648,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1849,7 +1658,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1860,7 +1668,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1871,7 +1678,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1882,7 +1688,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -1909,53 +1714,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::ValueBoxDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -1964,7 +1761,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::IDLType_ptr original_type_def (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1974,7 +1770,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -1982,7 +1777,6 @@ namespace POA_CORBA
 
     virtual void original_type_def (
         ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1992,7 +1786,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -2000,7 +1793,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -2011,7 +1803,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2019,7 +1810,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2027,7 +1817,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2035,7 +1824,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2043,7 +1831,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2051,7 +1838,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2059,7 +1845,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2067,7 +1852,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2075,7 +1859,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2083,7 +1866,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -2094,7 +1876,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -2105,7 +1886,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2113,7 +1893,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.inl
index 78a4a8dcb9d..578f0d31ed3 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.inl
@@ -36,7 +36,6 @@ POA_CORBA::FixedDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::FixedDef *> (servant);
@@ -44,7 +43,6 @@ POA_CORBA::FixedDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -57,7 +55,6 @@ POA_CORBA::FixedDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::FixedDef *> (servant);
@@ -65,7 +62,6 @@ POA_CORBA::FixedDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -75,7 +71,6 @@ POA_CORBA::FixedDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::FixedDef *> (servant);
@@ -83,7 +78,6 @@ POA_CORBA::FixedDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -93,7 +87,6 @@ POA_CORBA::ValueMemberDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ValueMemberDef *> (servant);
@@ -101,7 +94,6 @@ POA_CORBA::ValueMemberDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -114,7 +106,6 @@ POA_CORBA::ValueMemberDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ValueMemberDef *> (servant);
@@ -122,7 +113,6 @@ POA_CORBA::ValueMemberDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -132,7 +122,6 @@ POA_CORBA::ValueMemberDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueMemberDef *> (servant);
@@ -140,7 +129,6 @@ POA_CORBA::ValueMemberDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -150,7 +138,6 @@ POA_CORBA::ValueMemberDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueMemberDef *> (servant);
@@ -158,7 +145,6 @@ POA_CORBA::ValueMemberDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -168,7 +154,6 @@ POA_CORBA::ValueMemberDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueMemberDef *> (servant);
@@ -176,7 +161,6 @@ POA_CORBA::ValueMemberDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -186,7 +170,6 @@ POA_CORBA::ValueMemberDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueMemberDef *> (servant);
@@ -194,7 +177,6 @@ POA_CORBA::ValueMemberDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -204,7 +186,6 @@ POA_CORBA::ValueMemberDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueMemberDef *> (servant);
@@ -212,7 +193,6 @@ POA_CORBA::ValueMemberDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -222,7 +202,6 @@ POA_CORBA::ValueMemberDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueMemberDef *> (servant);
@@ -230,7 +209,6 @@ POA_CORBA::ValueMemberDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -240,7 +218,6 @@ POA_CORBA::ValueMemberDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueMemberDef *> (servant);
@@ -248,7 +225,6 @@ POA_CORBA::ValueMemberDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -258,7 +234,6 @@ POA_CORBA::ValueMemberDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueMemberDef *> (servant);
@@ -266,7 +241,6 @@ POA_CORBA::ValueMemberDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -276,7 +250,6 @@ POA_CORBA::ValueMemberDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueMemberDef *> (servant);
@@ -284,7 +257,6 @@ POA_CORBA::ValueMemberDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -297,7 +269,6 @@ POA_CORBA::ValueMemberDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueMemberDef *> (servant);
@@ -305,7 +276,6 @@ POA_CORBA::ValueMemberDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -318,7 +288,6 @@ POA_CORBA::ValueMemberDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueMemberDef *> (servant);
@@ -326,7 +295,6 @@ POA_CORBA::ValueMemberDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -336,7 +304,6 @@ POA_CORBA::ValueDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -344,7 +311,6 @@ POA_CORBA::ValueDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -357,7 +323,6 @@ POA_CORBA::ValueDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -365,7 +330,6 @@ POA_CORBA::ValueDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -378,7 +342,6 @@ POA_CORBA::ValueDef::lookup_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -386,7 +349,6 @@ POA_CORBA::ValueDef::lookup_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -399,7 +361,6 @@ POA_CORBA::ValueDef::contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -407,7 +368,6 @@ POA_CORBA::ValueDef::contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -420,7 +380,6 @@ POA_CORBA::ValueDef::lookup_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -428,7 +387,6 @@ POA_CORBA::ValueDef::lookup_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -441,7 +399,6 @@ POA_CORBA::ValueDef::describe_contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -449,7 +406,6 @@ POA_CORBA::ValueDef::describe_contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -462,7 +418,6 @@ POA_CORBA::ValueDef::create_module_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -470,7 +425,6 @@ POA_CORBA::ValueDef::create_module_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -483,7 +437,6 @@ POA_CORBA::ValueDef::create_constant_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -491,7 +444,6 @@ POA_CORBA::ValueDef::create_constant_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -504,7 +456,6 @@ POA_CORBA::ValueDef::create_struct_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -512,7 +463,6 @@ POA_CORBA::ValueDef::create_struct_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -525,7 +475,6 @@ POA_CORBA::ValueDef::create_union_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -533,7 +482,6 @@ POA_CORBA::ValueDef::create_union_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -546,7 +494,6 @@ POA_CORBA::ValueDef::create_enum_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -554,7 +501,6 @@ POA_CORBA::ValueDef::create_enum_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -567,7 +513,6 @@ POA_CORBA::ValueDef::create_alias_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -575,7 +520,6 @@ POA_CORBA::ValueDef::create_alias_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -588,7 +532,6 @@ POA_CORBA::ValueDef::create_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -596,7 +539,6 @@ POA_CORBA::ValueDef::create_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -609,7 +551,6 @@ POA_CORBA::ValueDef::create_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -617,7 +558,6 @@ POA_CORBA::ValueDef::create_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -630,7 +570,6 @@ POA_CORBA::ValueDef::create_value_box_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -638,7 +577,6 @@ POA_CORBA::ValueDef::create_value_box_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -651,7 +589,6 @@ POA_CORBA::ValueDef::create_exception_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -659,7 +596,6 @@ POA_CORBA::ValueDef::create_exception_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -672,7 +608,6 @@ POA_CORBA::ValueDef::create_native_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -680,7 +615,6 @@ POA_CORBA::ValueDef::create_native_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -693,7 +627,6 @@ POA_CORBA::ValueDef::create_abstract_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -701,7 +634,6 @@ POA_CORBA::ValueDef::create_abstract_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -714,7 +646,6 @@ POA_CORBA::ValueDef::create_local_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -722,7 +653,6 @@ POA_CORBA::ValueDef::create_local_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -735,7 +665,6 @@ POA_CORBA::ValueDef::create_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -743,7 +672,6 @@ POA_CORBA::ValueDef::create_ext_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -753,7 +681,6 @@ POA_CORBA::ValueDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -761,7 +688,6 @@ POA_CORBA::ValueDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -771,7 +697,6 @@ POA_CORBA::ValueDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -779,7 +704,6 @@ POA_CORBA::ValueDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -789,7 +713,6 @@ POA_CORBA::ValueDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -797,7 +720,6 @@ POA_CORBA::ValueDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -807,7 +729,6 @@ POA_CORBA::ValueDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -815,7 +736,6 @@ POA_CORBA::ValueDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -825,7 +745,6 @@ POA_CORBA::ValueDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -833,7 +752,6 @@ POA_CORBA::ValueDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -843,7 +761,6 @@ POA_CORBA::ValueDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -851,7 +768,6 @@ POA_CORBA::ValueDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -861,7 +777,6 @@ POA_CORBA::ValueDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -869,7 +784,6 @@ POA_CORBA::ValueDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -879,7 +793,6 @@ POA_CORBA::ValueDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -887,7 +800,6 @@ POA_CORBA::ValueDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -897,7 +809,6 @@ POA_CORBA::ValueDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -905,7 +816,6 @@ POA_CORBA::ValueDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -918,7 +828,6 @@ POA_CORBA::ValueDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -926,7 +835,6 @@ POA_CORBA::ValueDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -939,7 +847,6 @@ POA_CORBA::ValueDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -947,7 +854,6 @@ POA_CORBA::ValueDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -957,7 +863,6 @@ POA_CORBA::ValueDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -965,7 +870,6 @@ POA_CORBA::ValueDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -975,7 +879,6 @@ POA_CORBA::ExtValueDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -983,7 +886,6 @@ POA_CORBA::ExtValueDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -996,7 +898,6 @@ POA_CORBA::ExtValueDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1004,7 +905,6 @@ POA_CORBA::ExtValueDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1017,7 +917,6 @@ POA_CORBA::ExtValueDef::lookup_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1025,7 +924,6 @@ POA_CORBA::ExtValueDef::lookup_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1038,7 +936,6 @@ POA_CORBA::ExtValueDef::contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1046,7 +943,6 @@ POA_CORBA::ExtValueDef::contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1059,7 +955,6 @@ POA_CORBA::ExtValueDef::lookup_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1067,7 +962,6 @@ POA_CORBA::ExtValueDef::lookup_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1080,7 +974,6 @@ POA_CORBA::ExtValueDef::describe_contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1088,7 +981,6 @@ POA_CORBA::ExtValueDef::describe_contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1101,7 +993,6 @@ POA_CORBA::ExtValueDef::create_module_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1109,7 +1000,6 @@ POA_CORBA::ExtValueDef::create_module_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1122,7 +1012,6 @@ POA_CORBA::ExtValueDef::create_constant_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1130,7 +1019,6 @@ POA_CORBA::ExtValueDef::create_constant_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1143,7 +1031,6 @@ POA_CORBA::ExtValueDef::create_struct_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1151,7 +1038,6 @@ POA_CORBA::ExtValueDef::create_struct_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1164,7 +1050,6 @@ POA_CORBA::ExtValueDef::create_union_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1172,7 +1057,6 @@ POA_CORBA::ExtValueDef::create_union_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1185,7 +1069,6 @@ POA_CORBA::ExtValueDef::create_enum_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1193,7 +1076,6 @@ POA_CORBA::ExtValueDef::create_enum_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1206,7 +1088,6 @@ POA_CORBA::ExtValueDef::create_alias_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1214,7 +1095,6 @@ POA_CORBA::ExtValueDef::create_alias_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1227,7 +1107,6 @@ POA_CORBA::ExtValueDef::create_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1235,7 +1114,6 @@ POA_CORBA::ExtValueDef::create_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1248,7 +1126,6 @@ POA_CORBA::ExtValueDef::create_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1256,7 +1133,6 @@ POA_CORBA::ExtValueDef::create_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1269,7 +1145,6 @@ POA_CORBA::ExtValueDef::create_value_box_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1277,7 +1152,6 @@ POA_CORBA::ExtValueDef::create_value_box_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1290,7 +1164,6 @@ POA_CORBA::ExtValueDef::create_exception_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1298,7 +1171,6 @@ POA_CORBA::ExtValueDef::create_exception_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1311,7 +1183,6 @@ POA_CORBA::ExtValueDef::create_native_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1319,7 +1190,6 @@ POA_CORBA::ExtValueDef::create_native_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1332,7 +1202,6 @@ POA_CORBA::ExtValueDef::create_abstract_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1340,7 +1209,6 @@ POA_CORBA::ExtValueDef::create_abstract_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1353,7 +1221,6 @@ POA_CORBA::ExtValueDef::create_local_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1361,7 +1228,6 @@ POA_CORBA::ExtValueDef::create_local_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1374,7 +1240,6 @@ POA_CORBA::ExtValueDef::create_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1382,7 +1247,6 @@ POA_CORBA::ExtValueDef::create_ext_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1392,7 +1256,6 @@ POA_CORBA::ExtValueDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1400,7 +1263,6 @@ POA_CORBA::ExtValueDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1410,7 +1272,6 @@ POA_CORBA::ExtValueDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1418,7 +1279,6 @@ POA_CORBA::ExtValueDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1428,7 +1288,6 @@ POA_CORBA::ExtValueDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1436,7 +1295,6 @@ POA_CORBA::ExtValueDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1446,7 +1304,6 @@ POA_CORBA::ExtValueDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1454,7 +1311,6 @@ POA_CORBA::ExtValueDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1464,7 +1320,6 @@ POA_CORBA::ExtValueDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1472,7 +1327,6 @@ POA_CORBA::ExtValueDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1482,7 +1336,6 @@ POA_CORBA::ExtValueDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1490,7 +1343,6 @@ POA_CORBA::ExtValueDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1500,7 +1352,6 @@ POA_CORBA::ExtValueDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1508,7 +1359,6 @@ POA_CORBA::ExtValueDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1518,7 +1368,6 @@ POA_CORBA::ExtValueDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1526,7 +1375,6 @@ POA_CORBA::ExtValueDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1536,7 +1384,6 @@ POA_CORBA::ExtValueDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1544,7 +1391,6 @@ POA_CORBA::ExtValueDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1557,7 +1403,6 @@ POA_CORBA::ExtValueDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1565,7 +1410,6 @@ POA_CORBA::ExtValueDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1578,7 +1422,6 @@ POA_CORBA::ExtValueDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1586,7 +1429,6 @@ POA_CORBA::ExtValueDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1596,7 +1438,6 @@ POA_CORBA::ExtValueDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1604,7 +1445,6 @@ POA_CORBA::ExtValueDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1614,7 +1454,6 @@ POA_CORBA::ExtValueDef::_get_supported_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1622,7 +1461,6 @@ POA_CORBA::ExtValueDef::_get_supported_interfaces_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1632,7 +1470,6 @@ POA_CORBA::ExtValueDef::_set_supported_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1640,7 +1477,6 @@ POA_CORBA::ExtValueDef::_set_supported_interfaces_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1650,7 +1486,6 @@ POA_CORBA::ExtValueDef::_get_initializers_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1658,7 +1493,6 @@ POA_CORBA::ExtValueDef::_get_initializers_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1668,7 +1502,6 @@ POA_CORBA::ExtValueDef::_set_initializers_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1676,7 +1509,6 @@ POA_CORBA::ExtValueDef::_set_initializers_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1686,7 +1518,6 @@ POA_CORBA::ExtValueDef::_get_base_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1694,7 +1525,6 @@ POA_CORBA::ExtValueDef::_get_base_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1704,7 +1534,6 @@ POA_CORBA::ExtValueDef::_set_base_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1712,7 +1541,6 @@ POA_CORBA::ExtValueDef::_set_base_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1722,7 +1550,6 @@ POA_CORBA::ExtValueDef::_get_abstract_base_values_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1730,7 +1557,6 @@ POA_CORBA::ExtValueDef::_get_abstract_base_values_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1740,7 +1566,6 @@ POA_CORBA::ExtValueDef::_set_abstract_base_values_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1748,7 +1573,6 @@ POA_CORBA::ExtValueDef::_set_abstract_base_values_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1758,7 +1582,6 @@ POA_CORBA::ExtValueDef::_get_is_abstract_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1766,7 +1589,6 @@ POA_CORBA::ExtValueDef::_get_is_abstract_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1776,7 +1598,6 @@ POA_CORBA::ExtValueDef::_set_is_abstract_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1784,7 +1605,6 @@ POA_CORBA::ExtValueDef::_set_is_abstract_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1794,7 +1614,6 @@ POA_CORBA::ExtValueDef::_get_is_custom_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1802,7 +1621,6 @@ POA_CORBA::ExtValueDef::_get_is_custom_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1812,7 +1630,6 @@ POA_CORBA::ExtValueDef::_set_is_custom_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1820,7 +1637,6 @@ POA_CORBA::ExtValueDef::_set_is_custom_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1830,7 +1646,6 @@ POA_CORBA::ExtValueDef::_get_is_truncatable_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1838,7 +1653,6 @@ POA_CORBA::ExtValueDef::_get_is_truncatable_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1848,7 +1662,6 @@ POA_CORBA::ExtValueDef::_set_is_truncatable_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1856,7 +1669,6 @@ POA_CORBA::ExtValueDef::_set_is_truncatable_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1869,7 +1681,6 @@ POA_CORBA::ExtValueDef::is_a_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1877,7 +1688,6 @@ POA_CORBA::ExtValueDef::is_a_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1890,7 +1700,6 @@ POA_CORBA::ExtValueDef::describe_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1898,7 +1707,6 @@ POA_CORBA::ExtValueDef::describe_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1911,7 +1719,6 @@ POA_CORBA::ExtValueDef::create_value_member_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1919,7 +1726,6 @@ POA_CORBA::ExtValueDef::create_value_member_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1932,7 +1738,6 @@ POA_CORBA::ExtValueDef::create_attribute_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1940,7 +1745,6 @@ POA_CORBA::ExtValueDef::create_attribute_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1953,7 +1757,6 @@ POA_CORBA::ExtValueDef::create_operation_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1961,7 +1764,6 @@ POA_CORBA::ExtValueDef::create_operation_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1971,7 +1773,6 @@ POA_CORBA::ValueBoxDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ValueBoxDef *> (servant);
@@ -1979,7 +1780,6 @@ POA_CORBA::ValueBoxDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1992,7 +1792,6 @@ POA_CORBA::ValueBoxDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ValueBoxDef *> (servant);
@@ -2000,7 +1799,6 @@ POA_CORBA::ValueBoxDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2010,7 +1808,6 @@ POA_CORBA::ValueBoxDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueBoxDef *> (servant);
@@ -2018,7 +1815,6 @@ POA_CORBA::ValueBoxDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2028,7 +1824,6 @@ POA_CORBA::ValueBoxDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueBoxDef *> (servant);
@@ -2036,7 +1831,6 @@ POA_CORBA::ValueBoxDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2046,7 +1840,6 @@ POA_CORBA::ValueBoxDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueBoxDef *> (servant);
@@ -2054,7 +1847,6 @@ POA_CORBA::ValueBoxDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2064,7 +1856,6 @@ POA_CORBA::ValueBoxDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueBoxDef *> (servant);
@@ -2072,7 +1863,6 @@ POA_CORBA::ValueBoxDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2082,7 +1872,6 @@ POA_CORBA::ValueBoxDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueBoxDef *> (servant);
@@ -2090,7 +1879,6 @@ POA_CORBA::ValueBoxDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2100,7 +1888,6 @@ POA_CORBA::ValueBoxDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueBoxDef *> (servant);
@@ -2108,7 +1895,6 @@ POA_CORBA::ValueBoxDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2118,7 +1904,6 @@ POA_CORBA::ValueBoxDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueBoxDef *> (servant);
@@ -2126,7 +1911,6 @@ POA_CORBA::ValueBoxDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2136,7 +1920,6 @@ POA_CORBA::ValueBoxDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueBoxDef *> (servant);
@@ -2144,7 +1927,6 @@ POA_CORBA::ValueBoxDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2154,7 +1936,6 @@ POA_CORBA::ValueBoxDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueBoxDef *> (servant);
@@ -2162,7 +1943,6 @@ POA_CORBA::ValueBoxDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2175,7 +1955,6 @@ POA_CORBA::ValueBoxDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueBoxDef *> (servant);
@@ -2183,7 +1962,6 @@ POA_CORBA::ValueBoxDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2196,7 +1974,6 @@ POA_CORBA::ValueBoxDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueBoxDef *> (servant);
@@ -2204,7 +1981,6 @@ POA_CORBA::ValueBoxDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2214,7 +1990,6 @@ POA_CORBA::ValueBoxDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::ValueBoxDef *> (servant);
@@ -2222,7 +1997,6 @@ POA_CORBA::ValueBoxDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h
index a66c2726183..0878ffef071 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h
@@ -80,14 +80,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -97,7 +95,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -107,7 +104,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -117,7 +113,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::UShort digits (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -128,7 +123,6 @@ namespace POA_CORBA
 
     void digits (
         ::CORBA::UShort digits
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -138,7 +132,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Short scale (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -149,7 +142,6 @@ namespace POA_CORBA
 
     void scale (
         ::CORBA::Short scale
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -202,14 +194,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -219,7 +209,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -229,7 +218,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -240,7 +228,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -250,7 +237,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -261,7 +247,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -271,7 +256,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -282,7 +266,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -292,7 +275,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -302,7 +284,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -312,7 +293,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -322,7 +302,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -335,7 +314,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -345,7 +323,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -355,7 +332,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::IDLType_ptr type_def (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -366,7 +342,6 @@ namespace POA_CORBA
 
     void type_def (
         ::CORBA::IDLType_ptr type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -376,7 +351,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Visibility access (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -387,7 +361,6 @@ namespace POA_CORBA
 
     void access (
         ::CORBA::Visibility access
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -440,14 +413,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -457,7 +428,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -468,7 +438,6 @@ namespace POA_CORBA
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -480,7 +449,6 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -494,7 +462,6 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -507,7 +474,6 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -520,7 +486,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -535,7 +500,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -549,7 +513,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -564,7 +527,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -578,7 +540,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -592,7 +553,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -606,7 +566,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -626,7 +585,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -640,7 +598,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -654,7 +611,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -667,7 +623,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -681,7 +636,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -695,7 +649,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -715,7 +668,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -725,7 +677,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -736,7 +687,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -746,7 +696,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -757,7 +706,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -767,7 +715,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -778,7 +725,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -788,7 +734,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -798,7 +743,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -808,7 +752,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -818,7 +761,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -831,7 +773,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -841,7 +782,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -851,7 +791,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDefSeq * supported_interfaces (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -862,7 +801,6 @@ namespace POA_CORBA
 
     void supported_interfaces (
         const ::CORBA::InterfaceDefSeq & supported_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -872,7 +810,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InitializerSeq * initializers (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -883,7 +820,6 @@ namespace POA_CORBA
 
     void initializers (
         const ::CORBA::InitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -893,7 +829,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ValueDef_ptr base_value (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -904,7 +839,6 @@ namespace POA_CORBA
 
     void base_value (
         ::CORBA::ValueDef_ptr base_value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -914,7 +848,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ValueDefSeq * abstract_base_values (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -925,7 +858,6 @@ namespace POA_CORBA
 
     void abstract_base_values (
         const ::CORBA::ValueDefSeq & abstract_base_values
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -935,7 +867,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Boolean is_abstract (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -946,7 +877,6 @@ namespace POA_CORBA
 
     void is_abstract (
         ::CORBA::Boolean is_abstract
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -956,7 +886,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Boolean is_custom (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -967,7 +896,6 @@ namespace POA_CORBA
 
     void is_custom (
         ::CORBA::Boolean is_custom
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -977,7 +905,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Boolean is_truncatable (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -988,7 +915,6 @@ namespace POA_CORBA
 
     void is_truncatable (
         ::CORBA::Boolean is_truncatable
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -999,7 +925,6 @@ namespace POA_CORBA
 
     ::CORBA::Boolean is_a (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1009,7 +934,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ValueDef::FullValueDescription * describe_value (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1024,7 +948,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         ::CORBA::Visibility access
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1039,7 +962,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         ::CORBA::AttributeMode mode
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1057,7 +979,6 @@ namespace POA_CORBA
         const ::CORBA::ParDescriptionSeq & params,
         const ::CORBA::ExceptionDefSeq & exceptions,
         const ::CORBA::ContextIdSeq & contexts
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1110,14 +1031,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1127,7 +1046,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1138,7 +1056,6 @@ namespace POA_CORBA
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1150,7 +1067,6 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1164,7 +1080,6 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1177,7 +1092,6 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1190,7 +1104,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1205,7 +1118,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1219,7 +1131,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1234,7 +1145,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1248,7 +1158,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1262,7 +1171,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1276,7 +1184,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1296,7 +1203,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1310,7 +1216,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1324,7 +1229,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1337,7 +1241,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1351,7 +1254,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1365,7 +1267,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1385,7 +1286,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1395,7 +1295,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1406,7 +1305,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1416,7 +1314,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1427,7 +1324,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1437,7 +1333,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1448,7 +1343,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1458,7 +1352,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1468,7 +1361,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1478,7 +1370,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1488,7 +1379,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1501,7 +1391,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1511,7 +1400,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1521,7 +1409,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDefSeq * supported_interfaces (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1532,7 +1419,6 @@ namespace POA_CORBA
 
     void supported_interfaces (
         const ::CORBA::InterfaceDefSeq & supported_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1542,7 +1428,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InitializerSeq * initializers (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1553,7 +1438,6 @@ namespace POA_CORBA
 
     void initializers (
         const ::CORBA::InitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1563,7 +1447,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ValueDef_ptr base_value (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1574,7 +1457,6 @@ namespace POA_CORBA
 
     void base_value (
         ::CORBA::ValueDef_ptr base_value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1584,7 +1466,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ValueDefSeq * abstract_base_values (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1595,7 +1476,6 @@ namespace POA_CORBA
 
     void abstract_base_values (
         const ::CORBA::ValueDefSeq & abstract_base_values
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1605,7 +1485,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Boolean is_abstract (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1616,7 +1495,6 @@ namespace POA_CORBA
 
     void is_abstract (
         ::CORBA::Boolean is_abstract
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1626,7 +1504,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Boolean is_custom (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1637,7 +1514,6 @@ namespace POA_CORBA
 
     void is_custom (
         ::CORBA::Boolean is_custom
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1647,7 +1523,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Boolean is_truncatable (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1658,7 +1533,6 @@ namespace POA_CORBA
 
     void is_truncatable (
         ::CORBA::Boolean is_truncatable
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1669,7 +1543,6 @@ namespace POA_CORBA
 
     ::CORBA::Boolean is_a (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1679,7 +1552,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ValueDef::FullValueDescription * describe_value (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1694,7 +1566,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         ::CORBA::Visibility access
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1709,7 +1580,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         ::CORBA::AttributeMode mode
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1727,7 +1597,6 @@ namespace POA_CORBA
         const ::CORBA::ParDescriptionSeq & params,
         const ::CORBA::ExceptionDefSeq & exceptions,
         const ::CORBA::ContextIdSeq & contexts
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1737,7 +1606,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ExtInitializerSeq * ext_initializers (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1748,7 +1616,6 @@ namespace POA_CORBA
 
     void ext_initializers (
         const ::CORBA::ExtInitializerSeq & ext_initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1758,7 +1625,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ExtValueDef::ExtFullValueDescription * describe_ext_value (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1775,7 +1641,6 @@ namespace POA_CORBA
         ::CORBA::AttributeMode mode,
         const ::CORBA::ExceptionDefSeq & get_exceptions,
         const ::CORBA::ExceptionDefSeq & set_exceptions
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1828,14 +1693,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1845,7 +1708,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1855,7 +1717,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1866,7 +1727,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1876,7 +1736,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1887,7 +1746,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1897,7 +1755,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1908,7 +1765,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1918,7 +1774,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1928,7 +1783,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1938,7 +1792,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1948,7 +1801,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1961,7 +1813,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1971,7 +1822,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1981,7 +1831,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::IDLType_ptr original_type_def (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1992,7 +1841,6 @@ namespace POA_CORBA
 
     void original_type_def (
         ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.inl
index d3dd268bf91..d8aa507ca47 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.inl
@@ -128,14 +128,12 @@ POA_CORBA::FixedDef_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::FixedDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -144,14 +142,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::FixedDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -160,14 +156,12 @@ void POA_CORBA::FixedDef_tie<T>::destroy  (
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::FixedDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -176,14 +170,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::UShort POA_CORBA::FixedDef_tie<T>::digits  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->digits (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -193,7 +185,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::FixedDef_tie<T>::digits  (
     ::CORBA::UShort digits
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -201,7 +192,6 @@ void POA_CORBA::FixedDef_tie<T>::digits  (
 {
   this->ptr_->digits (
     digits
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -210,14 +200,12 @@ void POA_CORBA::FixedDef_tie<T>::digits  (
 
 template <class T> ACE_INLINE
 ::CORBA::Short POA_CORBA::FixedDef_tie<T>::scale  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->scale (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -227,7 +215,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::FixedDef_tie<T>::scale  (
     ::CORBA::Short scale
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -235,7 +222,6 @@ void POA_CORBA::FixedDef_tie<T>::scale  (
 {
   this->ptr_->scale (
     scale
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -337,14 +323,12 @@ POA_CORBA::ValueMemberDef_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ValueMemberDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -353,14 +337,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::ValueMemberDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -369,14 +351,12 @@ void POA_CORBA::ValueMemberDef_tie<T>::destroy  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ValueMemberDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -386,7 +366,6 @@ char * POA_CORBA::ValueMemberDef_tie<T>::id  (
 template <class T> ACE_INLINE
 void POA_CORBA::ValueMemberDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -394,7 +373,6 @@ void POA_CORBA::ValueMemberDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -403,14 +381,12 @@ void POA_CORBA::ValueMemberDef_tie<T>::id  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ValueMemberDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -420,7 +396,6 @@ char * POA_CORBA::ValueMemberDef_tie<T>::name  (
 template <class T> ACE_INLINE
 void POA_CORBA::ValueMemberDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -428,7 +403,6 @@ void POA_CORBA::ValueMemberDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -437,14 +411,12 @@ void POA_CORBA::ValueMemberDef_tie<T>::name  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ValueMemberDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -454,7 +426,6 @@ char * POA_CORBA::ValueMemberDef_tie<T>::version  (
 template <class T> ACE_INLINE
 void POA_CORBA::ValueMemberDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -462,7 +433,6 @@ void POA_CORBA::ValueMemberDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -471,14 +441,12 @@ void POA_CORBA::ValueMemberDef_tie<T>::version  (
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ValueMemberDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -487,14 +455,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ValueMemberDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -503,14 +469,12 @@ char * POA_CORBA::ValueMemberDef_tie<T>::absolute_name  (
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ValueMemberDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -519,14 +483,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ValueMemberDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -538,7 +500,6 @@ void POA_CORBA::ValueMemberDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -548,7 +509,6 @@ void POA_CORBA::ValueMemberDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -557,14 +517,12 @@ void POA_CORBA::ValueMemberDef_tie<T>::move  (
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ValueMemberDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -573,14 +531,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::IDLType_ptr POA_CORBA::ValueMemberDef_tie<T>::type_def  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type_def (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -590,7 +546,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ValueMemberDef_tie<T>::type_def  (
     ::CORBA::IDLType_ptr type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -598,7 +553,6 @@ void POA_CORBA::ValueMemberDef_tie<T>::type_def  (
 {
   this->ptr_->type_def (
     type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -607,14 +561,12 @@ void POA_CORBA::ValueMemberDef_tie<T>::type_def  (
 
 template <class T> ACE_INLINE
 ::CORBA::Visibility POA_CORBA::ValueMemberDef_tie<T>::access  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->access (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -624,7 +576,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ValueMemberDef_tie<T>::access  (
     ::CORBA::Visibility access
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -632,7 +583,6 @@ void POA_CORBA::ValueMemberDef_tie<T>::access  (
 {
   this->ptr_->access (
     access
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -734,14 +684,12 @@ POA_CORBA::ValueDef_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ValueDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -750,14 +698,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::ValueDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -767,7 +713,6 @@ void POA_CORBA::ValueDef_tie<T>::destroy  (
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ValueDef_tie<T>::lookup  (
     const char * search_name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -775,7 +720,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup (
     search_name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -786,7 +730,6 @@ template <class T> ACE_INLINE
 ::CORBA::ContainedSeq * POA_CORBA::ValueDef_tie<T>::contents  (
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -795,7 +738,6 @@ template <class T> ACE_INLINE
   return this->ptr_->contents (
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -808,7 +750,6 @@ template <class T> ACE_INLINE
     ::CORBA::Long levels_to_search,
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -819,7 +760,6 @@ template <class T> ACE_INLINE
     levels_to_search,
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -831,7 +771,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -841,7 +780,6 @@ template <class T> ACE_INLINE
     limit_type,
     exclude_inherited,
     max_returned_objs
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -853,7 +791,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -863,7 +800,6 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -877,7 +813,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -889,7 +824,6 @@ template <class T> ACE_INLINE
     version,
     type,
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -902,7 +836,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -913,7 +846,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -927,7 +859,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -939,7 +870,6 @@ template <class T> ACE_INLINE
     version,
     discriminator_type,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -952,7 +882,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -963,7 +892,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -976,7 +904,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -987,7 +914,6 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1000,7 +926,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1011,7 +936,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1030,7 +954,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1047,7 +970,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1060,7 +982,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1071,7 +992,6 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1084,7 +1004,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1095,7 +1014,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1107,7 +1025,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1117,7 +1034,6 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1130,7 +1046,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1141,7 +1056,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1154,7 +1068,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1165,7 +1078,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1184,7 +1096,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1201,7 +1112,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1210,14 +1120,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ValueDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1227,7 +1135,6 @@ char * POA_CORBA::ValueDef_tie<T>::id  (
 template <class T> ACE_INLINE
 void POA_CORBA::ValueDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1235,7 +1142,6 @@ void POA_CORBA::ValueDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1244,14 +1150,12 @@ void POA_CORBA::ValueDef_tie<T>::id  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ValueDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1261,7 +1165,6 @@ char * POA_CORBA::ValueDef_tie<T>::name  (
 template <class T> ACE_INLINE
 void POA_CORBA::ValueDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1269,7 +1172,6 @@ void POA_CORBA::ValueDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1278,14 +1180,12 @@ void POA_CORBA::ValueDef_tie<T>::name  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ValueDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1295,7 +1195,6 @@ char * POA_CORBA::ValueDef_tie<T>::version  (
 template <class T> ACE_INLINE
 void POA_CORBA::ValueDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1303,7 +1202,6 @@ void POA_CORBA::ValueDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1312,14 +1210,12 @@ void POA_CORBA::ValueDef_tie<T>::version  (
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ValueDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1328,14 +1224,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ValueDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1344,14 +1238,12 @@ char * POA_CORBA::ValueDef_tie<T>::absolute_name  (
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ValueDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1360,14 +1252,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ValueDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1379,7 +1269,6 @@ void POA_CORBA::ValueDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1389,7 +1278,6 @@ void POA_CORBA::ValueDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1398,14 +1286,12 @@ void POA_CORBA::ValueDef_tie<T>::move  (
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ValueDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1414,14 +1300,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDefSeq * POA_CORBA::ValueDef_tie<T>::supported_interfaces  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->supported_interfaces (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1431,7 +1315,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ValueDef_tie<T>::supported_interfaces  (
     const ::CORBA::InterfaceDefSeq & supported_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1439,7 +1322,6 @@ void POA_CORBA::ValueDef_tie<T>::supported_interfaces  (
 {
   this->ptr_->supported_interfaces (
     supported_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1448,14 +1330,12 @@ void POA_CORBA::ValueDef_tie<T>::supported_interfaces  (
 
 template <class T> ACE_INLINE
 ::CORBA::InitializerSeq * POA_CORBA::ValueDef_tie<T>::initializers  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->initializers (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1465,7 +1345,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ValueDef_tie<T>::initializers  (
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1473,7 +1352,6 @@ void POA_CORBA::ValueDef_tie<T>::initializers  (
 {
   this->ptr_->initializers (
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1482,14 +1360,12 @@ void POA_CORBA::ValueDef_tie<T>::initializers  (
 
 template <class T> ACE_INLINE
 ::CORBA::ValueDef_ptr POA_CORBA::ValueDef_tie<T>::base_value  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->base_value (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1499,7 +1375,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ValueDef_tie<T>::base_value  (
     ::CORBA::ValueDef_ptr base_value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1507,7 +1382,6 @@ void POA_CORBA::ValueDef_tie<T>::base_value  (
 {
   this->ptr_->base_value (
     base_value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1516,14 +1390,12 @@ void POA_CORBA::ValueDef_tie<T>::base_value  (
 
 template <class T> ACE_INLINE
 ::CORBA::ValueDefSeq * POA_CORBA::ValueDef_tie<T>::abstract_base_values  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->abstract_base_values (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1533,7 +1405,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ValueDef_tie<T>::abstract_base_values  (
     const ::CORBA::ValueDefSeq & abstract_base_values
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1541,7 +1412,6 @@ void POA_CORBA::ValueDef_tie<T>::abstract_base_values  (
 {
   this->ptr_->abstract_base_values (
     abstract_base_values
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1550,14 +1420,12 @@ void POA_CORBA::ValueDef_tie<T>::abstract_base_values  (
 
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ValueDef_tie<T>::is_abstract  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->is_abstract (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1567,7 +1435,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ValueDef_tie<T>::is_abstract  (
     ::CORBA::Boolean is_abstract
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1575,7 +1442,6 @@ void POA_CORBA::ValueDef_tie<T>::is_abstract  (
 {
   this->ptr_->is_abstract (
     is_abstract
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1584,14 +1450,12 @@ void POA_CORBA::ValueDef_tie<T>::is_abstract  (
 
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ValueDef_tie<T>::is_custom  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->is_custom (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1601,7 +1465,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ValueDef_tie<T>::is_custom  (
     ::CORBA::Boolean is_custom
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1609,7 +1472,6 @@ void POA_CORBA::ValueDef_tie<T>::is_custom  (
 {
   this->ptr_->is_custom (
     is_custom
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1618,14 +1480,12 @@ void POA_CORBA::ValueDef_tie<T>::is_custom  (
 
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ValueDef_tie<T>::is_truncatable  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->is_truncatable (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1635,7 +1495,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ValueDef_tie<T>::is_truncatable  (
     ::CORBA::Boolean is_truncatable
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1643,7 +1502,6 @@ void POA_CORBA::ValueDef_tie<T>::is_truncatable  (
 {
   this->ptr_->is_truncatable (
     is_truncatable
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1653,7 +1511,6 @@ void POA_CORBA::ValueDef_tie<T>::is_truncatable  (
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ValueDef_tie<T>::is_a  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1661,7 +1518,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->is_a (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1670,14 +1526,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::ValueDef::FullValueDescription * POA_CORBA::ValueDef_tie<T>::describe_value  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe_value (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1691,7 +1545,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     ::CORBA::Visibility access
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1703,7 +1556,6 @@ template <class T> ACE_INLINE
     version,
     type,
     access
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1717,7 +1569,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     ::CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1729,7 +1580,6 @@ template <class T> ACE_INLINE
     version,
     type,
     mode
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1746,7 +1596,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ParDescriptionSeq & params,
     const ::CORBA::ExceptionDefSeq & exceptions,
     const ::CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1761,7 +1610,6 @@ template <class T> ACE_INLINE
     params,
     exceptions,
     contexts
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1863,14 +1711,12 @@ POA_CORBA::ExtValueDef_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ExtValueDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1879,14 +1725,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExtValueDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1896,7 +1740,6 @@ void POA_CORBA::ExtValueDef_tie<T>::destroy  (
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ExtValueDef_tie<T>::lookup  (
     const char * search_name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1904,7 +1747,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup (
     search_name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1915,7 +1757,6 @@ template <class T> ACE_INLINE
 ::CORBA::ContainedSeq * POA_CORBA::ExtValueDef_tie<T>::contents  (
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1924,7 +1765,6 @@ template <class T> ACE_INLINE
   return this->ptr_->contents (
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1937,7 +1777,6 @@ template <class T> ACE_INLINE
     ::CORBA::Long levels_to_search,
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1948,7 +1787,6 @@ template <class T> ACE_INLINE
     levels_to_search,
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1960,7 +1798,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1970,7 +1807,6 @@ template <class T> ACE_INLINE
     limit_type,
     exclude_inherited,
     max_returned_objs
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1982,7 +1818,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1992,7 +1827,6 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2006,7 +1840,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2018,7 +1851,6 @@ template <class T> ACE_INLINE
     version,
     type,
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2031,7 +1863,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2042,7 +1873,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2056,7 +1886,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2068,7 +1897,6 @@ template <class T> ACE_INLINE
     version,
     discriminator_type,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2081,7 +1909,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2092,7 +1919,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2105,7 +1931,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2116,7 +1941,6 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2129,7 +1953,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2140,7 +1963,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2159,7 +1981,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2176,7 +1997,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2189,7 +2009,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2200,7 +2019,6 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2213,7 +2031,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2224,7 +2041,6 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2236,7 +2052,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2246,7 +2061,6 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2259,7 +2073,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2270,7 +2083,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2283,7 +2095,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2294,7 +2105,6 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2313,7 +2123,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2330,7 +2139,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2339,14 +2147,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtValueDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2356,7 +2162,6 @@ char * POA_CORBA::ExtValueDef_tie<T>::id  (
 template <class T> ACE_INLINE
 void POA_CORBA::ExtValueDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2364,7 +2169,6 @@ void POA_CORBA::ExtValueDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2373,14 +2177,12 @@ void POA_CORBA::ExtValueDef_tie<T>::id  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtValueDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2390,7 +2192,6 @@ char * POA_CORBA::ExtValueDef_tie<T>::name  (
 template <class T> ACE_INLINE
 void POA_CORBA::ExtValueDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2398,7 +2199,6 @@ void POA_CORBA::ExtValueDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2407,14 +2207,12 @@ void POA_CORBA::ExtValueDef_tie<T>::name  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtValueDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2424,7 +2222,6 @@ char * POA_CORBA::ExtValueDef_tie<T>::version  (
 template <class T> ACE_INLINE
 void POA_CORBA::ExtValueDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2432,7 +2229,6 @@ void POA_CORBA::ExtValueDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2441,14 +2237,12 @@ void POA_CORBA::ExtValueDef_tie<T>::version  (
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ExtValueDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2457,14 +2251,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtValueDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2473,14 +2265,12 @@ char * POA_CORBA::ExtValueDef_tie<T>::absolute_name  (
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ExtValueDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2489,14 +2279,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ExtValueDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2508,7 +2296,6 @@ void POA_CORBA::ExtValueDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2518,7 +2305,6 @@ void POA_CORBA::ExtValueDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2527,14 +2313,12 @@ void POA_CORBA::ExtValueDef_tie<T>::move  (
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ExtValueDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2543,14 +2327,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDefSeq * POA_CORBA::ExtValueDef_tie<T>::supported_interfaces  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->supported_interfaces (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2560,7 +2342,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ExtValueDef_tie<T>::supported_interfaces  (
     const ::CORBA::InterfaceDefSeq & supported_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2568,7 +2349,6 @@ void POA_CORBA::ExtValueDef_tie<T>::supported_interfaces  (
 {
   this->ptr_->supported_interfaces (
     supported_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2577,14 +2357,12 @@ void POA_CORBA::ExtValueDef_tie<T>::supported_interfaces  (
 
 template <class T> ACE_INLINE
 ::CORBA::InitializerSeq * POA_CORBA::ExtValueDef_tie<T>::initializers  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->initializers (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2594,7 +2372,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ExtValueDef_tie<T>::initializers  (
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2602,7 +2379,6 @@ void POA_CORBA::ExtValueDef_tie<T>::initializers  (
 {
   this->ptr_->initializers (
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2611,14 +2387,12 @@ void POA_CORBA::ExtValueDef_tie<T>::initializers  (
 
 template <class T> ACE_INLINE
 ::CORBA::ValueDef_ptr POA_CORBA::ExtValueDef_tie<T>::base_value  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->base_value (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2628,7 +2402,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ExtValueDef_tie<T>::base_value  (
     ::CORBA::ValueDef_ptr base_value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2636,7 +2409,6 @@ void POA_CORBA::ExtValueDef_tie<T>::base_value  (
 {
   this->ptr_->base_value (
     base_value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2645,14 +2417,12 @@ void POA_CORBA::ExtValueDef_tie<T>::base_value  (
 
 template <class T> ACE_INLINE
 ::CORBA::ValueDefSeq * POA_CORBA::ExtValueDef_tie<T>::abstract_base_values  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->abstract_base_values (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2662,7 +2432,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ExtValueDef_tie<T>::abstract_base_values  (
     const ::CORBA::ValueDefSeq & abstract_base_values
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2670,7 +2439,6 @@ void POA_CORBA::ExtValueDef_tie<T>::abstract_base_values  (
 {
   this->ptr_->abstract_base_values (
     abstract_base_values
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2679,14 +2447,12 @@ void POA_CORBA::ExtValueDef_tie<T>::abstract_base_values  (
 
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ExtValueDef_tie<T>::is_abstract  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->is_abstract (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2696,7 +2462,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ExtValueDef_tie<T>::is_abstract  (
     ::CORBA::Boolean is_abstract
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2704,7 +2469,6 @@ void POA_CORBA::ExtValueDef_tie<T>::is_abstract  (
 {
   this->ptr_->is_abstract (
     is_abstract
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2713,14 +2477,12 @@ void POA_CORBA::ExtValueDef_tie<T>::is_abstract  (
 
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ExtValueDef_tie<T>::is_custom  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->is_custom (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2730,7 +2492,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ExtValueDef_tie<T>::is_custom  (
     ::CORBA::Boolean is_custom
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2738,7 +2499,6 @@ void POA_CORBA::ExtValueDef_tie<T>::is_custom  (
 {
   this->ptr_->is_custom (
     is_custom
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2747,14 +2507,12 @@ void POA_CORBA::ExtValueDef_tie<T>::is_custom  (
 
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ExtValueDef_tie<T>::is_truncatable  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->is_truncatable (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2764,7 +2522,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ExtValueDef_tie<T>::is_truncatable  (
     ::CORBA::Boolean is_truncatable
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2772,7 +2529,6 @@ void POA_CORBA::ExtValueDef_tie<T>::is_truncatable  (
 {
   this->ptr_->is_truncatable (
     is_truncatable
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2782,7 +2538,6 @@ void POA_CORBA::ExtValueDef_tie<T>::is_truncatable  (
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ExtValueDef_tie<T>::is_a  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2790,7 +2545,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->is_a (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2799,14 +2553,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::ValueDef::FullValueDescription * POA_CORBA::ExtValueDef_tie<T>::describe_value  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe_value (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2820,7 +2572,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     ::CORBA::Visibility access
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2832,7 +2583,6 @@ template <class T> ACE_INLINE
     version,
     type,
     access
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2846,7 +2596,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     ::CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2858,7 +2607,6 @@ template <class T> ACE_INLINE
     version,
     type,
     mode
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2875,7 +2623,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ParDescriptionSeq & params,
     const ::CORBA::ExceptionDefSeq & exceptions,
     const ::CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2890,7 +2637,6 @@ template <class T> ACE_INLINE
     params,
     exceptions,
     contexts
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2899,14 +2645,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::ExtInitializerSeq * POA_CORBA::ExtValueDef_tie<T>::ext_initializers  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->ext_initializers (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2916,7 +2660,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ExtValueDef_tie<T>::ext_initializers  (
     const ::CORBA::ExtInitializerSeq & ext_initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2924,7 +2667,6 @@ void POA_CORBA::ExtValueDef_tie<T>::ext_initializers  (
 {
   this->ptr_->ext_initializers (
     ext_initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2933,14 +2675,12 @@ void POA_CORBA::ExtValueDef_tie<T>::ext_initializers  (
 
 template <class T> ACE_INLINE
 ::CORBA::ExtValueDef::ExtFullValueDescription * POA_CORBA::ExtValueDef_tie<T>::describe_ext_value  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe_ext_value (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2956,7 +2696,6 @@ template <class T> ACE_INLINE
     ::CORBA::AttributeMode mode,
     const ::CORBA::ExceptionDefSeq & get_exceptions,
     const ::CORBA::ExceptionDefSeq & set_exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2970,7 +2709,6 @@ template <class T> ACE_INLINE
     mode,
     get_exceptions,
     set_exceptions
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3072,14 +2810,12 @@ POA_CORBA::ValueBoxDef_tie<T>::_default_POA (void)
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ValueBoxDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3088,14 +2824,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::ValueBoxDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3104,14 +2838,12 @@ void POA_CORBA::ValueBoxDef_tie<T>::destroy  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ValueBoxDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3121,7 +2853,6 @@ char * POA_CORBA::ValueBoxDef_tie<T>::id  (
 template <class T> ACE_INLINE
 void POA_CORBA::ValueBoxDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3129,7 +2860,6 @@ void POA_CORBA::ValueBoxDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3138,14 +2868,12 @@ void POA_CORBA::ValueBoxDef_tie<T>::id  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ValueBoxDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3155,7 +2883,6 @@ char * POA_CORBA::ValueBoxDef_tie<T>::name  (
 template <class T> ACE_INLINE
 void POA_CORBA::ValueBoxDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3163,7 +2890,6 @@ void POA_CORBA::ValueBoxDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3172,14 +2898,12 @@ void POA_CORBA::ValueBoxDef_tie<T>::name  (
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ValueBoxDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3189,7 +2913,6 @@ char * POA_CORBA::ValueBoxDef_tie<T>::version  (
 template <class T> ACE_INLINE
 void POA_CORBA::ValueBoxDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3197,7 +2920,6 @@ void POA_CORBA::ValueBoxDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3206,14 +2928,12 @@ void POA_CORBA::ValueBoxDef_tie<T>::version  (
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ValueBoxDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3222,14 +2942,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ValueBoxDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3238,14 +2956,12 @@ char * POA_CORBA::ValueBoxDef_tie<T>::absolute_name  (
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ValueBoxDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3254,14 +2970,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ValueBoxDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3273,7 +2987,6 @@ void POA_CORBA::ValueBoxDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3283,7 +2996,6 @@ void POA_CORBA::ValueBoxDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3292,14 +3004,12 @@ void POA_CORBA::ValueBoxDef_tie<T>::move  (
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ValueBoxDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3308,14 +3018,12 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 ::CORBA::IDLType_ptr POA_CORBA::ValueBoxDef_tie<T>::original_type_def  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->original_type_def (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3325,7 +3033,6 @@ template <class T> ACE_INLINE
 template <class T> ACE_INLINE
 void POA_CORBA::ValueBoxDef_tie<T>::original_type_def  (
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3333,7 +3040,6 @@ void POA_CORBA::ValueBoxDef_tie<T>::original_type_def  (
 {
   this->ptr_->original_type_def (
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp
index 7f0e0ac536b..675bb71e1e0 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp
@@ -34,8 +34,7 @@ int
 TAO_IFR_Service_Loader::init (int argc,
                               ACE_TCHAR *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Copy command line parameter.
       ACE_Argv_Type_Converter command_line (argc,
@@ -45,22 +44,19 @@ TAO_IFR_Service_Loader::init (int argc,
       CORBA::ORB_var orb =
         CORBA::ORB_init (command_line.get_argc (),
                          command_line.get_ASCII_argv (),
-                         0
-                         ACE_ENV_ARG_PARAMETER);
+                         0);
 
       // This function call initializes the IFR_Service Service
       CORBA::Object_var object =
         this->create_object (orb.in (),
                              command_line.get_argc (),
-                             command_line.get_TCHAR_argv ()
-                             ACE_ENV_ARG_PARAMETER);
+                             command_line.get_TCHAR_argv ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // @@ Should we log this???
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -74,8 +70,7 @@ TAO_IFR_Service_Loader::fini (void)
 CORBA::Object_ptr
 TAO_IFR_Service_Loader::create_object (CORBA::ORB_ptr orb,
                                        int argc,
-                                       ACE_TCHAR *argv[]
-                                       ACE_ENV_ARG_DECL_NOT_USED)
+                                       ACE_TCHAR *argv[])
    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Initializes the IFR_Service Service. Returns -1
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h
index 4ed289fb58b..9f5547c0e37 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h
@@ -51,8 +51,7 @@ public:
   // ORB and the command line parameters.
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
-                                           ACE_TCHAR *argv[]
-                                           ACE_ENV_ARG_DECL)
+                                           ACE_TCHAR *argv[])
      ACE_THROW_SPEC ((CORBA::SystemException));
 
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
index f6a33cf6b81..ab1f5745bc8 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
@@ -61,16 +61,14 @@ TAO_IFR_Server::init_with_orb (int argc,
                                CORBA::ORB_ptr orb,
                                int use_multicast_server)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Duplicate the ORB.
       this->orb_ = CORBA::ORB::_duplicate (orb);
 
       // Get the POA from the ORB.
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         {
@@ -82,8 +80,7 @@ TAO_IFR_Server::init_with_orb (int argc,
           );
         }
       this->root_poa_ =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       int retval = OPTIONS::instance ()->parse_args (argc,
                                                     argv);
@@ -126,33 +123,28 @@ TAO_IFR_Server::init_with_orb (int argc,
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "IFR_Service::init");
+      ex._tao_print_exception ("IFR_Service::init");
 
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 int
 TAO_IFR_Server::fini (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       this->root_poa_->destroy (1,
-                                1
-                                ACE_ENV_ARG_PARAMETER);
+                                1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "TAO_IFR_Server::fini");
-      ACE_RE_THROW;
+      ex._tao_print_exception ("TAO_IFR_Server::fini");
+      throw;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -169,40 +161,34 @@ TAO_IFR_Server::create_poa (void)
 
   // ID Assignment Policy.
   policies[0] =
-    this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID
-                                                  ACE_ENV_ARG_PARAMETER);
+    this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID);
 
   // Lifespan Policy.
   policies[1] =
-    this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT
-                                             ACE_ENV_ARG_PARAMETER);
+    this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT);
 
   // Request Processing Policy.
   policies[2] =
     this->root_poa_->create_request_processing_policy (
         PortableServer::USE_DEFAULT_SERVANT
-        ACE_ENV_ARG_PARAMETER
       );
 
   // Servant Retention Policy.
   policies[3] =
     this->root_poa_->create_servant_retention_policy (
         PortableServer::NON_RETAIN
-        ACE_ENV_ARG_PARAMETER
       );
 
   // Id Uniqueness Policy.
   policies[4] =
     this->root_poa_->create_id_uniqueness_policy (
         PortableServer::MULTIPLE_ID
-        ACE_ENV_ARG_PARAMETER
       );
 
   this->repo_poa_ =
     this->root_poa_->create_POA ("repoPOA",
                                  poa_manager.in (),
-                                 policies
-                                 ACE_ENV_ARG_PARAMETER);
+                                 policies);
 
   policies[0]->destroy ();
 
@@ -297,8 +283,7 @@ TAO_IFR_Server::create_repository (void)
   PortableServer::ServantBase_var tie_safety (impl_tie);
   safety.release ();
 
-  this->repo_poa_->set_servant (impl_tie
-                                ACE_ENV_ARG_PARAMETER);
+  this->repo_poa_->set_servant (impl_tie);
 
   PortableServer::ObjectId_var oid =
     PortableServer::string_to_ObjectId ("");
@@ -307,17 +292,14 @@ TAO_IFR_Server::create_repository (void)
     this->repo_poa_->create_reference_with_id (
         oid.in (),
         "IDL:omg.org/CORBA/ComponentIR/ComponentRepository:1.0"
-        ACE_ENV_ARG_PARAMETER
       );
 
   CORBA::Repository_ptr repo_ref =
-    CORBA::Repository::_narrow (obj.in ()
-                                ACE_ENV_ARG_PARAMETER);
+    CORBA::Repository::_narrow (obj.in ());
 
   // Initialize the repository.
   int status = impl->repo_init (repo_ref,
-                                this->repo_poa_
-                                ACE_ENV_ARG_PARAMETER);
+                                this->repo_poa_);
 
   if (status != 0)
     {
@@ -326,17 +308,14 @@ TAO_IFR_Server::create_repository (void)
 
   // Save and output the IOR string.
   this->ifr_ior_ =
-    this->orb_->object_to_string (repo_ref
-                                  ACE_ENV_ARG_PARAMETER);
+    this->orb_->object_to_string (repo_ref);
 
 
   CORBA::Object_var table_object =
-    this->orb_->resolve_initial_references ("IORTable"
-                                            ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references ("IORTable");
 
   IORTable::Table_var adapter =
-    IORTable::Table::_narrow (table_object.in ()
-                              ACE_ENV_ARG_PARAMETER);
+    IORTable::Table::_narrow (table_object.in ());
 
   if (CORBA::is_nil (adapter.in ()))
     {
@@ -345,14 +324,12 @@ TAO_IFR_Server::create_repository (void)
   else
     {
       adapter->bind ("InterfaceRepository",
-                     this->ifr_ior_.in ()
-                     ACE_ENV_ARG_PARAMETER);
+                     this->ifr_ior_.in ());
     }
 
   // Add the repository to the ORB's table of initialized object references.
   this->orb_->register_initial_reference ("InterfaceRepository",
-                                          repo_ref
-                                          ACE_ENV_ARG_PARAMETER);
+                                          repo_ref);
 
   FILE *output_file_ =
     ACE_OS::fopen (OPTIONS::instance()->ior_output_file (),
@@ -487,7 +464,6 @@ void
 TAO_IFR_Service_Utils::valid_container (
     CORBA::DefinitionKind container_kind,
     CORBA::DefinitionKind contained_kind
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -549,8 +525,7 @@ TAO_IFR_Service_Utils::valid_container (
 
   if (error_flag == 1)
     {
-      ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 4,
-                                   CORBA::COMPLETED_NO));
+      throw CORBA::BAD_PARAM (CORBA::OMGVMCID | 4, CORBA::COMPLETED_NO);
     }
 }
 
@@ -561,24 +536,20 @@ TAO_IFR_Service_Utils::pre_exist (
     ACE_Configuration_Section_Key &key,
     TAO_Repository_i *repo,
     CORBA::DefinitionKind kind
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Service_Utils::id_exists (id,
-                                    repo
-                                    ACE_ENV_ARG_PARAMETER);
+                                    repo);
 
   TAO_IFR_Service_Utils::name_exists (checker,
                                       key,
                                       repo,
-                                      kind
-                                      ACE_ENV_ARG_PARAMETER);
+                                      kind);
 }
 
 void
 TAO_IFR_Service_Utils::id_exists (const char *id,
-                                  TAO_Repository_i *repo
-                                  ACE_ENV_ARG_DECL)
+                                  TAO_Repository_i *repo)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // The repo id must not already exist.
@@ -588,8 +559,7 @@ TAO_IFR_Service_Utils::id_exists (const char *id,
                                          holder)
        == 0)
     {
-      ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 2,
-                                   CORBA::COMPLETED_NO));
+      throw CORBA::BAD_PARAM (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
     }
 }
 
@@ -599,7 +569,6 @@ TAO_IFR_Service_Utils::name_exists (
     ACE_Configuration_Section_Key &key,
     TAO_Repository_i *repo,
     CORBA::DefinitionKind kind
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -639,8 +608,9 @@ TAO_IFR_Service_Utils::name_exists (
 
           if ((*checker) (member_name.fast_rep ()) != 0)
             {
-              ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 3,
-                                           CORBA::COMPLETED_NO));
+              throw CORBA::BAD_PARAM (
+                CORBA::OMGVMCID | 3,
+                CORBA::COMPLETED_NO);
             }
         }
     }
@@ -675,8 +645,9 @@ TAO_IFR_Service_Utils::name_exists (
 
           if ((*checker) (defn_name.fast_rep ()) != 0)
             {
-              ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 3,
-                                           CORBA::COMPLETED_NO));
+              throw CORBA::BAD_PARAM (
+                CORBA::OMGVMCID | 3,
+                CORBA::COMPLETED_NO);
             }
         }
     }
@@ -687,8 +658,7 @@ TAO_IFR_Service_Utils::name_exists (
       TAO_IFR_Service_Utils::check_subsection (checker,
                                                "attrs",
                                                repo->config (),
-                                               key
-                                               ACE_ENV_ARG_PARAMETER);
+                                               key);
     }
 
   if (kind == CORBA::dk_Interface)
@@ -696,8 +666,7 @@ TAO_IFR_Service_Utils::name_exists (
       TAO_IFR_Service_Utils::check_subsection (checker,
                                                "ops",
                                                repo->config (),
-                                               key
-                                               ACE_ENV_ARG_PARAMETER);
+                                               key);
     }
 
   if (kind == CORBA::dk_Component)
@@ -705,32 +674,27 @@ TAO_IFR_Service_Utils::name_exists (
       TAO_IFR_Service_Utils::check_subsection (checker,
                                                "provides",
                                                repo->config (),
-                                               key
-                                               ACE_ENV_ARG_PARAMETER);
+                                               key);
 
       TAO_IFR_Service_Utils::check_subsection (checker,
                                                "uses",
                                                repo->config (),
-                                               key
-                                               ACE_ENV_ARG_PARAMETER);
+                                               key);
 
       TAO_IFR_Service_Utils::check_subsection (checker,
                                                "emits",
                                                repo->config (),
-                                               key
-                                               ACE_ENV_ARG_PARAMETER);
+                                               key);
 
       TAO_IFR_Service_Utils::check_subsection (checker,
                                                "publishes",
                                                repo->config (),
-                                               key
-                                               ACE_ENV_ARG_PARAMETER);
+                                               key);
 
       TAO_IFR_Service_Utils::check_subsection (checker,
                                                "consumes",
                                                repo->config (),
-                                               key
-                                               ACE_ENV_ARG_PARAMETER);
+                                               key);
     }
 }
 
@@ -740,7 +704,6 @@ TAO_IFR_Service_Utils::check_subsection (
     const char *sub_section,
     ACE_Configuration *config,
     ACE_Configuration_Section_Key &key
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -778,8 +741,7 @@ TAO_IFR_Service_Utils::check_subsection (
 
       if ((*checker) (entry_name.fast_rep ()) != 0)
         {
-          ACE_THROW (CORBA::BAD_PARAM (3,
-                                       CORBA::COMPLETED_NO));
+          throw CORBA::BAD_PARAM (3, CORBA::COMPLETED_NO);
           return;
         }
     }
@@ -793,19 +755,16 @@ TAO_IFR_Service_Utils::valid_creation (
     name_clash_checker checker,
     ACE_Configuration_Section_Key &key,
     TAO_Repository_i *repo
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Service_Utils::valid_container (container_kind,
-                                          contained_kind
-                                          ACE_ENV_ARG_PARAMETER);
+                                          contained_kind);
 
   TAO_IFR_Service_Utils::pre_exist (id,
                                     checker,
                                     key,
                                     repo,
-                                    container_kind
-                                    ACE_ENV_ARG_PARAMETER);
+                                    container_kind);
 }
 
 ACE_TString
@@ -820,7 +779,6 @@ TAO_IFR_Service_Utils::create_common (
     TAO_IFR_Service_Utils::name_clash_checker checker,
     const char *version,
     const char *sub_section_name
-    ACE_ENV_ARG_DECL
   )
 {
   ACE_TString path;
@@ -832,8 +790,7 @@ TAO_IFR_Service_Utils::create_common (
                                          id,
                                          checker,
                                          container_key,
-                                         repo
-                                         ACE_ENV_ARG_PARAMETER);
+                                         repo);
 
   ACE_Configuration *config = repo->config ();
 
@@ -981,7 +938,6 @@ CORBA::TypeCode_ptr
 TAO_IFR_Service_Utils::gen_valuetype_tc_r (
       ACE_Configuration_Section_Key &key,
       TAO_Repository_i *repo
-      ACE_ENV_ARG_DECL
     )
 {
   ACE_TString name;
@@ -1046,24 +1002,21 @@ TAO_IFR_Service_Utils::gen_valuetype_tc_r (
                                     0);
       base_tc =
         TAO_IFR_Service_Utils::gen_valuetype_tc_r (base_key,
-                                                   repo
-                                                   ACE_ENV_ARG_PARAMETER);
+                                                   repo);
     }
 
   CORBA::ValueMemberSeq vm_seq;
   vm_seq.length (0);
   TAO_IFR_Service_Utils::fill_valuemember_seq (vm_seq,
                                                key,
-                                               repo
-                                               ACE_ENV_ARG_PARAMETER);
+                                               repo);
 
   return
     repo->tc_factory ()->create_value_tc (id.c_str (),
                                           name.c_str (),
                                           tm,
                                           base_tc.in (),
-                                          vm_seq
-                                          ACE_ENV_ARG_PARAMETER);
+                                          vm_seq);
 }
 
 void
@@ -1071,7 +1024,6 @@ TAO_IFR_Service_Utils::fill_valuemember_seq (
     CORBA::ValueMemberSeq &vm_seq,
     ACE_Configuration_Section_Key &key,
     TAO_Repository_i *repo
-    ACE_ENV_ARG_DECL
   )
 {
   ACE_Configuration_Section_Key members_key;
@@ -1244,23 +1196,20 @@ TAO_IFR_Service_Utils::path_to_container (ACE_TString &path,
 
 CORBA::Object_ptr
 TAO_IFR_Service_Utils::path_to_ir_object (ACE_TString &path,
-                                          TAO_Repository_i *repo
-                                          ACE_ENV_ARG_DECL)
+                                          TAO_Repository_i *repo)
 {
   CORBA::DefinitionKind def_kind =
     TAO_IFR_Service_Utils::path_to_def_kind (path, repo);
 
   return TAO_IFR_Service_Utils::create_objref (def_kind,
                                                path.c_str (),
-                                               repo
-                                               ACE_ENV_ARG_PARAMETER);
+                                               repo);
 }
 
 CORBA::Object_ptr
 TAO_IFR_Service_Utils::create_objref (CORBA::DefinitionKind def_kind,
                                       const char *obj_id,
-                                      TAO_Repository_i *repo
-                                      ACE_ENV_ARG_DECL)
+                                      TAO_Repository_i *repo)
 {
   ACE_TString repo_id ("IDL:omg.org/");
 
@@ -1378,8 +1327,7 @@ TAO_IFR_Service_Utils::create_objref (CORBA::DefinitionKind def_kind,
   PortableServer::POA_ptr poa = repo->select_poa (def_kind);
 
   return poa->create_reference_with_id (oid.in (),
-                                        repo_id.c_str ()
-                                        ACE_ENV_ARG_PARAMETER);
+                                        repo_id.c_str ());
 }
 
 char *
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h
index 16c8edb7be2..50fd7309417 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h
@@ -114,8 +114,7 @@ public:
 
   /// Checks for illegal member type in given container type.
   static void valid_container (CORBA::DefinitionKind container_kind,
-                               CORBA::DefinitionKind contained_kind
-                               ACE_ENV_ARG_DECL)
+                               CORBA::DefinitionKind contained_kind)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Wrapper for id_exists() and name_exists().
@@ -123,21 +122,18 @@ public:
                          name_clash_checker checker,
                          ACE_Configuration_Section_Key &key,
                          TAO_Repository_i *repo,
-                         CORBA::DefinitionKind kind
-                         ACE_ENV_ARG_DECL);
+                         CORBA::DefinitionKind kind);
 
   /// Checks for a global repository id clash.
   static void id_exists (const char *id,
-                         TAO_Repository_i *repo
-                         ACE_ENV_ARG_DECL)
+                         TAO_Repository_i *repo)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Checks for a local name clash.
   static void name_exists (name_clash_checker checker,
                            ACE_Configuration_Section_Key &key,
                            TAO_Repository_i *repo,
-                           CORBA::DefinitionKind kind
-                           ACE_ENV_ARG_DECL)
+                           CORBA::DefinitionKind kind)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Used by interfaces and components to check for name clashes
@@ -145,8 +141,7 @@ public:
   static void check_subsection (name_clash_checker checker,
                                 const char *sub_section,
                                 ACE_Configuration *config,
-                                ACE_Configuration_Section_Key &key
-                                ACE_ENV_ARG_DECL)
+                                ACE_Configuration_Section_Key &key)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Top-level method which calls all the above error-checking methods.
@@ -155,8 +150,7 @@ public:
                               const char *id,
                               name_clash_checker checker,
                               ACE_Configuration_Section_Key &key,
-                              TAO_Repository_i *repo
-                              ACE_ENV_ARG_DECL);
+                              TAO_Repository_i *repo);
 
   /// Code common to the creation of an entry for any non-anonymous type.
   static ACE_TString create_common (
@@ -170,7 +164,6 @@ public:
       name_clash_checker checker,
       const char *version,
       const char *sub_section_name
-      ACE_ENV_ARG_DECL
     );
 
   /// Common to Container::create_value() and ValueDef::supported_interfaces(),
@@ -191,14 +184,12 @@ public:
   static CORBA::TypeCode_ptr gen_valuetype_tc_r (
       ACE_Configuration_Section_Key &,
       TAO_Repository_i *
-      ACE_ENV_ARG_DECL
     );
 
   /// Called from the above function.
   static void fill_valuemember_seq (CORBA::ValueMemberSeq &,
                                     ACE_Configuration_Section_Key &,
-                                    TAO_Repository_i *
-                                    ACE_ENV_ARG_DECL);
+                                    TAO_Repository_i *);
 
   /// Converison from IR Object reference to key location path.
   static char *reference_to_path (CORBA::IRObject_ptr obj);
@@ -227,14 +218,12 @@ public:
 
   /// Conversion from key location path to IR Object reference.
   static CORBA::Object_ptr path_to_ir_object (ACE_TString &path,
-                                              TAO_Repository_i *repo
-                                              ACE_ENV_ARG_DECL);
+                                              TAO_Repository_i *repo);
 
   /// Can be called from the above method or directly from a derived class.
   static CORBA::Object_ptr create_objref (CORBA::DefinitionKind def_kind,
                                           const char *obj_id,
-                                          TAO_Repository_i *repo
-                                          ACE_ENV_ARG_DECL);
+                                          TAO_Repository_i *repo);
 
   /// Copy and octet sequence to a string..
   static char *oid_to_string (PortableServer::ObjectId &oid);
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp
index fa3a338254a..041e85dfa0c 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp
@@ -15,8 +15,7 @@ template<typename T>
 void
 TAO_IFR_Generic_Utils<T>::destroy_special (const char *section_name,
                                            TAO_Repository_i *repo,
-                                           ACE_Configuration_Section_Key &key
-                                           ACE_ENV_ARG_DECL)
+                                           ACE_Configuration_Section_Key &key)
 {
   ACE_Configuration_Section_Key sub_key;
   int status =
@@ -137,7 +136,6 @@ TAO_IFR_Desc_Utils<T_desc,T_impl>::fill_desc_begin (
     T_desc &desc,
     TAO_Repository_i *repo,
     ACE_Configuration_Section_Key &key
-    ACE_ENV_ARG_DECL
   )
 {
   T_impl impl (repo);
@@ -300,8 +298,7 @@ TAO_Port_Utils<T>::create_entry (const char *id,
                                  CORBA::Boolean is_multiple,
                                  TAO_Repository_i *repo,
                                  CORBA::DefinitionKind port_kind,
-                                 ACE_Configuration_Section_Key &key
-                                 ACE_ENV_ARG_DECL)
+                                 ACE_Configuration_Section_Key &key)
 {
   TAO_Container_i::tmp_name_holder (name);
   ACE_Configuration_Section_Key new_key;
@@ -315,8 +312,7 @@ TAO_Port_Utils<T>::create_entry (const char *id,
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          sub_section
-                                          ACE_ENV_ARG_PARAMETER);
+                                          sub_section);
 
   const char *tmp =
     TAO_IFR_Service_Utils::reference_to_path (port_base_type);
@@ -344,11 +340,9 @@ TAO_Port_Utils<T>::create_entry (const char *id,
 
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (path,
-                                              repo
-                                              ACE_ENV_ARG_PARAMETER);
+                                              repo);
 
-  return T::_narrow (obj.in ()
-                     ACE_ENV_ARG_PARAMETER);
+  return T::_narrow (obj.in ());
 }
 
 #if defined (__BORLANDC__) && (__BORLANDC__ <= 0x582)
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h
index 056582e494a..bf7479bc9bd 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h
@@ -41,8 +41,7 @@ class TAO_IFR_Generic_Utils
 public:
   static void destroy_special (const char *section_name,
                                TAO_Repository_i *repo,
-                               ACE_Configuration_Section_Key &key
-                               ACE_ENV_ARG_DECL);
+                               ACE_Configuration_Section_Key &key);
 
   static void set_initializers (const T &initializers,
                                 ACE_Configuration *config,
@@ -57,8 +56,7 @@ class TAO_IFR_Desc_Utils
 public:
   static void fill_desc_begin (T_desc &desc,
                                TAO_Repository_i *repo,
-                               ACE_Configuration_Section_Key &key
-                               ACE_ENV_ARG_DECL);
+                               ACE_Configuration_Section_Key &key);
 };
 
 template<typename T_strseq>
@@ -102,8 +100,7 @@ public:
                           CORBA::Boolean is_multiple,
                           TAO_Repository_i *repo,
                           CORBA::DefinitionKind port_kind,
-                          ACE_Configuration_Section_Key &key
-                          ACE_ENV_ARG_DECL);
+                          ACE_Configuration_Section_Key &key);
 
   static void set_is_multiple (CORBA::Boolean is_multiple,
                                ACE_Configuration *config,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_macro.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_macro.h
index e48f4668015..d01bb3dd710 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_macro.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_macro.h
@@ -22,7 +22,6 @@
                                 TAO_GUARD_FAILURE, \
                                 0), \
                               CORBA::COMPLETED_NO)); \
-  ACE_CHECK
 
 #define TAO_IFR_WRITE_GUARD_RETURN(RETURN) \
   ACE_WRITE_GUARD_THROW_EX (ACE_Lock, \
@@ -33,7 +32,6 @@
                                 TAO_GUARD_FAILURE, \
                                 0), \
                               CORBA::COMPLETED_NO)); \
-  ACE_CHECK_RETURN (RETURN)
 
 #define TAO_IFR_READ_GUARD_RETURN(RETURN) \
   ACE_READ_GUARD_THROW_EX (ACE_Lock, \
@@ -44,7 +42,6 @@
                                TAO_GUARD_FAILURE, \
                                0), \
                              CORBA::COMPLETED_NO)); \
-  ACE_CHECK_RETURN (RETURN)
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
index dc1e808aae5..b2691b27c00 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
@@ -29,7 +29,6 @@ TAO_IRObject_i::~TAO_IRObject_i (void)
 
 CORBA::DefinitionKind
 TAO_IRObject_i::def_kind (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -82,7 +81,7 @@ TAO_IRObject_i::update_key (void)
   if (status != 0)
     {
       // If we're here, destroy() has been called on us.
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+      throw CORBA::OBJECT_NOT_EXIST ();
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h
index e3f86156341..fa19fb2d349 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h
@@ -58,18 +58,15 @@ public:
   // Destructor.
 
   virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   // Pure virtual.
 
   virtual void destroy_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   // Pure virtual - the unlocked version called by the destroy() wrapper.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp
index 3c6e69a6a68..c5497345cfe 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp
@@ -33,7 +33,6 @@ TAO_InterfaceAttrExtension_i::~TAO_InterfaceAttrExtension_i (void)
 
 CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *
 TAO_InterfaceAttrExtension_i::describe_ext_interface (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -46,7 +45,6 @@ TAO_InterfaceAttrExtension_i::describe_ext_interface (
 
 CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *
 TAO_InterfaceAttrExtension_i::describe_ext_interface_i (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -138,8 +136,7 @@ TAO_InterfaceAttrExtension_i::describe_ext_interface_i (
       TAO_OperationDef_i op (this->repo_);
       op.section_key (key);
 
-      op.make_description (fifd->operations[i]
-                           ACE_ENV_ARG_PARAMETER);
+      op.make_description (fifd->operations[i]);
     }
 
   // Restore our original section key.
@@ -197,8 +194,7 @@ TAO_InterfaceAttrExtension_i::describe_ext_interface_i (
       TAO_ExtAttributeDef_i attr (this->repo_);
       attr.section_key (key);
 
-      attr.fill_description (fifd->attributes[i]
-                             ACE_ENV_ARG_PARAMETER);
+      attr.fill_description (fifd->attributes[i]);
     }
 
   // Restore our original section key.
@@ -247,7 +243,6 @@ TAO_InterfaceAttrExtension_i::create_ext_attribute (
     CORBA::AttributeMode mode,
     const CORBA::ExceptionDefSeq &get_exceptions,
     const CORBA::ExceptionDefSeq &set_exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -261,8 +256,7 @@ TAO_InterfaceAttrExtension_i::create_ext_attribute (
                                        type,
                                        mode,
                                        get_exceptions,
-                                       set_exceptions
-                                       ACE_ENV_ARG_PARAMETER);
+                                       set_exceptions);
 }
 
 CORBA::ExtAttributeDef_ptr
@@ -274,7 +268,6 @@ TAO_InterfaceAttrExtension_i::create_ext_attribute_i (
     CORBA::AttributeMode mode,
     const CORBA::ExceptionDefSeq &get_exceptions,
     const CORBA::ExceptionDefSeq &set_exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -292,8 +285,7 @@ TAO_InterfaceAttrExtension_i::create_ext_attribute_i (
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          "attrs"
-                                          ACE_ENV_ARG_PARAMETER);
+                                          "attrs");
 
   // Store the path to the attribute's type definition.
   char *type_path = TAO_IFR_Service_Utils::reference_to_path (type);
@@ -321,12 +313,10 @@ TAO_InterfaceAttrExtension_i::create_ext_attribute_i (
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Attribute,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
+                                          this->repo_);
 
   CORBA::ExtAttributeDef_var retval =
-    CORBA::ExtAttributeDef::_narrow (obj.in ()
-                                     ACE_ENV_ARG_PARAMETER);
+    CORBA::ExtAttributeDef::_narrow (obj.in ());
 
   return retval._retn ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h
index f330fe3dec6..152cabbc59a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h
@@ -53,13 +53,11 @@ public:
   virtual
   CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *
   describe_ext_interface (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *
   describe_ext_interface_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -71,7 +69,6 @@ public:
       CORBA::AttributeMode mode,
       const CORBA::ExceptionDefSeq &get_exceptions,
       const CORBA::ExceptionDefSeq &set_exceptions
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -83,7 +80,6 @@ public:
       CORBA::AttributeMode mode,
       const CORBA::ExceptionDefSeq &get_exceptions,
       const CORBA::ExceptionDefSeq &set_exceptions
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
index 971c23ee57f..e2670c1b6d5 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
@@ -63,14 +63,12 @@ TAO_InterfaceDef_i::destroy_i (void)
       "attrs",
       this->repo_,
       this->section_key_
-      ACE_ENV_ARG_PARAMETER
     );
 
   TAO_IFR_Generic_Utils<TAO_OperationDef_i>::destroy_special (
       "ops",
       this->repo_,
       this->section_key_
-      ACE_ENV_ARG_PARAMETER
     );
 
   // Destroy ourself.
@@ -180,7 +178,6 @@ TAO_InterfaceDef_i::type_i (void)
   return this->repo_->tc_factory ()->create_interface_tc (
                                          id.c_str (),
                                          name.c_str ()
-                                         ACE_ENV_ARG_PARAMETER
                                        );
 }
 
@@ -225,32 +222,27 @@ TAO_InterfaceDef_i::base_interfaces_i (void)
 
       CORBA::Object_var obj =
         TAO_IFR_Service_Utils::path_to_ir_object (path,
-                                                  this->repo_
-                                                  ACE_ENV_ARG_PARAMETER);
+                                                  this->repo_);
 
-      retval[i] = CORBA::InterfaceDef::_narrow (obj.in ()
-                                                ACE_ENV_ARG_PARAMETER);
+      retval[i] = CORBA::InterfaceDef::_narrow (obj.in ());
     }
 
   return retval._retn ();
 }
 
 void
-TAO_InterfaceDef_i::base_interfaces (const CORBA::InterfaceDefSeq &base_interfaces
-                                     ACE_ENV_ARG_DECL)
+TAO_InterfaceDef_i::base_interfaces (const CORBA::InterfaceDefSeq &base_interfaces)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->update_key ();
 
-  this->base_interfaces_i (base_interfaces
-                           ACE_ENV_ARG_PARAMETER);
+  this->base_interfaces_i (base_interfaces);
 }
 
 void
-TAO_InterfaceDef_i::base_interfaces_i (const CORBA::InterfaceDefSeq &base_interfaces
-                                       ACE_ENV_ARG_DECL)
+TAO_InterfaceDef_i::base_interfaces_i (const CORBA::InterfaceDefSeq &base_interfaces)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // If we are an abstract interface, all our base interfaces must be
@@ -267,8 +259,9 @@ TAO_InterfaceDef_i::base_interfaces_i (const CORBA::InterfaceDefSeq &base_interf
 
           if (def_kind != CORBA::dk_AbstractInterface)
             {
-              ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 11,
-                                           CORBA::COMPLETED_NO));
+              throw CORBA::BAD_PARAM (
+                CORBA::OMGVMCID | 11,
+                CORBA::COMPLETED_NO);
             }
         }
     }
@@ -310,8 +303,7 @@ TAO_InterfaceDef_i::base_interfaces_i (const CORBA::InterfaceDefSeq &base_interf
       TAO_IFR_Service_Utils::name_exists (&TAO_Container_i::same_as_tmp_name,
                                           this->section_key_,
                                           this->repo_,
-                                          this->def_kind ()
-                                          ACE_ENV_ARG_PARAMETER);
+                                          this->def_kind ());
 
       char *stringified = TAO_IFR_Service_Utils::int_to_string (i);
       this->repo_->config ()->set_string_value (inherited_key,
@@ -321,21 +313,18 @@ TAO_InterfaceDef_i::base_interfaces_i (const CORBA::InterfaceDefSeq &base_interf
 }
 
 CORBA::Boolean
-TAO_InterfaceDef_i::is_a (const char *interface_id
-                          ACE_ENV_ARG_DECL)
+TAO_InterfaceDef_i::is_a (const char *interface_id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
   this->update_key ();
 
-  return this->is_a_i (interface_id
-                       ACE_ENV_ARG_PARAMETER);
+  return this->is_a_i (interface_id);
 }
 
 CORBA::Boolean
-TAO_InterfaceDef_i::is_a_i (const char *interface_id
-                            ACE_ENV_ARG_DECL)
+TAO_InterfaceDef_i::is_a_i (const char *interface_id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::strcmp (interface_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
@@ -376,8 +365,7 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id
       TAO_InterfaceDef_i impl (this->repo_);
       impl.section_key (base_key);
 
-      CORBA::Boolean success = impl.is_a_i (interface_id
-                                            ACE_ENV_ARG_PARAMETER);
+      CORBA::Boolean success = impl.is_a_i (interface_id);
 
       if (success == 1)
         {
@@ -488,8 +476,7 @@ TAO_InterfaceDef_i::describe_interface_i (void)
       TAO_OperationDef_i op (this->repo_);
       op.section_key (key);
 
-      op.make_description (fifd->operations[i]
-                           ACE_ENV_ARG_PARAMETER);
+      op.make_description (fifd->operations[i]);
     }
 
   // Restore our original section key.
@@ -547,8 +534,7 @@ TAO_InterfaceDef_i::describe_interface_i (void)
       TAO_AttributeDef_i attr (this->repo_);
       attr.section_key (key);
 
-      attr.make_description (fifd->attributes[i]
-                             ACE_ENV_ARG_PARAMETER);
+      attr.make_description (fifd->attributes[i]);
     }
 
   // Restore our original section key.
@@ -598,7 +584,6 @@ TAO_InterfaceDef_i::create_attribute (
     const char *version,
     CORBA::IDLType_ptr type,
     CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -610,8 +595,7 @@ TAO_InterfaceDef_i::create_attribute (
                                    name,
                                    version,
                                    type,
-                                   mode
-                                   ACE_ENV_ARG_PARAMETER);
+                                   mode);
 }
 
 CORBA::AttributeDef_ptr
@@ -621,15 +605,13 @@ TAO_InterfaceDef_i::create_attribute_i (
     const char *version,
     CORBA::IDLType_ptr type,
     CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // This will throw an exception if a name clash is found.
   // create_common() will check for all other errors.
   this->check_inherited (name,
-                         CORBA::dk_Attribute
-                         ACE_ENV_ARG_PARAMETER);
+                         CORBA::dk_Attribute);
 
   TAO_Container_i::tmp_name_holder_ = name;
   ACE_Configuration_Section_Key new_key;
@@ -645,8 +627,7 @@ TAO_InterfaceDef_i::create_attribute_i (
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          "attrs"
-                                          ACE_ENV_ARG_PARAMETER);
+                                          "attrs");
 
   // Store the path to the attribute's type definition.
   char *type_path = TAO_IFR_Service_Utils::reference_to_path (type);
@@ -664,12 +645,10 @@ TAO_InterfaceDef_i::create_attribute_i (
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Attribute,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
+                                          this->repo_);
 
   CORBA::AttributeDef_var retval =
-    CORBA::AttributeDef::_narrow (obj.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+    CORBA::AttributeDef::_narrow (obj.in ());
 
   return retval._retn ();
 }
@@ -682,8 +661,7 @@ TAO_InterfaceDef_i::create_operation (const char *id,
                                       CORBA::OperationMode mode,
                                       const CORBA::ParDescriptionSeq &params,
                                       const CORBA::ExceptionDefSeq &exceptions,
-                                      const CORBA::ContextIdSeq &contexts
-                                      ACE_ENV_ARG_DECL)
+                                      const CORBA::ContextIdSeq &contexts)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::OperationDef::_nil ());
@@ -697,8 +675,7 @@ TAO_InterfaceDef_i::create_operation (const char *id,
                                    mode,
                                    params,
                                    exceptions,
-                                   contexts
-                                   ACE_ENV_ARG_PARAMETER);
+                                   contexts);
 }
 
 CORBA::OperationDef_ptr
@@ -709,15 +686,13 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
                                         CORBA::OperationMode mode,
                                         const CORBA::ParDescriptionSeq &params,
                                         const CORBA::ExceptionDefSeq &exceptions,
-                                        const CORBA::ContextIdSeq &contexts
-                                        ACE_ENV_ARG_DECL)
+                                        const CORBA::ContextIdSeq &contexts)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // This will throw an exception if a name clash is found.
   // create_common() will check for all other errors.
   this->check_inherited (name,
-                         CORBA::dk_Operation
-                         ACE_ENV_ARG_PARAMETER);
+                         CORBA::dk_Operation);
 
   TAO_Container_i::tmp_name_holder_ = name;
   ACE_Configuration_Section_Key new_key;
@@ -733,8 +708,7 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          "ops"
-                                          ACE_ENV_ARG_PARAMETER);
+                                          "ops");
 
   // Get the TypeCode for the return type.
   ACE_TString result_path (TAO_IFR_Service_Utils::reference_to_path (result));
@@ -874,12 +848,10 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Operation,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
+                                          this->repo_);
 
   CORBA::OperationDef_var retval =
-    CORBA::OperationDef::_narrow (obj.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+    CORBA::OperationDef::_narrow (obj.in ());
 
   return retval._retn ();
 }
@@ -890,7 +862,6 @@ TAO_InterfaceDef_i::interface_contents (
     ACE_Unbounded_Queue<ACE_TString> &path_queue,
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1004,8 +975,7 @@ TAO_InterfaceDef_i::interface_contents (
               base_iface.interface_contents (kind_queue,
                                              path_queue,
                                              limit_type,
-                                             exclude_inherited
-                                             ACE_ENV_ARG_PARAMETER);
+                                             exclude_inherited);
             }
         }
     }
@@ -1014,20 +984,18 @@ TAO_InterfaceDef_i::interface_contents (
 int
 TAO_InterfaceDef_i::name_clash (const char *name)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       TAO_Container_i::tmp_name_holder_ = name;
       TAO_IFR_Service_Utils::name_exists (&TAO_Container_i::same_as_tmp_name,
                                           TAO_IFR_Service_Utils::tmp_key_,
                                           TAO_IFR_Service_Utils::repo_,
-                                          CORBA::dk_Interface
-                                          ACE_ENV_ARG_PARAMETER);
+                                          CORBA::dk_Interface);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -1201,8 +1169,7 @@ TAO_InterfaceDef_i::inherited_operations (
 
 void
 TAO_InterfaceDef_i::check_inherited (const char *name,
-                                     CORBA::DefinitionKind kind
-                                     ACE_ENV_ARG_DECL)
+                                     CORBA::DefinitionKind kind)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Unbounded_Queue<ACE_Configuration_Section_Key> key_queue;
@@ -1233,8 +1200,7 @@ TAO_InterfaceDef_i::check_inherited (const char *name,
 
       if (inherited_name == name)
         {
-          ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 5,
-                                       CORBA::COMPLETED_NO));
+          throw CORBA::BAD_PARAM (CORBA::OMGVMCID | 5, CORBA::COMPLETED_NO);
         }
     }
 }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h
index 4d010fa0d48..e913e3bfed5 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h
@@ -56,86 +56,71 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void destroy_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Contained::Description *describe (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::Contained::Description *describe_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::InterfaceDefSeq *base_interfaces (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::InterfaceDefSeq *base_interfaces_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void base_interfaces (
       const CORBA::InterfaceDefSeq &base_interfaces
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void base_interfaces_i (
       const CORBA::InterfaceDefSeq &base_interfaces
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean is_a (
       const char *interface_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_a_i (
       const char *interface_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::InterfaceDef::FullInterfaceDescription *describe_interface (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::InterfaceDef::FullInterfaceDescription *describe_interface_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -145,7 +130,6 @@ public:
       const char *version,
       CORBA::IDLType_ptr type,
       CORBA::AttributeMode mode
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -155,7 +139,6 @@ public:
       const char *version,
       CORBA::IDLType_ptr type,
       CORBA::AttributeMode mode
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -168,7 +151,6 @@ public:
       const CORBA::ParDescriptionSeq &params,
       const CORBA::ExceptionDefSeq &exceptions,
       const CORBA::ContextIdSeq &contexts
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -181,7 +163,6 @@ public:
       const CORBA::ParDescriptionSeq &params,
       const CORBA::ExceptionDefSeq &exceptions,
       const CORBA::ContextIdSeq &contexts
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -190,7 +171,6 @@ public:
       ACE_Unbounded_Queue<ACE_TString> &path_queue,
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Gathers the attributes and operations of all the ancestors.
@@ -220,8 +200,7 @@ private:
   // the base interfaces.
 
   void check_inherited (const char *name,
-                        CORBA::DefinitionKind kind
-                        ACE_ENV_ARG_DECL)
+                        CORBA::DefinitionKind kind)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // When creating a new attribute, check for a clash with an inherited
   // attribute name.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp
index 2d028365215..6fe1c37dbc9 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp
@@ -32,21 +32,18 @@ TAO_LocalInterfaceDef_i::def_kind (void)
 }
 
 CORBA::Boolean
-TAO_LocalInterfaceDef_i::is_a (const char *interface_id
-                               ACE_ENV_ARG_DECL)
+TAO_LocalInterfaceDef_i::is_a (const char *interface_id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
   this->update_key ();
 
-  return this->is_a_i (interface_id
-                       ACE_ENV_ARG_PARAMETER);
+  return this->is_a_i (interface_id);
 }
 
 CORBA::Boolean
-TAO_LocalInterfaceDef_i::is_a_i (const char *interface_id
-                                 ACE_ENV_ARG_DECL)
+TAO_LocalInterfaceDef_i::is_a_i (const char *interface_id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::strcmp (interface_id, "IDL:omg.org/CORBA/LocalBase:1.0") == 0)
@@ -54,8 +51,7 @@ TAO_LocalInterfaceDef_i::is_a_i (const char *interface_id
       return 1;
     }
 
-  return this->TAO_InterfaceDef_i::is_a_i (interface_id
-                                           ACE_ENV_ARG_PARAMETER);
+  return this->TAO_InterfaceDef_i::is_a_i (interface_id);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h
index 92bfd1be945..1943789c717 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h
@@ -51,20 +51,17 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual CORBA::Boolean is_a (
       const char *interface_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_a_i (
       const char *interface_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h
index 8c178c7cf50..fd63eee2482 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h
@@ -54,32 +54,27 @@ public:
   virtual ~TAO_ModuleDef_i (void);
   // Destructor
 
-  virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::DefinitionKind def_kind ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
-  virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
-  virtual void destroy_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
-  virtual CORBA::Contained::Description *describe (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Contained::Description *describe ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
-  virtual CORBA::Contained::Description *describe_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Contained::Description *describe_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp
index 7530a0d99d9..65d533bf3c9 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp
@@ -58,8 +58,7 @@ TAO_NativeDef_i::type_i (void)
                                             name);
 
   return this->repo_->tc_factory ()->create_native_tc (id.c_str (),
-                                                       name.c_str ()
-                                                       ACE_ENV_ARG_PARAMETER);
+                                                       name.c_str ());
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h
index d6960a185e9..65776722912 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h
@@ -51,20 +51,17 @@ public:
   virtual ~TAO_NativeDef_i (void);
   // Destructor
 
-  virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::DefinitionKind def_kind ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
-  virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
-  virtual CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp
index 5b5ce177be2..cac495880e3 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp
@@ -36,7 +36,7 @@ TAO_OperationDef_i::def_kind (void)
 }
 
 CORBA::Contained::Description *
-TAO_OperationDef_i::describe (ACE_ENV_SINGLE_ARG_DECL )
+TAO_OperationDef_i::describe ( )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
@@ -47,7 +47,7 @@ TAO_OperationDef_i::describe (ACE_ENV_SINGLE_ARG_DECL )
 }
 
 CORBA::Contained::Description *
-TAO_OperationDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL )
+TAO_OperationDef_i::describe_i ( )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Contained::Description *desc_ptr = 0;
@@ -60,8 +60,7 @@ TAO_OperationDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL )
   retval->kind = this->def_kind ();
 
   CORBA::OperationDescription od;
-  this->make_description (od
-                          ACE_ENV_ARG_PARAMETER);
+  this->make_description (od);
 
   retval->value <<= od;
 
@@ -118,29 +117,24 @@ TAO_OperationDef_i::result_def_i (void)
 
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (result_path,
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
+                                              this->repo_);
 
-  return CORBA::IDLType::_narrow (obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+  return CORBA::IDLType::_narrow (obj.in ());
 }
 
 void
-TAO_OperationDef_i::result_def (CORBA::IDLType_ptr result_def
-                                ACE_ENV_ARG_DECL)
+TAO_OperationDef_i::result_def (CORBA::IDLType_ptr result_def)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->update_key ();
 
-  this->result_def_i (result_def
-                      ACE_ENV_ARG_PARAMETER);
+  this->result_def_i (result_def);
 }
 
 void
-TAO_OperationDef_i::result_def_i (CORBA::IDLType_ptr result_def
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+TAO_OperationDef_i::result_def_i (CORBA::IDLType_ptr result_def)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   char *result_path =
@@ -249,32 +243,27 @@ TAO_OperationDef_i::params_i (void)
 
       CORBA::Object_var obj =
         TAO_IFR_Service_Utils::path_to_ir_object (type_path,
-                                                  this->repo_
-                                                  ACE_ENV_ARG_PARAMETER);
+                                                  this->repo_);
 
-      retval[i].type_def = CORBA::IDLType::_narrow (obj.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
+      retval[i].type_def = CORBA::IDLType::_narrow (obj.in ());
     }
 
   return retval._retn ();
 }
 
 void
-TAO_OperationDef_i::params (const CORBA::ParDescriptionSeq &params
-                            ACE_ENV_ARG_DECL)
+TAO_OperationDef_i::params (const CORBA::ParDescriptionSeq &params)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->update_key ();
 
-  this->params_i (params
-                  ACE_ENV_ARG_PARAMETER);
+  this->params_i (params);
 }
 
 void
-TAO_OperationDef_i::params_i (const CORBA::ParDescriptionSeq &params
-                              ACE_ENV_ARG_DECL_NOT_USED)
+TAO_OperationDef_i::params_i (const CORBA::ParDescriptionSeq &params)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->remove_section (this->section_key_,
@@ -348,21 +337,18 @@ TAO_OperationDef_i::mode_i (void)
 }
 
 void
-TAO_OperationDef_i::mode (CORBA::OperationMode mode
-                          ACE_ENV_ARG_DECL)
+TAO_OperationDef_i::mode (CORBA::OperationMode mode)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->update_key ();
 
-  this->mode_i (mode
-                ACE_ENV_ARG_PARAMETER);
+  this->mode_i (mode);
 }
 
 void
-TAO_OperationDef_i::mode_i (CORBA::OperationMode mode
-                            ACE_ENV_ARG_DECL_NOT_USED)
+TAO_OperationDef_i::mode_i (CORBA::OperationMode mode)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (this->section_key_,
@@ -438,21 +424,18 @@ TAO_OperationDef_i::contexts_i (void)
 }
 
 void
-TAO_OperationDef_i::contexts (const CORBA::ContextIdSeq &contexts
-                              ACE_ENV_ARG_DECL)
+TAO_OperationDef_i::contexts (const CORBA::ContextIdSeq &contexts)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->update_key ();
 
-  this->contexts_i (contexts
-                    ACE_ENV_ARG_PARAMETER);
+  this->contexts_i (contexts);
 }
 
 void
-TAO_OperationDef_i::contexts_i (const CORBA::ContextIdSeq &contexts
-                                ACE_ENV_ARG_DECL_NOT_USED)
+TAO_OperationDef_i::contexts_i (const CORBA::ContextIdSeq &contexts)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->remove_section (this->section_key_,
@@ -480,7 +463,7 @@ TAO_OperationDef_i::contexts_i (const CORBA::ContextIdSeq &contexts
 }
 
 CORBA::ExceptionDefSeq *
-TAO_OperationDef_i::exceptions (ACE_ENV_SINGLE_ARG_DECL )
+TAO_OperationDef_i::exceptions ( )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
@@ -491,7 +474,7 @@ TAO_OperationDef_i::exceptions (ACE_ENV_SINGLE_ARG_DECL )
 }
 
 CORBA::ExceptionDefSeq *
-TAO_OperationDef_i::exceptions_i (ACE_ENV_SINGLE_ARG_DECL )
+TAO_OperationDef_i::exceptions_i ( )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Configuration_Section_Key excepts_key;
@@ -548,32 +531,27 @@ TAO_OperationDef_i::exceptions_i (ACE_ENV_SINGLE_ARG_DECL )
       CORBA::Object_var obj =
         TAO_IFR_Service_Utils::create_objref (CORBA::dk_Exception,
                                               path.c_str (),
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
+                                              this->repo_);
 
-      retval[i] = CORBA::ExceptionDef::_narrow (obj.in ()
-                                               ACE_ENV_ARG_PARAMETER);
+      retval[i] = CORBA::ExceptionDef::_narrow (obj.in ());
     }
 
   return retval._retn ();
 }
 
 void
-TAO_OperationDef_i::exceptions (const CORBA::ExceptionDefSeq &exceptions
-                                ACE_ENV_ARG_DECL)
+TAO_OperationDef_i::exceptions (const CORBA::ExceptionDefSeq &exceptions)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->update_key ();
 
-  this->exceptions_i (exceptions
-                      ACE_ENV_ARG_PARAMETER);
+  this->exceptions_i (exceptions);
 }
 
 void
-TAO_OperationDef_i::exceptions_i (const CORBA::ExceptionDefSeq &exceptions
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+TAO_OperationDef_i::exceptions_i (const CORBA::ExceptionDefSeq &exceptions)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->remove_section (this->section_key_,
@@ -588,8 +566,7 @@ TAO_OperationDef_i::exceptions_i (const CORBA::ExceptionDefSeq &exceptions
 
 void
 TAO_OperationDef_i::make_description (
-    CORBA::OperationDescription &od
-    ACE_ENV_ARG_DECL)
+    CORBA::OperationDescription &od)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   od.name = this->name_i ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h
index cd44958f558..c8b9bbf4a30 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h
@@ -51,124 +51,98 @@ public:
   virtual ~TAO_OperationDef_i (void);
   // Destructor
 
-  virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::DefinitionKind def_kind ()
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
-  virtual CORBA::Contained::Description *describe (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Contained::Description *describe ()
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
-  virtual CORBA::Contained::Description *describe_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Contained::Description *describe_i ()
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
-  virtual CORBA::TypeCode_ptr result (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr result ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::TypeCode_ptr result_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::TypeCode_ptr result_i ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::IDLType_ptr result_def (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::IDLType_ptr result_def ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::IDLType_ptr result_def_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::IDLType_ptr result_def_i ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void result_def (
-      CORBA::IDLType_ptr result_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::IDLType_ptr result_def)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result_def_i (
-      CORBA::IDLType_ptr result_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::IDLType_ptr result_def)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::ParDescriptionSeq *params (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::ParDescriptionSeq *params ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::ParDescriptionSeq *params_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::ParDescriptionSeq *params_i ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void params (
-      const CORBA::ParDescriptionSeq &params
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CORBA::ParDescriptionSeq &params)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void params_i (
-      const CORBA::ParDescriptionSeq &params
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CORBA::ParDescriptionSeq &params)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::OperationMode mode (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::OperationMode mode ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::OperationMode mode_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::OperationMode mode_i ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void mode (
-      CORBA::OperationMode mode
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::OperationMode mode)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void mode_i (
-      CORBA::OperationMode mode
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::OperationMode mode)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::ContextIdSeq *contexts (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::ContextIdSeq *contexts ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::ContextIdSeq *contexts_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::ContextIdSeq *contexts_i ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void contexts (
-      const CORBA::ContextIdSeq &contexts
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CORBA::ContextIdSeq &contexts)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void contexts_i (
-      const CORBA::ContextIdSeq &contexts
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CORBA::ContextIdSeq &contexts)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::ExceptionDefSeq *exceptions (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::ExceptionDefSeq *exceptions ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::ExceptionDefSeq *exceptions_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::ExceptionDefSeq *exceptions_i ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void exceptions (
-      const CORBA::ExceptionDefSeq &exceptions
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CORBA::ExceptionDefSeq &exceptions)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void exceptions_i (
-      const CORBA::ExceptionDefSeq &exceptions
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CORBA::ExceptionDefSeq &exceptions)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Common code for containers to call in
   // making descriptions.
 
-  void make_description (CORBA::OperationDescription &desc
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void make_description (CORBA::OperationDescription &desc)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr type_i (void)
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp
index 600ccada59f..2443d8c68f9 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp
@@ -39,8 +39,7 @@ void
 TAO_PrimitiveDef_i::destroy_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 2,
-                                   CORBA::COMPLETED_NO));
+  throw CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
 }
 
 CORBA::TypeCode_ptr
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h
index 05103c5c7ed..8214d91f77c 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h
@@ -50,43 +50,36 @@ public:
   virtual ~TAO_PrimitiveDef_i (void);
   // Destructor.
 
-  virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::DefinitionKind def_kind ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
-  virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // May not be called on a primitive kind - raises BAD_INV_ORDER.
 
-  virtual void destroy_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Must implement this here because it's pure virtual in the
   // base class.
 
-  virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
-  virtual CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PrimitiveKind kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PrimitiveKind kind ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::PrimitiveKind kind_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::PrimitiveKind kind_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp
index af098640b65..b4340673544 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp
@@ -54,7 +54,6 @@ TAO_ProvidesDef_i::describe_i (void)
                                              pd,
                                              this->repo_,
                                              this->section_key_
-                                             ACE_ENV_ARG_PARAMETER
                                            );
 
   ACE_TString base_type_id;
@@ -97,17 +96,14 @@ TAO_ProvidesDef_i::interface_type_i (void)
                                             holder);
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (holder,
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
+                                              this->repo_);
 
-  return CORBA::InterfaceDef::_narrow (obj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+  return CORBA::InterfaceDef::_narrow (obj.in ());
 }
 
 void
 TAO_ProvidesDef_i::interface_type (
     CORBA::InterfaceDef_ptr interface_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -115,14 +111,12 @@ TAO_ProvidesDef_i::interface_type (
 
   this->update_key ();
 
-  this->interface_type_i (interface_type
-                          ACE_ENV_ARG_PARAMETER);
+  this->interface_type_i (interface_type);
 }
 
 void
 TAO_ProvidesDef_i::interface_type_i (
     CORBA::InterfaceDef_ptr interface_type
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h
index e07923a3fee..26e284cb89a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h
@@ -50,42 +50,35 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual CORBA::Contained::Description *describe (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::Contained::Description *describe_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::InterfaceDef_ptr interface_type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::InterfaceDef_ptr interface_type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void interface_type (
       CORBA::InterfaceDef_ptr interface_type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void interface_type_i (
       CORBA::InterfaceDef_ptr interface_type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h
index 613bc9010e1..ca8407fb2c4 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h
@@ -52,7 +52,6 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
index 4a14f2ed549..734634884f7 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
@@ -49,24 +49,20 @@ void
 TAO_Repository_i::destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 2,
-                                   CORBA::COMPLETED_NO));
+  throw CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
 }
 
 CORBA::Contained_ptr
-TAO_Repository_i::lookup_id (const char *search_id
-                             ACE_ENV_ARG_DECL)
+TAO_Repository_i::lookup_id (const char *search_id)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::Contained::_nil ());
 
-  return this->lookup_id_i (search_id
-                            ACE_ENV_ARG_PARAMETER);
+  return this->lookup_id_i (search_id);
 }
 
 CORBA::Contained_ptr
-TAO_Repository_i::lookup_id_i (const char *search_id
-                               ACE_ENV_ARG_DECL)
+TAO_Repository_i::lookup_id_i (const char *search_id)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::strcmp (search_id, "IDL:omg.org/CORBA/Object:1.0") == 0
@@ -100,27 +96,22 @@ TAO_Repository_i::lookup_id_i (const char *search_id
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (def_kind,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
+                                          this->repo_);
 
-  return CORBA::Contained::_narrow (obj.in ()
-                                   ACE_ENV_ARG_PARAMETER);
+  return CORBA::Contained::_narrow (obj.in ());
 }
 
 CORBA::TypeCode_ptr
-TAO_Repository_i::get_canonical_typecode (CORBA::TypeCode_ptr tc
-                                          ACE_ENV_ARG_DECL)
+TAO_Repository_i::get_canonical_typecode (CORBA::TypeCode_ptr tc)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->get_canonical_typecode_i (tc
-                                         ACE_ENV_ARG_PARAMETER);
+  return this->get_canonical_typecode_i (tc);
 }
 
 CORBA::TypeCode_ptr
-TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc
-                                            ACE_ENV_ARG_DECL)
+TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::TCKind kind = tc->kind ();
@@ -139,12 +130,10 @@ TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc
       CORBA::TypeCode_var ctype = tc->content_type ();
 
       CORBA::TypeCode_var canon_ctype =
-        this->get_canonical_typecode_i (ctype.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+        this->get_canonical_typecode_i (ctype.in ());
 
       return this->tc_factory ()->create_array_tc (length,
-                                                   canon_ctype.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
+                                                   canon_ctype.in ());
     }
     case CORBA::tk_sequence:
     {
@@ -153,12 +142,10 @@ TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc
       CORBA::TypeCode_var ctype = tc->content_type ();
 
       CORBA::TypeCode_var canon_ctype =
-        this->get_canonical_typecode_i (ctype.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+        this->get_canonical_typecode_i (ctype.in ());
 
       return this->tc_factory ()->create_sequence_tc (length,
-                                                      canon_ctype.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
+                                                      canon_ctype.in ());
     }
     case CORBA::tk_alias:
     case CORBA::tk_objref:
@@ -214,8 +201,7 @@ TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc
 }
 
 CORBA::PrimitiveDef_ptr
-TAO_Repository_i::get_primitive (CORBA::PrimitiveKind kind
-                                 ACE_ENV_ARG_DECL)
+TAO_Repository_i::get_primitive (CORBA::PrimitiveKind kind)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString obj_id ("pkinds\\");
@@ -225,27 +211,22 @@ TAO_Repository_i::get_primitive (CORBA::PrimitiveKind kind
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Primitive,
                                           obj_id.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
+                                          this->repo_);
 
-  return CORBA::PrimitiveDef::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+  return CORBA::PrimitiveDef::_narrow (obj.in ());
 }
 
 CORBA::StringDef_ptr
-TAO_Repository_i::create_string (CORBA::ULong bound
-                                 ACE_ENV_ARG_DECL)
+TAO_Repository_i::create_string (CORBA::ULong bound)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::StringDef::_nil ());
 
-  return this->create_string_i (bound
-                                ACE_ENV_ARG_PARAMETER);
+  return this->create_string_i (bound);
 }
 
 CORBA::StringDef_ptr
-TAO_Repository_i::create_string_i (CORBA::ULong bound
-                                   ACE_ENV_ARG_DECL)
+TAO_Repository_i::create_string_i (CORBA::ULong bound)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int count = 0;
@@ -284,27 +265,22 @@ TAO_Repository_i::create_string_i (CORBA::ULong bound
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_String,
                                           obj_id.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
+                                          this->repo_);
 
-  return CORBA::StringDef::_narrow (obj.in ()
-                                   ACE_ENV_ARG_PARAMETER);
+  return CORBA::StringDef::_narrow (obj.in ());
 }
 
 CORBA::WstringDef_ptr
-TAO_Repository_i::create_wstring (CORBA::ULong bound
-                                  ACE_ENV_ARG_DECL)
+TAO_Repository_i::create_wstring (CORBA::ULong bound)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::WstringDef::_nil ());
 
-  return this->create_wstring_i (bound
-                                 ACE_ENV_ARG_PARAMETER);
+  return this->create_wstring_i (bound);
 }
 
 CORBA::WstringDef_ptr
-TAO_Repository_i::create_wstring_i (CORBA::ULong bound
-                                    ACE_ENV_ARG_DECL)
+TAO_Repository_i::create_wstring_i (CORBA::ULong bound)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int count = 0;
@@ -343,30 +319,25 @@ TAO_Repository_i::create_wstring_i (CORBA::ULong bound
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Wstring,
                                                obj_id.c_str (),
-                                               this->repo_
-                                               ACE_ENV_ARG_PARAMETER);
+                                               this->repo_);
 
-  return CORBA::WstringDef::_narrow (obj.in ()
-                                    ACE_ENV_ARG_PARAMETER);
+  return CORBA::WstringDef::_narrow (obj.in ());
 }
 
 CORBA::SequenceDef_ptr
 TAO_Repository_i::create_sequence (CORBA::ULong bound,
-                                   CORBA::IDLType_ptr element_type
-                                   ACE_ENV_ARG_DECL)
+                                   CORBA::IDLType_ptr element_type)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::SequenceDef::_nil ());
 
   return this->create_sequence_i (bound,
-                                  element_type
-                                  ACE_ENV_ARG_PARAMETER);
+                                  element_type);
 }
 
 CORBA::SequenceDef_ptr
 TAO_Repository_i::create_sequence_i (CORBA::ULong bound,
-                                     CORBA::IDLType_ptr element_type
-                                     ACE_ENV_ARG_DECL)
+                                     CORBA::IDLType_ptr element_type)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int count = 0;
@@ -416,30 +387,25 @@ TAO_Repository_i::create_sequence_i (CORBA::ULong bound,
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Sequence,
                                           obj_id.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
+                                          this->repo_);
 
-  return CORBA::SequenceDef::_narrow (obj.in ()
-                                     ACE_ENV_ARG_PARAMETER);
+  return CORBA::SequenceDef::_narrow (obj.in ());
 }
 
 CORBA::ArrayDef_ptr
 TAO_Repository_i::create_array (CORBA::ULong length,
-                                CORBA::IDLType_ptr element_type
-                                ACE_ENV_ARG_DECL)
+                                CORBA::IDLType_ptr element_type)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ArrayDef::_nil ());
 
   return this->create_array_i (length,
-                               element_type
-                               ACE_ENV_ARG_PARAMETER);
+                               element_type);
 }
 
 CORBA::ArrayDef_ptr
 TAO_Repository_i::create_array_i (CORBA::ULong length,
-                                  CORBA::IDLType_ptr element_type
-                                  ACE_ENV_ARG_DECL)
+                                  CORBA::IDLType_ptr element_type)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int count = 0;
@@ -489,30 +455,26 @@ TAO_Repository_i::create_array_i (CORBA::ULong length,
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Array,
                                           obj_id.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
+                                          this->repo_);
 
-  return CORBA::ArrayDef::_narrow (obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+  return CORBA::ArrayDef::_narrow (obj.in ());
 }
 
 CORBA::FixedDef_ptr
 TAO_Repository_i::create_fixed (CORBA::UShort digits,
-                                CORBA::Short scale
-                                ACE_ENV_ARG_DECL)
+                                CORBA::Short scale)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::FixedDef::_nil ());
 
   return this->create_fixed_i (digits,
-                               scale
-                               ACE_ENV_ARG_PARAMETER);
+                               scale);
 }
 
 CORBA::FixedDef_ptr
 TAO_Repository_i::create_fixed_i (CORBA::UShort /* digits */,
                                   CORBA::Short /* scale */
-                                  ACE_ENV_ARG_DECL)
+                                  )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::FixedDef::_nil ());
@@ -520,8 +482,7 @@ TAO_Repository_i::create_fixed_i (CORBA::UShort /* digits */,
 
 int
 TAO_Repository_i::repo_init (CORBA::Repository_ptr repo_ref,
-                             PortableServer::POA_ptr repo_poa
-                             ACE_ENV_ARG_DECL)
+                             PortableServer::POA_ptr repo_poa)
 {
   this->repo_objref_ = repo_ref;
   this->repo_poa_ = repo_poa;
@@ -542,14 +503,12 @@ TAO_Repository_i::repo_init (CORBA::Repository_ptr repo_ref,
 
   // Resolve and narrow the TypeCodeFactory.
   CORBA::Object_var object =
-    this->orb_->resolve_initial_references ("TypeCodeFactory"
-                                            ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references ("TypeCodeFactory");
 
   if (!CORBA::is_nil (object.in ()))
     {
       this->tc_factory_ =
-        CORBA::TypeCodeFactory::_narrow (object.in ()
-                                         ACE_ENV_ARG_PARAMETER);
+        CORBA::TypeCodeFactory::_narrow (object.in ());
 
       if (CORBA::is_nil (this->tc_factory_.in ()))
         ACE_ERROR_RETURN ((
@@ -571,14 +530,12 @@ TAO_Repository_i::repo_init (CORBA::Repository_ptr repo_ref,
 
   // Resolve and narrow the POACurrent object.
   object =
-    this->orb_->resolve_initial_references ("POACurrent"
-                                            ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references ("POACurrent");
 
   if (!CORBA::is_nil (object.in ()))
     {
       this->poa_current_ =
-        PortableServer::Current::_narrow (object.in ()
-                                          ACE_ENV_ARG_PARAMETER);
+        PortableServer::Current::_narrow (object.in ());
 
       if (CORBA::is_nil (this->poa_current_.in ()))
         ACE_ERROR_RETURN ((
@@ -752,33 +709,28 @@ TAO_Repository_i::create_servants_and_poas (void)
 
   // ID Assignment Policy.
   policies[0] =
-    this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID
-                                                  ACE_ENV_ARG_PARAMETER);
+    this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID);
 
   // Lifespan Policy.
   policies[1] =
-    this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT
-                                             ACE_ENV_ARG_PARAMETER);
+    this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT);
 
   // Request Processing Policy.
   policies[2] =
     this->root_poa_->create_request_processing_policy (
         PortableServer::USE_DEFAULT_SERVANT
-        ACE_ENV_ARG_PARAMETER
       );
 
   // Servant Retention Policy.
   policies[3] =
     this->root_poa_->create_servant_retention_policy (
         PortableServer::NON_RETAIN
-        ACE_ENV_ARG_PARAMETER
       );
 
   // Id Uniqueness Policy.
   policies[4] =
     this->root_poa_->create_id_uniqueness_policy (
         PortableServer::MULTIPLE_ID
-        ACE_ENV_ARG_PARAMETER
       );
 
   PortableServer::POAManager_var poa_manager =
@@ -788,8 +740,7 @@ TAO_Repository_i::create_servants_and_poas (void)
   this-> name ## _poa_ = \
     this->root_poa_->create_POA (#name "_poa", \
                                  poa_manager.in (), \
-                                 policies \
-                                 ACE_ENV_ARG_PARAMETER); \
+                                 policies); \
 \
   TAO_ ## name ## _i * name ## _impl = 0; \
   ACE_NEW_RETURN (name ## _impl, \
@@ -805,8 +756,7 @@ TAO_Repository_i::create_servants_and_poas (void)
   PortableServer::ServantBase_var name ## _safety ( \
       this-> name ## _servant_ \
     ); \
-  this-> name ## _poa_->set_servant (this-> name ## _servant_ \
-                                     ACE_ENV_ARG_PARAMETER); \
+  this-> name ## _poa_->set_servant (this-> name ## _servant_);
 
   CONCRETE_IR_OBJECT_TYPES
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h
index 3c58bccb6b5..87cf86d6f10 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h
@@ -84,44 +84,37 @@ public:
   virtual ~TAO_Repository_i (void);
 
   virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Accessor for the readonly attribute.
 
   virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // May not be called on a repository - raises BAD_INV_ORDER.
 
   virtual CORBA::Contained_ptr lookup_id (
       const char *search_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Contained_ptr lookup_id_i (
       const char *search_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr get_canonical_typecode (
       CORBA::TypeCode_ptr tc
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr get_canonical_typecode_i (
       CORBA::TypeCode_ptr tc
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::PrimitiveDef_ptr get_primitive (
       CORBA::PrimitiveKind kind
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // No locking necessary because the database is not
@@ -129,73 +122,62 @@ public:
 
   virtual CORBA::StringDef_ptr create_string (
       CORBA::ULong bound
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::StringDef_ptr create_string_i (
-      CORBA::ULong bound
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::ULong bound)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::WstringDef_ptr create_wstring (
       CORBA::ULong bound
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::WstringDef_ptr create_wstring_i (
       CORBA::ULong bound
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::SequenceDef_ptr create_sequence (
       CORBA::ULong bound,
       CORBA::IDLType_ptr element_type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC (( CORBA::SystemException));
 
   CORBA::SequenceDef_ptr create_sequence_i (
       CORBA::ULong bound,
       CORBA::IDLType_ptr element_type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC (( CORBA::SystemException));
 
   virtual CORBA::ArrayDef_ptr create_array (
       CORBA::ULong length,
       CORBA::IDLType_ptr element_type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ArrayDef_ptr create_array_i (
       CORBA::ULong length,
       CORBA::IDLType_ptr element_type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::FixedDef_ptr create_fixed (
       CORBA::UShort digits,
       CORBA::Short scale
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::FixedDef_ptr create_fixed_i (
       CORBA::UShort digits,
       CORBA::Short scale
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   int repo_init (CORBA::Repository_ptr repo_ref,
-                 PortableServer::POA_ptr repo_poa
-                 ACE_ENV_ARG_DECL);
+                 PortableServer::POA_ptr repo_poa);
   // Called at startup to get everything initialized.
 
   virtual int create_servants_and_poas (void);
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp
index fb74b1d975b..1b96ebf5d1d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp
@@ -84,7 +84,6 @@ TAO_SequenceDef_i::type_i (void)
   return this->repo_->tc_factory ()->create_sequence_tc (
                                          bound,
                                          element_typecode.in ()
-                                         ACE_ENV_ARG_PARAMETER
                                        );
 }
 
@@ -112,19 +111,16 @@ TAO_SequenceDef_i::bound_i (void)
 }
 
 void
-TAO_SequenceDef_i::bound (CORBA::ULong bound
-                          ACE_ENV_ARG_DECL)
+TAO_SequenceDef_i::bound (CORBA::ULong bound)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->bound_i (bound
-                 ACE_ENV_ARG_PARAMETER);
+  this->bound_i (bound);
 }
 
 void
-TAO_SequenceDef_i::bound_i (CORBA::ULong bound
-                            ACE_ENV_ARG_DECL_NOT_USED)
+TAO_SequenceDef_i::bound_i (CORBA::ULong bound)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (this->section_key_,
@@ -181,29 +177,24 @@ TAO_SequenceDef_i::element_type_def_i (void)
 
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (element_path,
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
+                                              this->repo_);
 
-  return CORBA::IDLType::_narrow (obj.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+  return CORBA::IDLType::_narrow (obj.in ());
 }
 
 void
-TAO_SequenceDef_i::element_type_def (CORBA::IDLType_ptr element_type_def
-                                     ACE_ENV_ARG_DECL)
+TAO_SequenceDef_i::element_type_def (CORBA::IDLType_ptr element_type_def)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->update_key ();
 
-  this->element_type_def_i (element_type_def
-                            ACE_ENV_ARG_PARAMETER);
+  this->element_type_def_i (element_type_def);
 }
 
 void
-TAO_SequenceDef_i::element_type_def_i (CORBA::IDLType_ptr element_type_def
-                                       ACE_ENV_ARG_DECL)
+TAO_SequenceDef_i::element_type_def_i (CORBA::IDLType_ptr element_type_def)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->destroy_element_type ();
@@ -217,8 +208,7 @@ TAO_SequenceDef_i::element_type_def_i (CORBA::IDLType_ptr element_type_def
 }
 
 void
-TAO_SequenceDef_i::destroy_element_type (
-      ACE_ENV_SINGLE_ARG_DECL)
+TAO_SequenceDef_i::destroy_element_type ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString element_path;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h
index cbed0039d88..9189728fcce 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h
@@ -50,92 +50,76 @@ public:
   virtual ~TAO_SequenceDef_i (void);
   // Destructor
 
-  virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::DefinitionKind def_kind ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
-  virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
-  virtual void destroy_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
-  virtual CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
-  virtual CORBA::ULong bound (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::ULong bound ()
 
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::ULong bound_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::ULong bound_i ()
 
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void bound (
-      CORBA::ULong bound
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::ULong bound)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void bound_i (
-      CORBA::ULong bound
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::ULong bound)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::TypeCode_ptr element_type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr element_type ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::TypeCode_ptr element_type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::TypeCode_ptr element_type_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::IDLType_ptr element_type_def (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::IDLType_ptr element_type_def ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::IDLType_ptr element_type_def_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::IDLType_ptr element_type_def_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void element_type_def (
-      CORBA::IDLType_ptr element_type_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::IDLType_ptr element_type_def)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void element_type_def_i (
-      CORBA::IDLType_ptr element_type_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::IDLType_ptr element_type_def)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
-  void destroy_element_type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void destroy_element_type ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Destroys an anonymous non-primitive element type.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp
index 10eff46d8b3..28fb4b79870 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp
@@ -73,7 +73,6 @@ TAO_StringDef_i::type_i (void)
 
   return this->repo_->tc_factory ()->create_string_tc (
                                          bound
-                                         ACE_ENV_ARG_PARAMETER
                                        );
 }
 
@@ -101,21 +100,18 @@ TAO_StringDef_i::bound_i (void)
 }
 
 void
-TAO_StringDef_i::bound (CORBA::ULong bound
-                        ACE_ENV_ARG_DECL)
+TAO_StringDef_i::bound (CORBA::ULong bound)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->update_key ();
 
-  this->bound_i (bound
-                 ACE_ENV_ARG_PARAMETER);
+  this->bound_i (bound);
 }
 
 void
-TAO_StringDef_i::bound_i (CORBA::ULong bound
-                          ACE_ENV_ARG_DECL_NOT_USED)
+TAO_StringDef_i::bound_i (CORBA::ULong bound)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (this->section_key_,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h
index 5f1e402b8ce..f6bb6c00a8a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h
@@ -51,54 +51,45 @@ public:
   virtual ~TAO_StringDef_i (void);
   // Destructor.
 
-  virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::DefinitionKind def_kind ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
-  virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
-  virtual void destroy_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
-  virtual CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
-  virtual CORBA::ULong bound (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::ULong bound ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::ULong bound_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::ULong bound_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void bound (
-      CORBA::ULong bound
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::ULong bound)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void bound_i (
-      CORBA::ULong bound
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::ULong bound)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp
index 5962494a08a..3050169c3fa 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp
@@ -86,7 +86,7 @@ TAO_StructDef_i::type_i (void)
 
   if (TAO_RecursiveDef_OuterScopes::SeenBefore( id ))
     return this->repo_->tc_factory ()->
-                 create_recursive_tc ( id.c_str () ACE_ENV_ARG_PARAMETER);
+                 create_recursive_tc ( id.c_str ());
 
   TAO_RecursiveDef_OuterScopes NowSeenThis( id );
 
@@ -105,8 +105,7 @@ TAO_StructDef_i::type_i (void)
 
   return this->repo_->tc_factory ()->create_struct_tc (id.c_str (),
                                                        name.c_str (),
-                                                       members.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
+                                                       members.in ());
 }
 
 CORBA::StructMemberSeq *
@@ -213,11 +212,9 @@ TAO_StructDef_i::members_i (void)
 
       obj = TAO_IFR_Service_Utils::create_objref (kind,
                                                   path.c_str (),
-                                                  this->repo_
-                                                  ACE_ENV_ARG_PARAMETER);
+                                                  this->repo_);
 
-      retval[k].type_def = CORBA::IDLType::_narrow (obj.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
+      retval[k].type_def = CORBA::IDLType::_narrow (obj.in ());
 
       this->repo_->config ()->expand_path (this->repo_->root_key (),
                                            path,
@@ -243,21 +240,18 @@ TAO_StructDef_i::members_i (void)
 }
 
 void
-TAO_StructDef_i::members (const CORBA::StructMemberSeq &members
-                          ACE_ENV_ARG_DECL)
+TAO_StructDef_i::members (const CORBA::StructMemberSeq &members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->update_key ();
 
-  this->members_i (members
-                   ACE_ENV_ARG_PARAMETER);
+  this->members_i (members);
 }
 
 void
-TAO_StructDef_i::members_i (const CORBA::StructMemberSeq &members
-                            ACE_ENV_ARG_DECL)
+TAO_StructDef_i::members_i (const CORBA::StructMemberSeq &members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our old members, both refs and defns.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h
index a679e5ff3dd..ede4b8371f8 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h
@@ -52,54 +52,45 @@ public:
   virtual ~TAO_StructDef_i (void);
   // Destructor
 
-  virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::DefinitionKind def_kind ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
-  virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry and its contents.
 
-  virtual void destroy_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
-  virtual CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
-  virtual CORBA::StructMemberSeq *members (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::StructMemberSeq *members ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::StructMemberSeq *members_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::StructMemberSeq *members_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void members (
-      const CORBA::StructMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CORBA::StructMemberSeq &members)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void members_i (
-      const CORBA::StructMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CORBA::StructMemberSeq &members)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h
index 1d836a105d2..2bf952d08ca 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h
@@ -53,14 +53,12 @@ public:
   virtual ~TAO_TypedefDef_i (void);
   // Destructor
 
-  virtual CORBA::Contained::Description *describe (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Contained::Description *describe ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
-  virtual CORBA::Contained::Description *describe_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Contained::Description *describe_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
index a683ee73fb1..2d1de15f315 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
@@ -89,7 +89,7 @@ TAO_UnionDef_i::type_i (void)
 
   if (TAO_RecursiveDef_OuterScopes::SeenBefore( id ))
     return this->repo_->tc_factory ()->
-                 create_recursive_tc ( id.c_str () ACE_ENV_ARG_PARAMETER);
+                 create_recursive_tc ( id.c_str ());
 
   TAO_RecursiveDef_OuterScopes NowSeenThis( id );
 
@@ -111,8 +111,7 @@ TAO_UnionDef_i::type_i (void)
   return this->repo_->tc_factory ()->create_union_tc (id.c_str (),
                                                       name.c_str (),
                                                       tc.in (),
-                                                      members.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
+                                                      members.in ());
 }
 
 CORBA::TypeCode_ptr
@@ -168,17 +167,14 @@ TAO_UnionDef_i::discriminator_type_def_i (void)
 
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (disc_path,
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
+                                              this->repo_);
 
-  return CORBA::IDLType::_narrow (obj.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+  return CORBA::IDLType::_narrow (obj.in ());
 }
 
 void
 TAO_UnionDef_i::discriminator_type_def (
     CORBA::IDLType_ptr discriminator_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -186,14 +182,12 @@ TAO_UnionDef_i::discriminator_type_def (
 
   this->update_key ();
 
-  this->discriminator_type_def_i (discriminator_type_def
-                                  ACE_ENV_ARG_PARAMETER);
+  this->discriminator_type_def_i (discriminator_type_def);
 }
 
 void
 TAO_UnionDef_i::discriminator_type_def_i (
     CORBA::IDLType_ptr discriminator_type_def
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -291,19 +285,16 @@ TAO_UnionDef_i::members_i (void)
       retval[k].name = name.c_str ();
 
       this->fetch_label (next_key,
-                         retval[k]
-                         ACE_ENV_ARG_PARAMETER);
+                         retval[k]);
 
       this->repo_->config ()->get_string_value (next_key,
                                                 "path",
                                                 path);
 
       obj = TAO_IFR_Service_Utils::path_to_ir_object (path,
-                                                      this->repo_
-                                                      ACE_ENV_ARG_PARAMETER);
+                                                      this->repo_);
 
-      retval[k].type_def = CORBA::IDLType::_narrow (obj.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
+      retval[k].type_def = CORBA::IDLType::_narrow (obj.in ());
 
       impl = TAO_IFR_Service_Utils::path_to_idltype (path,
                                                      this->repo_);
@@ -324,21 +315,18 @@ TAO_UnionDef_i::members_i (void)
 }
 
 void
-TAO_UnionDef_i::members (const CORBA::UnionMemberSeq &members
-                         ACE_ENV_ARG_DECL)
+TAO_UnionDef_i::members (const CORBA::UnionMemberSeq &members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->update_key ();
 
-  this->members_i (members
-                   ACE_ENV_ARG_PARAMETER);
+  this->members_i (members);
 }
 
 void
-TAO_UnionDef_i::members_i (const CORBA::UnionMemberSeq &members
-                           ACE_ENV_ARG_DECL)
+TAO_UnionDef_i::members_i (const CORBA::UnionMemberSeq &members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our old members, both refs and defns.
@@ -382,15 +370,13 @@ TAO_UnionDef_i::members_i (const CORBA::UnionMemberSeq &members
                                                 member_path);
 
       this->store_label (member_key,
-                         members[i].label
-                         ACE_ENV_ARG_PARAMETER);
+                         members[i].label);
     }
 }
 
 void
 TAO_UnionDef_i::fetch_label (const ACE_Configuration_Section_Key member_key,
-                             CORBA::UnionMember &member
-                             ACE_ENV_ARG_DECL)
+                             CORBA::UnionMember &member)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Configuration::VALUETYPE vt;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h
index feace1c2ec5..b29dba18492 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h
@@ -52,94 +52,78 @@ public:
   virtual ~TAO_UnionDef_i (void);
   // Destructor
 
-  virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::DefinitionKind def_kind ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
-  virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry and its contents.
 
-  virtual void destroy_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
-  virtual CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
-  virtual CORBA::TypeCode_ptr discriminator_type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr discriminator_type ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::TypeCode_ptr discriminator_type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::TypeCode_ptr discriminator_type_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::IDLType_ptr discriminator_type_def (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::IDLType_ptr discriminator_type_def ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::IDLType_ptr discriminator_type_def_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::IDLType_ptr discriminator_type_def_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void discriminator_type_def (
-      CORBA::IDLType_ptr discriminator_type_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::IDLType_ptr discriminator_type_def)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void discriminator_type_def_i (
-      CORBA::IDLType_ptr discriminator_type_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::IDLType_ptr discriminator_type_def)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::UnionMemberSeq *members (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::UnionMemberSeq *members ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::UnionMemberSeq *members_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::UnionMemberSeq *members_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void members (
-      const CORBA::UnionMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CORBA::UnionMemberSeq &members)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void members_i (
-      const CORBA::UnionMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CORBA::UnionMemberSeq &members)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
   void fetch_label (
       const ACE_Configuration_Section_Key member_key,
-      CORBA::UnionMember &member
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::UnionMember &member)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Used by members() to get each member's label value.
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp
index b32ebb03d35..c9505d4e842 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp
@@ -52,7 +52,6 @@ TAO_UsesDef_i::describe_i (void)
                                          ud,
                                          this->repo_,
                                          this->section_key_
-                                         ACE_ENV_ARG_PARAMETER
                                        );
 
   ACE_TString base_type_id;
@@ -96,17 +95,14 @@ TAO_UsesDef_i::interface_type_i (void)
                                             holder);
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (holder,
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
+                                              this->repo_);
 
-  return CORBA::InterfaceDef::_narrow (obj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+  return CORBA::InterfaceDef::_narrow (obj.in ());
 }
 
 void
 TAO_UsesDef_i::interface_type (
     CORBA::InterfaceDef_ptr interface_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -114,14 +110,12 @@ TAO_UsesDef_i::interface_type (
 
   this->update_key ();
 
-  this->interface_type_i (interface_type
-                          ACE_ENV_ARG_PARAMETER);
+  this->interface_type_i (interface_type);
 }
 
 void
 TAO_UsesDef_i::interface_type_i (
     CORBA::InterfaceDef_ptr interface_type
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -179,7 +173,6 @@ TAO_UsesDef_i::is_multiple_i (void)
 void
 TAO_UsesDef_i::is_multiple (
     CORBA::Boolean is_multiple
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -187,14 +180,12 @@ TAO_UsesDef_i::is_multiple (
 
   this->update_key ();
 
-  this->is_multiple_i (is_multiple
-                       ACE_ENV_ARG_PARAMETER);
+  this->is_multiple_i (is_multiple);
 }
 
 void
 TAO_UsesDef_i::is_multiple_i (
     CORBA::Boolean is_multiple
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h
index c0daa00be10..7041e0200d1 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h
@@ -51,64 +51,53 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual CORBA::Contained::Description *describe (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::Contained::Description *describe_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::InterfaceDef_ptr interface_type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void interface_type (
       CORBA::InterfaceDef_ptr interface_type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void interface_type_i (
       CORBA::InterfaceDef_ptr interface_type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::InterfaceDef_ptr interface_type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean is_multiple (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_multiple_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void is_multiple (
       CORBA::Boolean is_multiple
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void is_multiple_i (
       CORBA::Boolean is_multiple
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp
index 6398e72e4d9..286aefa3e47 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp
@@ -73,8 +73,7 @@ TAO_ValueBoxDef_i::type_i (void)
 
   return this->repo_->tc_factory ()->create_value_box_tc (id.c_str (),
                                                           name.c_str (),
-                                                          tc.in ()
-                                                          ACE_ENV_ARG_PARAMETER);
+                                                          tc.in ());
 }
 
 CORBA::IDLType_ptr
@@ -99,29 +98,24 @@ TAO_ValueBoxDef_i::original_type_def_i (void)
 
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (boxed_type_path,
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
+                                              this->repo_);
 
-  return CORBA::IDLType::_narrow (obj.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+  return CORBA::IDLType::_narrow (obj.in ());
 }
 
 void
-TAO_ValueBoxDef_i::original_type_def (CORBA::IDLType_ptr original_type_def
-                                      ACE_ENV_ARG_DECL)
+TAO_ValueBoxDef_i::original_type_def (CORBA::IDLType_ptr original_type_def)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->update_key ();
 
-  this->original_type_def_i (original_type_def
-                             ACE_ENV_ARG_PARAMETER);
+  this->original_type_def_i (original_type_def);
 }
 
 void
-TAO_ValueBoxDef_i::original_type_def_i (CORBA::IDLType_ptr original_type_def
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+TAO_ValueBoxDef_i::original_type_def_i (CORBA::IDLType_ptr original_type_def)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   char *boxed_type =
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h
index 9fd68ca1cc8..ae7d26a8803 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h
@@ -51,43 +51,36 @@ public:
   virtual ~TAO_ValueBoxDef_i (void);
   // Destructor
 
-  virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::DefinitionKind def_kind ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
-  virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
-  virtual CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
-  virtual CORBA::IDLType_ptr original_type_def (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::IDLType_ptr original_type_def ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::IDLType_ptr original_type_def_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::IDLType_ptr original_type_def_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void original_type_def (
-      CORBA::IDLType_ptr original_type_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::IDLType_ptr original_type_def)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void original_type_def_i (
-      CORBA::IDLType_ptr original_type_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::IDLType_ptr original_type_def)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
index 69e9baa58db..f7c7b9dbdd2 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
@@ -60,14 +60,12 @@ TAO_ValueDef_i::destroy_i (void)
       "attrs",
       this->repo_,
       this->section_key_
-      ACE_ENV_ARG_PARAMETER
     );
 
   TAO_IFR_Generic_Utils<TAO_OperationDef_i>::destroy_special (
       "ops",
       this->repo_,
       this->section_key_
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -92,8 +90,7 @@ TAO_ValueDef_i::describe_i (void)
                   0);
   CORBA::ValueDescription_var safe_vd = vd;
 
-  this->fill_value_description (safe_vd.inout ()
-                                ACE_ENV_ARG_PARAMETER);
+  this->fill_value_description (safe_vd.inout ());
 
   CORBA::Contained::Description *cd = 0;
   ACE_NEW_RETURN (cd,
@@ -126,8 +123,7 @@ TAO_ValueDef_i::type_i (void)
   /// avoid this problem, the recursion is moved to a static utility
   /// function.
   return TAO_IFR_Service_Utils::gen_valuetype_tc_r (this->section_key_,
-                                                    this->repo_
-                                                    ACE_ENV_ARG_PARAMETER);
+                                                    this->repo_);
 }
 
 CORBA::InterfaceDefSeq *
@@ -183,11 +179,9 @@ TAO_ValueDef_i::supported_interfaces_i (void)
                                                 holder.fast_rep (),
                                                 holder);
       obj = TAO_IFR_Service_Utils::path_to_ir_object (holder,
-                                                      this->repo_
-                                                      ACE_ENV_ARG_PARAMETER);
+                                                      this->repo_);
 
-      retval[i] = CORBA::InterfaceDef::_narrow (obj.in ()
-                                                ACE_ENV_ARG_PARAMETER);
+      retval[i] = CORBA::InterfaceDef::_narrow (obj.in ());
     }
 
   return retval._retn ();
@@ -196,7 +190,6 @@ TAO_ValueDef_i::supported_interfaces_i (void)
 void
 TAO_ValueDef_i::supported_interfaces (
     const CORBA::InterfaceDefSeq &supported_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -204,14 +197,12 @@ TAO_ValueDef_i::supported_interfaces (
 
   this->update_key ();
 
-  this->supported_interfaces_i (supported_interfaces
-                                ACE_ENV_ARG_PARAMETER);
+  this->supported_interfaces_i (supported_interfaces);
 }
 
 void
 TAO_ValueDef_i::supported_interfaces_i (
     const CORBA::InterfaceDefSeq &supported_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -263,8 +254,9 @@ TAO_ValueDef_i::supported_interfaces_i (
             }
           else
             {
-              ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 12,
-                                           CORBA::COMPLETED_NO));
+              throw CORBA::BAD_PARAM (
+                CORBA::OMGVMCID | 12,
+                CORBA::COMPLETED_NO);
               return;
             }
         }
@@ -272,8 +264,7 @@ TAO_ValueDef_i::supported_interfaces_i (
       TAO_IFR_Service_Utils::name_exists (&TAO_ValueDef_i::name_clash,
                                           this->section_key_,
                                           this->repo_,
-                                          CORBA::dk_Value
-                                          ACE_ENV_ARG_PARAMETER);
+                                          CORBA::dk_Value);
 
       stringified = TAO_IFR_Service_Utils::int_to_string (i);
       supported_id = supported_interfaces[i]->_interface_repository_id ();
@@ -378,12 +369,10 @@ TAO_ValueDef_i::initializers_i (void)
 
           obj =
             TAO_IFR_Service_Utils::path_to_ir_object (holder,
-                                                      this->repo_
-                                                      ACE_ENV_ARG_PARAMETER);
+                                                      this->repo_);
 
           retval[i].members[j].type_def =
-            CORBA::IDLType::_narrow (obj.in ()
-                                     ACE_ENV_ARG_PARAMETER);
+            CORBA::IDLType::_narrow (obj.in ());
         }
     }
 
@@ -391,21 +380,18 @@ TAO_ValueDef_i::initializers_i (void)
 }
 
 void
-TAO_ValueDef_i::initializers (const CORBA::InitializerSeq &initializers
-                              ACE_ENV_ARG_DECL)
+TAO_ValueDef_i::initializers (const CORBA::InitializerSeq &initializers)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->update_key ();
 
-  this->initializers_i (initializers
-                        ACE_ENV_ARG_PARAMETER);
+  this->initializers_i (initializers);
 }
 
 void
-TAO_ValueDef_i::initializers_i (const CORBA::InitializerSeq &initializers
-                                ACE_ENV_ARG_DECL_NOT_USED)
+TAO_ValueDef_i::initializers_i (const CORBA::InitializerSeq &initializers)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->remove_section (this->section_key_,
@@ -449,29 +435,24 @@ TAO_ValueDef_i::base_value_i (void)
                                             holder);
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (holder,
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
+                                              this->repo_);
 
-  return CORBA::ValueDef::_narrow (obj.in ()
-                                   ACE_ENV_ARG_PARAMETER);
+  return CORBA::ValueDef::_narrow (obj.in ());
 }
 
 void
-TAO_ValueDef_i::base_value (CORBA::ValueDef_ptr base_value
-                            ACE_ENV_ARG_DECL)
+TAO_ValueDef_i::base_value (CORBA::ValueDef_ptr base_value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->update_key ();
 
-  this->base_value_i (base_value
-                      ACE_ENV_ARG_PARAMETER);
+  this->base_value_i (base_value);
 }
 
 void
-TAO_ValueDef_i::base_value_i (CORBA::ValueDef_ptr base_value
-                              ACE_ENV_ARG_DECL)
+TAO_ValueDef_i::base_value_i (CORBA::ValueDef_ptr base_value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (base_value))
@@ -496,8 +477,7 @@ TAO_ValueDef_i::base_value_i (CORBA::ValueDef_ptr base_value
   TAO_IFR_Service_Utils::name_exists (&TAO_ValueDef_i::name_clash,
                                       this->section_key_,
                                       this->repo_,
-                                      CORBA::dk_Value
-                                      ACE_ENV_ARG_PARAMETER);
+                                      CORBA::dk_Value);
 
   this->repo_->config ()->set_string_value (
                               this->section_key_,
@@ -559,11 +539,9 @@ TAO_ValueDef_i::abstract_base_values_i (void)
                                                 holder.fast_rep (),
                                                 holder);
       obj = TAO_IFR_Service_Utils::path_to_ir_object (holder,
-                                                      this->repo_
-                                                      ACE_ENV_ARG_PARAMETER);
+                                                      this->repo_);
 
-      retval[i] = CORBA::ValueDef::_narrow (obj.in ()
-                                            ACE_ENV_ARG_PARAMETER);
+      retval[i] = CORBA::ValueDef::_narrow (obj.in ());
     }
 
   return retval._retn ();
@@ -572,7 +550,6 @@ TAO_ValueDef_i::abstract_base_values_i (void)
 void
 TAO_ValueDef_i::abstract_base_values (
     const CORBA::ValueDefSeq &abstract_base_values
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -580,14 +557,12 @@ TAO_ValueDef_i::abstract_base_values (
 
   this->update_key ();
 
-  this->abstract_base_values_i (abstract_base_values
-                                ACE_ENV_ARG_PARAMETER);
+  this->abstract_base_values_i (abstract_base_values);
 }
 
 void
 TAO_ValueDef_i::abstract_base_values_i (
     const CORBA::ValueDefSeq &abstract_base_values
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -632,8 +607,7 @@ TAO_ValueDef_i::abstract_base_values_i (
       TAO_IFR_Service_Utils::name_exists (&TAO_ValueDef_i::name_clash,
                                           this->section_key_,
                                           this->repo_,
-                                          CORBA::dk_Value
-                                          ACE_ENV_ARG_PARAMETER);
+                                          CORBA::dk_Value);
 
       base_id = abstract_base_values[i]->_interface_repository_id ();
       stringified = TAO_IFR_Service_Utils::int_to_string (i);
@@ -666,21 +640,18 @@ TAO_ValueDef_i::is_abstract_i (void)
 }
 
 void
-TAO_ValueDef_i::is_abstract (CORBA::Boolean is_abstract
-                             ACE_ENV_ARG_DECL)
+TAO_ValueDef_i::is_abstract (CORBA::Boolean is_abstract)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->update_key ();
 
-  this->is_abstract (is_abstract
-                     ACE_ENV_ARG_PARAMETER);
+  this->is_abstract (is_abstract);
 }
 
 void
-TAO_ValueDef_i::is_abstract_i (CORBA::Boolean is_abstract
-                             ACE_ENV_ARG_DECL_NOT_USED)
+TAO_ValueDef_i::is_abstract_i (CORBA::Boolean is_abstract)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (
@@ -712,21 +683,18 @@ TAO_ValueDef_i::is_custom_i (void)
 }
 
 void
-TAO_ValueDef_i::is_custom (CORBA::Boolean is_custom
-                           ACE_ENV_ARG_DECL)
+TAO_ValueDef_i::is_custom (CORBA::Boolean is_custom)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->update_key ();
 
-  this->is_custom_i (is_custom
-                     ACE_ENV_ARG_PARAMETER);
+  this->is_custom_i (is_custom);
 }
 
 void
-TAO_ValueDef_i::is_custom_i (CORBA::Boolean is_custom
-                             ACE_ENV_ARG_DECL_NOT_USED)
+TAO_ValueDef_i::is_custom_i (CORBA::Boolean is_custom)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (
@@ -758,21 +726,18 @@ TAO_ValueDef_i::is_truncatable_i (void)
 }
 
 void
-TAO_ValueDef_i::is_truncatable (CORBA::Boolean is_truncatable
-                                ACE_ENV_ARG_DECL)
+TAO_ValueDef_i::is_truncatable (CORBA::Boolean is_truncatable)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->update_key ();
 
-  this->is_truncatable_i (is_truncatable
-                          ACE_ENV_ARG_PARAMETER);
+  this->is_truncatable_i (is_truncatable);
 }
 
 void
-TAO_ValueDef_i::is_truncatable_i (CORBA::Boolean is_truncatable
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+TAO_ValueDef_i::is_truncatable_i (CORBA::Boolean is_truncatable)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (
@@ -782,21 +747,18 @@ TAO_ValueDef_i::is_truncatable_i (CORBA::Boolean is_truncatable
 }
 
 CORBA::Boolean
-TAO_ValueDef_i::is_a (const char *id
-                      ACE_ENV_ARG_DECL)
+TAO_ValueDef_i::is_a (const char *id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
   this->update_key ();
 
-  return this->is_a_i (id
-                       ACE_ENV_ARG_PARAMETER);
+  return this->is_a_i (id);
 }
 
 CORBA::Boolean
-TAO_ValueDef_i::is_a_i (const char *id
-                        ACE_ENV_ARG_DECL)
+TAO_ValueDef_i::is_a_i (const char *id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::strcmp (id, "IDL:omg.org/CORBA/ValueBase:1.0") == 0)
@@ -860,8 +822,7 @@ TAO_ValueDef_i::is_a_i (const char *id
                                            0);
       TAO_ValueDef_i impl (this->repo_);
       impl.section_key (base_key);
-      success = impl.is_a_i (id
-                             ACE_ENV_ARG_PARAMETER);
+      success = impl.is_a_i (id);
 
       if (success)
         {
@@ -1042,12 +1003,10 @@ TAO_ValueDef_i::describe_value_i (void)
                     TAO_IFR_Service_Utils::path_to_ir_object (
                                                holder,
                                                this->repo_
-                                               ACE_ENV_ARG_PARAMETER
                                              );
 
                   fv_desc->operations[i].parameters[j].type_def =
-                    CORBA::IDLType::_narrow (obj.in ()
-                                             ACE_ENV_ARG_PARAMETER);
+                    CORBA::IDLType::_narrow (obj.in ());
 
                   this->repo_->config ()->get_integer_value (param_key,
                                                              "mode",
@@ -1246,12 +1205,10 @@ TAO_ValueDef_i::describe_value_i (void)
 
           obj =
             TAO_IFR_Service_Utils::path_to_ir_object (holder,
-                                                      this->repo_
-                                                      ACE_ENV_ARG_PARAMETER);
+                                                      this->repo_);
 
           fv_desc->members[i].type_def =
-            CORBA::IDLType::_narrow (obj.in ()
-                                     ACE_ENV_ARG_PARAMETER);
+            CORBA::IDLType::_narrow (obj.in ());
         }
     }
 
@@ -1318,12 +1275,10 @@ TAO_ValueDef_i::describe_value_i (void)
                   obj =
                     TAO_IFR_Service_Utils::path_to_ir_object (
                                                holder,
-                                               this->repo_
-                                               ACE_ENV_ARG_PARAMETER);
+                                               this->repo_);
 
                   fv_desc->initializers[i].members[j].type_def =
-                    CORBA::IDLType::_narrow (obj.in ()
-                                             ACE_ENV_ARG_PARAMETER);
+                    CORBA::IDLType::_narrow (obj.in ());
                 }
             }
         }
@@ -1361,8 +1316,7 @@ TAO_ValueDef_i::create_value_member (const char *id,
                                      const char *name,
                                      const char *version,
                                      CORBA::IDLType_ptr type,
-                                     CORBA::Visibility access
-                                     ACE_ENV_ARG_DECL)
+                                     CORBA::Visibility access)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ValueMemberDef::_nil ());
@@ -1373,8 +1327,7 @@ TAO_ValueDef_i::create_value_member (const char *id,
                                       name,
                                       version,
                                       type,
-                                      access
-                                      ACE_ENV_ARG_PARAMETER);
+                                      access);
 }
 
 CORBA::ValueMemberDef_ptr
@@ -1382,8 +1335,7 @@ TAO_ValueDef_i::create_value_member_i (const char *id,
                                        const char *name,
                                        const char *version,
                                        CORBA::IDLType_ptr type,
-                                       CORBA::Visibility access
-                                       ACE_ENV_ARG_DECL)
+                                       CORBA::Visibility access)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Container_i::tmp_name_holder_ = name;
@@ -1400,8 +1352,7 @@ TAO_ValueDef_i::create_value_member_i (const char *id,
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          "members"
-                                          ACE_ENV_ARG_PARAMETER);
+                                          "members");
 
   // Store the path to the attribute's type definition.
   char *type_path = TAO_IFR_Service_Utils::reference_to_path (type);
@@ -1419,12 +1370,10 @@ TAO_ValueDef_i::create_value_member_i (const char *id,
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_ValueMember,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
+                                          this->repo_);
 
   CORBA::ValueMemberDef_var retval =
-    CORBA::ValueMemberDef::_narrow (obj.in ()
-                                    ACE_ENV_ARG_PARAMETER);
+    CORBA::ValueMemberDef::_narrow (obj.in ());
 
   return retval._retn ();
 }
@@ -1436,7 +1385,6 @@ TAO_ValueDef_i::create_attribute (
     const char *version,
     CORBA::IDLType_ptr type,
     CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1448,8 +1396,7 @@ TAO_ValueDef_i::create_attribute (
                                    name,
                                    version,
                                    type,
-                                   mode
-                                   ACE_ENV_ARG_PARAMETER);
+                                   mode);
 }
 
 CORBA::AttributeDef_ptr
@@ -1459,7 +1406,6 @@ TAO_ValueDef_i::create_attribute_i (
     const char *version,
     CORBA::IDLType_ptr type,
     CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1477,8 +1423,7 @@ TAO_ValueDef_i::create_attribute_i (
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          "attrs"
-                                          ACE_ENV_ARG_PARAMETER);
+                                          "attrs");
 
   // Store the path to the attribute's type definition.
   char *type_path = TAO_IFR_Service_Utils::reference_to_path (type);
@@ -1496,12 +1441,10 @@ TAO_ValueDef_i::create_attribute_i (
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Attribute,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
+                                          this->repo_);
 
   CORBA::AttributeDef_var retval =
-    CORBA::AttributeDef::_narrow (obj.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+    CORBA::AttributeDef::_narrow (obj.in ());
 
   return retval._retn ();
 }
@@ -1516,7 +1459,6 @@ TAO_ValueDef_i::create_operation (
     const CORBA::ParDescriptionSeq &params,
     const CORBA::ExceptionDefSeq &exceptions,
     const CORBA::ContextIdSeq &contexts
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1531,8 +1473,7 @@ TAO_ValueDef_i::create_operation (
                                    mode,
                                    params,
                                    exceptions,
-                                   contexts
-                                   ACE_ENV_ARG_PARAMETER);
+                                   contexts);
 }
 
 CORBA::OperationDef_ptr
@@ -1545,7 +1486,6 @@ TAO_ValueDef_i::create_operation_i (
     const CORBA::ParDescriptionSeq &params,
     const CORBA::ExceptionDefSeq &exceptions,
     const CORBA::ContextIdSeq &contexts
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1563,8 +1503,7 @@ TAO_ValueDef_i::create_operation_i (
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          "ops"
-                                          ACE_ENV_ARG_PARAMETER);
+                                          "ops");
 
   // Get the TypeCode for the return type.
   ACE_TString result_path (TAO_IFR_Service_Utils::reference_to_path (result));
@@ -1709,12 +1648,10 @@ TAO_ValueDef_i::create_operation_i (
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Operation,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
+                                          this->repo_);
 
   CORBA::OperationDef_var retval =
-    CORBA::OperationDef::_narrow (obj.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+    CORBA::OperationDef::_narrow (obj.in ());
 
   return retval._retn ();
 }
@@ -1722,27 +1659,24 @@ TAO_ValueDef_i::create_operation_i (
 int
 TAO_ValueDef_i::name_clash (const char *name)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       TAO_Container_i::tmp_name_holder_ = name;
       TAO_IFR_Service_Utils::name_exists (&TAO_Container_i::same_as_tmp_name,
                                           TAO_IFR_Service_Utils::tmp_key_,
                                           TAO_IFR_Service_Utils::repo_,
-                                          CORBA::dk_Value
-                                          ACE_ENV_ARG_PARAMETER);
+                                          CORBA::dk_Value);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
 
 void
-TAO_ValueDef_i::fill_value_description (CORBA::ValueDescription &desc
-                                        ACE_ENV_ARG_DECL)
+TAO_ValueDef_i::fill_value_description (CORBA::ValueDescription &desc)
 {
   desc.name = this->name_i ();
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h
index 0d5dd9d7f9f..3d1f3fd3049 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h
@@ -54,219 +54,180 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Contained::Description *describe (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::Contained::Description *describe_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::InterfaceDefSeq *supported_interfaces (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::InterfaceDefSeq *supported_interfaces_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void supported_interfaces (
       const CORBA::InterfaceDefSeq & supported_interfaces
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void supported_interfaces_i (
       const CORBA::InterfaceDefSeq & supported_interfaces
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::InitializerSeq *initializers (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::InitializerSeq *initializers_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void initializers (
       const CORBA::InitializerSeq & initializers
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void initializers_i (
       const CORBA::InitializerSeq & initializers
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::ValueDef_ptr base_value (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ValueDef_ptr base_value_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void base_value (
       CORBA::ValueDef_ptr base_value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void base_value_i (
       CORBA::ValueDef_ptr base_value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::ValueDefSeq *abstract_base_values (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ValueDefSeq *abstract_base_values_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void abstract_base_values (
       const CORBA::ValueDefSeq & abstract_base_values
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void abstract_base_values_i (
       const CORBA::ValueDefSeq & abstract_base_values
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean is_abstract (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_abstract_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void is_abstract (
       CORBA::Boolean is_abstract
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void is_abstract_i (
       CORBA::Boolean is_abstract
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean is_custom (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_custom_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void is_custom (
       CORBA::Boolean is_custom
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void is_custom_i (
       CORBA::Boolean is_custom
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean is_truncatable (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_truncatable_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void is_truncatable (
       CORBA::Boolean is_truncatable
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void is_truncatable_i (
       CORBA::Boolean is_truncatable
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean is_a (
       const char *id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_a_i (
       const char *id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::ValueDef::FullValueDescription *describe_value (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ValueDef::FullValueDescription *describe_value_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -276,7 +237,6 @@ public:
       const char *version,
       CORBA::IDLType_ptr type,
       CORBA::Visibility access
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -286,7 +246,6 @@ public:
       const char *version,
       CORBA::IDLType_ptr type,
       CORBA::Visibility access
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -296,7 +255,6 @@ public:
       const char *version,
       CORBA::IDLType_ptr type,
       CORBA::AttributeMode mode
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -306,7 +264,6 @@ public:
       const char *version,
       CORBA::IDLType_ptr type,
       CORBA::AttributeMode mode
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -319,7 +276,6 @@ public:
       const CORBA::ParDescriptionSeq &params,
       const CORBA::ExceptionDefSeq &exceptions,
       const CORBA::ContextIdSeq &contexts
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -332,7 +288,6 @@ public:
       const CORBA::ParDescriptionSeq &params,
       const CORBA::ExceptionDefSeq &exceptions,
       const CORBA::ContextIdSeq &contexts
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -340,8 +295,7 @@ public:
   // Called from TAO_IFR_Service_Utils::name_exists() when we
   // are a base valuetype.
 
-  void fill_value_description (CORBA::ValueDescription &desc
-                               ACE_ENV_ARG_DECL);
+  void fill_value_description (CORBA::ValueDescription &desc);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp
index 05bcce93f17..005edee0cd1 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp
@@ -55,7 +55,6 @@ TAO_ValueMemberDef_i::describe_i (void)
                                                 vm,
                                                 this->repo_,
                                                 this->section_key_
-                                                ACE_ENV_ARG_PARAMETER
                                               );
 
   vm.type = this->type_i ();
@@ -66,11 +65,9 @@ TAO_ValueMemberDef_i::describe_i (void)
                                             holder);
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (holder,
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
+                                              this->repo_);
 
-  vm.type_def = CORBA::IDLType::_narrow (obj.in ()
-                                         ACE_ENV_ARG_PARAMETER);
+  vm.type_def = CORBA::IDLType::_narrow (obj.in ());
 
   CORBA::ULong val = 0;
   this->repo_->config ()->get_integer_value  (this->section_key_,
@@ -134,29 +131,24 @@ TAO_ValueMemberDef_i::type_def_i (void)
                                             holder);
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (holder,
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
+                                              this->repo_);
 
-  return CORBA::IDLType::_narrow (obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+  return CORBA::IDLType::_narrow (obj.in ());
 }
 
 void
-TAO_ValueMemberDef_i::type_def (CORBA::IDLType_ptr type_def
-                                ACE_ENV_ARG_DECL)
+TAO_ValueMemberDef_i::type_def (CORBA::IDLType_ptr type_def)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->update_key ();
 
-  this->type_def_i (type_def
-                    ACE_ENV_ARG_PARAMETER);
+  this->type_def_i (type_def);
 }
 
 void
-TAO_ValueMemberDef_i::type_def_i (CORBA::IDLType_ptr type_def
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+TAO_ValueMemberDef_i::type_def_i (CORBA::IDLType_ptr type_def)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const char *path = TAO_IFR_Service_Utils::reference_to_path (type_def);
@@ -188,21 +180,18 @@ TAO_ValueMemberDef_i::access_i (void)
 }
 
 void
-TAO_ValueMemberDef_i::access (CORBA::Visibility access
-                              ACE_ENV_ARG_DECL)
+TAO_ValueMemberDef_i::access (CORBA::Visibility access)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->update_key ();
 
-  this->access_i (access
-                  ACE_ENV_ARG_PARAMETER);
+  this->access_i (access);
 }
 
 void
-TAO_ValueMemberDef_i::access_i (CORBA::Visibility access
-                                ACE_ENV_ARG_DECL_NOT_USED)
+TAO_ValueMemberDef_i::access_i (CORBA::Visibility access)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (this->section_key_,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h
index 1da19410d15..45137157c14 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h
@@ -50,75 +50,62 @@ public:
   virtual ~TAO_ValueMemberDef_i (void);
   // Destructor
 
-  virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::DefinitionKind def_kind ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
-  virtual CORBA::Contained::Description *describe (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Contained::Description *describe ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
-  virtual CORBA::Contained::Description *describe_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Contained::Description *describe_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
-  virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::TypeCode_ptr type_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::IDLType_ptr type_def (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::IDLType_ptr type_def ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::IDLType_ptr type_def_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::IDLType_ptr type_def_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void type_def (
-      CORBA::IDLType_ptr type_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::IDLType_ptr type_def)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void type_def_i (
-      CORBA::IDLType_ptr type_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::IDLType_ptr type_def)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Visibility access (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Visibility access ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Visibility access_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Visibility access_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void access (
-      CORBA::Visibility access
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::Visibility access)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void access_i (
-      CORBA::Visibility access
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::Visibility access)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp
index 44e756538e6..0e40d0dd1ec 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp
@@ -73,8 +73,7 @@ TAO_WstringDef_i::type_i (void)
 {
   CORBA::ULong bound = this->bound_i ();
 
-  return this->repo_->tc_factory ()->create_wstring_tc (bound
-                                                        ACE_ENV_ARG_PARAMETER);
+  return this->repo_->tc_factory ()->create_wstring_tc (bound);
 }
 CORBA::ULong
 TAO_WstringDef_i::bound (void)
@@ -101,21 +100,18 @@ TAO_WstringDef_i::bound_i (void)
 }
 
 void
-TAO_WstringDef_i::bound (CORBA::ULong bound
-                         ACE_ENV_ARG_DECL)
+TAO_WstringDef_i::bound (CORBA::ULong bound)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->update_key ();
 
-  this->bound_i (bound
-                 ACE_ENV_ARG_PARAMETER);
+  this->bound_i (bound);
 }
 
 void
-TAO_WstringDef_i::bound_i (CORBA::ULong bound
-                           ACE_ENV_ARG_DECL_NOT_USED)
+TAO_WstringDef_i::bound_i (CORBA::ULong bound)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (this->section_key_,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h
index c1317c0a888..6e41ff96d89 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h
@@ -51,54 +51,45 @@ public:
   virtual ~TAO_WstringDef_i (void);
   // Destructor.
 
-  virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::DefinitionKind def_kind ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
-  virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
-  virtual void destroy_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's virtual function.
 
-  virtual CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's virtual function.
 
-  virtual CORBA::ULong bound (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::ULong bound ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::ULong bound_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::ULong bound_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void bound (
-      CORBA::ULong bound
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::ULong bound)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void bound_i (
-      CORBA::ULong bound
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::ULong bound)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h
index 12bb7c1df80..035a41a37dc 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h
@@ -63,8 +63,7 @@ public:
   /**
    * The returned "Location" is a sequence of length 1.
    */
-  virtual CosLoadBalancing::Location * the_location (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CosLoadBalancing::Location * the_location ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the average CPU load at the location which this
@@ -74,8 +73,7 @@ public:
    *         equal to CosLoadBalancing::LoadAverage, and the average CPU
    *         load.
    */
-  virtual CosLoadBalancing::LoadList * loads (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CosLoadBalancing::LoadList * loads ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@}
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h
index c369ce8e2c0..ea3431fa897 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h
@@ -60,8 +60,7 @@ public:
   /**
    * The returned "Location" is a sequence of length 1.
    */
-  virtual CosLoadBalancing::Location * the_location (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CosLoadBalancing::Location * the_location ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the average CPU load at the location which this
@@ -71,8 +70,7 @@ public:
    *         equal to CosLoadBalancing::LoadAverage, and the average CPU
    *         load.
    */
-  virtual CosLoadBalancing::LoadList * loads (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CosLoadBalancing::LoadList * loads ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@}
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp
index 52cd589b7b7..dbac81329a8 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp
@@ -25,8 +25,7 @@ TAO_LB_ClientComponent::fini (void)
 int
 TAO_LB_ClientComponent::register_orb_initializer (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Register the LB_ClientComponent ORB initializer.
       PortableInterceptor::ORBInitializer_ptr tmp;
@@ -40,17 +39,14 @@ TAO_LB_ClientComponent::register_orb_initializer (void)
 
       PortableInterceptor::ORBInitializer_var initializer = tmp;
 
-      PortableInterceptor::register_orb_initializer (initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+      PortableInterceptor::register_orb_initializer (initializer.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unable to register LB_ClientComponent ORB "
-                           "initializer.");
+      ex._tao_print_exception (
+        "Unable to register LB_ClientComponent ORB ""initializer.");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp
index 664f0aa669b..3fb67cb6dd4 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp
@@ -11,16 +11,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 TAO_LB_ClientORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_LB_ClientORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ClientRequestInterceptor_ptr tmp;
@@ -34,8 +32,7 @@ TAO_LB_ClientORBInitializer::post_init (
 
   PortableInterceptor::ClientRequestInterceptor_var client_interceptor = tmp;
 
-  info->add_client_request_interceptor (client_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+  info->add_client_request_interceptor (client_interceptor.in ());
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h
index 595c7198ea0..ae4b5b53b76 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h
@@ -56,12 +56,10 @@ public:
    * interface.
    */
   //@{
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
index b6169e415f3..f66ac874705 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
@@ -10,8 +10,7 @@ ACE_RCSID (LoadBalancing,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 char *
-TAO_LB_ClientRequestInterceptor::name (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_ClientRequestInterceptor::name ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("TAO_LB_ClientRequestInterceptor");
@@ -25,8 +24,7 @@ TAO_LB_ClientRequestInterceptor::destroy (void)
 
 void
 TAO_LB_ClientRequestInterceptor::send_request (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -71,30 +69,26 @@ TAO_LB_ClientRequestInterceptor::send_request (
 
   const CORBA::Boolean replace = 0;
   ri->add_request_service_context (service_context,
-                                   replace
-                                   ACE_ENV_ARG_PARAMETER);
+                                   replace);
 }
 
 void
 TAO_LB_ClientRequestInterceptor::send_poll (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_LB_ClientRequestInterceptor::receive_reply (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_LB_ClientRequestInterceptor::receive_exception (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -102,8 +96,7 @@ TAO_LB_ClientRequestInterceptor::receive_exception (
 
 void
 TAO_LB_ClientRequestInterceptor::receive_other (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h
index 19c5318134a..900293f53f6 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h
@@ -75,30 +75,25 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_request (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_poll (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_reply (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_exception (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_other (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
   //@}
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
index 2f90d572291..4c8ebd7067d 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
@@ -99,8 +99,7 @@ TAO_LB_Component::register_orb_initializer (
   const CORBA::StringSeq & repository_ids,
   const char * location)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Register the LB_Component ORB initializer.
       PortableInterceptor::ORBInitializer_ptr tmp;
@@ -116,17 +115,14 @@ TAO_LB_Component::register_orb_initializer (
 
       PortableInterceptor::ORBInitializer_var initializer = tmp;
 
-      PortableInterceptor::register_orb_initializer (initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+      PortableInterceptor::register_orb_initializer (initializer.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unable to register LB_Component ORB "
-                           "initializer.");
+      ex._tao_print_exception (
+        "Unable to register LB_Component ORB ""initializer.");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
index 51f6c4e2090..b426519dec2 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
@@ -47,23 +47,20 @@ TAO_LB_IORInterceptor::destroy (void)
 
 void
 TAO_LB_IORInterceptor::establish_components (
-    PortableInterceptor::IORInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::IORInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_LB_IORInterceptor::components_established (
-    PortableInterceptor::IORInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::IORInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int argc = 0;
   CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                         0,
-                                        this->orb_id_.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+                                        this->orb_id_.in ());
 
   // Save a copy of the current ObjectReferenceFactory.
   PortableInterceptor::ObjectReferenceFactory_var old_orf =
@@ -85,15 +82,13 @@ TAO_LB_IORInterceptor::components_established (
 
   PortableInterceptor::ObjectReferenceFactory_var orf = tmp;
 
-  info->current_factory (orf.in ()
-                         ACE_ENV_ARG_PARAMETER);
+  info->current_factory (orf.in ());
 }
 
 void
 TAO_LB_IORInterceptor::adapter_manager_state_changed (
     const char *,
-    PortableInterceptor::AdapterState state
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::AdapterState state)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (state == PortableInterceptor::ACTIVE)
@@ -105,8 +100,7 @@ TAO_LB_IORInterceptor::adapter_manager_state_changed (
 void
 TAO_LB_IORInterceptor::adapter_state_changed (
     const PortableInterceptor::ObjectReferenceTemplateSeq &,
-    PortableInterceptor::AdapterState state
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::AdapterState state)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (state == PortableInterceptor::ACTIVE)
@@ -125,13 +119,12 @@ TAO_LB_IORInterceptor::register_load_alert (void)
       return;
   }
 
-  ACE_TRY_EX (foo)
+  try
     {
       // By now, the RootPOA has been fully initialized, so it is safe
       // to activate the LoadAlert object.
       CosLoadBalancing::LoadAlert_var la =
         this->load_alert_._this ();
-      ACE_TRY_CHECK_EX (foo);
 
       {
         ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_);
@@ -140,41 +133,35 @@ TAO_LB_IORInterceptor::register_load_alert (void)
       }
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             "LoadAlert::_this()");
+        ex._tao_print_exception ("LoadAlert::_this()");
     }
-  ACE_ENDTRY;
 
-  ACE_TRY
+  try
     {
       PortableGroup::Location location (1);
       location.length (1);
       location[0].id = CORBA::string_dup (this->location_.in ());
 
       this->lm_->register_load_alert (location,
-                                      this->la_ref_.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+                                      this->la_ref_.in ());
     }
-  ACE_CATCH (CosLoadBalancing::LoadAlertAlreadyPresent, ex)
+  catch (const CosLoadBalancing::LoadAlertAlreadyPresent& ex)
     {
       if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ex,
-                             "LoadManager::register_load_alert");
+        ex._tao_print_exception ("LoadManager::register_load_alert");
 
-      ACE_TRY_THROW (CORBA::BAD_INV_ORDER ());
+      throw CORBA::BAD_INV_ORDER ();
     }
-  ACE_CATCH (CosLoadBalancing::LoadAlertNotAdded, ex)
+  catch (const CosLoadBalancing::LoadAlertNotAdded& ex)
     {
       if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ex,
-                             "LoadManager::register_load_alert");
+        ex._tao_print_exception ("LoadManager::register_load_alert");
 
-      ACE_TRY_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
-  ACE_ENDTRY;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
index ded72a5e5f6..b3d2481831d 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
@@ -80,29 +80,25 @@ public:
 
   /// Add the tagged components to the IOR.
   virtual void establish_components (
-      PortableInterceptor::IORInfo_ptr info
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::IORInfo_ptr info)
     ACE_THROW_SPEC ((
         CORBA::SystemException
     ));
 
   virtual void components_established (
-      PortableInterceptor::IORInfo_ptr info
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::IORInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void adapter_manager_state_changed (
       const char * id,
-      PortableInterceptor::AdapterState state
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::AdapterState state)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
   virtual void adapter_state_changed (
       const PortableInterceptor::ObjectReferenceTemplateSeq & templates,
-      PortableInterceptor::AdapterState state
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::AdapterState state)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
index cc06f8ac8d2..79c481f007d 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
@@ -78,31 +78,28 @@ TAO_LB_LeastLoaded::get_properties (void)
 void
 TAO_LB_LeastLoaded::push_loads (
     const PortableGroup::Location & the_location,
-    const CosLoadBalancing::LoadList & loads
-    ACE_ENV_ARG_DECL)
+    const CosLoadBalancing::LoadList & loads)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Only the first load is used by this load balancing strategy.
   if (loads.length () == 0)
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   CosLoadBalancing::Load load;  // Unused
 
   this->push_loads (the_location,
                     loads,
-                    load
-                    ACE_ENV_ARG_PARAMETER);
+                    load);
 }
 
 void
 TAO_LB_LeastLoaded::push_loads (
     const PortableGroup::Location & the_location,
     const CosLoadBalancing::LoadList & loads,
-    CosLoadBalancing::Load & load
-    ACE_ENV_ARG_DECL)
+    CosLoadBalancing::Load & load)
 {
   if (loads.length () == 0)
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   // Only the first load is used by this load balancing strategy.
   const CosLoadBalancing::Load & new_load = loads[0];
@@ -117,7 +114,7 @@ TAO_LB_LeastLoaded::push_loads (
           CosLoadBalancing::Load & previous_load = entry->int_id_;
 
           if (previous_load.id != new_load.id)
-            ACE_THROW (CORBA::BAD_PARAM ());  // Somebody switched
+            throw CORBA::BAD_PARAM ();  // Somebody switched
                                               // LoadIds on us!
 
           previous_load.value =
@@ -140,7 +137,7 @@ TAO_LB_LeastLoaded::push_loads (
                             "ERROR: TAO_LB_LeastLoaded - "
                             "Unable to push loads\n"));
 
-              ACE_THROW (CORBA::INTERNAL ());
+              throw CORBA::INTERNAL ();
             }
 
           load = eff_load;
@@ -155,8 +152,7 @@ TAO_LB_LeastLoaded::push_loads (
 
 CosLoadBalancing::LoadList *
 TAO_LB_LeastLoaded::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
-                               const PortableGroup::Location & the_location
-                               ACE_ENV_ARG_DECL)
+                               const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosLoadBalancing::LocationNotFound))
 {
@@ -164,13 +160,11 @@ TAO_LB_LeastLoaded::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
     ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
 
   CosLoadBalancing::LoadList_var loads =
-    load_manager->get_loads (the_location
-                             ACE_ENV_ARG_PARAMETER);
+    load_manager->get_loads (the_location);
 
   this->push_loads (the_location,
                     loads.in (),
-                    loads[0]
-                    ACE_ENV_ARG_PARAMETER);
+                    loads[0]);
 
   return loads._retn ();
 }
@@ -179,8 +173,7 @@ TAO_LB_LeastLoaded::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
 CORBA::Object_ptr
 TAO_LB_LeastLoaded::next_member (
     PortableGroup::ObjectGroup_ptr object_group,
-    CosLoadBalancing::LoadManager_ptr load_manager
-    ACE_ENV_ARG_DECL)
+    CosLoadBalancing::LoadManager_ptr load_manager)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::MemberNotFound))
@@ -190,8 +183,7 @@ TAO_LB_LeastLoaded::next_member (
                       CORBA::Object::_nil ());
 
   PortableGroup::Locations_var locations =
-    load_manager->locations_of_members (object_group
-                                        ACE_ENV_ARG_PARAMETER);
+    load_manager->locations_of_members (object_group);
 
   if (locations->length () == 0)
     ACE_THROW_RETURN (CORBA::TRANSIENT (),
@@ -204,8 +196,7 @@ TAO_LB_LeastLoaded::next_member (
   CORBA::Boolean found_location =
     this->get_location (load_manager,
                         locations.in (),
-                        location
-                        ACE_ENV_ARG_PARAMETER);
+                        location);
 
   if (found_location)
     {
@@ -214,8 +205,7 @@ TAO_LB_LeastLoaded::next_member (
 //                   location[0].id.in ()));
 
       return load_manager->get_member_ref (object_group,
-                                           location
-                                           ACE_ENV_ARG_PARAMETER);
+                                           location);
     }
   else
     {
@@ -231,27 +221,24 @@ TAO_LB_LeastLoaded::next_member (
 
       return TAO_LB_Random::_tao_next_member (object_group,
                                               load_manager,
-                                              locations.in ()
-                                              ACE_ENV_ARG_PARAMETER);
+                                              locations.in ());
     }
 }
 
 void
 TAO_LB_LeastLoaded::analyze_loads (
     PortableGroup::ObjectGroup_ptr object_group,
-    CosLoadBalancing::LoadManager_ptr load_manager
-    ACE_ENV_ARG_DECL)
+    CosLoadBalancing::LoadManager_ptr load_manager)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (load_manager))
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   PortableGroup::Locations_var locations =
-    load_manager->locations_of_members (object_group
-                                        ACE_ENV_ARG_PARAMETER);
+    load_manager->locations_of_members (object_group);
 
   if (locations->length () == 0)
-    ACE_THROW (CORBA::TRANSIENT ());
+    throw CORBA::TRANSIENT ();
 
   const CORBA::ULong len = locations->length ();
 
@@ -259,7 +246,7 @@ TAO_LB_LeastLoaded::analyze_loads (
   // locations require load to be shed.
   for (CORBA::ULong i = 0; i < len; ++i)
     {
-      ACE_TRY
+      try
         {
           const PortableGroup::Location & loc = locations[i];
 
@@ -267,14 +254,12 @@ TAO_LB_LeastLoaded::analyze_loads (
           // LoadManager and push it to this Strategy's load
           // processor.
           CosLoadBalancing::LoadList_var current_loads =
-            load_manager->get_loads (loc
-                                     ACE_ENV_ARG_PARAMETER);
+            load_manager->get_loads (loc);
 
           CosLoadBalancing::Load load;
           this->push_loads (loc,
                             current_loads.in (),
-                            load
-                            ACE_ENV_ARG_PARAMETER);
+                            load);
 /*
            ACE_DEBUG ((LM_DEBUG,
                        "EFFECTIVE_LOAD == %f\n"
@@ -303,24 +288,21 @@ TAO_LB_LeastLoaded::analyze_loads (
                   // associated with the member at that location it
                   // should redirect client requests back to the
                   // LoadManager.
-                  load_manager->enable_alert (loc
-                                              ACE_ENV_ARG_PARAMETER);
+                  load_manager->enable_alert (loc);
                 }
               else
                 {
                   // The location is not overloaded.  Disable load
                   // shedding at given location.
-                  load_manager->disable_alert (loc
-                                               ACE_ENV_ARG_PARAMETER);
+                  load_manager->disable_alert (loc);
                 }
             }
         }
-      ACE_CATCH (CosLoadBalancing::LocationNotFound, ex)
+      catch (const CosLoadBalancing::LocationNotFound& ex)
         {
           // No load available for the requested location.  Try the
           // next location.
         }
-      ACE_ENDTRY;
     }
 }
 
@@ -334,8 +316,7 @@ CORBA::Boolean
 TAO_LB_LeastLoaded::get_location (
   CosLoadBalancing::LoadManager_ptr load_manager,
   const PortableGroup::Locations & locations,
-  PortableGroup::Location & location
-  ACE_ENV_ARG_DECL)
+  PortableGroup::Location & location)
 {
   CORBA::Float min_load = FLT_MAX;  // Start out with the largest
                                     // positive value.
@@ -350,23 +331,21 @@ TAO_LB_LeastLoaded::get_location (
   // of them.
   for (CORBA::ULong i = 0; i < len; ++i)
     {
-      ACE_TRY
+      try
         {
           const PortableGroup::Location & loc = locations[i];
 
           // Retrieve the load list for the location from the LoadManager
           // and push it to this Strategy's load processor.
           CosLoadBalancing::LoadList_var current_loads =
-            load_manager->get_loads (loc
-                                     ACE_ENV_ARG_PARAMETER);
+            load_manager->get_loads (loc);
 
           found_load = 1;
 
           CosLoadBalancing::Load load;
           this->push_loads (loc,
                             current_loads.in (),
-                            load
-                            ACE_ENV_ARG_PARAMETER);
+                            load);
 /*
            ACE_DEBUG ((LM_DEBUG,
                        "LOC = %u"
@@ -477,12 +456,11 @@ TAO_LB_LeastLoaded::get_location (
 
           // ACE_DEBUG ((LM_DEBUG, "NEW MIN_LOAD == %f\n", min_load));
         }
-      ACE_CATCH (CosLoadBalancing::LocationNotFound, ex)
+      catch (const CosLoadBalancing::LocationNotFound& ex)
         {
           // No load available for the requested location.  Try the
           // next location.
         }
-      ACE_ENDTRY;
     }
 
 //   ACE_DEBUG ((LM_DEBUG,
@@ -511,8 +489,7 @@ TAO_LB_LeastLoaded::get_location (
 }
 
 void
-TAO_LB_LeastLoaded::init (const PortableGroup::Properties & props
-                          ACE_ENV_ARG_DECL)
+TAO_LB_LeastLoaded::init (const PortableGroup::Properties & props)
 {
   CORBA::Float critical_threshold =
     TAO_LB::LL_DEFAULT_CRITICAL_THRESHOLD;
@@ -531,8 +508,7 @@ TAO_LB_LeastLoaded::init (const PortableGroup::Properties & props
                           "org.omg.CosLoadBalancing.Strategy.LeastLoaded.CriticalThreshold") == 0)
         {
           this->extract_float_property (property,
-                                        critical_threshold
-                                        ACE_ENV_ARG_PARAMETER);
+                                        critical_threshold);
 
           ct = &property;
         }
@@ -541,48 +517,42 @@ TAO_LB_LeastLoaded::init (const PortableGroup::Properties & props
                                "org.omg.CosLoadBalancing.Strategy.LeastLoaded.RejectThreshold") == 0)
         {
           this->extract_float_property (property,
-                                        reject_threshold
-                                        ACE_ENV_ARG_PARAMETER);
+                                        reject_threshold);
         }
 
       else if (ACE_OS::strcmp (property.nam[0].id.in (),
                                "org.omg.CosLoadBalancing.Strategy.LeastLoaded.Tolerance") == 0)
         {
           this->extract_float_property (property,
-                                        tolerance
-                                        ACE_ENV_ARG_PARAMETER);
+                                        tolerance);
 
           // Valid tolerance values are greater than or equal to one.
           if (tolerance < 1)
-            ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                       property.val));
+            throw PortableGroup::InvalidProperty (property.nam, property.val);
         }
 
       else if (ACE_OS::strcmp (property.nam[0].id.in (),
                                "org.omg.CosLoadBalancing.Strategy.LeastLoaded.Dampening") == 0)
         {
           this->extract_float_property (property,
-                                        dampening
-                                        ACE_ENV_ARG_PARAMETER);
+                                        dampening);
 
           // Dampening range is [0,1).
           if (dampening < 0 || dampening >= 1)
-            ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                       property.val));
+            throw PortableGroup::InvalidProperty (property.nam, property.val);
         }
 
       else if (ACE_OS::strcmp (property.nam[0].id.in (),
                                "org.omg.CosLoadBalancing.Strategy.LeastLoaded.PerBalanceLoad") == 0)
         {
           this->extract_float_property (property,
-                                        per_balance_load
-                                        ACE_ENV_ARG_PARAMETER);
+                                        per_balance_load);
         }
     }
 
   if (critical_threshold != 0 && reject_threshold != 0
       && critical_threshold <= reject_threshold)
-    ACE_THROW (PortableGroup::InvalidProperty (ct->nam, ct->val));
+    throw PortableGroup::InvalidProperty (ct->nam, ct->val);
 
   this->properties_ = props;
 
@@ -611,12 +581,10 @@ TAO_LB_LeastLoaded::init (const PortableGroup::Properties & props
 void
 TAO_LB_LeastLoaded::extract_float_property (
   const PortableGroup::Property & property,
-  CORBA::Float & value
-  ACE_ENV_ARG_DECL)
+  CORBA::Float & value)
 {
   if (!(property.val >>= value))
-    ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                               property.val));
+    throw PortableGroup::InvalidProperty (property.nam, property.val);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
index 3c79ae6a5b8..73d3715b1a3 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
@@ -90,46 +90,39 @@ public:
   virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CosLoadBalancing::Properties * get_properties (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CosLoadBalancing::Properties * get_properties ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void push_loads (
       const PortableGroup::Location & the_location,
-      const CosLoadBalancing::LoadList & loads
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CosLoadBalancing::LoadList & loads)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CosLoadBalancing::LoadList * get_loads (
       CosLoadBalancing::LoadManager_ptr load_manager,
-      const PortableGroup::Location & the_location
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Location & the_location)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosLoadBalancing::LocationNotFound));
 
   virtual CORBA::Object_ptr next_member (
       PortableGroup::ObjectGroup_ptr object_group,
-      CosLoadBalancing::LoadManager_ptr load_manager
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CosLoadBalancing::LoadManager_ptr load_manager)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound,
                      PortableGroup::MemberNotFound));
 
   virtual void analyze_loads (
       PortableGroup::ObjectGroup_ptr object_group,
-      CosLoadBalancing::LoadManager_ptr load_manager
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CosLoadBalancing::LoadManager_ptr load_manager)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
   /// Returns the default POA for this servant.
   virtual PortableServer::POA_ptr _default_POA (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     );
 
   /// Initialize the LeastLoaded instance with the given properties.
-  void init (const PortableGroup::Properties & props
-             ACE_ENV_ARG_DECL);
+  void init (const PortableGroup::Properties & props);
 
 protected:
 
@@ -140,8 +133,7 @@ protected:
   /// locations.
   CORBA::Boolean get_location (CosLoadBalancing::LoadManager_ptr load_manager,
                                const PortableGroup::Locations & locations,
-                               PortableGroup::Location & location
-                               ACE_ENV_ARG_DECL);
+                               PortableGroup::Location & location);
 
   /// Return the effective load.
   CORBA::Float effective_load (CORBA::Float previous_load,
@@ -152,14 +144,12 @@ protected:
   void push_loads (
       const PortableGroup::Location & the_location,
       const CosLoadBalancing::LoadList & loads,
-      CosLoadBalancing::Load & effective_load
-      ACE_ENV_ARG_DECL);
+      CosLoadBalancing::Load & effective_load);
 
   /// Utility method to extract a CORBA::Float value from the given
   /// property.
   void extract_float_property (const PortableGroup::Property & property,
-                               CORBA::Float & value
-                               ACE_ENV_ARG_DECL);
+                               CORBA::Float & value);
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp
index f85bbc721fa..1ce94dba907 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp
@@ -21,8 +21,7 @@ TAO_LB_LoadAlert_Handler::enable_alert (void)
 
 void
 TAO_LB_LoadAlert_Handler::enable_alert_excep (
-    ::Messaging::ExceptionHolder *
-    ACE_ENV_ARG_DECL_NOT_USED)
+    ::Messaging::ExceptionHolder *)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -39,8 +38,7 @@ TAO_LB_LoadAlert_Handler::disable_alert (void)
 
 void
 TAO_LB_LoadAlert_Handler::disable_alert_excep (
-    ::Messaging::ExceptionHolder *
-    ACE_ENV_ARG_DECL_NOT_USED)
+    ::Messaging::ExceptionHolder *)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
index 15a7c1c7e30..7168d127bcd 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
@@ -47,16 +47,14 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void enable_alert_excep (
-      ::Messaging::ExceptionHolder *
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ::Messaging::ExceptionHolder *)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void disable_alert (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void disable_alert_excep (
-      ::Messaging::ExceptionHolder *
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ::Messaging::ExceptionHolder *)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
index ab0d9693771..f011686083f 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
@@ -76,31 +76,28 @@ TAO_LB_LoadAverage::get_properties (void)
 void
 TAO_LB_LoadAverage::push_loads (
     const PortableGroup::Location & the_location,
-    const CosLoadBalancing::LoadList & loads
-    ACE_ENV_ARG_DECL)
+    const CosLoadBalancing::LoadList & loads)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Only the first load is used by this load balancing strategy.
   if (loads.length () == 0)
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   CosLoadBalancing::Load load;  // Unused
 
   this->push_loads (the_location,
                     loads,
-                    load
-                    ACE_ENV_ARG_PARAMETER);
+                    load);
 }
 
 void
 TAO_LB_LoadAverage::push_loads (
     const PortableGroup::Location & the_location,
     const CosLoadBalancing::LoadList & loads,
-    CosLoadBalancing::Load & load
-    ACE_ENV_ARG_DECL)
+    CosLoadBalancing::Load & load)
 {
   if (loads.length () == 0)
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   // Only the first load is used by this load balancing strategy.
   const CosLoadBalancing::Load & new_load = loads[0];
@@ -115,7 +112,7 @@ TAO_LB_LoadAverage::push_loads (
           CosLoadBalancing::Load & previous_load = entry->int_id_;
 
           if (previous_load.id != new_load.id)
-            ACE_THROW (CORBA::BAD_PARAM ());  // Somebody switched
+            throw CORBA::BAD_PARAM ();  // Somebody switched
                                               // LoadIds on us!
 
           previous_load.value =
@@ -138,7 +135,7 @@ TAO_LB_LoadAverage::push_loads (
                             "ERROR: TAO_LB_LoadAverage - "
                             "Unable to push loads\n"));
 
-              ACE_THROW (CORBA::INTERNAL ());
+              throw CORBA::INTERNAL ();
             }
 
           load = eff_load;
@@ -153,8 +150,7 @@ TAO_LB_LoadAverage::push_loads (
 
 CosLoadBalancing::LoadList *
 TAO_LB_LoadAverage::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
-                               const PortableGroup::Location & the_location
-                               ACE_ENV_ARG_DECL)
+                               const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosLoadBalancing::LocationNotFound))
 {
@@ -162,13 +158,11 @@ TAO_LB_LoadAverage::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
     ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
 
   CosLoadBalancing::LoadList_var loads =
-    load_manager->get_loads (the_location
-                             ACE_ENV_ARG_PARAMETER);
+    load_manager->get_loads (the_location);
 
   this->push_loads (the_location,
                     loads.in (),
-                    loads[0]
-                    ACE_ENV_ARG_PARAMETER);
+                    loads[0]);
 
   return loads._retn ();
 }
@@ -177,8 +171,7 @@ TAO_LB_LoadAverage::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
 CORBA::Object_ptr
 TAO_LB_LoadAverage::next_member (
     PortableGroup::ObjectGroup_ptr object_group,
-    CosLoadBalancing::LoadManager_ptr load_manager
-    ACE_ENV_ARG_DECL)
+    CosLoadBalancing::LoadManager_ptr load_manager)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::MemberNotFound))
@@ -188,8 +181,7 @@ TAO_LB_LoadAverage::next_member (
                       CORBA::Object::_nil ());
 
   PortableGroup::Locations_var locations =
-    load_manager->locations_of_members (object_group
-                                        ACE_ENV_ARG_PARAMETER);
+    load_manager->locations_of_members (object_group);
 
   if (locations->length () == 0)
     ACE_THROW_RETURN (CORBA::TRANSIENT (),
@@ -200,26 +192,23 @@ TAO_LB_LoadAverage::next_member (
 
   return TAO_LB_Random::_tao_next_member (object_group,
                                           load_manager,
-                                          locations.in ()
-                                          ACE_ENV_ARG_PARAMETER);
+                                          locations.in ());
 }
 
 void
 TAO_LB_LoadAverage::analyze_loads (
     PortableGroup::ObjectGroup_ptr object_group,
-    CosLoadBalancing::LoadManager_ptr load_manager
-    ACE_ENV_ARG_DECL)
+    CosLoadBalancing::LoadManager_ptr load_manager)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (load_manager))
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   PortableGroup::Locations_var locations =
-    load_manager->locations_of_members (object_group
-                                        ACE_ENV_ARG_PARAMETER);
+    load_manager->locations_of_members (object_group);
 
   if (locations->length () == 0)
-    ACE_THROW (CORBA::TRANSIENT ());
+    throw CORBA::TRANSIENT ();
 
   const CORBA::ULong len = locations->length ();
 
@@ -233,7 +222,7 @@ TAO_LB_LoadAverage::analyze_loads (
   // the average load of all the locations
   for (CORBA::ULong i = 0; i < len; ++i)
     {
-      ACE_TRY
+      try
         {
           const PortableGroup::Location & loc = locations[i];
 
@@ -241,14 +230,12 @@ TAO_LB_LoadAverage::analyze_loads (
           // LoadManager and push it to this Strategy's load
           // processor.
           CosLoadBalancing::LoadList_var current_loads =
-            load_manager->get_loads (loc
-                                     ACE_ENV_ARG_PARAMETER);
+            load_manager->get_loads (loc);
 
           CosLoadBalancing::Load load;
           this->push_loads (loc,
                             current_loads.in (),
-                            load
-                            ACE_ENV_ARG_PARAMETER);
+                            load);
 
           // @@ Jai, please use the compound "+=" operator here.  It
           //    is more efficient in this case.
@@ -262,12 +249,11 @@ TAO_LB_LoadAverage::analyze_loads (
                        total_load.value));
           */
         }
-      ACE_CATCH (CosLoadBalancing::LocationNotFound, ex)
+      catch (const CosLoadBalancing::LocationNotFound& ex)
         {
           // no location found
           //
         }
-      ACE_ENDTRY;
     }
 
   avg_load.value = total_load.value / len;
@@ -281,7 +267,7 @@ TAO_LB_LoadAverage::analyze_loads (
   // the location where the load has to be shed.
   for (CORBA::ULong j = 0; j < len; ++j)
     {
-      ACE_TRY_EX (SECOND)
+      try
         {
           const PortableGroup::Location & loc = locations[j];
 
@@ -295,9 +281,7 @@ TAO_LB_LoadAverage::analyze_loads (
 
           if (tmp[j].value <= avg_load.value)
             {
-              load_manager->disable_alert (loc
-                                           ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK_EX (SECOND);
+              load_manager->disable_alert (loc);
             }
           else
             {
@@ -325,9 +309,7 @@ TAO_LB_LoadAverage::analyze_loads (
               // coding style.
               if (percent_diff <= TAO_LB::LA_DEFAULT_DIFF_AVERAGE_CUTOFF)
               {
-                load_manager->disable_alert (loc
-                                             ACE_ENV_ARG_PARAMETER);
-                ACE_TRY_CHECK_EX (SECOND);
+                load_manager->disable_alert (loc);
               }
               else if ((percent_diff > TAO_LB::LA_DEFAULT_DIFF_AVERAGE_CUTOFF)
                        && (percent_diff < 1))
@@ -338,20 +320,17 @@ TAO_LB_LoadAverage::analyze_loads (
                             i));
 */
 
-                load_manager->enable_alert (loc
-                                            ACE_ENV_ARG_PARAMETER);
+                load_manager->enable_alert (loc);
 
-                ACE_TRY_CHECK_EX (SECOND);
               }
 
             }
         }
-      ACE_CATCH (CosLoadBalancing::LocationNotFound, ex)
+      catch (const CosLoadBalancing::LocationNotFound& ex)
         {
           // no location found
           //
         }
-      ACE_ENDTRY;
     }
 
 }
@@ -363,8 +342,7 @@ TAO_LB_LoadAverage::_default_POA (void)
 }
 
 void
-TAO_LB_LoadAverage::init (const PortableGroup::Properties & props
-                          ACE_ENV_ARG_DECL)
+TAO_LB_LoadAverage::init (const PortableGroup::Properties & props)
 {
   CORBA::Float tolerance = TAO_LB::LA_DEFAULT_TOLERANCE;
   CORBA::Float dampening = TAO_LB::LA_DEFAULT_DAMPENING;
@@ -378,34 +356,29 @@ TAO_LB_LoadAverage::init (const PortableGroup::Properties & props
                           "org.omg.CosLoadBalancing.Strategy.LoadAverage.Tolerance") == 0)
         {
           this->extract_float_property (property,
-                                        tolerance
-                                        ACE_ENV_ARG_PARAMETER);
+                                        tolerance);
 
           // Valid tolerance values are greater than or equal to one.
           if (tolerance < 1)
-            ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                       property.val));
+            throw PortableGroup::InvalidProperty (property.nam, property.val);
         }
 
       else if (ACE_OS::strcmp (property.nam[0].id.in (),
                                "org.omg.CosLoadBalancing.Strategy.LoadAverage.Dampening") == 0)
         {
           this->extract_float_property (property,
-                                        dampening
-                                        ACE_ENV_ARG_PARAMETER);
+                                        dampening);
 
           // Dampening range is [0,1).
           if (dampening < 0 || dampening >= 1)
-            ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                       property.val));
+            throw PortableGroup::InvalidProperty (property.nam, property.val);
         }
 
       else if (ACE_OS::strcmp (property.nam[0].id.in (),
                                "org.omg.CosLoadBalancing.Strategy.LoadAverage.PerBalanceLoad") == 0)
         {
           this->extract_float_property (property,
-                                        per_balance_load
-                                        ACE_ENV_ARG_PARAMETER);
+                                        per_balance_load);
         }
     }
 
@@ -431,12 +404,10 @@ TAO_LB_LoadAverage::init (const PortableGroup::Properties & props
 void
 TAO_LB_LoadAverage::extract_float_property (
   const PortableGroup::Property & property,
-  CORBA::Float & value
-  ACE_ENV_ARG_DECL)
+  CORBA::Float & value)
 {
   if (!(property.val >>= value))
-    ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                               property.val));
+    throw PortableGroup::InvalidProperty (property.nam, property.val);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h
index b2fb8a4d9f8..74e2b0d4c4c 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h
@@ -72,46 +72,39 @@ public:
   virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CosLoadBalancing::Properties * get_properties (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CosLoadBalancing::Properties * get_properties ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void push_loads (
       const PortableGroup::Location & the_location,
-      const CosLoadBalancing::LoadList & loads
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CosLoadBalancing::LoadList & loads)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CosLoadBalancing::LoadList * get_loads (
       CosLoadBalancing::LoadManager_ptr load_manager,
-      const PortableGroup::Location & the_location
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Location & the_location)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosLoadBalancing::LocationNotFound));
 
   virtual CORBA::Object_ptr next_member (
       PortableGroup::ObjectGroup_ptr object_group,
-      CosLoadBalancing::LoadManager_ptr load_manager
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CosLoadBalancing::LoadManager_ptr load_manager)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound,
                      PortableGroup::MemberNotFound));
 
   virtual void analyze_loads (
       PortableGroup::ObjectGroup_ptr object_group,
-      CosLoadBalancing::LoadManager_ptr load_manager
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CosLoadBalancing::LoadManager_ptr load_manager)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
   /// Returns the default POA for this servant.
   virtual PortableServer::POA_ptr _default_POA (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     );
 
   /// Initialize the LoadAverage instance with the given properties.
-  void init (const PortableGroup::Properties & props
-             ACE_ENV_ARG_DECL);
+  void init (const PortableGroup::Properties & props);
 
 protected:
 
@@ -127,14 +120,12 @@ protected:
   void push_loads (
       const PortableGroup::Location & the_location,
       const CosLoadBalancing::LoadList & loads,
-      CosLoadBalancing::Load & effective_load
-      ACE_ENV_ARG_DECL);
+      CosLoadBalancing::Load & effective_load);
 
   /// Utility method to extract a CORBA::Float value from the given
   /// property.
   void extract_float_property (const PortableGroup::Property & property,
-                               CORBA::Float & value
-                               ACE_ENV_ARG_DECL);
+                               CORBA::Float & value);
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
index 30fd71fe937..b5435451887 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
@@ -72,12 +72,11 @@ TAO_LB_LoadManager::~TAO_LB_LoadManager (void)
 void
 TAO_LB_LoadManager::push_loads (
     const PortableGroup::Location & the_location,
-    const CosLoadBalancing::LoadList & loads
-    ACE_ENV_ARG_DECL)
+    const CosLoadBalancing::LoadList & loads)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (loads.length () == 0)
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   {
     ACE_GUARD (TAO_SYNCH_MUTEX,
@@ -85,14 +84,13 @@ TAO_LB_LoadManager::push_loads (
                this->load_lock_);
 
     if (this->load_map_.rebind (the_location, loads) == -1)
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
   }
 
   // Analyze loads for object groups that have members residing at the
   // given location.
   PortableGroup::ObjectGroups_var groups =
-    this->object_group_manager_.groups_at_location (the_location
-                                                    ACE_ENV_ARG_PARAMETER);
+    this->object_group_manager_.groups_at_location (the_location);
 
   const CORBA::ULong len = groups->length ();
 
@@ -101,11 +99,10 @@ TAO_LB_LoadManager::push_loads (
       PortableGroup::ObjectGroup_ptr object_group =
         groups[i];
 
-      ACE_TRY
+      try
         {
           PortableGroup::Properties_var properties =
-            this->get_properties (object_group
-                                  ACE_ENV_ARG_PARAMETER);
+            this->get_properties (object_group);
 
           PortableGroup::Value value;
           CosLoadBalancing::Strategy_ptr strategy;
@@ -122,21 +119,18 @@ TAO_LB_LoadManager::push_loads (
               && !CORBA::is_nil (strategy))
             {
               strategy->analyze_loads (object_group,
-                                       this->lm_ref_.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+                                       this->lm_ref_.in ());
             }
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           // Ignore all exceptions.
         }
-      ACE_ENDTRY;
     }
 }
 
 CosLoadBalancing::LoadList *
-TAO_LB_LoadManager::get_loads (const PortableGroup::Location & the_location
-                               ACE_ENV_ARG_DECL)
+TAO_LB_LoadManager::get_loads (const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosLoadBalancing::LocationNotFound))
 {
@@ -163,8 +157,7 @@ TAO_LB_LoadManager::get_loads (const PortableGroup::Location & the_location
 }
 
 void
-TAO_LB_LoadManager::enable_alert (const PortableGroup::Location & the_location
-                                  ACE_ENV_ARG_DECL)
+TAO_LB_LoadManager::enable_alert (const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ((CosLoadBalancing::LoadAlertNotFound))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->load_alert_lock_);
@@ -211,17 +204,15 @@ TAO_LB_LoadManager::enable_alert (const PortableGroup::Location & the_location
         // synchronously.  In particular, the load alert can and
         // should be performed in parallel to other tasks, such as
         // member selection.
-        load_alert->sendc_enable_alert (this->load_alert_handler_.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+        load_alert->sendc_enable_alert (this->load_alert_handler_.in ());
       }
     }
   else
-    ACE_THROW (CosLoadBalancing::LoadAlertNotFound ());
+    throw CosLoadBalancing::LoadAlertNotFound ();
 }
 
 void
-TAO_LB_LoadManager::disable_alert (const PortableGroup::Location & the_location
-                                   ACE_ENV_ARG_DECL)
+TAO_LB_LoadManager::disable_alert (const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ((CosLoadBalancing::LoadAlertNotFound))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->load_alert_lock_);
@@ -267,25 +258,23 @@ TAO_LB_LoadManager::disable_alert (const PortableGroup::Location & the_location
         // synchronously.  In particular, the load alert can and
         // should be performed in parallel to other tasks, such as
         // member selection.
-        load_alert->sendc_disable_alert (this->load_alert_handler_.in ()
-                                         ACE_ENV_ARG_PARAMETER);
+        load_alert->sendc_disable_alert (this->load_alert_handler_.in ());
       }
     }
   else
-    ACE_THROW (CosLoadBalancing::LoadAlertNotFound ());
+    throw CosLoadBalancing::LoadAlertNotFound ();
 }
 
 void
 TAO_LB_LoadManager::register_load_alert (
     const PortableGroup::Location & the_location,
-    CosLoadBalancing::LoadAlert_ptr load_alert
-    ACE_ENV_ARG_DECL)
+    CosLoadBalancing::LoadAlert_ptr load_alert)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosLoadBalancing::LoadAlertAlreadyPresent,
                    CosLoadBalancing::LoadAlertNotAdded))
 {
   if (CORBA::is_nil (load_alert))
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->load_alert_lock_);
 
@@ -296,19 +285,18 @@ TAO_LB_LoadManager::register_load_alert (
 
   if (result == 1)
     {
-      ACE_THROW (CosLoadBalancing::LoadAlertAlreadyPresent ());
+      throw CosLoadBalancing::LoadAlertAlreadyPresent ();
     }
   else if (result == -1)
     {
       // Problems dude!
-      ACE_THROW (CosLoadBalancing::LoadAlertNotAdded ());
+      throw CosLoadBalancing::LoadAlertNotAdded ();
     }
 }
 
 CosLoadBalancing::LoadAlert_ptr
 TAO_LB_LoadManager::get_load_alert (
-    const PortableGroup::Location & the_location
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosLoadBalancing::LoadAlertNotFound))
 {
@@ -334,8 +322,7 @@ TAO_LB_LoadManager::get_load_alert (
 
 void
 TAO_LB_LoadManager::remove_load_alert (
-    const PortableGroup::Location & the_location
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosLoadBalancing::LoadAlertNotFound))
 {
@@ -344,27 +331,25 @@ TAO_LB_LoadManager::remove_load_alert (
   // requests should be allowed through once again since there will be
   // no way to control the load shedding mechanism once the LoadAlert
   // object is no longer under the control of the LoadManager.
-  this->disable_alert (the_location
-                       ACE_ENV_ARG_PARAMETER);
+  this->disable_alert (the_location);
 
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->load_alert_lock_);
 
   if (this->load_alert_map_.unbind (the_location) != 0)
     {
-      ACE_THROW (CosLoadBalancing::LoadAlertNotFound ());
+      throw CosLoadBalancing::LoadAlertNotFound ();
     }
 }
 
 void
 TAO_LB_LoadManager::register_load_monitor (
     const PortableGroup::Location & the_location,
-    CosLoadBalancing::LoadMonitor_ptr load_monitor
-    ACE_ENV_ARG_DECL)
+    CosLoadBalancing::LoadMonitor_ptr load_monitor)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosLoadBalancing::MonitorAlreadyPresent))
 {
   if (CORBA::is_nil (load_monitor))
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   const CosLoadBalancing::LoadMonitor_var the_monitor =
     CosLoadBalancing::LoadMonitor::_duplicate (load_monitor);
@@ -398,12 +383,12 @@ TAO_LB_LoadManager::register_load_monitor (
 
           (void) this->monitor_map_.unbind (the_location);
 
-          ACE_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
     }
   else if (result == 1)
     {
-      ACE_THROW (CosLoadBalancing::MonitorAlreadyPresent ());
+      throw CosLoadBalancing::MonitorAlreadyPresent ();
     }
   else if (result != 0)
     {
@@ -412,14 +397,13 @@ TAO_LB_LoadManager::register_load_monitor (
                     "TAO_LB_LoadManager::register_load_monitor: "
                     "Unable to register load monitor.\n"));
 
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 }
 
 CosLoadBalancing::LoadMonitor_ptr
 TAO_LB_LoadManager::get_load_monitor (
-    const PortableGroup::Location & the_location
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosLoadBalancing::LocationNotFound))
 {
@@ -441,8 +425,7 @@ TAO_LB_LoadManager::get_load_monitor (
 
 void
 TAO_LB_LoadManager::remove_load_monitor (
-    const PortableGroup::Location & the_location
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosLoadBalancing::LocationNotFound))
 {
@@ -451,7 +434,7 @@ TAO_LB_LoadManager::remove_load_monitor (
              this->monitor_lock_);
 
   if (this->monitor_map_.unbind (the_location) != 0)
-    ACE_THROW (CosLoadBalancing::LocationNotFound ());
+    throw CosLoadBalancing::LocationNotFound ();
 
   // If no load monitors are registered with the load balancer than
   // shutdown the "pull monitoring."
@@ -465,7 +448,7 @@ TAO_LB_LoadManager::remove_load_monitor (
                         "TAO_LB_LoadManager::remove_load_monitor: "
                         "Unable to cancel timer.\n"));
 
-          ACE_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
 
       this->timer_id_ = -1;
@@ -474,114 +457,95 @@ TAO_LB_LoadManager::remove_load_monitor (
 
 void
 TAO_LB_LoadManager::set_default_properties (
-    const PortableGroup::Properties & props
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Properties & props)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::InvalidProperty,
                    PortableGroup::UnsupportedProperty))
 {
   PortableGroup::Properties new_props (props);
-  this->preprocess_properties (new_props
-                               ACE_ENV_ARG_PARAMETER);
+  this->preprocess_properties (new_props);
 
-  this->property_manager_.set_default_properties (new_props
-                                                  ACE_ENV_ARG_PARAMETER);
+  this->property_manager_.set_default_properties (new_props);
 }
 
 PortableGroup::Properties *
-TAO_LB_LoadManager::get_default_properties (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO_LB_LoadManager::get_default_properties ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
-    this->property_manager_.get_default_properties (
-      ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->property_manager_.get_default_properties ();
 }
 
 void
 TAO_LB_LoadManager::remove_default_properties (
-    const PortableGroup::Properties & props
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Properties & props)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::InvalidProperty,
                    PortableGroup::UnsupportedProperty))
 {
-  this->property_manager_.remove_default_properties (props
-                                                     ACE_ENV_ARG_PARAMETER);
+  this->property_manager_.remove_default_properties (props);
 }
 
 void
 TAO_LB_LoadManager::set_type_properties (
     const char *type_id,
-    const PortableGroup::Properties & overrides
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Properties & overrides)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::InvalidProperty,
                    PortableGroup::UnsupportedProperty))
 {
   PortableGroup::Properties new_overrides (overrides);
-  this->preprocess_properties (new_overrides
-                               ACE_ENV_ARG_PARAMETER);
+  this->preprocess_properties (new_overrides);
 
   this->property_manager_.set_type_properties (type_id,
-                                               new_overrides
-                                               ACE_ENV_ARG_PARAMETER);
+                                               new_overrides);
 }
 
 PortableGroup::Properties *
 TAO_LB_LoadManager::get_type_properties (
-    const char *type_id
-    ACE_ENV_ARG_DECL)
+    const char *type_id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
-    this->property_manager_.get_type_properties (type_id
-                                                 ACE_ENV_ARG_PARAMETER);
+    this->property_manager_.get_type_properties (type_id);
 }
 
 void
 TAO_LB_LoadManager::remove_type_properties (
     const char *type_id,
-    const PortableGroup::Properties & props
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Properties & props)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::InvalidProperty,
                    PortableGroup::UnsupportedProperty))
 {
   this->property_manager_.remove_type_properties (type_id,
-                                                  props
-                                                  ACE_ENV_ARG_PARAMETER);
+                                                  props);
 }
 
 void
 TAO_LB_LoadManager::set_properties_dynamically (
     PortableGroup::ObjectGroup_ptr object_group,
-    const PortableGroup::Properties & overrides
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Properties & overrides)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::InvalidProperty,
                    PortableGroup::UnsupportedProperty))
 {
   PortableGroup::Properties new_overrides (overrides);
-  this->preprocess_properties (new_overrides
-                               ACE_ENV_ARG_PARAMETER);
+  this->preprocess_properties (new_overrides);
 
   this->property_manager_.set_properties_dynamically (object_group,
-                                                      new_overrides
-                                                      ACE_ENV_ARG_PARAMETER);
+                                                      new_overrides);
 }
 
 PortableGroup::Properties *
 TAO_LB_LoadManager::get_properties (
-    PortableGroup::ObjectGroup_ptr object_group
-    ACE_ENV_ARG_DECL)
+    PortableGroup::ObjectGroup_ptr object_group)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound))
 {
   return
-    this->property_manager_.get_properties (object_group
-                                            ACE_ENV_ARG_PARAMETER);
+    this->property_manager_.get_properties (object_group);
 }
 
 PortableGroup::ObjectGroup_ptr
@@ -589,8 +553,7 @@ TAO_LB_LoadManager::create_member (
     PortableGroup::ObjectGroup_ptr object_group,
     const PortableGroup::Location & the_location,
     const char * type_id,
-    const PortableGroup::Criteria & the_criteria
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Criteria & the_criteria)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::MemberAlreadyPresent,
@@ -603,16 +566,14 @@ TAO_LB_LoadManager::create_member (
     this->object_group_manager_.create_member (object_group,
                                                the_location,
                                                type_id,
-                                               the_criteria
-                                               ACE_ENV_ARG_PARAMETER);
+                                               the_criteria);
 }
 
 PortableGroup::ObjectGroup_ptr
 TAO_LB_LoadManager::add_member (
     PortableGroup::ObjectGroup_ptr object_group,
     const PortableGroup::Location & the_location,
-    CORBA::Object_ptr member
-    ACE_ENV_ARG_DECL)
+    CORBA::Object_ptr member)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::MemberAlreadyPresent,
@@ -621,97 +582,82 @@ TAO_LB_LoadManager::add_member (
   return
     this->object_group_manager_.add_member (object_group,
                                             the_location,
-                                            member
-                                            ACE_ENV_ARG_PARAMETER);
+                                            member);
 }
 
 PortableGroup::ObjectGroup_ptr
 TAO_LB_LoadManager::remove_member (
     PortableGroup::ObjectGroup_ptr object_group,
-    const PortableGroup::Location & the_location
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::MemberNotFound))
 {
   return
     this->object_group_manager_.remove_member (object_group,
-                                               the_location
-                                               ACE_ENV_ARG_PARAMETER);
+                                               the_location);
 }
 
 PortableGroup::Locations *
 TAO_LB_LoadManager::locations_of_members (
-    PortableGroup::ObjectGroup_ptr object_group
-    ACE_ENV_ARG_DECL)
+    PortableGroup::ObjectGroup_ptr object_group)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound))
 {
   return
-    this->object_group_manager_.locations_of_members (object_group
-                                                      ACE_ENV_ARG_PARAMETER);
+    this->object_group_manager_.locations_of_members (object_group);
 }
 
 PortableGroup::ObjectGroups *
 TAO_LB_LoadManager::groups_at_location (
-    const PortableGroup::Location & the_location
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
-    this->object_group_manager_.groups_at_location (the_location
-                                                    ACE_ENV_ARG_PARAMETER);
+    this->object_group_manager_.groups_at_location (the_location);
 }
 
 PortableGroup::ObjectGroupId
 TAO_LB_LoadManager::get_object_group_id (
-    PortableGroup::ObjectGroup_ptr object_group
-    ACE_ENV_ARG_DECL)
+    PortableGroup::ObjectGroup_ptr object_group)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound))
 {
   return
-    this->object_group_manager_.get_object_group_id (object_group
-                                                     ACE_ENV_ARG_PARAMETER);
+    this->object_group_manager_.get_object_group_id (object_group);
 }
 
 PortableGroup::ObjectGroup_ptr
 TAO_LB_LoadManager::get_object_group_ref (
-    PortableGroup::ObjectGroup_ptr object_group
-    ACE_ENV_ARG_DECL)
+    PortableGroup::ObjectGroup_ptr object_group)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound))
 {
   return
-    this->object_group_manager_.get_object_group_ref (object_group
-                                                      ACE_ENV_ARG_PARAMETER);
+    this->object_group_manager_.get_object_group_ref (object_group);
 }
 
 PortableGroup::ObjectGroup_ptr TAO_LB_LoadManager::get_object_group_ref_from_id (
-    PortableGroup::ObjectGroupId group_id
-  ACE_ENV_ARG_DECL)
+    PortableGroup::ObjectGroupId group_id)
   ACE_THROW_SPEC((
     CORBA::SystemException,
     PortableGroup::ObjectGroupNotFound))
 {
   return this->object_group_manager_.get_object_group_ref_from_id (
-    group_id
-    ACE_ENV_ARG_PARAMETER);
+    group_id);
 }
 
 CORBA::Object_ptr
 TAO_LB_LoadManager::get_member_ref (
     PortableGroup::ObjectGroup_ptr object_group,
-    const PortableGroup::Location & the_location
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::MemberNotFound))
 {
   return
     this->object_group_manager_.get_member_ref (object_group,
-                                                the_location
-                                                ACE_ENV_ARG_PARAMETER);
+                                                the_location);
 }
 
 CORBA::Object_ptr
@@ -719,8 +665,7 @@ TAO_LB_LoadManager::create_object (
     const char * type_id,
     const PortableGroup::Criteria & the_criteria,
     PortableGroup::GenericFactory::FactoryCreationId_out
-      factory_creation_id
-    ACE_ENV_ARG_DECL)
+      factory_creation_id)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::NoFactory,
                    PortableGroup::ObjectNotCreated,
@@ -732,14 +677,12 @@ TAO_LB_LoadManager::create_object (
 
 
   PortableGroup::Criteria new_criteria (the_criteria);
-  this->preprocess_properties (new_criteria
-                               ACE_ENV_ARG_PARAMETER);
+  this->preprocess_properties (new_criteria);
 
   CORBA::Object_ptr obj =
     this->generic_factory_.create_object (type_id,
                                           new_criteria,
-                                          factory_creation_id
-                                          ACE_ENV_ARG_PARAMETER);
+                                          factory_creation_id);
 
 
   return obj;
@@ -748,8 +691,7 @@ TAO_LB_LoadManager::create_object (
 #if 0
 void
 TAO_LB_LoadManager::process_criteria (
-  const PortableGroup::Criteria & the_criteria
-  ACE_ENV_ARG_DECL)
+  const PortableGroup::Criteria & the_criteria)
 {
   // List of invalid criteria.  If this list has a length greater than
   // zero, then the PortableGroup::InvalidCriteria exception will
@@ -785,33 +727,31 @@ TAO_LB_LoadManager::process_criteria (
 
       // Unknown property
       else
-        ACE_THROW (PortableGroup::InvalidProperty (the_criteria[i].nam,
-                                                   the_criteria[i].val));
+        throw PortableGroup::InvalidProperty (
+          the_criteria[i].nam,
+          the_criteria[i].val);
     }
 
   if (invalid_criteria.length () != 0)
-    ACE_THROW (PortableGroup::InvalidCriteria (invalid_criteria));
+    throw PortableGroup::InvalidCriteria (invalid_criteria);
 
   if (found_factory == 0)
-    ACE_THROW (PortableGroup::NoFactory ());
+    throw PortableGroup::NoFactory ();
 }
 #endif  /* 0 */
 
 void
 TAO_LB_LoadManager::delete_object (
     const PortableGroup::GenericFactory::FactoryCreationId &
-      factory_creation_id
-    ACE_ENV_ARG_DECL)
+      factory_creation_id)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectNotFound))
 {
-  this->generic_factory_.delete_object (factory_creation_id
-                                        ACE_ENV_ARG_PARAMETER);
+  this->generic_factory_.delete_object (factory_creation_id);
 }
 
 CORBA::Object_ptr
-TAO_LB_LoadManager::next_member (const PortableServer::ObjectId & oid
-                                 ACE_ENV_ARG_DECL)
+TAO_LB_LoadManager::next_member (const PortableServer::ObjectId & oid)
 {
   PortableGroup::ObjectGroup_var object_group =
     this->object_group_manager_.object_group (oid);
@@ -821,8 +761,7 @@ TAO_LB_LoadManager::next_member (const PortableServer::ObjectId & oid
                       CORBA::Object::_nil ());
 
   PortableGroup::Properties_var properties =
-    this->get_properties (object_group.in ()
-                          ACE_ENV_ARG_PARAMETER);
+    this->get_properties (object_group.in ());
 
   // Prefer custom load balancing strategies over built-in ones.
   PortableGroup::Value value;
@@ -838,8 +777,7 @@ TAO_LB_LoadManager::next_member (const PortableServer::ObjectId & oid
        && !CORBA::is_nil (strategy))
     {
       return strategy->next_member (object_group.in (),
-                                    this->lm_ref_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
+                                    this->lm_ref_.in ());
     }
 
   ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
@@ -849,8 +787,7 @@ TAO_LB_LoadManager::next_member (const PortableServer::ObjectId & oid
 void
 TAO_LB_LoadManager::init (ACE_Reactor * reactor,
                           CORBA::ORB_ptr orb,
-                          PortableServer::POA_ptr root_poa
-                          ACE_ENV_ARG_DECL)
+                          PortableServer::POA_ptr root_poa)
 {
   ACE_ASSERT (!CORBA::is_nil (orb));
   ACE_ASSERT (!CORBA::is_nil (root_poa));
@@ -879,13 +816,11 @@ TAO_LB_LoadManager::init (ACE_Reactor * reactor,
       // for a ServantLocator.
       PortableServer::RequestProcessingPolicy_var request =
         root_poa->create_request_processing_policy (
-          PortableServer::USE_SERVANT_MANAGER
-          ACE_ENV_ARG_PARAMETER);
+          PortableServer::USE_SERVANT_MANAGER);
 
       PortableServer::ServantRetentionPolicy_var retention =
         root_poa->create_servant_retention_policy (
-          PortableServer::NON_RETAIN
-          ACE_ENV_ARG_PARAMETER);
+          PortableServer::NON_RETAIN);
 
       // Create the PolicyList containing the policies necessary for
       // the POA to support ServantLocators.
@@ -924,8 +859,7 @@ TAO_LB_LoadManager::init (ACE_Reactor * reactor,
 
       this->poa_ = root_poa->create_POA (poa_name,
                                          poa_manager.in (),
-                                         policy_list
-                                         ACE_ENV_ARG_PARAMETER);
+                                         policy_list);
 
       request->destroy ();
 
@@ -933,8 +867,7 @@ TAO_LB_LoadManager::init (ACE_Reactor * reactor,
 
       // Now set the MemberLocator as the child POA's Servant
       // Manager.
-      this->poa_->set_servant_manager (member_locator.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+      this->poa_->set_servant_manager (member_locator.in ());
 
       this->object_group_manager_.poa (this->poa_.in ());
       this->generic_factory_.poa (this->poa_.in ());
@@ -951,8 +884,7 @@ TAO_LB_LoadManager::init (ACE_Reactor * reactor,
       this->lm_ref_ = this->_this ();
 
       orb->register_initial_reference ("LoadManager",
-                                       this->lm_ref_.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+                                       this->lm_ref_.in ());
     }
 
   if (CORBA::is_nil (this->load_alert_handler_.in ()))
@@ -986,8 +918,7 @@ TAO_LB_LoadManager::init (ACE_Reactor * reactor,
 }
 
 void
-TAO_LB_LoadManager::preprocess_properties (PortableGroup::Properties & props
-                                           ACE_ENV_ARG_DECL)
+TAO_LB_LoadManager::preprocess_properties (PortableGroup::Properties & props)
 {
   // @@ This is slow.  Optimize this code.
 
@@ -1000,8 +931,7 @@ TAO_LB_LoadManager::preprocess_properties (PortableGroup::Properties & props
           CosLoadBalancing::CustomStrategy_ptr strategy;
           if (!(property.val >>= strategy)
               || CORBA::is_nil (strategy))
-            ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                       property.val));
+            throw PortableGroup::InvalidProperty (property.nam, property.val);
         }
 
       else if (property.nam == this->built_in_balancing_strategy_info_name_)
@@ -1014,8 +944,7 @@ TAO_LB_LoadManager::preprocess_properties (PortableGroup::Properties & props
               // to a "Strategy" property.
 
               CosLoadBalancing::Strategy_var strategy =
-                this->make_strategy (info
-                                     ACE_ENV_ARG_PARAMETER);
+                this->make_strategy (info);
 
               if (!CORBA::is_nil (strategy.in ()))
                 {
@@ -1024,25 +953,23 @@ TAO_LB_LoadManager::preprocess_properties (PortableGroup::Properties & props
                   property.val <<= strategy.in ();
                 }
               else
-                ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                           property.val));
+                throw PortableGroup::InvalidProperty (
+                  property.nam,
+                  property.val);
             }
           else
-            ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                       property.val));
+            throw PortableGroup::InvalidProperty (property.nam, property.val);
         }
       else if (property.nam == this->built_in_balancing_strategy_name_)
         {
           // It is illegal to set the Strategy property externally.
-          ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                     property.val));
+          throw PortableGroup::InvalidProperty (property.nam, property.val);
         }
     }
 }
 
 CosLoadBalancing::Strategy_ptr
-TAO_LB_LoadManager::make_strategy (CosLoadBalancing::StrategyInfo * info
-                                   ACE_ENV_ARG_DECL)
+TAO_LB_LoadManager::make_strategy (CosLoadBalancing::StrategyInfo * info)
 {
   /**
    * @todo We need a strategy factory.  This is just too messy.
@@ -1139,8 +1066,7 @@ TAO_LB_LoadManager::make_strategy (CosLoadBalancing::StrategyInfo * info
 
           PortableServer::ServantBase_var s = ll_servant;
 
-          ll_servant->init (info->props
-                            ACE_ENV_ARG_PARAMETER);
+          ll_servant->init (info->props);
 
           return ll_servant->_this ();
         }
@@ -1182,8 +1108,7 @@ TAO_LB_LoadManager::make_strategy (CosLoadBalancing::StrategyInfo * info
 
           PortableServer::ServantBase_var s = lm_servant;
 
-          lm_servant->init (info->props
-                            ACE_ENV_ARG_PARAMETER);
+          lm_servant->init (info->props);
 
           return lm_servant->_this ();
         }
@@ -1225,8 +1150,7 @@ TAO_LB_LoadManager::make_strategy (CosLoadBalancing::StrategyInfo * info
 
           PortableServer::ServantBase_var s = la_servant;
 
-          la_servant->init (info->props
-                            ACE_ENV_ARG_PARAMETER);
+          la_servant->init (info->props);
 
           return la_servant->_this ();
         }
@@ -1240,7 +1164,7 @@ TAO_LB_LoadManager::make_strategy (CosLoadBalancing::StrategyInfo * info
 // }
 
 // void
-// TAO_LB_LoadManager::deactivate_strategy (ACE_ENV_ARG_DECL)
+// TAO_LB_LoadManager::deactivate_strategy ()
 // {
 //   PortableServer::ObjectId_var oid =
 //     this->poa_->reference_to_id (
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h
index 42ce6c006c4..22cfeb1d3e3 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h
@@ -53,34 +53,29 @@ public:
 
   /// For the PUSH load monitoring style.
   virtual void push_loads (const PortableGroup::Location & the_location,
-                           const CosLoadBalancing::LoadList & loads
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                           const CosLoadBalancing::LoadList & loads)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the raw loads at the given location.
   virtual CosLoadBalancing::LoadList * get_loads (
-      const PortableGroup::Location & the_location
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Location & the_location)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosLoadBalancing::LocationNotFound));
 
   /// Inform member at given location of load alert condition.
-  virtual void enable_alert (const PortableGroup::Location & the_location
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void enable_alert (const PortableGroup::Location & the_location)
     ACE_THROW_SPEC ((CosLoadBalancing::LoadAlertNotFound));
 
   /// Inform member at given location that load alert condition has
   /// passed.
-  virtual void disable_alert (const PortableGroup::Location & the_location
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void disable_alert (const PortableGroup::Location & the_location)
     ACE_THROW_SPEC ((CosLoadBalancing::LoadAlertNotFound));
 
   /// Register a LoadAlert object for the member at the given
   /// location.
   virtual void register_load_alert (
       const PortableGroup::Location & the_location,
-      CosLoadBalancing::LoadAlert_ptr load_alert
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CosLoadBalancing::LoadAlert_ptr load_alert)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosLoadBalancing::LoadAlertAlreadyPresent,
                      CosLoadBalancing::LoadAlertNotAdded));
@@ -88,38 +83,33 @@ public:
   /// Retrieve the LoadAlert object for the member at the given
   /// location.
   virtual CosLoadBalancing::LoadAlert_ptr get_load_alert (
-      const PortableGroup::Location & the_location
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Location & the_location)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosLoadBalancing::LoadAlertNotFound));
 
   /// Remove (de-register) the LoadAlert object for the member at the
   /// given location.
-  virtual void remove_load_alert (const PortableGroup::Location & the_location
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void remove_load_alert (const PortableGroup::Location & the_location)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosLoadBalancing::LoadAlertNotFound));
 
   /// Register a load monitor with the load balancer.
   virtual void register_load_monitor (
       const PortableGroup::Location & the_location,
-      CosLoadBalancing::LoadMonitor_ptr load_monitor
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CosLoadBalancing::LoadMonitor_ptr load_monitor)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosLoadBalancing::MonitorAlreadyPresent));
 
   /// Return a reference to the load monitor at the given location.
   virtual CosLoadBalancing::LoadMonitor_ptr get_load_monitor (
-      const PortableGroup::Location & the_location
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Location & the_location)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosLoadBalancing::LocationNotFound));
 
   /// Remove a load monitor at the given location from the load
   /// balancer.
   virtual void remove_load_monitor (
-      const PortableGroup::Location & the_location
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Location & the_location)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosLoadBalancing::LocationNotFound));
 
@@ -134,21 +124,18 @@ public:
 
   /// Set the default properties to be used by all object groups.
   virtual void set_default_properties (
-      const PortableGroup::Properties & props
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Properties & props)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::InvalidProperty,
                      PortableGroup::UnsupportedProperty));
 
   /// Get the default properties used by all object groups.
-  virtual PortableGroup::Properties * get_default_properties (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual PortableGroup::Properties * get_default_properties ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Remove default properties.
   virtual void remove_default_properties (
-      const PortableGroup::Properties & props
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Properties & props)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::InvalidProperty,
                      PortableGroup::UnsupportedProperty));
@@ -157,8 +144,7 @@ public:
   /// properties override the default properties.
   virtual void set_type_properties (
       const char * type_id,
-      const PortableGroup::Properties & overrides
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Properties & overrides)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::InvalidProperty,
                      PortableGroup::UnsupportedProperty));
@@ -169,15 +155,13 @@ public:
    * addition to the default properties that were not overridden.
    */
   virtual PortableGroup::Properties * get_type_properties (
-      const char * type_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const char * type_id)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Remove the given properties associated with the Replica type ID.
   virtual void remove_type_properties (
       const char * type_id,
-      const PortableGroup::Properties & props
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Properties & props)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::InvalidProperty,
                      PortableGroup::UnsupportedProperty));
@@ -190,8 +174,7 @@ public:
    */
   virtual void set_properties_dynamically (
       PortableGroup::ObjectGroup_ptr object_group,
-      const PortableGroup::Properties & overrides
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Properties & overrides)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound,
                      PortableGroup::InvalidProperty,
@@ -205,8 +188,7 @@ public:
    * that weren't overridden.
    */
   virtual PortableGroup::Properties * get_properties (
-      PortableGroup::ObjectGroup_ptr object_group
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableGroup::ObjectGroup_ptr object_group)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound));
 
@@ -226,8 +208,7 @@ public:
       PortableGroup::ObjectGroup_ptr object_group,
       const PortableGroup::Location & the_location,
       const char * type_id,
-      const PortableGroup::Criteria & the_criteria
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Criteria & the_criteria)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound,
                      PortableGroup::MemberAlreadyPresent,
@@ -240,8 +221,7 @@ public:
   virtual PortableGroup::ObjectGroup_ptr add_member (
       PortableGroup::ObjectGroup_ptr object_group,
       const PortableGroup::Location & the_location,
-      CORBA::Object_ptr member
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::Object_ptr member)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound,
                      PortableGroup::MemberAlreadyPresent,
@@ -256,43 +236,37 @@ public:
    */
   virtual PortableGroup::ObjectGroup_ptr remove_member (
       PortableGroup::ObjectGroup_ptr object_group,
-      const PortableGroup::Location & the_location
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Location & the_location)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound,
                      PortableGroup::MemberNotFound));
 
   /// Return the locations of the members in the given ObjectGroup.
   virtual PortableGroup::Locations * locations_of_members (
-      PortableGroup::ObjectGroup_ptr object_group
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableGroup::ObjectGroup_ptr object_group)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound));
 
   /// Return the locations of the members in the given ObjectGroup.
   virtual PortableGroup::ObjectGroups * groups_at_location (
-      const PortableGroup::Location & the_location
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Location & the_location)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the ObjectGroupId for the given ObjectGroup.
   virtual PortableGroup::ObjectGroupId get_object_group_id (
-      PortableGroup::ObjectGroup_ptr object_group
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableGroup::ObjectGroup_ptr object_group)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound));
 
   /// @note Does this method make sense for load balanced objects?
   virtual PortableGroup::ObjectGroup_ptr get_object_group_ref (
-      PortableGroup::ObjectGroup_ptr object_group
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableGroup::ObjectGroup_ptr object_group)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound));
 
   /// TAO specific method
   virtual PortableGroup::ObjectGroup_ptr get_object_group_ref_from_id (
-      PortableGroup::ObjectGroupId group_id
-      ACE_ENV_ARG_DECL)
+      PortableGroup::ObjectGroupId group_id)
     ACE_THROW_SPEC((
        CORBA::SystemException,
        PortableGroup::ObjectGroupNotFound));
@@ -301,8 +275,7 @@ public:
   /// ObjectGroup at the given location.
   virtual CORBA::Object_ptr get_member_ref (
       PortableGroup::ObjectGroup_ptr object_group,
-      const PortableGroup::Location & loc
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Location & loc)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound,
                      PortableGroup::MemberNotFound));
@@ -326,8 +299,7 @@ public:
       const char * type_id,
       const PortableGroup::Criteria & the_criteria,
       PortableGroup::GenericFactory::FactoryCreationId_out
-        factory_creation_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        factory_creation_id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::NoFactory,
                      PortableGroup::ObjectNotCreated,
@@ -343,8 +315,7 @@ public:
    */
   virtual void delete_object (
       const PortableGroup::GenericFactory::FactoryCreationId &
-        factory_creation_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        factory_creation_id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectNotFound));
 
@@ -357,8 +328,7 @@ public:
    * given ObjectId.  The object group's load balancing strategy
    * will be queried for that member.
    */
-  CORBA::Object_ptr next_member (const PortableServer::ObjectId & oid
-                                 ACE_ENV_ARG_DECL);
+  CORBA::Object_ptr next_member (const PortableServer::ObjectId & oid);
 
 public:
 
@@ -367,8 +337,7 @@ public:
   /// (i.e. for the MemberLocator).
   void init (ACE_Reactor * reactor,
              CORBA::ORB_ptr orb,
-             PortableServer::POA_ptr root_poa
-             ACE_ENV_ARG_DECL);
+             PortableServer::POA_ptr root_poa);
 
 protected:
 
@@ -406,14 +375,12 @@ private:
    * Strategy properties, and verifying that CustomStrategy references
    * are not nil.
    */
-  void preprocess_properties (PortableGroup::Properties & props
-                              ACE_ENV_ARG_DECL);
+  void preprocess_properties (PortableGroup::Properties & props);
 
   /// Create a built-in load balancing strategy and return a reference
   /// to it.
   CosLoadBalancing::Strategy_ptr make_strategy (
-    CosLoadBalancing::StrategyInfo * info
-    ACE_ENV_ARG_DECL);
+    CosLoadBalancing::StrategyInfo * info);
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
index c394e740d43..e71f683933a 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
@@ -77,31 +77,28 @@ TAO_LB_LoadMinimum::get_properties (void)
 void
 TAO_LB_LoadMinimum::push_loads (
     const PortableGroup::Location & the_location,
-    const CosLoadBalancing::LoadList & loads
-    ACE_ENV_ARG_DECL)
+    const CosLoadBalancing::LoadList & loads)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Only the first load is used by this load balancing strategy.
   if (loads.length () == 0)
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   CosLoadBalancing::Load load;  // Unused
 
   this->push_loads (the_location,
                     loads,
-                    load
-                    ACE_ENV_ARG_PARAMETER);
+                    load);
 }
 
 void
 TAO_LB_LoadMinimum::push_loads (
     const PortableGroup::Location & the_location,
     const CosLoadBalancing::LoadList & loads,
-    CosLoadBalancing::Load & load
-    ACE_ENV_ARG_DECL)
+    CosLoadBalancing::Load & load)
 {
   if (loads.length () == 0)
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   // Only the first load is used by this load balancing strategy.
   const CosLoadBalancing::Load & new_load = loads[0];
@@ -116,7 +113,7 @@ TAO_LB_LoadMinimum::push_loads (
           CosLoadBalancing::Load & previous_load = entry->int_id_;
 
           if (previous_load.id != new_load.id)
-            ACE_THROW (CORBA::BAD_PARAM ());  // Somebody switched
+            throw CORBA::BAD_PARAM ();  // Somebody switched
                                               // LoadIds on us!
 
           previous_load.value =
@@ -139,7 +136,7 @@ TAO_LB_LoadMinimum::push_loads (
                             "ERROR: TAO_LB_LoadMinimum - "
                             "Unable to push loads\n"));
 
-              ACE_THROW (CORBA::INTERNAL ());
+              throw CORBA::INTERNAL ();
             }
 
           load = eff_load;
@@ -154,8 +151,7 @@ TAO_LB_LoadMinimum::push_loads (
 
 CosLoadBalancing::LoadList *
 TAO_LB_LoadMinimum::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
-                               const PortableGroup::Location & the_location
-                               ACE_ENV_ARG_DECL)
+                               const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosLoadBalancing::LocationNotFound))
 {
@@ -163,13 +159,11 @@ TAO_LB_LoadMinimum::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
     ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
 
   CosLoadBalancing::LoadList_var loads =
-    load_manager->get_loads (the_location
-                             ACE_ENV_ARG_PARAMETER);
+    load_manager->get_loads (the_location);
 
   this->push_loads (the_location,
                     loads.in (),
-                    loads[0]
-                    ACE_ENV_ARG_PARAMETER);
+                    loads[0]);
 
   return loads._retn ();
 }
@@ -178,8 +172,7 @@ TAO_LB_LoadMinimum::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
 CORBA::Object_ptr
 TAO_LB_LoadMinimum::next_member (
     PortableGroup::ObjectGroup_ptr object_group,
-    CosLoadBalancing::LoadManager_ptr load_manager
-    ACE_ENV_ARG_DECL)
+    CosLoadBalancing::LoadManager_ptr load_manager)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::MemberNotFound))
@@ -189,8 +182,7 @@ TAO_LB_LoadMinimum::next_member (
                       CORBA::Object::_nil ());
 
   PortableGroup::Locations_var locations =
-    load_manager->locations_of_members (object_group
-                                        ACE_ENV_ARG_PARAMETER);
+    load_manager->locations_of_members (object_group);
 
   if (locations->length () == 0)
     ACE_THROW_RETURN (CORBA::TRANSIENT (),
@@ -203,8 +195,7 @@ TAO_LB_LoadMinimum::next_member (
   CORBA::Boolean found_location =
     this->get_location (load_manager,
                         locations.in (),
-                        location
-                        ACE_ENV_ARG_PARAMETER);
+                        location);
 
   if (found_location)
     {
@@ -215,8 +206,7 @@ TAO_LB_LoadMinimum::next_member (
 */
 
       return load_manager->get_member_ref (object_group,
-                                           location
-                                           ACE_ENV_ARG_PARAMETER);
+                                           location);
     }
   else
     {
@@ -236,27 +226,24 @@ TAO_LB_LoadMinimum::next_member (
 
       return TAO_LB_Random::_tao_next_member (object_group,
                                               load_manager,
-                                              locations.in ()
-                                              ACE_ENV_ARG_PARAMETER);
+                                              locations.in ());
     }
 }
 
 void
 TAO_LB_LoadMinimum::analyze_loads (
     PortableGroup::ObjectGroup_ptr object_group,
-    CosLoadBalancing::LoadManager_ptr load_manager
-    ACE_ENV_ARG_DECL)
+    CosLoadBalancing::LoadManager_ptr load_manager)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
     if (CORBA::is_nil (load_manager))
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   PortableGroup::Locations_var locations =
-    load_manager->locations_of_members (object_group
-                                        ACE_ENV_ARG_PARAMETER);
+    load_manager->locations_of_members (object_group);
 
   if (locations->length () == 0)
-    ACE_THROW (CORBA::TRANSIENT ());
+    throw CORBA::TRANSIENT ();
 
   const CORBA::ULong len = locations->length ();
 
@@ -272,7 +259,7 @@ TAO_LB_LoadMinimum::analyze_loads (
   // the average load of all the locations
   for (CORBA::ULong i = 0; i < len; ++i)
     {
-      ACE_TRY
+      try
         {
           const PortableGroup::Location & loc = locations[i];
 
@@ -280,14 +267,12 @@ TAO_LB_LoadMinimum::analyze_loads (
           // LoadManager and push it to this Strategy's load
           // processor.
           CosLoadBalancing::LoadList_var current_loads =
-            load_manager->get_loads (loc
-                                     ACE_ENV_ARG_PARAMETER);
+            load_manager->get_loads (loc);
 
           CosLoadBalancing::Load load;
           this->push_loads (loc,
                             current_loads.in (),
-                            load
-                            ACE_ENV_ARG_PARAMETER);
+                            load);
 
           total_load.value = total_load.value + load.value;
           tmp[i] = load;
@@ -304,12 +289,11 @@ TAO_LB_LoadMinimum::analyze_loads (
           */
 
         }
-      ACE_CATCH (CosLoadBalancing::LocationNotFound, ex)
+      catch (const CosLoadBalancing::LocationNotFound& ex)
         {
           // no location found
           //
         }
-      ACE_ENDTRY;
     }
 
   avg_load.value = total_load.value / len;
@@ -325,7 +309,7 @@ TAO_LB_LoadMinimum::analyze_loads (
   // the location where the load has to be shed.
   for (CORBA::ULong j = 0; j < len; ++j)
     {
-      ACE_TRY_EX (SECOND)
+      try
         {
           const PortableGroup::Location & loc = locations[j];
 
@@ -339,9 +323,7 @@ TAO_LB_LoadMinimum::analyze_loads (
 
           if (tmp[j].value <= avg_load.value)
             {
-              load_manager->disable_alert (loc
-                                           ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK_EX (SECOND);
+              load_manager->disable_alert (loc);
             }
           else
             {
@@ -367,9 +349,7 @@ TAO_LB_LoadMinimum::analyze_loads (
 
               if (percent_diff <= TAO_LB::LM_DEFAULT_DIFF_AVERAGE_CUTOFF)
               {
-                load_manager->disable_alert (loc
-                                             ACE_ENV_ARG_PARAMETER);
-                ACE_TRY_CHECK_EX (SECOND);
+                load_manager->disable_alert (loc);
               }
               else if ((percent_diff > TAO_LB::LM_DEFAULT_DIFF_AVERAGE_CUTOFF)
                        && (percent_diff < 1))
@@ -379,18 +359,15 @@ TAO_LB_LoadMinimum::analyze_loads (
                             "%P --- ALERTING LOCATION %u\n",
                             i));
 */
-                load_manager->enable_alert (loc
-                                            ACE_ENV_ARG_PARAMETER);
-                ACE_TRY_CHECK_EX (SECOND);
+                load_manager->enable_alert (loc);
               }
             }
         }
-      ACE_CATCH (CosLoadBalancing::LocationNotFound, ex)
+      catch (const CosLoadBalancing::LocationNotFound& ex)
         {
           // no location found
           //
         }
-      ACE_ENDTRY;
     }
 
 }
@@ -405,8 +382,7 @@ CORBA::Boolean
 TAO_LB_LoadMinimum::get_location (
   CosLoadBalancing::LoadManager_ptr load_manager,
   const PortableGroup::Locations & locations,
-  PortableGroup::Location & location
-  ACE_ENV_ARG_DECL)
+  PortableGroup::Location & location)
 {
   CORBA::Float min_load = FLT_MAX;  // Start out with the largest
                                     // positive value.
@@ -421,23 +397,21 @@ TAO_LB_LoadMinimum::get_location (
   // of them.
   for (CORBA::ULong i = 0; i < len; ++i)
     {
-      ACE_TRY
+      try
         {
           const PortableGroup::Location & loc = locations[i];
 
           // Retrieve the load list for the location from the LoadManager
           // and push it to this Strategy's load processor.
           CosLoadBalancing::LoadList_var current_loads =
-            load_manager->get_loads (loc
-                                     ACE_ENV_ARG_PARAMETER);
+            load_manager->get_loads (loc);
 
           found_load = 1;
 
           CosLoadBalancing::Load load;
           this->push_loads (loc,
                             current_loads.in (),
-                            load
-                            ACE_ENV_ARG_PARAMETER);
+                            load);
 /*
           ACE_DEBUG ((LM_DEBUG,
                       "LOC == %u"
@@ -537,12 +511,11 @@ TAO_LB_LoadMinimum::get_location (
 
           // ACE_DEBUG ((LM_DEBUG, "NEW MIN_LOAD == %f\n", min_load));
         }
-      ACE_CATCH (CosLoadBalancing::LocationNotFound, ex)
+      catch (const CosLoadBalancing::LocationNotFound& ex)
         {
           // No load available for the requested location.  Try the
           // next location.
         }
-      ACE_ENDTRY;
     }
 
 //   ACE_DEBUG ((LM_DEBUG,
@@ -569,8 +542,7 @@ TAO_LB_LoadMinimum::get_location (
 }
 
 void
-TAO_LB_LoadMinimum::init (const PortableGroup::Properties & props
-                          ACE_ENV_ARG_DECL)
+TAO_LB_LoadMinimum::init (const PortableGroup::Properties & props)
 {
   CORBA::Float tolerance = TAO_LB::LM_DEFAULT_TOLERANCE;
   CORBA::Float dampening = TAO_LB::LM_DEFAULT_DAMPENING;
@@ -584,34 +556,29 @@ TAO_LB_LoadMinimum::init (const PortableGroup::Properties & props
                           "org.omg.CosLoadBalancing.Strategy.LoadMinimum.Tolerance") == 0)
         {
           this->extract_float_property (property,
-                                        tolerance
-                                        ACE_ENV_ARG_PARAMETER);
+                                        tolerance);
 
           // Valid tolerance values are greater than or equal to one.
           if (tolerance < 1)
-            ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                       property.val));
+            throw PortableGroup::InvalidProperty (property.nam, property.val);
         }
 
       else if (ACE_OS::strcmp (property.nam[0].id.in (),
                                "org.omg.CosLoadBalancing.Strategy.LoadMinimum.Dampening") == 0)
         {
           this->extract_float_property (property,
-                                        dampening
-                                        ACE_ENV_ARG_PARAMETER);
+                                        dampening);
 
           // Dampening range is [0,1).
           if (dampening < 0 || dampening >= 1)
-            ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                       property.val));
+            throw PortableGroup::InvalidProperty (property.nam, property.val);
         }
 
       else if (ACE_OS::strcmp (property.nam[0].id.in (),
                                "org.omg.CosLoadBalancing.Strategy.LoadMinimum.PerBalanceLoad") == 0)
         {
           this->extract_float_property (property,
-                                        per_balance_load
-                                        ACE_ENV_ARG_PARAMETER);
+                                        per_balance_load);
         }
     }
 
@@ -637,12 +604,10 @@ TAO_LB_LoadMinimum::init (const PortableGroup::Properties & props
 void
 TAO_LB_LoadMinimum::extract_float_property (
   const PortableGroup::Property & property,
-  CORBA::Float & value
-  ACE_ENV_ARG_DECL)
+  CORBA::Float & value)
 {
   if (!(property.val >>= value))
-    ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                               property.val));
+    throw PortableGroup::InvalidProperty (property.nam, property.val);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h
index dd1cb712c76..b2785462279 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h
@@ -91,46 +91,39 @@ public:
   virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CosLoadBalancing::Properties * get_properties (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CosLoadBalancing::Properties * get_properties ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void push_loads (
       const PortableGroup::Location & the_location,
-      const CosLoadBalancing::LoadList & loads
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CosLoadBalancing::LoadList & loads)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CosLoadBalancing::LoadList * get_loads (
       CosLoadBalancing::LoadManager_ptr load_manager,
-      const PortableGroup::Location & the_location
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Location & the_location)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosLoadBalancing::LocationNotFound));
 
   virtual CORBA::Object_ptr next_member (
       PortableGroup::ObjectGroup_ptr object_group,
-      CosLoadBalancing::LoadManager_ptr load_manager
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CosLoadBalancing::LoadManager_ptr load_manager)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound,
                      PortableGroup::MemberNotFound));
 
   virtual void analyze_loads (
       PortableGroup::ObjectGroup_ptr object_group,
-      CosLoadBalancing::LoadManager_ptr load_manager
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CosLoadBalancing::LoadManager_ptr load_manager)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
   /// Returns the default POA for this servant.
   virtual PortableServer::POA_ptr _default_POA (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     );
 
   /// Initialize the LoadMinimum instance with the given properties.
-  void init (const PortableGroup::Properties & props
-             ACE_ENV_ARG_DECL);
+  void init (const PortableGroup::Properties & props);
 
 protected:
 
@@ -141,8 +134,7 @@ protected:
   /// locations.
   CORBA::Boolean get_location (CosLoadBalancing::LoadManager_ptr load_manager,
                                const PortableGroup::Locations & locations,
-                               PortableGroup::Location & location
-                               ACE_ENV_ARG_DECL);
+                               PortableGroup::Location & location);
 
   /// Return the effective load.
   CORBA::Float effective_load (CORBA::Float previous_load,
@@ -153,14 +145,12 @@ protected:
   void push_loads (
       const PortableGroup::Location & the_location,
       const CosLoadBalancing::LoadList & loads,
-      CosLoadBalancing::Load & effective_load
-      ACE_ENV_ARG_DECL);
+      CosLoadBalancing::Load & effective_load);
 
   /// Utility method to extract a CORBA::Float value from the given
   /// property.
   void extract_float_property (const PortableGroup::Property & property,
-                               CORBA::Float & value
-                               ACE_ENV_ARG_DECL);
+                               CORBA::Float & value);
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp
index 5cf5ab748b7..b213c38e90e 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp
@@ -22,16 +22,14 @@ TAO_LB_MemberLocator::preinvoke (
     const PortableServer::ObjectId & oid,
     PortableServer::POA_ptr /* adapter */,
     const char * /* operation */,
-    PortableServer::ServantLocator::Cookie & /* the_cookie */
-    ACE_ENV_ARG_DECL)
+    PortableServer::ServantLocator::Cookie & /* the_cookie */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::ForwardRequest))
 {
-  ACE_TRY
+  try
     {
       CORBA::Object_var member =
-        this->load_manager_->next_member (oid
-                                          ACE_ENV_ARG_PARAMETER);
+        this->load_manager_->next_member (oid);
 
 //       ACE_DEBUG ((LM_DEBUG, "%N:%l\n"));
 //       ACE_DEBUG ((LM_DEBUG,
@@ -40,21 +38,18 @@ TAO_LB_MemberLocator::preinvoke (
       ACE_ASSERT (!CORBA::is_nil (member.in ()));
       // Throw a forward exception to force the client to redirect its
       // requests to the member chosen by the LoadBalancer.
-      ACE_TRY_THROW (PortableServer::ForwardRequest (member.in ()));
+      throw PortableServer::ForwardRequest (member.in ());
     }
-  ACE_CATCH (PortableGroup::ObjectGroupNotFound, ex)
+  catch (const PortableGroup::ObjectGroupNotFound& ex)
     {
       if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ex,
-                             "LoadManager::next_member()");
+        ex._tao_print_exception ("LoadManager::next_member()");
     }
-  ACE_CATCH (PortableGroup::MemberNotFound, ex)
+  catch (const PortableGroup::MemberNotFound& ex)
     {
       if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ex,
-                             "LoadManager::next_member()");
+        ex._tao_print_exception ("LoadManager::next_member()");
     }
-  ACE_ENDTRY;
 
   ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
 }
@@ -65,8 +60,7 @@ TAO_LB_MemberLocator::postinvoke (
     PortableServer::POA_ptr /* adapter */,
     const char * /* operation */,
     PortableServer::ServantLocator::Cookie /* the_cookie */,
-    PortableServer::Servant /* the_servant */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableServer::Servant /* the_servant */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h
index e376937f0a5..bc395ed36f0 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h
@@ -61,8 +61,7 @@ public:
       const PortableServer::ObjectId & oid,
       PortableServer::POA_ptr adapter,
       const char * operation,
-      PortableServer::ServantLocator::Cookie & the_cookie
-      ACE_ENV_ARG_DECL)
+      PortableServer::ServantLocator::Cookie & the_cookie)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::ForwardRequest));
 
@@ -72,8 +71,7 @@ public:
       PortableServer::POA_ptr adapter,
       const char * operation,
       PortableServer::ServantLocator::Cookie the_cookie,
-      PortableServer::Servant the_servant
-      ACE_ENV_ARG_DECL)
+      PortableServer::Servant the_servant)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@}
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
index 82fbebf223c..f82e4f02eb7 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
@@ -26,25 +26,21 @@ TAO_LB_ORBInitializer::TAO_LB_ORBInitializer (
 
 void
 TAO_LB_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_LB_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_var obj =
-    info->resolve_initial_references ("LoadManager"
-                                      ACE_ENV_ARG_PARAMETER);
+    info->resolve_initial_references ("LoadManager");
 
   CosLoadBalancing::LoadManager_var lm =
-    CosLoadBalancing::LoadManager::_narrow (obj.in ()
-                                            ACE_ENV_ARG_PARAMETER);
+    CosLoadBalancing::LoadManager::_narrow (obj.in ());
 
   CORBA::String_var orbid = info->orb_id ();
 
@@ -64,8 +60,7 @@ TAO_LB_ORBInitializer::post_init (
 
   PortableInterceptor::IORInterceptor_var ior_interceptor = tmp;
 
-  info->add_ior_interceptor (ior_interceptor.in ()
-                             ACE_ENV_ARG_PARAMETER);
+  info->add_ior_interceptor (ior_interceptor.in ());
 
   // ----------------
 
@@ -80,8 +75,7 @@ TAO_LB_ORBInitializer::post_init (
 
   PortableInterceptor::ServerRequestInterceptor_var sr_interceptor = sri;
 
-  info->add_server_request_interceptor (sr_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+  info->add_server_request_interceptor (sr_interceptor.in ());
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h
index 292e36558ab..83f93618333 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h
@@ -68,12 +68,10 @@ public:
    * interface.
    */
   //@{
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
index f8fdc8189aa..f53fac41955 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
@@ -56,24 +56,21 @@ TAO_LB_ObjectReferenceFactory::~TAO_LB_ObjectReferenceFactory (void)
   // No need to call CORBA::remove_ref() on this->old_orf_.  It is a
   // "_var" object, meaning that will be done automatically.
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   if (!CORBA::is_nil (this->lm_.in ()))
     {
       const CORBA::ULong len = this->fcids_.size ();
       for (CORBA::ULong i = 0; i < len; ++i)
         {
-          ACE_TRY
+          try
             {
               // Clean up all object groups we created.
-              this->lm_->delete_object (this->fcids_[i].in ()
-                                        ACE_ENV_ARG_PARAMETER);
+              this->lm_->delete_object (this->fcids_[i].in ());
             }
-          ACE_CATCHANY
+          catch (const CORBA::Exception& ex)
             {
               // Ignore all exceptions.
             }
-          ACE_ENDTRY;
         }
     }
 
@@ -86,8 +83,7 @@ TAO_LB_ObjectReferenceFactory::~TAO_LB_ObjectReferenceFactory (void)
 CORBA::Object_ptr
 TAO_LB_ObjectReferenceFactory::make_object (
     const char * repository_id,
-    const PortableInterceptor::ObjectId & id
-    ACE_ENV_ARG_DECL)
+    const PortableInterceptor::ObjectId & id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (repository_id == 0)
@@ -95,8 +91,7 @@ TAO_LB_ObjectReferenceFactory::make_object (
 
   CORBA::Object_var obj =
     this->old_orf_->make_object (repository_id,
-                                 id
-                                 ACE_ENV_ARG_PARAMETER);
+                                 id);
 
   PortableGroup::ObjectGroup_var object_group;
 
@@ -105,8 +100,7 @@ TAO_LB_ObjectReferenceFactory::make_object (
   CORBA::Boolean const found_group =
     this->find_object_group (repository_id,
                              index,
-                             object_group.out ()
-                             ACE_ENV_ARG_PARAMETER);
+                             object_group.out ());
 
   if (found_group)
     {
@@ -114,46 +108,41 @@ TAO_LB_ObjectReferenceFactory::make_object (
       // subsequent object reference creation calls.
       if (!this->registered_members_[index])
         {
-          ACE_TRY
+          try
             {
               object_group =
                 this->lm_->add_member (object_group.in (),
                                        this->location_,
-                                       obj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+                                       obj.in ());
             }
-          ACE_CATCH (PortableGroup::ObjectGroupNotFound, ex)
+          catch (const PortableGroup::ObjectGroupNotFound& ex)
             {
               if (TAO_debug_level > 0)
-                ACE_PRINT_EXCEPTION (ex,
-                                     "TAO_LB_ObjectReferenceFactory::"
-                                     "make_object");
+                ex._tao_print_exception (
+                  "TAO_LB_ObjectReferenceFactory::""make_object");
 
               ACE_THROW_RETURN (CORBA::BAD_PARAM (),
                                 CORBA::Object::_nil ());
             }
-          ACE_CATCH (PortableGroup::MemberAlreadyPresent, ex)
+          catch (const PortableGroup::MemberAlreadyPresent& ex)
             {
               if (TAO_debug_level > 0)
-                ACE_PRINT_EXCEPTION (ex,
-                                     "TAO_LB_ObjectReferenceFactory::"
-                                     "make_object");
+                ex._tao_print_exception (
+                  "TAO_LB_ObjectReferenceFactory::""make_object");
 
               ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (),
                                 CORBA::Object::_nil ());
 
             }
-          ACE_CATCH (PortableGroup::ObjectNotAdded, ex)
+          catch (const PortableGroup::ObjectNotAdded& ex)
             {
               if (TAO_debug_level > 0)
-                ACE_PRINT_EXCEPTION (ex,
-                                     "TAO_LB_ObjectReferenceFactory::"
-                                     "make_object");
+                ex._tao_print_exception (
+                  "TAO_LB_ObjectReferenceFactory::""make_object");
 
               ACE_THROW_RETURN (CORBA::UNKNOWN (),
                                 CORBA::Object::_nil ());
             }
-          ACE_ENDTRY;
 
           this->registered_members_[index] = 1;
         }
@@ -171,8 +160,7 @@ CORBA::Boolean
 TAO_LB_ObjectReferenceFactory::find_object_group (
   const char * repository_id,
   CORBA::ULong & index,
-  PortableGroup::ObjectGroup_out object_group
-  ACE_ENV_ARG_DECL)
+  PortableGroup::ObjectGroup_out object_group)
 {
   if (!this->load_managed_object (repository_id, index))
     return false;
@@ -202,8 +190,7 @@ TAO_LB_ObjectReferenceFactory::find_object_group (
           group =
             this->lm_->create_object (repository_id,
                                       criteria,
-                                      fcid.out ()
-                                      ACE_ENV_ARG_PARAMETER);
+                                      fcid.out ());
 
           CORBA::ULong const len = this->fcids_.size ();
           this->fcids_.size (len + 1); // Incremental growth.  Yuck!
@@ -212,8 +199,7 @@ TAO_LB_ObjectReferenceFactory::find_object_group (
       else
         {
           group =
-            this->orb_->string_to_object (this->object_groups_[index]
-                                          ACE_ENV_ARG_PARAMETER);
+            this->orb_->string_to_object (this->object_groups_[index]);
         }
 
       if (this->table_.bind (repository_id, group) != 0)
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
index 81fddbe05bf..a5e119164e3 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
@@ -70,8 +70,7 @@ class TAO_LB_ObjectReferenceFactory
   //@{
   virtual CORBA::Object_ptr make_object (
       const char * repository_id,
-      const PortableInterceptor::ObjectId & id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableInterceptor::ObjectId & id)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
@@ -99,8 +98,7 @@ protected:
   /// RepositoryId.
   CORBA::Boolean find_object_group (const char * repository_id,
                                     CORBA::ULong & index,
-                                    PortableGroup::ObjectGroup_out object_group
-                                    ACE_ENV_ARG_DECL);
+                                    PortableGroup::ObjectGroup_out object_group);
 
   /// Determine if object with given RepositoryId is load managed.
   CORBA::Boolean load_managed_object (const char * repository_id,
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp
index 53c9b33e1ae..1b01771d3b1 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp
@@ -38,8 +38,7 @@ TAO_LB_Pull_Handler::handle_timeout (
   if (begin == end)
     return 0;       // No work to be done.
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Iterate over all registered load monitors.
       //
@@ -57,8 +56,7 @@ TAO_LB_Pull_Handler::handle_timeout (
             monitor->loads ();
 
           this->load_manager_->push_loads (location,
-                                           load_list.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+                                           load_list.in ());
 
 //           ACE_DEBUG ((LM_DEBUG,
 //                       "LOCATION = %s\tLOAD = %f\n",
@@ -66,15 +64,13 @@ TAO_LB_Pull_Handler::handle_timeout (
 //                       load_list[0].value));
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Catch the exception and ignore it.
 
       if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             "(%P|%t) PullHandler::handle_timeout()\n");
+        ex._tao_print_exception ("(%P|%t) PullHandler::handle_timeout()\n");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
index eac615d5efb..ac8b15a1dcd 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
@@ -53,33 +53,29 @@ TAO_LB_Random::get_properties (void)
 void
 TAO_LB_Random::push_loads (
     const PortableGroup::Location & /* the_location */,
-    const CosLoadBalancing::LoadList & /* loads */
-    ACE_ENV_ARG_DECL)
+    const CosLoadBalancing::LoadList & /* loads */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosLoadBalancing::StrategyNotAdaptive))
 {
-  ACE_THROW (CosLoadBalancing::StrategyNotAdaptive ());
+  throw CosLoadBalancing::StrategyNotAdaptive ();
 }
 
 CosLoadBalancing::LoadList *
 TAO_LB_Random::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
-                          const PortableGroup::Location & the_location
-                          ACE_ENV_ARG_DECL)
+                          const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosLoadBalancing::LocationNotFound))
 {
   if (CORBA::is_nil (load_manager))
     ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
 
-  return load_manager->get_loads (the_location
-                                  ACE_ENV_ARG_PARAMETER);
+  return load_manager->get_loads (the_location);
 }
 
 CORBA::Object_ptr
 TAO_LB_Random::next_member (
     PortableGroup::ObjectGroup_ptr object_group,
-    CosLoadBalancing::LoadManager_ptr load_manager
-    ACE_ENV_ARG_DECL)
+    CosLoadBalancing::LoadManager_ptr load_manager)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::MemberNotFound))
@@ -88,20 +84,17 @@ TAO_LB_Random::next_member (
     ACE_THROW_RETURN (CORBA::BAD_PARAM (), CORBA::Object::_nil ());
 
   PortableGroup::Locations_var locations =
-    load_manager->locations_of_members (object_group
-                                        ACE_ENV_ARG_PARAMETER);
+    load_manager->locations_of_members (object_group);
 
   return TAO_LB_Random::_tao_next_member (object_group,
                                           load_manager,
-                                          locations.in ()
-                                          ACE_ENV_ARG_PARAMETER);
+                                          locations.in ());
 }
 
 void
 TAO_LB_Random::analyze_loads (
     PortableGroup::ObjectGroup_ptr /* object_group */,
-    CosLoadBalancing::LoadManager_ptr /* load_manager */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    CosLoadBalancing::LoadManager_ptr /* load_manager */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -116,8 +109,7 @@ CORBA::Object_ptr
 TAO_LB_Random::_tao_next_member (
     PortableGroup::ObjectGroup_ptr object_group,
     CosLoadBalancing::LoadManager_ptr load_manager,
-    const PortableGroup::Locations & locations
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Locations & locations)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::MemberNotFound))
@@ -160,8 +152,7 @@ TAO_LB_Random::_tao_next_member (
 //               locations[i][0].id.in ()));
 
   return load_manager->get_member_ref (object_group,
-                                       locations[i]
-                                       ACE_ENV_ARG_PARAMETER);
+                                       locations[i]);
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h
index 12d0ef5dac7..a1ffe3ee89c 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h
@@ -53,42 +53,36 @@ public:
   virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CosLoadBalancing::Properties * get_properties (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CosLoadBalancing::Properties * get_properties ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void push_loads (
       const PortableGroup::Location & the_location,
-      const CosLoadBalancing::LoadList & loads
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CosLoadBalancing::LoadList & loads)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosLoadBalancing::StrategyNotAdaptive));
 
   virtual CosLoadBalancing::LoadList * get_loads (
       CosLoadBalancing::LoadManager_ptr load_manager,
-      const PortableGroup::Location & the_location
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Location & the_location)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosLoadBalancing::LocationNotFound));
 
   virtual CORBA::Object_ptr next_member (
       PortableGroup::ObjectGroup_ptr object_group,
-      CosLoadBalancing::LoadManager_ptr load_manager
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CosLoadBalancing::LoadManager_ptr load_manager)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound,
                      PortableGroup::MemberNotFound));
 
   virtual void analyze_loads (
       PortableGroup::ObjectGroup_ptr object_group,
-      CosLoadBalancing::LoadManager_ptr load_manager
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CosLoadBalancing::LoadManager_ptr load_manager)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
   /// Returns the default POA for this servant.
   virtual PortableServer::POA_ptr _default_POA (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     );
 
   /// TAO-specific underlying implementation of this Random load
@@ -96,8 +90,7 @@ public:
   static CORBA::Object_ptr _tao_next_member (
       PortableGroup::ObjectGroup_ptr object_group,
       CosLoadBalancing::LoadManager_ptr load_manager,
-      const PortableGroup::Locations & locations
-      ACE_ENV_ARG_DECL)
+      const PortableGroup::Locations & locations)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound,
                      PortableGroup::MemberNotFound));
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
index 5acd2861bb1..09a69aaaf26 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
@@ -53,33 +53,29 @@ TAO_LB_RoundRobin::get_properties (void)
 void
 TAO_LB_RoundRobin::push_loads (
     const PortableGroup::Location & /* the_location */,
-    const CosLoadBalancing::LoadList & /* loads */
-    ACE_ENV_ARG_DECL)
+    const CosLoadBalancing::LoadList & /* loads */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosLoadBalancing::StrategyNotAdaptive))
 {
-  ACE_THROW (CosLoadBalancing::StrategyNotAdaptive ());
+  throw CosLoadBalancing::StrategyNotAdaptive ();
 }
 
 CosLoadBalancing::LoadList *
 TAO_LB_RoundRobin::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
-                              const PortableGroup::Location & the_location
-                              ACE_ENV_ARG_DECL)
+                              const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosLoadBalancing::LocationNotFound))
 {
   if (CORBA::is_nil (load_manager))
     ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
 
-  return load_manager->get_loads (the_location
-                                  ACE_ENV_ARG_PARAMETER);
+  return load_manager->get_loads (the_location);
 }
 
 CORBA::Object_ptr
 TAO_LB_RoundRobin::next_member (
     PortableGroup::ObjectGroup_ptr object_group,
-    CosLoadBalancing::LoadManager_ptr load_manager
-    ACE_ENV_ARG_DECL)
+    CosLoadBalancing::LoadManager_ptr load_manager)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::MemberNotFound))
@@ -88,8 +84,7 @@ TAO_LB_RoundRobin::next_member (
     ACE_THROW_RETURN (CORBA::BAD_PARAM (), CORBA::Object::_nil ());
 
   const PortableGroup::ObjectGroupId id =
-    load_manager->get_object_group_id (object_group
-                                       ACE_ENV_ARG_PARAMETER);
+    load_manager->get_object_group_id (object_group);
 
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     monitor,
@@ -102,8 +97,7 @@ TAO_LB_RoundRobin::next_member (
   //
   // There is a race condition here.  The
   PortableGroup::Locations_var locations =
-    load_manager->locations_of_members (object_group
-                                        ACE_ENV_ARG_PARAMETER);
+    load_manager->locations_of_members (object_group);
 
   const CORBA::ULong len = locations->length ();
 
@@ -123,8 +117,7 @@ TAO_LB_RoundRobin::next_member (
       // collocated.
       CORBA::Object_var member =
         load_manager->get_member_ref (object_group,
-                                      locations[i]
-                                      ACE_ENV_ARG_PARAMETER);
+                                      locations[i]);
 
       // Increment index to point to next location.
       i++;
@@ -145,15 +138,13 @@ TAO_LB_RoundRobin::next_member (
     ACE_THROW_RETURN (CORBA::INTERNAL (), CORBA::Object::_nil ());
 
   return load_manager->get_member_ref (object_group,
-                                       locations[index]
-                                       ACE_ENV_ARG_PARAMETER);
+                                       locations[index]);
 }
 
 void
 TAO_LB_RoundRobin::analyze_loads (
     PortableGroup::ObjectGroup_ptr /* object_group */,
-    CosLoadBalancing::LoadManager_ptr /* load_manager */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    CosLoadBalancing::LoadManager_ptr /* load_manager */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h
index 712924ca4c6..aecac8a987b 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h
@@ -54,42 +54,36 @@ public:
   virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CosLoadBalancing::Properties * get_properties (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CosLoadBalancing::Properties * get_properties ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void push_loads (
       const PortableGroup::Location & the_location,
-      const CosLoadBalancing::LoadList & loads
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CosLoadBalancing::LoadList & loads)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosLoadBalancing::StrategyNotAdaptive));
 
   virtual CosLoadBalancing::LoadList * get_loads (
       CosLoadBalancing::LoadManager_ptr load_manager,
-      const PortableGroup::Location & the_location
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Location & the_location)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosLoadBalancing::LocationNotFound));
 
   virtual CORBA::Object_ptr next_member (
       PortableGroup::ObjectGroup_ptr object_group,
-      CosLoadBalancing::LoadManager_ptr load_manager
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CosLoadBalancing::LoadManager_ptr load_manager)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound,
                      PortableGroup::MemberNotFound));
 
   virtual void analyze_loads (
       PortableGroup::ObjectGroup_ptr object_group,
-      CosLoadBalancing::LoadManager_ptr load_manager
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CosLoadBalancing::LoadManager_ptr load_manager)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
   /// Returns the default POA for this servant.
   virtual PortableServer::POA_ptr _default_POA (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     );
 
 protected:
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
index 75813c76a50..4feb2474cac 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
@@ -37,8 +37,7 @@ TAO_LB_ServerRequestInterceptor::destroy (void)
 
 void
 TAO_LB_ServerRequestInterceptor::receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -52,11 +51,10 @@ TAO_LB_ServerRequestInterceptor::receive_request_service_contexts (
         return;  // Do not redirect.
 
 #if 0
-      ACE_TRY
+      try
         {
           IOP::ServiceContext_var service_context =
-            ri->get_request_service_context (CosLoadBalancing::LOAD_MANAGED
-                                             ACE_ENV_ARG_PARAMETER);
+            ri->get_request_service_context (CosLoadBalancing::LOAD_MANAGED);
 
           /*
           // Use TAO-specific "compiled marshaling" instead of
@@ -69,25 +67,25 @@ TAO_LB_ServerRequestInterceptor::receive_request_service_contexts (
 
           CORBA::Boolean byte_order;
           if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
-            ACE_TRY_THROW (CORBA::BAD_PARAM ());
+            throw CORBA::BAD_PARAM ();
 
           cdr.reset_byte_order (static_cast<int> (byte_order));
 
           CORBA::Object_var object_group;
           if (cdr >> object_group.out ())
-            ACE_TRY_THROW (PortableInterceptor::ForwardRequest (object_group.in (),
+            throw PortableInterceptor::ForwardRequest (object_group.in (,
                                                             0));
           else
-            ACE_TRY_THROW (CORBA::BAD_PARAM ());
+            throw CORBA::BAD_PARAM ();
           */
 
           // A ServiceContext of the given ServiceId exists.  This
           // means that the target is load balanced.  Force the client
           // to try another profile since this location is currently
           // overloaded.
-          ACE_TRY_THROW (CORBA::TRANSIENT ());
+          throw CORBA::TRANSIENT ();
         }
-      ACE_CATCH (CORBA::BAD_PARAM, ex)
+      catch (const CORBA::BAD_PARAM& ex)
         {
           // No CosLoadBalancing::LB_GROUP_REF ServiceContext.  This
           // probably means that the target object is not
@@ -104,24 +102,22 @@ TAO_LB_ServerRequestInterceptor::receive_request_service_contexts (
           // Make sure we get a CORBA::BAD_PARAM for the right
           // reason.
           if (ex.minor () != (CORBA::OMGVMCID | 26))
-            ACE_RE_THROW;
+            throw;
         }
-      ACE_ENDTRY;
 #else
       // Force the client to try another profile since this location
       // is currently overloaded.
       //
       // NOTE: This applies to both load balanced and non-load
       // balanced targets.
-      ACE_THROW (CORBA::TRANSIENT ());
+      throw CORBA::TRANSIENT ();
 #endif  /* 0 */
     }
 }
 
 void
 TAO_LB_ServerRequestInterceptor::receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -129,16 +125,14 @@ TAO_LB_ServerRequestInterceptor::receive_request (
 
 void
 TAO_LB_ServerRequestInterceptor::send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr /* ri */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr /* ri */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_LB_ServerRequestInterceptor::send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -155,8 +149,7 @@ TAO_LB_ServerRequestInterceptor::send_exception (
 
 void
 TAO_LB_ServerRequestInterceptor::send_other (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
index 3330d8ddee0..5cd2591ffeb 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
@@ -70,31 +70,26 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_request_service_contexts (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_request (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_reply (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_exception (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_other (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
   //@}
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
index 5353a4cb052..e05a6f943da 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
@@ -17,28 +17,23 @@ TAO_BasicLogFactory_i::~TAO_BasicLogFactory_i (void)
 
 DsLogAdmin::BasicLogFactory_ptr
 TAO_BasicLogFactory_i::activate (CORBA::ORB_ptr orb,
-                                 PortableServer::POA_ptr poa
-                                 ACE_ENV_ARG_DECL)
+                                 PortableServer::POA_ptr poa)
 {
-  TAO_LogMgr_i::init (orb, poa ACE_ENV_ARG_PARAMETER);
+  TAO_LogMgr_i::init (orb, poa);
 
 
   PortableServer::ObjectId_var oid =
-    this->factory_poa_->activate_object (this
-					 ACE_ENV_ARG_PARAMETER);
+    this->factory_poa_->activate_object (this);
 
   CORBA::Object_var obj =
-    this->factory_poa_->id_to_reference (oid.in ()
-					 ACE_ENV_ARG_PARAMETER);
+    this->factory_poa_->id_to_reference (oid.in ());
 
   // narrow and store the result..
   this->log_mgr_ =
-    DsLogAdmin::LogMgr::_narrow (obj.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+    DsLogAdmin::LogMgr::_narrow (obj.in ());
 
   DsLogAdmin::BasicLogFactory_var v_return =
-    DsLogAdmin::BasicLogFactory::_narrow (obj.in ()
-					  ACE_ENV_ARG_PARAMETER);
+    DsLogAdmin::BasicLogFactory::_narrow (obj.in ());
 
   return v_return._retn ();
 }
@@ -46,8 +41,7 @@ TAO_BasicLogFactory_i::activate (CORBA::ORB_ptr orb,
 DsLogAdmin::BasicLog_ptr
 TAO_BasicLogFactory_i::create (DsLogAdmin::LogFullActionType full_action,
                                CORBA::ULongLong max_size,
-                               DsLogAdmin::LogId_out id_out
-                               ACE_ENV_ARG_DECL)
+                               DsLogAdmin::LogId_out id_out)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidLogFullAction
                    ))
@@ -55,16 +49,15 @@ TAO_BasicLogFactory_i::create (DsLogAdmin::LogFullActionType full_action,
   this->create_i (full_action,
 		  max_size,
 		  0,
-		  id_out
-		  ACE_ENV_ARG_PARAMETER);
+		  id_out);
   DsLogAdmin::LogId id = id_out;
 
 #if (TAO_HAS_MINIMUM_POA == 0)
   DsLogAdmin::Log_var log =
-    this->create_log_reference (id ACE_ENV_ARG_PARAMETER);
+    this->create_log_reference (id);
 #else
   DsLogAdmin::Log_var log =
-    this->create_log_object (id ACE_ENV_ARG_PARAMETER);
+    this->create_log_object (id);
 #endif
 
   // narrow to BasicLog
@@ -77,8 +70,7 @@ TAO_BasicLogFactory_i::create (DsLogAdmin::LogFullActionType full_action,
 DsLogAdmin::BasicLog_ptr
 TAO_BasicLogFactory_i::create_with_id (DsLogAdmin::LogId id,
                                        DsLogAdmin::LogFullActionType full_action,
-                                       CORBA::ULongLong max_size
-                                       ACE_ENV_ARG_DECL)
+                                       CORBA::ULongLong max_size)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    DsLogAdmin::LogIdAlreadyExists,
@@ -88,15 +80,14 @@ TAO_BasicLogFactory_i::create_with_id (DsLogAdmin::LogId id,
   this->create_with_id_i (id,
 			  full_action,
 			  max_size,
-			  0
-			  ACE_ENV_ARG_PARAMETER);
+			  0);
 
 #if (TAO_HAS_MINIMUM_POA == 0)
   DsLogAdmin::Log_var log =
-    this->create_log_reference (id ACE_ENV_ARG_PARAMETER);
+    this->create_log_reference (id);
 #else
   DsLogAdmin::Log_var log =
-    this->create_log_object (id ACE_ENV_ARG_PARAMETER);
+    this->create_log_object (id);
 #endif
 
   // narrow to BasicLog
@@ -113,8 +104,7 @@ TAO_BasicLogFactory_i::create_repositoryid ()
 }
 
 PortableServer::ServantBase*
-TAO_BasicLogFactory_i::create_log_servant (DsLogAdmin::LogId id
-					   ACE_ENV_ARG_DECL)
+TAO_BasicLogFactory_i::create_log_servant (DsLogAdmin::LogId id)
 {
   TAO_BasicLog_i* basic_log_i;
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h
index f6cc8f4113a..b7341463161 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h
@@ -61,16 +61,14 @@ public:
   /// Activate this servant with the ORB and POA passed in.
   DsLogAdmin::BasicLogFactory_ptr
     activate (CORBA::ORB_ptr orb,
-              PortableServer::POA_ptr poa
-              ACE_ENV_ARG_DECL);
+              PortableServer::POA_ptr poa);
 
   /// Allows clients to create new BasicLog objects.
   /// Raises DsLogAdmin::InvalidThreshold.
   DsLogAdmin::BasicLog_ptr
     create (DsLogAdmin::LogFullActionType full_action,
             CORBA::ULongLong max_size,
-            DsLogAdmin::LogId_out id
-            ACE_ENV_ARG_DECL)
+            DsLogAdmin::LogId_out id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidLogFullAction
                      ));
@@ -79,8 +77,7 @@ public:
   DsLogAdmin::BasicLog_ptr
     create_with_id (DsLogAdmin::LogId id,
                     DsLogAdmin::LogFullActionType full_action,
-                    CORBA::ULongLong max_size
-                    ACE_ENV_ARG_DECL)
+                    CORBA::ULongLong max_size)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      DsLogAdmin::LogIdAlreadyExists,
@@ -90,10 +87,9 @@ public:
 protected:
   virtual CORBA::RepositoryId
     create_repositoryid ();
-	
+
   virtual PortableServer::ServantBase*
-    create_log_servant (DsLogAdmin::LogId id
-			ACE_ENV_ARG_DECL);
+    create_log_servant (DsLogAdmin::LogId id);
 
   /// Our object ref. after <active>ation.
   DsLogAdmin::LogMgr_var        log_mgr_;
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
index e76571c0c1d..8073177c807 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
@@ -25,40 +25,35 @@ TAO_BasicLog_i::~TAO_BasicLog_i (void)
 }
 
 DsLogAdmin::Log_ptr
-TAO_BasicLog_i::copy (DsLogAdmin::LogId &id
-                  ACE_ENV_ARG_DECL)
+TAO_BasicLog_i::copy (DsLogAdmin::LogId &id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   DsLogAdmin::BasicLogFactory_var basicLogFactory =
-    DsLogAdmin::BasicLogFactory::_narrow (factory_.in ()
-                                          ACE_ENV_ARG_PARAMETER);
+    DsLogAdmin::BasicLogFactory::_narrow (factory_.in ());
 
   DsLogAdmin::BasicLog_var log =
-    basicLogFactory->create (DsLogAdmin::halt, 0, id
-                             ACE_ENV_ARG_PARAMETER);
+    basicLogFactory->create (DsLogAdmin::halt, 0, id);
 
 
   // Copy the attributes from the log.
-  this->copy_attributes (log.in () ACE_ENV_ARG_PARAMETER);
+  this->copy_attributes (log.in ());
 
   return log._retn ();
 
 }
 
 DsLogAdmin::Log_ptr
-TAO_BasicLog_i::copy_with_id (DsLogAdmin::LogId id ACE_ENV_ARG_DECL)
+TAO_BasicLog_i::copy_with_id (DsLogAdmin::LogId id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   DsLogAdmin::BasicLogFactory_var basicLogFactory =
-    DsLogAdmin::BasicLogFactory::_narrow (factory_.in ()
-                                          ACE_ENV_ARG_PARAMETER);
+    DsLogAdmin::BasicLogFactory::_narrow (factory_.in ());
 
   DsLogAdmin::BasicLog_var log =
-    basicLogFactory->create_with_id (id, DsLogAdmin::halt, 0
-                                     ACE_ENV_ARG_PARAMETER);
+    basicLogFactory->create_with_id (id, DsLogAdmin::halt, 0);
 
   // Copy the attributes from the log.
-  this->copy_attributes (log.in () ACE_ENV_ARG_PARAMETER);
+  this->copy_attributes (log.in ());
 
   return log._retn ();
 
@@ -69,16 +64,13 @@ TAO_BasicLog_i::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Remove ourselves from the list of logs.
-  this->logmgr_i_.remove (this->logid_
-			  ACE_ENV_ARG_PARAMETER);
+  this->logmgr_i_.remove (this->logid_);
 
   // Deregister with POA.
   PortableServer::ObjectId_var id =
-    this->poa_->servant_to_id (this
-			       ACE_ENV_ARG_PARAMETER);
+    this->poa_->servant_to_id (this);
 
-  this->poa_->deactivate_object (id.in ()
-				 ACE_ENV_ARG_PARAMETER);
+  this->poa_->deactivate_object (id.in ());
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
index df98a3dcc26..59ce4c92c4e 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
@@ -62,13 +62,11 @@ public:
                   DsLogAdmin::LogId id);
 
   /// Duplicate the log.
-  virtual DsLogAdmin::Log_ptr copy (DsLogAdmin::LogId &id
-                                    ACE_ENV_ARG_DECL)
+  virtual DsLogAdmin::Log_ptr copy (DsLogAdmin::LogId &id)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Duplicate the log specifying an id.
-  virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id
-                                            ACE_ENV_ARG_DECL)
+  virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Destroy the log object and all contained records.
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp
index f94861e8e70..feff0864efc 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp
@@ -27,7 +27,7 @@ TAO_Event_LogConsumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer
 }
 
 void
-TAO_Event_LogConsumer::push (const CORBA::Any& data ACE_ENV_ARG_DECL)
+TAO_Event_LogConsumer::push (const CORBA::Any& data)
 ACE_THROW_SPEC ((
                 CORBA::SystemException,
                 CosEventComm::Disconnected
@@ -63,28 +63,27 @@ ACE_THROW_SPEC ((
   //
   // I have submitted a defect report to the OMG for clarification.
   //    --jtc
-  ACE_TRY
+  try
     {
       // log the RecordList.
-      this->log_->write_recordlist (recList ACE_ENV_ARG_PARAMETER);
+      this->log_->write_recordlist (recList);
     }
-  ACE_CATCH (DsLogAdmin::LogFull, ex)
+  catch (const DsLogAdmin::LogFull& )
     {
-      ACE_THROW (CORBA::NO_RESOURCES ());
+      throw CORBA::NO_RESOURCES ();
     }
-  ACE_CATCH (DsLogAdmin::LogOffDuty, ex)
+  catch (const DsLogAdmin::LogOffDuty& )
     {
-      ACE_THROW (CORBA::NO_RESOURCES ());
+      throw CORBA::NO_RESOURCES ();
     }
-  ACE_CATCH (DsLogAdmin::LogLocked, ex)
+  catch (const DsLogAdmin::LogLocked& )
     {
-      ACE_THROW (CORBA::NO_PERMISSION ());
+      throw CORBA::NO_PERMISSION ();
     }
-  ACE_CATCH (DsLogAdmin::LogDisabled, ex)
+  catch (const DsLogAdmin::LogDisabled& )
     {
-      ACE_THROW (CORBA::TRANSIENT ());
+      throw CORBA::TRANSIENT ();
     }
-  ACE_ENDTRY;
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h
index 6ff0db91682..abc9657d016 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h
@@ -78,7 +78,7 @@ private:
 
   /// This method will call TAO_Log_i::log() to write
   /// the event to the Log.
-  void push (const CORBA::Any& data ACE_ENV_ARG_DECL)
+  void push (const CORBA::Any& data)
     ACE_THROW_SPEC ((
             CORBA::SystemException,
             CosEventComm::Disconnected
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
index a66770656f6..f0cf0016c9c 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
@@ -14,8 +14,7 @@ TAO_EventLogFactory_i::TAO_EventLogFactory_i (void)
 {
   TAO_CEC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       PortableServer::POA_var defPOA =
         this->_default_POA ();
@@ -28,13 +27,12 @@ TAO_EventLogFactory_i::TAO_EventLogFactory_i (void)
 
       impl->activate ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            "Caught exception in "
                            "EventLogFactory_i constructor.");
     }
-  ACE_ENDTRY;
 }
 
 TAO_EventLogFactory_i::~TAO_EventLogFactory_i (void)
@@ -43,8 +41,7 @@ TAO_EventLogFactory_i::~TAO_EventLogFactory_i (void)
 }
 
 CosEventChannelAdmin::EventChannel_ptr
-TAO_EventLogFactory_i::init (PortableServer::POA_ptr /* poa */
-                             ACE_ENV_ARG_DECL)
+TAO_EventLogFactory_i::init (PortableServer::POA_ptr /* poa */)
 {
   ACE_ASSERT (!CORBA::is_nil (this->poa_.in ()));
 
@@ -53,30 +50,27 @@ TAO_EventLogFactory_i::init (PortableServer::POA_ptr /* poa */
   auto_ptr <TAO_CEC_EventChannel> ec (impl);
 
   PortableServer::ObjectId_var oid =
-    this->poa_->activate_object (ec.get ()
-                                 ACE_ENV_ARG_PARAMETER);
+    this->poa_->activate_object (ec.get ());
 
   ec.release ();
 
   CORBA::Object_var obj =
-    this->poa_->id_to_reference (oid.in () ACE_ENV_ARG_PARAMETER);
+    this->poa_->id_to_reference (oid.in ());
 
   ec_return =
-    CosEventChannelAdmin::EventChannel::_narrow (obj.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
+    CosEventChannelAdmin::EventChannel::_narrow (obj.in ());
 
   return ec_return._retn ();
 }
 
 DsEventLogAdmin::EventLogFactory_ptr
 TAO_EventLogFactory_i::activate (CORBA::ORB_ptr orb,
-                                 PortableServer::POA_ptr poa
-                                 ACE_ENV_ARG_DECL)
+                                 PortableServer::POA_ptr poa)
 {
-  TAO_LogMgr_i::init (orb, poa ACE_ENV_ARG_PARAMETER);
+  TAO_LogMgr_i::init (orb, poa);
 
 
-  this->event_channel_ = init (this->poa_.in () ACE_ENV_ARG_PARAMETER);
+  this->event_channel_ = init (this->poa_.in ());
 
   this->consumer_admin_ =
     this->event_channel_->for_consumers ();
@@ -86,21 +80,17 @@ TAO_EventLogFactory_i::activate (CORBA::ORB_ptr orb,
                     CORBA::NO_MEMORY ());
 
   PortableServer::ObjectId_var oid =
-    this->factory_poa_->activate_object (this
-					 ACE_ENV_ARG_PARAMETER);
+    this->factory_poa_->activate_object (this);
 
   CORBA::Object_var obj =
-    this->factory_poa_->id_to_reference (oid.in ()
-					 ACE_ENV_ARG_PARAMETER);
+    this->factory_poa_->id_to_reference (oid.in ());
 
   // narrow and store the result..
   this->log_mgr_ =
-    DsLogAdmin::LogMgr::_narrow (obj.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+    DsLogAdmin::LogMgr::_narrow (obj.in ());
 
   DsEventLogAdmin::EventLogFactory_var v_return =
-    DsEventLogAdmin::EventLogFactory::_narrow (obj.in ()
-                                               ACE_ENV_ARG_PARAMETER);
+    DsEventLogAdmin::EventLogFactory::_narrow (obj.in ());
 
   return v_return._retn ();
 }
@@ -110,8 +100,7 @@ TAO_EventLogFactory_i::create (
     DsLogAdmin::LogFullActionType full_action,
     CORBA::ULongLong max_size,
     const DsLogAdmin::CapacityAlarmThresholdList & thresholds,
-    DsLogAdmin::LogId_out id_out
-    ACE_ENV_ARG_DECL)
+    DsLogAdmin::LogId_out id_out)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidLogFullAction,
                    DsLogAdmin::InvalidThreshold))
@@ -119,16 +108,15 @@ TAO_EventLogFactory_i::create (
   this->create_i (full_action,
 		  max_size,
 		  & thresholds,
-		  id_out
-		  ACE_ENV_ARG_PARAMETER);
+		  id_out);
   DsLogAdmin::LogId id = id_out;
 
 #if (TAO_HAS_MINIMUM_POA == 0)
   DsLogAdmin::Log_var log =
-    this->create_log_reference (id ACE_ENV_ARG_PARAMETER);
+    this->create_log_reference (id);
 #else
   DsLogAdmin::Log_var log =
-    this->create_log_object (id ACE_ENV_ARG_PARAMETER);
+    this->create_log_object (id);
 #endif
 
   // narrow to EventLog
@@ -136,7 +124,7 @@ TAO_EventLogFactory_i::create (
     DsEventLogAdmin::EventLog::_narrow (log.in ());
 
   // @@ JTC - squelch exception?
-  notifier_->object_creation (id ACE_ENV_ARG_PARAMETER);
+  notifier_->object_creation (id);
 
   return event_log._retn();
 }
@@ -146,8 +134,7 @@ TAO_EventLogFactory_i::create_with_id (
     DsLogAdmin::LogId id,
     DsLogAdmin::LogFullActionType full_action,
     CORBA::ULongLong max_size,
-    const DsLogAdmin::CapacityAlarmThresholdList & thresholds
-    ACE_ENV_ARG_DECL)
+    const DsLogAdmin::CapacityAlarmThresholdList & thresholds)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::LogIdAlreadyExists,
                    DsLogAdmin::InvalidLogFullAction,
@@ -156,15 +143,14 @@ TAO_EventLogFactory_i::create_with_id (
   this->create_with_id_i (id,
 			  full_action,
 			  max_size,
-			  & thresholds
-			  ACE_ENV_ARG_PARAMETER);
+			  & thresholds);
 
 #if (TAO_HAS_MINIMUM_POA == 0)
   DsLogAdmin::Log_var log =
-    this->create_log_reference (id ACE_ENV_ARG_PARAMETER);
+    this->create_log_reference (id);
 #else
   DsLogAdmin::Log_var log =
-    this->create_log_object (id ACE_ENV_ARG_PARAMETER);
+    this->create_log_object (id);
 #endif
 
   // narrow to EventLog
@@ -172,7 +158,7 @@ TAO_EventLogFactory_i::create_with_id (
     DsEventLogAdmin::EventLog::_narrow (log.in ());
 
   // @@ JTC - squelch exception?
-  notifier_->object_creation (id ACE_ENV_ARG_PARAMETER);
+  notifier_->object_creation (id);
 
   return event_log._retn ();
 }
@@ -184,8 +170,7 @@ TAO_EventLogFactory_i::create_repositoryid ()
 }
 
 PortableServer::ServantBase*
-TAO_EventLogFactory_i::create_log_servant (DsLogAdmin::LogId id
-					   ACE_ENV_ARG_DECL)
+TAO_EventLogFactory_i::create_log_servant (DsLogAdmin::LogId id)
 {
   TAO_EventLog_i* event_log_i;
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h
index ea8e6e5c63f..3d4250a454d 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h
@@ -65,14 +65,12 @@ public:
   /// Initialise the EventChannel and obtain a
   /// pointer to it.
   CosEventChannelAdmin::EventChannel_ptr
-    init (PortableServer::POA_ptr poa
-              ACE_ENV_ARG_DECL);
+    init (PortableServer::POA_ptr poa);
 
   /// Activate this servant with the ORB and POA passed in.
   DsEventLogAdmin::EventLogFactory_ptr
     activate (CORBA::ORB_ptr orb,
-              PortableServer::POA_ptr poa
-              ACE_ENV_ARG_DECL);
+              PortableServer::POA_ptr poa);
 
   /// Used to create an EventLog.
   DsEventLogAdmin::EventLog_ptr create (
@@ -80,7 +78,6 @@ public:
         CORBA::ULongLong max_size,
         const DsLogAdmin::CapacityAlarmThresholdList & thresholds,
         DsLogAdmin::LogId_out id
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -94,7 +91,6 @@ public:
         DsLogAdmin::LogFullActionType full_action,
         CORBA::ULongLong max_size,
         const DsLogAdmin::CapacityAlarmThresholdList & thresholds
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -105,14 +101,12 @@ public:
 
   // = Implementation of the CosEventChannelAdmin::ConsumerAdmin methods.
   CosEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier (
-        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier (
-        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -121,10 +115,9 @@ public:
 protected:
   virtual CORBA::RepositoryId
     create_repositoryid ();
-	
+
   virtual PortableServer::ServantBase*
-    create_log_servant (DsLogAdmin::LogId id
-			ACE_ENV_ARG_DECL);
+    create_log_servant (DsLogAdmin::LogId id);
 
   /// Our object ref. after <active>ation.
   DsLogAdmin::LogMgr_var log_mgr_;
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp
index 0c6f3a27609..1941a26221d 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp
@@ -42,11 +42,10 @@ TAO_EventLogNotification::obtain_proxy_consumer()
 }
 
 void
-TAO_EventLogNotification::send_notification (const CORBA::Any& any
-                                             ACE_ENV_ARG_DECL)
+TAO_EventLogNotification::send_notification (const CORBA::Any& any)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  consumer_->push (any ACE_ENV_ARG_PARAMETER);
+  consumer_->push (any);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h
index cfb54245804..c76eb44ca2c 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h
@@ -67,7 +67,7 @@ protected:
   void obtain_proxy_consumer ();
 
   /// Send the event on the event channel.
-  virtual void send_notification (const CORBA::Any& any ACE_ENV_ARG_DECL)
+  virtual void send_notification (const CORBA::Any& any)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
index bc0a85a9974..09c2e907049 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
@@ -20,7 +20,6 @@ TAO_EventLog_i::TAO_EventLog_i (CORBA::ORB_ptr orb,
     poa_(PortableServer::POA::_duplicate(poa)),
     log_poa_(PortableServer::POA::_duplicate(log_poa))
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   // Create an instance of the event channel.
   TAO_CEC_EventChannel_Attributes attr (this->poa_.in(),
@@ -40,38 +39,34 @@ TAO_EventLog_i::~TAO_EventLog_i ()
 
 
 DsLogAdmin::Log_ptr
-TAO_EventLog_i::copy (DsLogAdmin::LogId &id ACE_ENV_ARG_DECL)
+TAO_EventLog_i::copy (DsLogAdmin::LogId &id)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Duplicate the log.
   DsEventLogAdmin::EventLogFactory_var eventLogFactory =
-    DsEventLogAdmin::EventLogFactory::_narrow (factory_.in ()
-                                               ACE_ENV_ARG_PARAMETER);
+    DsEventLogAdmin::EventLogFactory::_narrow (factory_.in ());
 
   DsEventLogAdmin::EventLog_var log =
-    eventLogFactory->create (DsLogAdmin::halt, 0, thresholds_, id
-                             ACE_ENV_ARG_PARAMETER);
+    eventLogFactory->create (DsLogAdmin::halt, 0, thresholds_, id);
 
-  this->copy_attributes (log.in () ACE_ENV_ARG_PARAMETER);
+  this->copy_attributes (log.in ());
 
   return log._retn ();
 
 }
 
 DsLogAdmin::Log_ptr
-TAO_EventLog_i::copy_with_id (DsLogAdmin::LogId id ACE_ENV_ARG_DECL)
+TAO_EventLog_i::copy_with_id (DsLogAdmin::LogId id)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Duplicate the log supplying the log id.
   DsEventLogAdmin::EventLogFactory_var eventLogFactory =
-    DsEventLogAdmin::EventLogFactory::_narrow (factory_.in ()
-                                               ACE_ENV_ARG_PARAMETER);
+    DsEventLogAdmin::EventLogFactory::_narrow (factory_.in ());
 
   DsEventLogAdmin::EventLog_var log =
-    eventLogFactory->create_with_id (id, DsLogAdmin::halt, 0, thresholds_
-                                     ACE_ENV_ARG_PARAMETER);
+    eventLogFactory->create_with_id (id, DsLogAdmin::halt, 0, thresholds_);
 
-  this->copy_attributes (log.in () ACE_ENV_ARG_PARAMETER);
+  this->copy_attributes (log.in ());
 
   return log._retn ();
 
@@ -83,19 +78,16 @@ TAO_EventLog_i::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Send event to indicate the log has been deleted.
-  notifier_->object_deletion (logid_ ACE_ENV_ARG_PARAMETER);
+  notifier_->object_deletion (logid_);
 
   // Remove ourselves from the list of logs.
-  this->logmgr_i_.remove (this->logid_
-			  ACE_ENV_ARG_PARAMETER);
+  this->logmgr_i_.remove (this->logid_);
 
   // Deregister with POA.
   PortableServer::ObjectId_var id =
-    this->log_poa_->servant_to_id (this
-                                   ACE_ENV_ARG_PARAMETER);
+    this->log_poa_->servant_to_id (this);
 
-  this->log_poa_->deactivate_object (id.in ()
-                                     ACE_ENV_ARG_PARAMETER);
+  this->log_poa_->deactivate_object (id.in ());
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h
index 43f5f543dbd..2a9d40090e1 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h
@@ -71,13 +71,11 @@ public:
                   DsLogAdmin::LogId id);
 
   /// Duplicate the log.
-  virtual DsLogAdmin::Log_ptr copy (DsLogAdmin::LogId &id
-                                    ACE_ENV_ARG_DECL)
+  virtual DsLogAdmin::Log_ptr copy (DsLogAdmin::LogId &id)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Duplicate the log specifying an id.
-  virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id
-                                            ACE_ENV_ARG_DECL)
+  virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Destroy the log object and all contained records.
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp
index 19eb6da3148..b907563ad65 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp
@@ -36,8 +36,7 @@ TAO_Hash_Iterator_i::~TAO_Hash_Iterator_i (void)
 
 DsLogAdmin::RecordList*
 TAO_Hash_Iterator_i::get (CORBA::ULong position,
-                          CORBA::ULong how_many
-                          ACE_ENV_ARG_DECL)
+                          CORBA::ULong how_many)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidParam))
 {
@@ -57,8 +56,7 @@ TAO_Hash_Iterator_i::get (CORBA::ULong position,
     }
 
   // Use an Interpreter to build an expression tree.
-  TAO_Log_Constraint_Interpreter interpreter (constraint_.in ()
-                                              ACE_ENV_ARG_PARAMETER);
+  TAO_Log_Constraint_Interpreter interpreter (constraint_.in ());
 
   // Sequentially iterate over all the records and pick the ones that
   // meet the constraints.
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h
index 245eb9c98cd..8e95a97d085 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h
@@ -61,8 +61,7 @@ public:
 
   /// Gets a list of LogRecords.
   virtual DsLogAdmin::RecordList* get (CORBA::ULong position,
-                                       CORBA::ULong how_many
-                                       ACE_ENV_ARG_DECL)
+                                       CORBA::ULong how_many)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidParam));
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
index ecfeb356013..1d0e8609fda 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
@@ -117,8 +117,7 @@ TAO_Hash_LogRecordStore::reset_gauge (void)
 }
 
 int
-TAO_Hash_LogRecordStore::log (const DsLogAdmin::LogRecord &const_rec
-            ACE_ENV_ARG_DECL)
+TAO_Hash_LogRecordStore::log (const DsLogAdmin::LogRecord &const_rec)
 {
   // Get log record size...
   size_t record_size = log_record_size (const_rec);
@@ -163,16 +162,14 @@ TAO_Hash_LogRecordStore::log (const DsLogAdmin::LogRecord &const_rec
 
 int
 TAO_Hash_LogRecordStore::retrieve_i (DsLogAdmin::RecordId id,
-				     DsLogAdmin::LogRecord &rec
-				     ACE_ENV_ARG_DECL)
+				     DsLogAdmin::LogRecord &rec)
 {
   int retval = rec_map_.find (id, rec);
   return retval;
 }
 
 int
-TAO_Hash_LogRecordStore::update_i (DsLogAdmin::LogRecord &rec
-				   ACE_ENV_ARG_DECL)
+TAO_Hash_LogRecordStore::update_i (DsLogAdmin::LogRecord &rec)
 {
   DsLogAdmin::LogRecord oldrec;
 
@@ -196,8 +193,7 @@ TAO_Hash_LogRecordStore::update_i (DsLogAdmin::LogRecord &rec
 }
 
 int
-TAO_Hash_LogRecordStore::remove_i (DsLogAdmin::RecordId id
-				   ACE_ENV_ARG_DECL)
+TAO_Hash_LogRecordStore::remove_i (DsLogAdmin::RecordId id)
 {
   DsLogAdmin::LogRecord rec;
   if (rec_map_.unbind (id, rec) != 0)
@@ -212,8 +208,7 @@ TAO_Hash_LogRecordStore::remove_i (DsLogAdmin::RecordId id
 }
 
 void
-TAO_Hash_LogRecordStore::remove_i (LOG_RECORD_STORE_ITER iter
-				   ACE_ENV_ARG_DECL)
+TAO_Hash_LogRecordStore::remove_i (LOG_RECORD_STORE_ITER iter)
 {
   size_t size = log_record_size(iter->item ());
 
@@ -254,8 +249,7 @@ TAO_Hash_LogRecordStore::purge_old_records (void)
 void
 TAO_Hash_LogRecordStore::set_record_attribute (DsLogAdmin::RecordId id,
                 const DsLogAdmin::NVList
-                &attr_list
-                ACE_ENV_ARG_DECL)
+                &attr_list)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidRecordId,
                    DsLogAdmin::InvalidAttribute))
@@ -263,16 +257,16 @@ TAO_Hash_LogRecordStore::set_record_attribute (DsLogAdmin::RecordId id,
   // TODO: validate attributes here.
 
   DsLogAdmin::LogRecord rec;
-  if (this->retrieve_i (id, rec ACE_ENV_ARG_PARAMETER) == -1)
+  if (this->retrieve_i (id, rec) == -1)
     {
-      ACE_THROW (DsLogAdmin::InvalidRecordId ());
+      throw DsLogAdmin::InvalidRecordId ();
     }
 
   rec.attr_list = attr_list;
 
-  if (this->update_i (rec ACE_ENV_ARG_PARAMETER) == -1)
+  if (this->update_i (rec) == -1)
     {
-      ACE_THROW (CORBA::PERSIST_STORE ());
+      throw CORBA::PERSIST_STORE ();
     }
 }
 
@@ -281,19 +275,18 @@ TAO_Hash_LogRecordStore::set_records_attribute (
   const char *grammar,
   const char *constraint,
   const DsLogAdmin::NVList
-  &attr_list ACE_ENV_ARG_DECL)
+  &attr_list)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidGrammar,
                    DsLogAdmin::InvalidConstraint,
                    DsLogAdmin::InvalidAttribute))
 {
-  this->check_grammar (grammar ACE_ENV_ARG_PARAMETER);
+  this->check_grammar (grammar);
 
   // TODO: validate attributes here.
 
   // Use an Interpreter to build an expression tree.
-  TAO_Log_Constraint_Interpreter interpreter (constraint
-                                              ACE_ENV_ARG_PARAMETER);
+  TAO_Log_Constraint_Interpreter interpreter (constraint);
 
   // Create iterators
   LOG_RECORD_STORE_ITER iter (rec_map_.begin ());
@@ -318,14 +311,13 @@ TAO_Hash_LogRecordStore::set_records_attribute (
 }
 
 DsLogAdmin::NVList*
-TAO_Hash_LogRecordStore::get_record_attribute (DsLogAdmin::RecordId id
-                             ACE_ENV_ARG_DECL)
+TAO_Hash_LogRecordStore::get_record_attribute (DsLogAdmin::RecordId id)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidRecordId))
 {
   DsLogAdmin::LogRecord rec;
 
-  int retval = this->retrieve_i (id, rec ACE_ENV_ARG_PARAMETER);
+  int retval = this->retrieve_i (id, rec);
 
   if (retval == -1)
     {
@@ -374,14 +366,12 @@ TAO_Hash_LogRecordStore::log_record_size (const DsLogAdmin::LogRecord &rec)
 DsLogAdmin::RecordList*
 TAO_Hash_LogRecordStore::query_i (const char *constraint,
                                   DsLogAdmin::Iterator_out &iter_out,
-                                  CORBA::ULong how_many
-                                  ACE_ENV_ARG_DECL)
+                                  CORBA::ULong how_many)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidConstraint))
 {
   // Use an Interpreter to build an expression tree.
-  TAO_Log_Constraint_Interpreter interpreter (constraint
-                                              ACE_ENV_ARG_PARAMETER);
+  TAO_Log_Constraint_Interpreter interpreter (constraint);
 
   // Sequentially iterate over all the records and pick the ones that
   // meet the constraints.
@@ -462,25 +452,22 @@ TAO_Hash_LogRecordStore::query_i (const char *constraint,
 DsLogAdmin::RecordList*
 TAO_Hash_LogRecordStore::query (const char *grammar,
                                 const char *constraint,
-                                DsLogAdmin::Iterator_out iter_out
-                                ACE_ENV_ARG_DECL)
+                                DsLogAdmin::Iterator_out iter_out)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidGrammar,
                    DsLogAdmin::InvalidConstraint))
 {
-  this->check_grammar (grammar ACE_ENV_ARG_PARAMETER);
+  this->check_grammar (grammar);
 
   return this->query_i (constraint,
                         iter_out,
-                        this->max_rec_list_len_
-                        ACE_ENV_ARG_PARAMETER);
+                        this->max_rec_list_len_);
 }
 
 DsLogAdmin::RecordList*
 TAO_Hash_LogRecordStore::retrieve (DsLogAdmin::TimeT from_time,
                                    CORBA::Long how_many,
-                                   DsLogAdmin::Iterator_out iter_out
-                                   ACE_ENV_ARG_DECL)
+                                   DsLogAdmin::Iterator_out iter_out)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Decide between forward vs backward retrieval.
@@ -507,23 +494,20 @@ TAO_Hash_LogRecordStore::retrieve (DsLogAdmin::TimeT from_time,
 
   return this->query_i (constraint,
                         iter_out,
-                        how_many
-                        ACE_ENV_ARG_PARAMETER);
+                        how_many);
 }
 
 CORBA::ULong
 TAO_Hash_LogRecordStore::match (const char* grammar,
-				const char *constraint
-				ACE_ENV_ARG_DECL)
+				const char *constraint)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidGrammar,
                    DsLogAdmin::InvalidConstraint))
 {
-  this->check_grammar (grammar ACE_ENV_ARG_PARAMETER);
+  this->check_grammar (grammar);
 
   // Use an Interpreter to build an expression tree.
-  TAO_Log_Constraint_Interpreter interpreter (constraint
-                                              ACE_ENV_ARG_PARAMETER);
+  TAO_Log_Constraint_Interpreter interpreter (constraint);
 
   // Create iterators
   LOG_RECORD_STORE_ITER iter (rec_map_.begin ());
@@ -548,17 +532,15 @@ TAO_Hash_LogRecordStore::match (const char* grammar,
 
 CORBA::ULong
 TAO_Hash_LogRecordStore::delete_records (const char *grammar,
-					 const char *constraint
-                                         ACE_ENV_ARG_DECL)
+					 const char *constraint)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint))
 {
-  this->check_grammar (grammar ACE_ENV_ARG_PARAMETER);
+  this->check_grammar (grammar);
 
   // Use an Interpreter to build an expression tree.
-  TAO_Log_Constraint_Interpreter interpreter (constraint
-                                              ACE_ENV_ARG_PARAMETER);
+  TAO_Log_Constraint_Interpreter interpreter (constraint);
 
   // Create iterators
   LOG_RECORD_STORE_ITER iter (rec_map_.begin ());
@@ -587,8 +569,7 @@ TAO_Hash_LogRecordStore::delete_records (const char *grammar,
 }
 
 CORBA::ULong
-TAO_Hash_LogRecordStore::delete_records_by_id (const DsLogAdmin::RecordIdList &ids
-                                               ACE_ENV_ARG_DECL)
+TAO_Hash_LogRecordStore::delete_records_by_id (const DsLogAdmin::RecordIdList &ids)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong count (0);
@@ -625,8 +606,7 @@ TAO_Hash_LogRecordStore::remove_old_records (void)
   ACE_OS::sprintf (out, "time < %.0f", temp1);
 
   // Use an Interpreter to build an expression tree.
-  TAO_Log_Constraint_Interpreter interpreter (out
-                                              ACE_ENV_ARG_PARAMETER);
+  TAO_Log_Constraint_Interpreter interpreter (out);
 
   // Create iterators
   LOG_RECORD_STORE_ITER iter (rec_map_.begin ());
@@ -662,8 +642,7 @@ TAO_Hash_LogRecordStore::lock()
 
 
 void
-TAO_Hash_LogRecordStore::check_grammar (const char* grammar
-                                        ACE_ENV_ARG_DECL)
+TAO_Hash_LogRecordStore::check_grammar (const char* grammar)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidGrammar))
 {
@@ -671,7 +650,7 @@ TAO_Hash_LogRecordStore::check_grammar (const char* grammar
   if (ACE_OS::strcmp (grammar, "TCL") != 0 &&
       ACE_OS::strcmp (grammar, "ETCL") != 0 &&
       ACE_OS::strcmp (grammar, "EXTENDED_TCL") != 0)
-    ACE_THROW (DsLogAdmin::InvalidGrammar ());
+    throw DsLogAdmin::InvalidGrammar ();
 }
 
 
@@ -682,8 +661,7 @@ TAO_Hash_LogRecordStore::get_administrative_state (void) const
 }
 
 void
-TAO_Hash_LogRecordStore::set_administrative_state (DsLogAdmin::AdministrativeState state
-                                                   ACE_ENV_ARG_DECL)
+TAO_Hash_LogRecordStore::set_administrative_state (DsLogAdmin::AdministrativeState state)
 {
   this->admin_state_ = state;
 }
@@ -701,8 +679,7 @@ TAO_Hash_LogRecordStore::get_capacity_alarm_thresholds (void) const
 }
 
 void
-TAO_Hash_LogRecordStore::set_capacity_alarm_thresholds (const DsLogAdmin::CapacityAlarmThresholdList& thresholds
-                                                        ACE_ENV_ARG_DECL)
+TAO_Hash_LogRecordStore::set_capacity_alarm_thresholds (const DsLogAdmin::CapacityAlarmThresholdList& thresholds)
 {
   this->thresholds_ = thresholds;
 }
@@ -716,8 +693,7 @@ TAO_Hash_LogRecordStore::get_forwarding_state (void) const
 }
 
 void
-TAO_Hash_LogRecordStore::set_forwarding_state (DsLogAdmin::ForwardingState state
-                                               ACE_ENV_ARG_DECL)
+TAO_Hash_LogRecordStore::set_forwarding_state (DsLogAdmin::ForwardingState state)
 {
   this->forward_state_ = state;
 }
@@ -729,8 +705,7 @@ TAO_Hash_LogRecordStore::get_interval (void) const
 }
 
 void
-TAO_Hash_LogRecordStore::set_interval (const DsLogAdmin::TimeInterval &interval
-                                       ACE_ENV_ARG_DECL)
+TAO_Hash_LogRecordStore::set_interval (const DsLogAdmin::TimeInterval &interval)
 {
   this->interval_ = interval;
 }
@@ -743,8 +718,7 @@ TAO_Hash_LogRecordStore::get_log_full_action (void) const
 }
 
 void
-TAO_Hash_LogRecordStore::set_log_full_action (DsLogAdmin::LogFullActionType action
-                                              ACE_ENV_ARG_DECL)
+TAO_Hash_LogRecordStore::set_log_full_action (DsLogAdmin::LogFullActionType action)
 {
   this->log_full_action_ = action;
 }
@@ -761,8 +735,7 @@ TAO_Hash_LogRecordStore::get_log_qos (void) const
 }
 
 void
-TAO_Hash_LogRecordStore::set_log_qos (const DsLogAdmin::QoSList& qos
-              ACE_ENV_ARG_DECL)
+TAO_Hash_LogRecordStore::set_log_qos (const DsLogAdmin::QoSList& qos)
 {
   this->log_qos_ = qos;
 }
@@ -774,8 +747,7 @@ TAO_Hash_LogRecordStore::get_max_record_life (void) const
 }
 
 void
-TAO_Hash_LogRecordStore::set_max_record_life (CORBA::ULong max_record_life
-                                              ACE_ENV_ARG_DECL)
+TAO_Hash_LogRecordStore::set_max_record_life (CORBA::ULong max_record_life)
 {
   this->max_record_life_ = max_record_life;
 }
@@ -787,8 +759,7 @@ TAO_Hash_LogRecordStore::get_max_size (void) const
 }
 
 void
-TAO_Hash_LogRecordStore::set_max_size (CORBA::ULongLong size
-                                       ACE_ENV_ARG_DECL)
+TAO_Hash_LogRecordStore::set_max_size (CORBA::ULongLong size)
 {
   this->max_size_ = size;
 }
@@ -805,8 +776,7 @@ TAO_Hash_LogRecordStore::get_week_mask (void)
 }
 
 void
-TAO_Hash_LogRecordStore::set_week_mask (const DsLogAdmin::WeekMask &masks
-          ACE_ENV_ARG_DECL)
+TAO_Hash_LogRecordStore::set_week_mask (const DsLogAdmin::WeekMask &masks)
 {
   this->weekmask_ = masks;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h
index b570f667d12..23711349255 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h
@@ -91,8 +91,7 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore
 
   /// Sets the administrative state of the log
   virtual void
-    set_administrative_state (DsLogAdmin::AdministrativeState
-                              ACE_ENV_ARG_DECL);
+    set_administrative_state (DsLogAdmin::AdministrativeState);
 
   /// Get the capacity alarm thresholds
   virtual DsLogAdmin::CapacityAlarmThresholdList*
@@ -100,8 +99,7 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore
 
   /// Set the capacity alarm thresholds
   virtual void
-    set_capacity_alarm_thresholds (const DsLogAdmin::CapacityAlarmThresholdList& thresholds
-                                   ACE_ENV_ARG_DECL);
+    set_capacity_alarm_thresholds (const DsLogAdmin::CapacityAlarmThresholdList& thresholds);
 
   /// Gets the forwarding state
   virtual DsLogAdmin::ForwardingState
@@ -109,8 +107,7 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore
 
   /// Sets the forwarding state
   virtual void
-    set_forwarding_state (DsLogAdmin::ForwardingState state
-                          ACE_ENV_ARG_DECL);
+    set_forwarding_state (DsLogAdmin::ForwardingState state);
 
   /// Get the log duration
   virtual DsLogAdmin::TimeInterval
@@ -118,8 +115,7 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore
 
   /// Set the log duration.
   virtual void
-    set_interval (const DsLogAdmin::TimeInterval & interval
-                  ACE_ENV_ARG_DECL);
+    set_interval (const DsLogAdmin::TimeInterval & interval);
 
   /// Gets the log full action
   virtual DsLogAdmin::LogFullActionType
@@ -127,8 +123,7 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore
 
   /// Sets the log full action
   virtual void
-    set_log_full_action(DsLogAdmin::LogFullActionType action
-                        ACE_ENV_ARG_DECL);
+    set_log_full_action(DsLogAdmin::LogFullActionType action);
 
   /// Get the list of the QoS properties supported by the log.
   virtual DsLogAdmin::QoSList*
@@ -136,8 +131,7 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore
 
   /// Set the list of the QoS properties supported by the log.
   virtual void
-    set_log_qos (const DsLogAdmin::QoSList& qos
-		 ACE_ENV_ARG_DECL);
+    set_log_qos (const DsLogAdmin::QoSList& qos);
 
   /// Gets the max record life
   virtual CORBA::ULong
@@ -145,8 +139,7 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore
 
   /// Sets the max record life
   virtual void
-    set_max_record_life (CORBA::ULong life
-                         ACE_ENV_ARG_DECL);
+    set_max_record_life (CORBA::ULong life);
 
   /// Get the current set value of the max size of the log data.
   virtual CORBA::ULongLong
@@ -154,8 +147,7 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore
 
   /// Set the max size of log data. size == 0, => infinite.
   virtual void
-    set_max_size (CORBA::ULongLong size
-                  ACE_ENV_ARG_DECL);
+    set_max_size (CORBA::ULongLong size);
 
   /// Get the weekly scheduling parameters
   virtual DsLogAdmin::WeekMask*
@@ -163,8 +155,7 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore
 
   /// Set the weekly scheduling parameters.
   virtual void
-    set_week_mask (const DsLogAdmin::WeekMask & masks
-		   ACE_ENV_ARG_DECL);
+    set_week_mask (const DsLogAdmin::WeekMask & masks);
 
 
   // = LogRecordStore status methods
@@ -195,7 +186,7 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore
   /// Insert rec into storage. Returns 0 on success -1 on failure and 1
   /// if the log is full.
   virtual int
-    log (const DsLogAdmin::LogRecord &rec ACE_ENV_ARG_DECL);
+    log (const DsLogAdmin::LogRecord &rec);
 
   /// Deletes "old" records from the store.
   virtual int
@@ -204,8 +195,7 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore
   /// Set single record attributes.
   virtual void
     set_record_attribute (DsLogAdmin::RecordId id,
-			  const DsLogAdmin::NVList & attr_list
-			  ACE_ENV_ARG_DECL)
+			  const DsLogAdmin::NVList & attr_list)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidRecordId,
                      DsLogAdmin::InvalidAttribute));
@@ -215,8 +205,7 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore
   virtual CORBA::ULong
     set_records_attribute (const char * grammar,
 			   const char * c,
-			   const DsLogAdmin::NVList & attr_list
-			   ACE_ENV_ARG_DECL)
+			   const DsLogAdmin::NVList & attr_list)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint,
@@ -225,8 +214,7 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore
   /// Get the attributes of the record with id <id>. Raises
   /// DsLogAdmin::InvalidRecordId
   virtual DsLogAdmin::NVList*
-    get_record_attribute (DsLogAdmin::RecordId id
-			  ACE_ENV_ARG_DECL)
+    get_record_attribute (DsLogAdmin::RecordId id)
     ACE_THROW_SPEC ((CORBA::SystemException,
 		     DsLogAdmin::InvalidRecordId));
 
@@ -240,8 +228,7 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore
   virtual DsLogAdmin::RecordList*
     query (const char * grammar,
            const char * c,
-           DsLogAdmin::Iterator_out i
-           ACE_ENV_ARG_DECL)
+           DsLogAdmin::Iterator_out i)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint));
@@ -251,15 +238,13 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore
   virtual DsLogAdmin::RecordList*
     retrieve (DsLogAdmin::TimeT from_time,
               CORBA::Long how_many,
-              DsLogAdmin::Iterator_out i
-              ACE_ENV_ARG_DECL)
+              DsLogAdmin::Iterator_out i)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Returns the number of records matching constraint <c>.
   virtual CORBA::ULong
     match (const char * grammar,
-           const char * c
-           ACE_ENV_ARG_DECL)
+           const char * c)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint));
@@ -267,16 +252,14 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore
   /// Delete records matching constraint <c>.
   virtual CORBA::ULong
     delete_records (const char * grammar,
-                    const char * c
-                    ACE_ENV_ARG_DECL)
+                    const char * c)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint));
 
   /// Delete records matching ids in <ids>
   virtual CORBA::ULong
-    delete_records_by_id (const DsLogAdmin::RecordIdList & ids
-                          ACE_ENV_ARG_DECL)
+    delete_records_by_id (const DsLogAdmin::RecordIdList & ids)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::ULong
@@ -299,31 +282,26 @@ protected:
   /// Set rec to the pointer to the LogRecord with the given
   /// id. Returns 0 on success, -1 on failure.
   int retrieve_i (DsLogAdmin::RecordId id,
-		  DsLogAdmin::LogRecord &rec
-		  ACE_ENV_ARG_DECL);
+		  DsLogAdmin::LogRecord &rec);
 
   /// Update into storage. Returns 0 on success -1 on failure.
-  int update_i (DsLogAdmin::LogRecord &rec
-		ACE_ENV_ARG_DECL);
+  int update_i (DsLogAdmin::LogRecord &rec);
 
   /// Remove the record with id <id> from the LogRecordStore.
   /// Returns 0 on success, -1 on failure.
-  int remove_i (DsLogAdmin::RecordId id
-		ACE_ENV_ARG_DECL);
+  int remove_i (DsLogAdmin::RecordId id);
 
   /// Remove the record from the LogRecordStore.
-  void remove_i (LOG_RECORD_STORE_ITER iter
-		 ACE_ENV_ARG_DECL);
+  void remove_i (LOG_RECORD_STORE_ITER iter);
 
   DsLogAdmin::RecordList* query_i (const char *constraint,
                                    DsLogAdmin::Iterator_out &iter_out,
-                                   CORBA::ULong how_many
-                                   ACE_ENV_ARG_DECL)
+                                   CORBA::ULong how_many)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidConstraint));
 
   /// Throws DsLogAdmin::InvalidGrammar if we don't support this grammar.
-  void check_grammar (const char* grammar ACE_ENV_ARG_DECL)
+  void check_grammar (const char* grammar)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar));
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp
index f7dc9d0419f..a947a10e3d0 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp
@@ -54,8 +54,7 @@ TAO_Hash_LogStore::list_logs (void)
     {
       iter.next (hash_entry);
       iter.advance ();
-      (*list)[i] = logmgr_i_->create_log_reference (static_cast<DsLogAdmin::LogId> (hash_entry->ext_id_)
-						    ACE_ENV_ARG_PARAMETER);
+      (*list)[i] = logmgr_i_->create_log_reference (static_cast<DsLogAdmin::LogId> (hash_entry->ext_id_));
     }
 
   return list;
@@ -102,8 +101,7 @@ TAO_Hash_LogStore::list_logs_by_id (void)
 
 
 DsLogAdmin::Log_ptr
-TAO_Hash_LogStore::find_log (DsLogAdmin::LogId id
-                        ACE_ENV_ARG_DECL)
+TAO_Hash_LogStore::find_log (DsLogAdmin::LogId id)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -112,7 +110,6 @@ TAO_Hash_LogStore::find_log (DsLogAdmin::LogId id
                            guard,
                            lock_,
                            CORBA::INTERNAL ());
-  ACE_CHECK (DsLogAdmin::Log::_nil ());
 
   if (hash_map_.find (id) != 0)
     {
@@ -120,14 +117,13 @@ TAO_Hash_LogStore::find_log (DsLogAdmin::LogId id
     }
   else
     {
-      return logmgr_i_->create_log_reference (id ACE_ENV_ARG_PARAMETER);
+      return logmgr_i_->create_log_reference (id);
     }
 }
 
 
 bool
-TAO_Hash_LogStore::exists (DsLogAdmin::LogId id
-			   ACE_ENV_ARG_DECL)
+TAO_Hash_LogStore::exists (DsLogAdmin::LogId id)
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
@@ -139,8 +135,7 @@ TAO_Hash_LogStore::exists (DsLogAdmin::LogId id
 
 
 int
-TAO_Hash_LogStore::remove (DsLogAdmin::LogId id
-			   ACE_ENV_ARG_DECL)
+TAO_Hash_LogStore::remove (DsLogAdmin::LogId id)
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                             guard,
@@ -163,8 +158,7 @@ void
 TAO_Hash_LogStore::create(DsLogAdmin::LogFullActionType full_action,
                                       CORBA::ULongLong max_size,
                                       const DsLogAdmin::CapacityAlarmThresholdList* thresholds,
-                                      DsLogAdmin::LogId_out id_out
-                                      ACE_ENV_ARG_DECL)
+                                      DsLogAdmin::LogId_out id_out)
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                             guard,
@@ -191,7 +185,7 @@ TAO_Hash_LogStore::create(DsLogAdmin::LogFullActionType full_action,
 
   if (this->hash_map_.bind (id, recordstore.get ()) != 0)
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   recordstore.release ();
@@ -202,8 +196,7 @@ void
 TAO_Hash_LogStore::create_with_id (DsLogAdmin::LogId id,
                                                DsLogAdmin::LogFullActionType full_action,
                                                CORBA::ULongLong max_size,
-                                               const DsLogAdmin::CapacityAlarmThresholdList* thresholds
-                                               ACE_ENV_ARG_DECL)
+                                               const DsLogAdmin::CapacityAlarmThresholdList* thresholds)
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                             guard,
@@ -212,7 +205,7 @@ TAO_Hash_LogStore::create_with_id (DsLogAdmin::LogId id,
 
   if (this->hash_map_.find (id) == 0)
     {
-      ACE_THROW (DsLogAdmin::LogIdAlreadyExists ());
+      throw DsLogAdmin::LogIdAlreadyExists ();
     }
 
   TAO_Hash_LogRecordStore* impl = 0;
@@ -229,7 +222,7 @@ TAO_Hash_LogStore::create_with_id (DsLogAdmin::LogId id,
 
   if (this->hash_map_.bind (id, recordstore.get ()) != 0)
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   recordstore.release ();
@@ -237,8 +230,7 @@ TAO_Hash_LogStore::create_with_id (DsLogAdmin::LogId id,
 
 
 TAO_LogRecordStore*
-TAO_Hash_LogStore::get_log_record_store (DsLogAdmin::LogId id
-                                         ACE_ENV_ARG_DECL)
+TAO_Hash_LogStore::get_log_record_store (DsLogAdmin::LogId id)
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h
index af4b79881c3..b33057fd5a1 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h
@@ -67,33 +67,30 @@ public:
 
   /// Returns a reference to the log with the supplied id.
   virtual DsLogAdmin::Log_ptr
-    find_log (DsLogAdmin::LogId id
-              ACE_ENV_ARG_DECL)
+    find_log (DsLogAdmin::LogId id)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
   /// Returns true if log exists, otherwise false
-  virtual bool exists (DsLogAdmin::LogId id ACE_ENV_ARG_DECL);
+  virtual bool exists (DsLogAdmin::LogId id);
 
   /// Remove the given entry from the hash table.
-  virtual int remove (DsLogAdmin::LogId id ACE_ENV_ARG_DECL);
+  virtual int remove (DsLogAdmin::LogId id);
 
   /// @brief Create log
   virtual void
     create (DsLogAdmin::LogFullActionType full_action,
             CORBA::ULongLong max_size,
             const DsLogAdmin::CapacityAlarmThresholdList* thresholds,
-            DsLogAdmin::LogId_out id_out
-            ACE_ENV_ARG_DECL);
+            DsLogAdmin::LogId_out id_out);
 
   /// @brief Create log
   virtual void
     create_with_id (DsLogAdmin::LogId id,
                     DsLogAdmin::LogFullActionType full_action,
                     CORBA::ULongLong max_size,
-                    const DsLogAdmin::CapacityAlarmThresholdList* thresholds
-                    ACE_ENV_ARG_DECL);
+                    const DsLogAdmin::CapacityAlarmThresholdList* thresholds);
 
   /// @brief Get log record store
   ///
@@ -102,8 +99,7 @@ public:
   /// @param id log id
   ///
   virtual TAO_LogRecordStore*
-    get_log_record_store (DsLogAdmin::LogId id
-                          ACE_ENV_ARG_DECL);
+    get_log_record_store (DsLogAdmin::LogId id);
 
 private:
   ACE_SYNCH_RW_MUTEX	lock_;
diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
index 2e999252b50..968076e56f6 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
@@ -39,12 +39,11 @@ TAO_Iterator_i::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ObjectId_var oid =
-    this->poa_->servant_to_id (this ACE_ENV_ARG_PARAMETER);
+    this->poa_->servant_to_id (this);
 
   // Goodbye cruel world...
   // deactivate from the poa.
-  this->poa_->deactivate_object (oid.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+  this->poa_->deactivate_object (oid.in ());
   return;
 }
 
@@ -52,14 +51,13 @@ TAO_Iterator_i::destroy (void)
 int
 TAO_Iterator_i::handle_timeout(const ACE_Time_Value&, const void*)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       this->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
index 303c6163e59..ec4dd4dd8d4 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
@@ -59,8 +59,7 @@ public:
 
   /// Gets a list of LogRecords.
   virtual DsLogAdmin::RecordList* get (CORBA::ULong position,
-				       CORBA::ULong how_many
-				       ACE_ENV_ARG_DECL)
+				       CORBA::ULong how_many)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidParam))			= 0;
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp b/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp
index 02bfbb96fac..388450253a2 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp
@@ -20,8 +20,7 @@ TAO_LogActivator::~TAO_LogActivator ()
 
 PortableServer::Servant
 TAO_LogActivator::incarnate (const PortableServer::ObjectId& oid,
-			     PortableServer::POA_ptr
-			     ACE_ENV_ARG_DECL)
+			     PortableServer::POA_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
 		   PortableServer::ForwardRequest
 		   ))
@@ -30,10 +29,10 @@ TAO_LogActivator::incarnate (const PortableServer::ObjectId& oid,
 
   DsLogAdmin::LogId id = ACE_OS::strtoul(poa_id.in (), 0, 0);
 
-  if (!logmgr_i_.exists(id ACE_ENV_ARG_PARAMETER))
+  if (!logmgr_i_.exists(id))
     ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
 
-  return logmgr_i_.create_log_servant (id ACE_ENV_ARG_PARAMETER);
+  return logmgr_i_.create_log_servant (id);
 }
 
 
@@ -42,8 +41,7 @@ TAO_LogActivator::etherealize (const PortableServer::ObjectId&,
 			       PortableServer::POA_ptr,
 			       PortableServer::Servant servant,
 			       CORBA::Boolean,
-			       CORBA::Boolean remaining_activations
-			       ACE_ENV_ARG_DECL_NOT_USED)
+			       CORBA::Boolean remaining_activations)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (!remaining_activations)
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogActivator.h b/TAO/orbsvcs/orbsvcs/Log/LogActivator.h
index d39364a5661..35bcaca5f22 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogActivator.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogActivator.h
@@ -49,8 +49,7 @@ public:
   virtual ~TAO_LogActivator();
 
   virtual PortableServer::Servant incarnate (const PortableServer::ObjectId& oid,
-					     PortableServer::POA_ptr poa
-					     ACE_ENV_ARG_DECL)
+					     PortableServer::POA_ptr poa)
     ACE_THROW_SPEC ((
 		     CORBA::SystemException,
 		     PortableServer::ForwardRequest
@@ -60,8 +59,7 @@ public:
 			    PortableServer::POA_ptr poa,
 			    PortableServer::Servant servant,
 			    CORBA::Boolean cleanup_in_progress,
-			    CORBA::Boolean remaining_activations
-			    ACE_ENV_ARG_DECL)
+			    CORBA::Boolean remaining_activations)
     ACE_THROW_SPEC ((
 		     CORBA::SystemException
 		     ));
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
index 5b03a1d8640..182eb38d929 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
@@ -27,8 +27,7 @@ TAO_LogMgr_i::~TAO_LogMgr_i ()
 
 void
 TAO_LogMgr_i::init (CORBA::ORB_ptr orb,
-		    PortableServer::POA_ptr poa
-		    ACE_ENV_ARG_DECL)
+		    PortableServer::POA_ptr poa)
 {
   this->orb_ = CORBA::ORB::_duplicate (orb);
   this->poa_ = PortableServer::POA::_duplicate (poa);
@@ -42,13 +41,11 @@ TAO_LogMgr_i::init (CORBA::ORB_ptr orb,
     // Create Factory POA
     policies.length (1);
     policies[0] =
-      this->poa_->create_lifespan_policy (PortableServer::PERSISTENT
-					  ACE_ENV_ARG_PARAMETER);
+      this->poa_->create_lifespan_policy (PortableServer::PERSISTENT);
 
     this->factory_poa_ = this->poa_->create_POA ("factory_POA",
 						 poa_manager.in (),
-						 policies
-						 ACE_ENV_ARG_PARAMETER);
+						 policies);
   }
 
 
@@ -58,28 +55,23 @@ TAO_LogMgr_i::init (CORBA::ORB_ptr orb,
     // Create Log POA
     policies.length (2);
     policies[0] =
-      this->poa_->create_lifespan_policy (PortableServer::PERSISTENT
-					  ACE_ENV_ARG_PARAMETER);
+      this->poa_->create_lifespan_policy (PortableServer::PERSISTENT);
 
     policies[1] =
-      this->poa_->create_id_assignment_policy (PortableServer::USER_ID
-					       ACE_ENV_ARG_PARAMETER);
+      this->poa_->create_id_assignment_policy (PortableServer::USER_ID);
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT)
     policies.length(4);
     policies[2] =
-      this->poa_->create_servant_retention_policy (PortableServer::RETAIN
-						   ACE_ENV_ARG_PARAMETER);
+      this->poa_->create_servant_retention_policy (PortableServer::RETAIN);
 
     policies[3] =
-      this->poa_->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER
-						    ACE_ENV_ARG_PARAMETER);
+      this->poa_->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER);
 #endif
 
     this->log_poa_ = this->factory_poa_->create_POA ("log_POA",
 						     poa_manager.in (),
-						     policies
-						     ACE_ENV_ARG_PARAMETER);
+						     policies);
   }
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT)
@@ -89,8 +81,7 @@ TAO_LogMgr_i::init (CORBA::ORB_ptr orb,
 		    TAO_LogActivator (*this),
 		    CORBA::NO_MEMORY ());
 
-  this->log_poa_->set_servant_manager(servant_activator
-              ACE_ENV_ARG_PARAMETER);
+  this->log_poa_->set_servant_manager(servant_activator);
 #endif
 
   // Load Log Strategy
@@ -119,8 +110,7 @@ TAO_LogMgr_i::create_objectid (DsLogAdmin::LogId id)
 }
 
 DsLogAdmin::Log_ptr
-TAO_LogMgr_i::create_log_reference (DsLogAdmin::LogId id
-				    ACE_ENV_ARG_DECL)
+TAO_LogMgr_i::create_log_reference (DsLogAdmin::LogId id)
 {
   PortableServer::ObjectId_var oid =
     this->create_objectid (id);
@@ -129,25 +119,23 @@ TAO_LogMgr_i::create_log_reference (DsLogAdmin::LogId id
 
   CORBA::Object_var obj =
     this->log_poa_->create_reference_with_id (oid.in (),
-                intf.in ()
-					      ACE_ENV_ARG_PARAMETER);
+                intf.in ());
 
   // Use _unchecked_narrow() because this may be called from a servant
   // activator's incarnate() method.  A plain _narrow() will result in
   // infinate recursion.
   DsLogAdmin::Log_var log =
-    DsLogAdmin::Log::_unchecked_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+    DsLogAdmin::Log::_unchecked_narrow (obj.in ());
 
   return log._retn();
 }
 
 DsLogAdmin::Log_ptr
-TAO_LogMgr_i::create_log_object (DsLogAdmin::LogId id
-				 ACE_ENV_ARG_DECL)
+TAO_LogMgr_i::create_log_object (DsLogAdmin::LogId id)
 {
   PortableServer::ServantBase* servant = 0;
 
-  servant = create_log_servant (id ACE_ENV_ARG_PARAMETER);
+  servant = create_log_servant (id);
 
   PortableServer::ServantBase_var safe_servant = servant;
   // Transfer ownership to the POA.
@@ -157,10 +145,9 @@ TAO_LogMgr_i::create_log_object (DsLogAdmin::LogId id
 
   // Register with the poa
   this->log_poa_->activate_object_with_id (oid.in (),
-					   servant
-					   ACE_ENV_ARG_PARAMETER);
+					   servant);
 
-  return create_log_reference (id ACE_ENV_ARG_PARAMETER);
+  return create_log_reference (id);
 }
 
 DsLogAdmin::LogList*
@@ -184,49 +171,44 @@ TAO_LogMgr_i::list_logs_by_id (void)
 
 
 DsLogAdmin::Log_ptr
-TAO_LogMgr_i::find_log (DsLogAdmin::LogId id
-                        ACE_ENV_ARG_DECL)
+TAO_LogMgr_i::find_log (DsLogAdmin::LogId id)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->logstore_->find_log (id ACE_ENV_ARG_PARAMETER);
+  return this->logstore_->find_log (id);
 }
 
 
 TAO_LogRecordStore*
-TAO_LogMgr_i::get_log_record_store (DsLogAdmin::LogId id
-				    ACE_ENV_ARG_DECL)
+TAO_LogMgr_i::get_log_record_store (DsLogAdmin::LogId id)
 {
-  return this->logstore_->get_log_record_store (id ACE_ENV_ARG_PARAMETER);
+  return this->logstore_->get_log_record_store (id);
 }
 
 
 bool
-TAO_LogMgr_i::exists (DsLogAdmin::LogId id
-		      ACE_ENV_ARG_DECL)
+TAO_LogMgr_i::exists (DsLogAdmin::LogId id)
 {
-  return this->logstore_->exists (id ACE_ENV_ARG_PARAMETER);
+  return this->logstore_->exists (id);
 }
 
 
 int
-TAO_LogMgr_i::remove (DsLogAdmin::LogId id
-		      ACE_ENV_ARG_DECL)
+TAO_LogMgr_i::remove (DsLogAdmin::LogId id)
 {
-  return this->logstore_->remove (id ACE_ENV_ARG_PARAMETER);
+  return this->logstore_->remove (id);
 }
 
 void
 TAO_LogMgr_i::create_i (DsLogAdmin::LogFullActionType full_action,
 			CORBA::ULongLong max_size,
 			const DsLogAdmin::CapacityAlarmThresholdList* thresholds,
-			DsLogAdmin::LogId_out id_out
-			ACE_ENV_ARG_DECL)
+			DsLogAdmin::LogId_out id_out)
 {
   // Validate log_full_action before creating log
   if (full_action != DsLogAdmin::wrap && full_action != DsLogAdmin::halt)
-    ACE_THROW (DsLogAdmin::InvalidLogFullAction ());
+    throw DsLogAdmin::InvalidLogFullAction ();
 
   if (thresholds)
     {
@@ -236,20 +218,18 @@ TAO_LogMgr_i::create_i (DsLogAdmin::LogFullActionType full_action,
   this->logstore_->create (full_action,
 			   max_size,
 			   thresholds,
-			   id_out
-			   ACE_ENV_ARG_PARAMETER);
+			   id_out);
 }
 
 void
 TAO_LogMgr_i::create_with_id_i (DsLogAdmin::LogId id,
 				DsLogAdmin::LogFullActionType full_action,
 				CORBA::ULongLong max_size,
-				const DsLogAdmin::CapacityAlarmThresholdList* thresholds
-				ACE_ENV_ARG_DECL)
+				const DsLogAdmin::CapacityAlarmThresholdList* thresholds)
 {
   // Validate log_full_action before creating log
   if (full_action != DsLogAdmin::wrap && full_action != DsLogAdmin::halt)
-    ACE_THROW (DsLogAdmin::InvalidLogFullAction ());
+    throw DsLogAdmin::InvalidLogFullAction ();
 
   if (thresholds)
     {
@@ -259,8 +239,7 @@ TAO_LogMgr_i::create_with_id_i (DsLogAdmin::LogId id,
   this->logstore_->create_with_id (id,
 				   full_action,
 				   max_size,
-				   thresholds
-				   ACE_ENV_ARG_PARAMETER);
+				   thresholds);
 }
 
 CORBA::ORB_ptr
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
index 4f85f5d0125..209d202ac55 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
@@ -66,19 +66,16 @@ public:
 
   /// Returns a reference to the log with the supplied id.
   DsLogAdmin::Log_ptr
-    find_log (DsLogAdmin::LogId id
-              ACE_ENV_ARG_DECL)
+    find_log (DsLogAdmin::LogId id)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
   /// Returns true if log exists, otherwise false
-  bool exists (DsLogAdmin::LogId id
-               ACE_ENV_ARG_DECL);
+  bool exists (DsLogAdmin::LogId id);
 
   /// Remove the given entry from the container.
-  int remove (DsLogAdmin::LogId id
-	      ACE_ENV_ARG_DECL);
+  int remove (DsLogAdmin::LogId id);
 
   /// @brief Create ObjectId
   ///
@@ -100,8 +97,7 @@ public:
   /// @return object reference
   ///
   virtual DsLogAdmin::Log_ptr
-    create_log_reference (DsLogAdmin::LogId id
-			  ACE_ENV_ARG_DECL);
+    create_log_reference (DsLogAdmin::LogId id);
 
   /// @brief Create log object
   ///
@@ -112,8 +108,7 @@ public:
   /// @return object reference
   ///
   virtual DsLogAdmin::Log_ptr
-    create_log_object (DsLogAdmin::LogId id
-		       ACE_ENV_ARG_DECL);
+    create_log_object (DsLogAdmin::LogId id);
 
   /// @brief Create log repository id
   ///
@@ -132,8 +127,7 @@ public:
   ///
   /// @return pointer to servant
   virtual PortableServer::ServantBase*
-    create_log_servant (DsLogAdmin::LogId id
-			ACE_ENV_ARG_DECL)			= 0;
+    create_log_servant (DsLogAdmin::LogId id)			= 0;
 
   /// @brief Get log record store
   ///
@@ -142,8 +136,7 @@ public:
   /// @param id log id
   ///
   TAO_LogRecordStore*
-    get_log_record_store (DsLogAdmin::LogId id
-		          ACE_ENV_ARG_DECL);
+    get_log_record_store (DsLogAdmin::LogId id);
 
   CORBA::ORB_ptr orb();
 
@@ -163,22 +156,19 @@ protected:
   /// @param poa Parent POA
   ///
   void init (CORBA::ORB_ptr orb,
-	     PortableServer::POA_ptr poa
-	     ACE_ENV_ARG_DECL);
+	     PortableServer::POA_ptr poa);
 
   /// @brief Create log
   void create_i (DsLogAdmin::LogFullActionType full_action,
 		 CORBA::ULongLong max_size,
 		 const DsLogAdmin::CapacityAlarmThresholdList* thresholds,
-		 DsLogAdmin::LogId_out id_out
-		 ACE_ENV_ARG_DECL);
+		 DsLogAdmin::LogId_out id_out);
 
   /// @brief Create log
   void create_with_id_i (DsLogAdmin::LogId id,
 			 DsLogAdmin::LogFullActionType full_action,
 			 CORBA::ULongLong max_size,
-			 const DsLogAdmin::CapacityAlarmThresholdList* thresholds
-			 ACE_ENV_ARG_DECL);
+			 const DsLogAdmin::CapacityAlarmThresholdList* thresholds);
 
   /// ORB.
   CORBA::ORB_var                orb_;
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp
index 49ffdd604fa..73b508c0c06 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp
@@ -19,8 +19,7 @@ TAO_LogNotification::~TAO_LogNotification (void)
 }
 
 void
-TAO_LogNotification::object_creation (DsLogAdmin::LogId id
-                                      ACE_ENV_ARG_DECL)
+TAO_LogNotification::object_creation (DsLogAdmin::LogId id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -38,13 +37,11 @@ TAO_LogNotification::object_creation (DsLogAdmin::LogId id
 
   any <<= event;
 
-  this->send_notification (any
-                           ACE_ENV_ARG_PARAMETER);
+  this->send_notification (any);
 }
 
 void
-TAO_LogNotification::object_deletion (DsLogAdmin::LogId id
-                                      ACE_ENV_ARG_DECL)
+TAO_LogNotification::object_deletion (DsLogAdmin::LogId id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any any;
@@ -61,14 +58,12 @@ TAO_LogNotification::object_deletion (DsLogAdmin::LogId id
 
   any <<= event;
 
-  this->send_notification (any
-                           ACE_ENV_ARG_PARAMETER);
+  this->send_notification (any);
 }
 
 void
 TAO_LogNotification::processing_error_alarm (CORBA::ULong error_num,
-                                             const char* error_string
-                                             ACE_ENV_ARG_DECL)
+                                             const char* error_string)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any any;
@@ -79,8 +74,7 @@ TAO_LogNotification::processing_error_alarm (CORBA::ULong error_num,
 
   any <<= event;
 
-  this->send_notification (any
-                           ACE_ENV_ARG_PARAMETER);
+  this->send_notification (any);
 }
 
 void
@@ -88,8 +82,7 @@ TAO_LogNotification::attribute_value_change (DsLogAdmin::Log_ptr log,
                                              DsLogAdmin::LogId id,
                                              DsLogNotification::AttributeType type,
                                              CORBA::Any oldValue,
-                                             CORBA::Any newValue
-                                             ACE_ENV_ARG_DECL)
+                                             CORBA::Any newValue)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any any;
@@ -111,8 +104,7 @@ TAO_LogNotification::attribute_value_change (DsLogAdmin::Log_ptr log,
 
   any <<= event;
 
-  this->send_notification (any
-                           ACE_ENV_ARG_PARAMETER);
+  this->send_notification (any);
 }
 
 void
@@ -120,8 +112,7 @@ TAO_LogNotification::capacity_alarm_threshold_value_change (
     DsLogAdmin::Log_ptr log,
     DsLogAdmin::LogId id,
     const DsLogAdmin::CapacityAlarmThresholdList& oldValue,
-    const DsLogAdmin::CapacityAlarmThresholdList& newValue
-    ACE_ENV_ARG_DECL)
+    const DsLogAdmin::CapacityAlarmThresholdList& newValue)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any oldV, newV;
@@ -132,16 +123,14 @@ TAO_LogNotification::capacity_alarm_threshold_value_change (
                                 id,
                                 DsLogNotification::capacityAlarmThreshold,
                                 oldV,
-                                newV
-                                ACE_ENV_ARG_PARAMETER);
+                                newV);
 }
 
 void
 TAO_LogNotification::log_full_action_value_change (DsLogAdmin::Log_ptr log,
                                                    DsLogAdmin::LogId id,
                                                    CORBA::ULong oldValue,
-                                                   CORBA::ULong newValue
-                                                   ACE_ENV_ARG_DECL)
+                                                   CORBA::ULong newValue)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any oldV, newV;
@@ -152,16 +141,14 @@ TAO_LogNotification::log_full_action_value_change (DsLogAdmin::Log_ptr log,
                                 id,
                                 DsLogNotification::logFullAction,
                                 oldV,
-                                newV
-                                ACE_ENV_ARG_PARAMETER);
+                                newV);
 }
 
 void
 TAO_LogNotification::max_log_size_value_change (DsLogAdmin::Log_ptr log,
                                                 DsLogAdmin::LogId id,
                                                 CORBA::ULongLong oldValue,
-                                                CORBA::ULongLong newValue
-                                                ACE_ENV_ARG_DECL)
+                                                CORBA::ULongLong newValue)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any oldV, newV;
@@ -172,16 +159,14 @@ TAO_LogNotification::max_log_size_value_change (DsLogAdmin::Log_ptr log,
                                 id,
                                 DsLogNotification::maxLogSize,
                                 oldV,
-                                newV
-                                ACE_ENV_ARG_PARAMETER);
+                                newV);
 }
 
 void
 TAO_LogNotification::start_time_value_change (DsLogAdmin::Log_ptr log,
                                               DsLogAdmin::LogId id,
                                               DsLogAdmin::TimeT oldValue,
-                                              DsLogAdmin::TimeT newValue
-                                              ACE_ENV_ARG_DECL)
+                                              DsLogAdmin::TimeT newValue)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any oldV, newV;
@@ -192,16 +177,14 @@ TAO_LogNotification::start_time_value_change (DsLogAdmin::Log_ptr log,
                                 id,
                                 DsLogNotification::startTime,
                                 oldV,
-                                newV
-                                ACE_ENV_ARG_PARAMETER);
+                                newV);
 }
 
 void
 TAO_LogNotification::stop_time_value_change (DsLogAdmin::Log_ptr log,
                                              DsLogAdmin::LogId id,
                                              DsLogAdmin::TimeT oldValue,
-                                             DsLogAdmin::TimeT newValue
-                                             ACE_ENV_ARG_DECL)
+                                             DsLogAdmin::TimeT newValue)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any oldV, newV;
@@ -212,16 +195,14 @@ TAO_LogNotification::stop_time_value_change (DsLogAdmin::Log_ptr log,
                                 id,
                                 DsLogNotification::stopTime,
                                 oldV,
-                                newV
-                                ACE_ENV_ARG_PARAMETER);
+                                newV);
 }
 
 void
 TAO_LogNotification::week_mask_value_change (DsLogAdmin::Log_ptr log,
                                              DsLogAdmin::LogId id,
                                              const DsLogAdmin::WeekMask& oldValue,
-                                             const DsLogAdmin::WeekMask& newValue
-                                             ACE_ENV_ARG_DECL)
+                                             const DsLogAdmin::WeekMask& newValue)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any oldV, newV;
@@ -232,16 +213,14 @@ TAO_LogNotification::week_mask_value_change (DsLogAdmin::Log_ptr log,
                                 id,
                                 DsLogNotification::weekMask,
                                 oldV,
-                                newV
-                                ACE_ENV_ARG_PARAMETER);
+                                newV);
 }
 
 void
 TAO_LogNotification::max_record_life_value_change (DsLogAdmin::Log_ptr log,
                                                    DsLogAdmin::LogId id,
                                                    CORBA::ULong oldValue,
-                                                   CORBA::ULong newValue
-                                                   ACE_ENV_ARG_DECL)
+                                                   CORBA::ULong newValue)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any oldV, newV;
@@ -252,8 +231,7 @@ TAO_LogNotification::max_record_life_value_change (DsLogAdmin::Log_ptr log,
                                 id,
                                 DsLogNotification::maxRecordLife,
                                 oldV,
-                                newV
-                                ACE_ENV_ARG_PARAMETER);
+                                newV);
 }
 
 void
@@ -261,8 +239,7 @@ TAO_LogNotification::quality_of_service_value_change (
     DsLogAdmin::Log_ptr log,
     DsLogAdmin::LogId id,
     const DsLogAdmin::QoSList& oldValue,
-    const DsLogAdmin::QoSList& newValue
-    ACE_ENV_ARG_DECL)
+    const DsLogAdmin::QoSList& newValue)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any oldV, newV;
@@ -273,16 +250,14 @@ TAO_LogNotification::quality_of_service_value_change (
                                 id,
                                 DsLogNotification::qualityOfService,
                                 oldV,
-                                newV
-                                ACE_ENV_ARG_PARAMETER);
+                                newV);
 }
 
 void
 TAO_LogNotification::state_change (DsLogAdmin::Log_ptr log,
                                    DsLogAdmin::LogId id,
                                    DsLogNotification::StateType type,
-                                   CORBA::Any newValue
-                                   ACE_ENV_ARG_DECL)
+                                   CORBA::Any newValue)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any any;
@@ -303,16 +278,14 @@ TAO_LogNotification::state_change (DsLogAdmin::Log_ptr log,
 
   any <<= event;
 
-  this->send_notification (any
-                           ACE_ENV_ARG_PARAMETER);
+  this->send_notification (any);
 }
 
 void
 TAO_LogNotification::administrative_state_change (
     DsLogAdmin::Log_ptr log,
     DsLogAdmin::LogId id,
-    DsLogAdmin::AdministrativeState newValue
-    ACE_ENV_ARG_DECL)
+    DsLogAdmin::AdministrativeState newValue)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any newV;
@@ -321,16 +294,14 @@ TAO_LogNotification::administrative_state_change (
   this->state_change (log,
                       id,
                       DsLogNotification::administrativeState,
-                      newV
-                      ACE_ENV_ARG_PARAMETER);
+                      newV);
 }
 
 void
 TAO_LogNotification::operational_state_change (
     DsLogAdmin::Log_ptr log,
     DsLogAdmin::LogId id,
-    DsLogAdmin::OperationalState newValue
-    ACE_ENV_ARG_DECL)
+    DsLogAdmin::OperationalState newValue)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any newV;
@@ -339,15 +310,13 @@ TAO_LogNotification::operational_state_change (
   this->state_change (log,
                       id,
                       DsLogNotification::operationalState,
-                      newV
-                      ACE_ENV_ARG_PARAMETER);
+                      newV);
 }
 
 void
 TAO_LogNotification::forwarding_state_change (DsLogAdmin::Log_ptr log,
                                               DsLogAdmin::LogId id,
-                                              DsLogAdmin::ForwardingState newValue
-                                              ACE_ENV_ARG_DECL)
+                                              DsLogAdmin::ForwardingState newValue)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any newV;
@@ -356,8 +325,7 @@ TAO_LogNotification::forwarding_state_change (DsLogAdmin::Log_ptr log,
   this->state_change (log,
                       id,
                       DsLogNotification::forwardingState,
-                      newV
-                      ACE_ENV_ARG_PARAMETER);
+                      newV);
 }
 
 void
@@ -366,8 +334,7 @@ TAO_LogNotification::threshold_alarm (
     DsLogAdmin::LogId id,
     DsLogAdmin::Threshold crossedValue,
     DsLogAdmin::Threshold observedValue,
-    DsLogNotification::PerceivedSeverityType severity
-    ACE_ENV_ARG_DECL)
+    DsLogNotification::PerceivedSeverityType severity)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any any;
@@ -387,13 +354,11 @@ TAO_LogNotification::threshold_alarm (
 
   any <<= event;
 
-  this->send_notification (any
-                           ACE_ENV_ARG_PARAMETER);
+  this->send_notification (any);
 }
 
 void
-TAO_LogNotification::send_notification (const CORBA::Any & /* any */
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+TAO_LogNotification::send_notification (const CORBA::Any & /* any */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.h b/TAO/orbsvcs/orbsvcs/Log/LogNotification.h
index 32b68ecae1f..c16782d6fe9 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.h
@@ -49,16 +49,15 @@ public:
   virtual ~TAO_LogNotification (void);
 
   /// Event generated when a new log is created.
-  void object_creation (DsLogAdmin::LogId id ACE_ENV_ARG_DECL)
+  void object_creation (DsLogAdmin::LogId id)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Event generated when a new log is deleted.
-  void object_deletion (DsLogAdmin::LogId id ACE_ENV_ARG_DECL)
+  void object_deletion (DsLogAdmin::LogId id)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Event generated.
-  void processing_error_alarm (CORBA::ULong error_num, const char* error_string
-                               ACE_ENV_ARG_DECL)
+  void processing_error_alarm (CORBA::ULong error_num, const char* error_string)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// AttributeValueChange event generation method.
@@ -66,100 +65,88 @@ public:
                         DsLogAdmin::LogId id,
                         DsLogNotification::AttributeType type,
                         CORBA::Any oldValue,
-                        CORBA::Any newValue ACE_ENV_ARG_DECL)
+                        CORBA::Any newValue)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// AttributeValueChange event generation method.
   void capacity_alarm_threshold_value_change (DsLogAdmin::Log_ptr log,
                         DsLogAdmin::LogId id,
                         const DsLogAdmin::CapacityAlarmThresholdList& oldValue,
-                        const DsLogAdmin::CapacityAlarmThresholdList& newValue
-                        ACE_ENV_ARG_DECL)
+                        const DsLogAdmin::CapacityAlarmThresholdList& newValue)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// AttributeValueChange event generation method.
   void log_full_action_value_change (DsLogAdmin::Log_ptr log,
                               DsLogAdmin::LogId id,
                               CORBA::ULong oldValue,
-                              CORBA::ULong newValue
-                              ACE_ENV_ARG_DECL)
+                              CORBA::ULong newValue)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// AttributeValueChange event generation method.
   void max_log_size_value_change (DsLogAdmin::Log_ptr log,
                               DsLogAdmin::LogId id,
                               CORBA::ULongLong oldValue,
-                              CORBA::ULongLong newValue
-                              ACE_ENV_ARG_DECL)
+                              CORBA::ULongLong newValue)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// AttributeValueChange event generation method.
   void start_time_value_change (DsLogAdmin::Log_ptr log,
                               DsLogAdmin::LogId id,
                               DsLogAdmin::TimeT oldValue,
-                              DsLogAdmin::TimeT newValue
-                              ACE_ENV_ARG_DECL)
+                              DsLogAdmin::TimeT newValue)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// AttributeValueChange event generation method.
   void stop_time_value_change (DsLogAdmin::Log_ptr log,
                               DsLogAdmin::LogId id,
                               DsLogAdmin::TimeT oldValue,
-                              DsLogAdmin::TimeT newValue
-                              ACE_ENV_ARG_DECL)
+                              DsLogAdmin::TimeT newValue)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// AttributeValueChange event generation method.
   void week_mask_value_change (DsLogAdmin::Log_ptr log,
                               DsLogAdmin::LogId id,
                               const DsLogAdmin::WeekMask& oldValue,
-                              const DsLogAdmin::WeekMask& newValue
-                              ACE_ENV_ARG_DECL)
+                              const DsLogAdmin::WeekMask& newValue)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// AttributeValueChange event generation method.
   void max_record_life_value_change (DsLogAdmin::Log_ptr log,
                               DsLogAdmin::LogId id,
                               CORBA::ULong oldValue,
-                              CORBA::ULong newValue
-                              ACE_ENV_ARG_DECL)
+                              CORBA::ULong newValue)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// AttributeValueChange event generation method.
   void quality_of_service_value_change (DsLogAdmin::Log_ptr log,
                               DsLogAdmin::LogId id,
                               const DsLogAdmin::QoSList& oldValue,
-                              const DsLogAdmin::QoSList& newValue
-                              ACE_ENV_ARG_DECL)
+                              const DsLogAdmin::QoSList& newValue)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// StateChange event generation method.
   void state_change (DsLogAdmin::Log_ptr log,
                     DsLogAdmin::LogId id,
                     DsLogNotification::StateType type,
-                    CORBA::Any newValue
-                    ACE_ENV_ARG_DECL)
+                    CORBA::Any newValue)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// StateChange event generation method.
   void administrative_state_change (DsLogAdmin::Log_ptr log,
                     DsLogAdmin::LogId id,
-                    DsLogAdmin::AdministrativeState newValue
-                    ACE_ENV_ARG_DECL)
+                    DsLogAdmin::AdministrativeState newValue)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// StateChange event generation method.
   void operational_state_change (DsLogAdmin::Log_ptr log,
                     DsLogAdmin::LogId id,
-                    DsLogAdmin::OperationalState newValue
-                    ACE_ENV_ARG_DECL)
+                    DsLogAdmin::OperationalState newValue)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// StateChange event generation method.
   void forwarding_state_change (DsLogAdmin::Log_ptr log,
                     DsLogAdmin::LogId id,
-                    DsLogAdmin::ForwardingState newValue
-                    ACE_ENV_ARG_DECL)
+                    DsLogAdmin::ForwardingState newValue)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// StateChange event generation method.
@@ -167,14 +154,12 @@ public:
                     DsLogAdmin::LogId id,
                     DsLogAdmin::Threshold crossedValue,
                     DsLogAdmin::Threshold observedValue,
-                    DsLogNotification::PerceivedSeverityType severity
-                    ACE_ENV_ARG_DECL)
+                    DsLogNotification::PerceivedSeverityType severity)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Method overriden by by event-aware logging services to cause
   /// a notification event to be sent.
-  virtual void send_notification (const CORBA::Any &
-                                  ACE_ENV_ARG_DECL)
+  virtual void send_notification (const CORBA::Any &)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h
index a0d84000b77..785c965d4e6 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h
@@ -59,8 +59,7 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
 
   /// Sets the administrative state of the log
   virtual void
-    set_administrative_state (DsLogAdmin::AdministrativeState state
-			      ACE_ENV_ARG_DECL)			= 0;
+    set_administrative_state (DsLogAdmin::AdministrativeState state)			= 0;
 
   /// Get the capacity alarm thresholds
   virtual DsLogAdmin::CapacityAlarmThresholdList*
@@ -68,8 +67,7 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
 
   /// Set the capacity alarm thresholds
   virtual void
-    set_capacity_alarm_thresholds (const DsLogAdmin::CapacityAlarmThresholdList& thresholds
-				   ACE_ENV_ARG_DECL)		= 0;
+    set_capacity_alarm_thresholds (const DsLogAdmin::CapacityAlarmThresholdList& thresholds)		= 0;
 
   /// Gets the forwarding state
   virtual DsLogAdmin::ForwardingState
@@ -77,8 +75,7 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
 
   /// Sets the forwarding state
   virtual void
-    set_forwarding_state (DsLogAdmin::ForwardingState state
-			  ACE_ENV_ARG_DECL)			= 0;
+    set_forwarding_state (DsLogAdmin::ForwardingState state)			= 0;
 
   /// Get the log duration
   virtual DsLogAdmin::TimeInterval
@@ -86,8 +83,7 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
 
   /// Set the log duration.
   virtual void
-    set_interval (const DsLogAdmin::TimeInterval& interval
-		  ACE_ENV_ARG_DECL)				= 0;
+    set_interval (const DsLogAdmin::TimeInterval& interval)				= 0;
 
   /// Get the log full action
   virtual DsLogAdmin::LogFullActionType
@@ -95,8 +91,7 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
 
   /// Set the log full action
   virtual void
-    set_log_full_action(DsLogAdmin::LogFullActionType action
-			ACE_ENV_ARG_DECL)			= 0;
+    set_log_full_action(DsLogAdmin::LogFullActionType action)			= 0;
 
   /// Get the list of the QoS properties supported by the log.
   virtual DsLogAdmin::QoSList*
@@ -104,8 +99,7 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
 
   /// Set the list of the QoS properties supported by the log.
   virtual void
-    set_log_qos (const DsLogAdmin::QoSList& qos
-		 ACE_ENV_ARG_DECL)				= 0;
+    set_log_qos (const DsLogAdmin::QoSList& qos)				= 0;
 
   /// Gets the max record life
   virtual CORBA::ULong
@@ -113,8 +107,7 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
 
   /// Sets the max record life
   virtual void
-    set_max_record_life (CORBA::ULong life
-			 ACE_ENV_ARG_DECL)			= 0;
+    set_max_record_life (CORBA::ULong life)			= 0;
 
   /// Get the current set value of the max size of the log data.
   virtual CORBA::ULongLong
@@ -122,8 +115,7 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
 
   /// Set the max size of log data. size == 0, => infinite.
   virtual void
-    set_max_size (CORBA::ULongLong size
-		  ACE_ENV_ARG_DECL)				= 0;
+    set_max_size (CORBA::ULongLong size)				= 0;
 
   /// Get the weekly scheduling parameters
   virtual DsLogAdmin::WeekMask*
@@ -131,8 +123,7 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
 
   /// Set the weekly scheduling parameters.
   virtual void
-    set_week_mask (const DsLogAdmin::WeekMask& masks
-		  ACE_ENV_ARG_DECL)				= 0;
+    set_week_mask (const DsLogAdmin::WeekMask& masks)				= 0;
 
 
   // = LogRecordStore status methods
@@ -163,7 +154,7 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
   /// Insert rec into storage.
   /// Returns 0 on success -1 on failure and 1 if the log is full.
   virtual int
-    log (const DsLogAdmin::LogRecord &rec ACE_ENV_ARG_DECL)	= 0;
+    log (const DsLogAdmin::LogRecord &rec)	= 0;
 
   /// Deletes "old" records from the store.
   virtual int
@@ -172,8 +163,7 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
   /// Set single record attributes.
   virtual void
     set_record_attribute (DsLogAdmin::RecordId id,
-                          const DsLogAdmin::NVList & attr_list
-                          ACE_ENV_ARG_DECL)
+                          const DsLogAdmin::NVList & attr_list)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidRecordId,
                      DsLogAdmin::InvalidAttribute))		= 0;
@@ -183,8 +173,7 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
   virtual CORBA::ULong
     set_records_attribute (const char * grammar,
                            const char * c,
-                           const DsLogAdmin::NVList & attr_list
-                           ACE_ENV_ARG_DECL)
+                           const DsLogAdmin::NVList & attr_list)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint,
@@ -193,8 +182,7 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
   /// Get the attributes of the record with id <id>. Raises
   /// DsLogAdmin::InvalidRecordId
   virtual DsLogAdmin::NVList*
-    get_record_attribute (DsLogAdmin::RecordId id
-                          ACE_ENV_ARG_DECL)
+    get_record_attribute (DsLogAdmin::RecordId id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidRecordId))		= 0;
 
@@ -209,8 +197,7 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
   virtual DsLogAdmin::RecordList*
     query (const char * grammar,
 	   const char * c,
-	   DsLogAdmin::Iterator_out i
-	   ACE_ENV_ARG_DECL)
+	   DsLogAdmin::Iterator_out i)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint))		= 0;
@@ -220,15 +207,13 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
   virtual DsLogAdmin::RecordList*
     retrieve (DsLogAdmin::TimeT from_time,
 	      CORBA::Long how_many,
-	      DsLogAdmin::Iterator_out i
-	      ACE_ENV_ARG_DECL)
+	      DsLogAdmin::Iterator_out i)
     ACE_THROW_SPEC ((CORBA::SystemException))			= 0;
 
   /// Returns the number of records matching constraint <c>.
   virtual CORBA::ULong
     match (const char * grammar,
-	   const char * c
-	   ACE_ENV_ARG_DECL)
+	   const char * c)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint))		= 0;
@@ -236,16 +221,14 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
   /// Delete records matching constraint <c>.
   virtual CORBA::ULong
     delete_records (const char * grammar,
-		    const char * c
-		    ACE_ENV_ARG_DECL)
+		    const char * c)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint)) 		= 0;
 
   /// Delete records matching ids in <ids>
   virtual CORBA::ULong
-    delete_records_by_id (const DsLogAdmin::RecordIdList & ids
-			  ACE_ENV_ARG_DECL)
+    delete_records_by_id (const DsLogAdmin::RecordIdList & ids)
     ACE_THROW_SPEC ((CORBA::SystemException))			= 0;
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogStore.h b/TAO/orbsvcs/orbsvcs/Log/LogStore.h
index 5e62df949d5..8fe2fddceb5 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogStore.h
@@ -51,37 +51,32 @@ public:
 
   /// Returns a reference to the log with the supplied id.
   virtual DsLogAdmin::Log_ptr
-    find_log (DsLogAdmin::LogId id
-              ACE_ENV_ARG_DECL)
+    find_log (DsLogAdmin::LogId id)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ))					= 0;
 
   /// Returns true if log exists, otherwise false
   virtual bool
-    exists (DsLogAdmin::LogId id
-	    ACE_ENV_ARG_DECL)				= 0;
+    exists (DsLogAdmin::LogId id)				= 0;
 
   /// Remove the given entry from the hash table.
   virtual int
-    remove (DsLogAdmin::LogId id
-	    ACE_ENV_ARG_DECL)				= 0;
+    remove (DsLogAdmin::LogId id)				= 0;
 
   /// @brief Create log
   virtual void
     create (DsLogAdmin::LogFullActionType full_action,
 	    CORBA::ULongLong max_size,
 	    const DsLogAdmin::CapacityAlarmThresholdList* thresholds,
-	    DsLogAdmin::LogId_out id_out
-	    ACE_ENV_ARG_DECL)				= 0;
+	    DsLogAdmin::LogId_out id_out)				= 0;
 
   /// @brief Create log
   virtual void
     create_with_id (DsLogAdmin::LogId id,
 		    DsLogAdmin::LogFullActionType full_action,
 		    CORBA::ULongLong max_size,
-		    const DsLogAdmin::CapacityAlarmThresholdList* thresholds
-		    ACE_ENV_ARG_DECL)			= 0;
+		    const DsLogAdmin::CapacityAlarmThresholdList* thresholds)			= 0;
 
   /// @brief Get log record store
   ///
@@ -90,8 +85,7 @@ public:
   /// @param id log id
   ///
   virtual TAO_LogRecordStore*
-    get_log_record_store (DsLogAdmin::LogId id
-		          ACE_ENV_ARG_DECL)		= 0;
+    get_log_record_store (DsLogAdmin::LogId id)		= 0;
 
 protected:
   // Constructor
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp
index ab9f366a6bb..b3819127dee 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp
@@ -50,14 +50,13 @@ int
 TAO_Log_Compaction_Handler::handle_timeout (const ACE_Time_Value&,
                                             const void *)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       this->log_->remove_old_records();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp
index 6281d19c48d..b8b51624edf 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp
@@ -10,7 +10,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Log_Constraint_Interpreter::TAO_Log_Constraint_Interpreter (
     const char *constraints
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((DsLogAdmin::InvalidConstraint,
                    CORBA::NO_MEMORY))
@@ -26,7 +25,7 @@ TAO_Log_Constraint_Interpreter::TAO_Log_Constraint_Interpreter (
   {
       // root_ is set in this base class call.
       if (TAO_ETCL_Interpreter::build_tree (constraints) != 0)
-          ACE_THROW (DsLogAdmin::InvalidConstraint ());
+          throw DsLogAdmin::InvalidConstraint ();
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h
index 18f754d8c79..709310343f9 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h
@@ -6,12 +6,12 @@
  *
  *  $Id$
  *
- *  
+ *
  *
  *
  *  @author Pradeep Gore <pradeep@cs.wustl.edu>
  *  @author D A Hanvey <d.hanvey@qub.ac.uk>
- *  
+ *
  */
 //=============================================================================
 
@@ -45,14 +45,13 @@ public:
 
   // = Initialization and termination methods.
 
-  /** 
+  /**
    * This constructor builds an expression tree representing the
    * constraint specified in <constraints>, and throws an Illegal
    * Constraint exception if the constraint given has syntax errors or
    * semantic errors, such as mismatched types.
    */
-  TAO_Log_Constraint_Interpreter (const char* constraints
-                   ACE_ENV_ARG_DECL)
+  TAO_Log_Constraint_Interpreter (const char* constraints)
     ACE_THROW_SPEC ((DsLogAdmin::InvalidConstraint,
                      CORBA::NO_MEMORY));
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
index 127f17c5b86..04bf648e406 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
@@ -133,8 +133,7 @@ TAO_Log_Constraint_Visitor::visit_union_pos (
     TAO_ETCL_Union_Pos *union_pos
   )
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       if (union_pos->union_value ()->accept (this) == 0)
         {
@@ -142,8 +141,7 @@ TAO_Log_Constraint_Visitor::visit_union_pos (
           this->queue_.dequeue_head (disc_val);
 
           TAO_DynUnion_i dyn_union;
-          dyn_union.init (this->current_member_.in ()
-                          ACE_ENV_ARG_PARAMETER);
+          dyn_union.init (this->current_member_.in ());
 
           CORBA::TypeCode_var tc = this->current_member_->type ();
 
@@ -157,8 +155,7 @@ TAO_Log_Constraint_Visitor::visit_union_pos (
                 CORBA::TypeCode_var disc_tc =
                   tc->discriminator_type ();
                 CORBA::TCKind disc_kind =
-                  TAO_DynAnyFactory::unalias (disc_tc.in ()
-                                              ACE_ENV_ARG_PARAMETER);
+                  TAO_DynAnyFactory::unalias (disc_tc.in ());
 
                 switch (disc_kind)
                 {
@@ -208,11 +205,9 @@ TAO_Log_Constraint_Visitor::visit_union_pos (
                 DynamicAny::DynAny_var dyn_any =
                   TAO::MakeDynAnyUtils::make_dyn_any_t<const CORBA::Any &> (
                     disc_tc.in (),
-                    disc_any
-                    ACE_ENV_ARG_PARAMETER);
+                    disc_any);
 
-                dyn_union.set_discriminator (dyn_any.in ()
-                                             ACE_ENV_ARG_PARAMETER);
+                dyn_union.set_discriminator (dyn_any.in ());
                 DynamicAny::DynAny_var u_member =
                   dyn_union.member ();
 
@@ -232,8 +227,7 @@ TAO_Log_Constraint_Visitor::visit_union_pos (
 
                 for (i = 0; i < count; ++i)
                   {
-                    member_name = tc->member_name (i
-                                                   ACE_ENV_ARG_PARAMETER);
+                    member_name = tc->member_name (i);
 
                     if (ACE_OS::strcmp (name, member_name) == 0)
                       {
@@ -244,8 +238,7 @@ TAO_Log_Constraint_Visitor::visit_union_pos (
                 // If there's no match, member_label will throw
                 // CORBA::TypeCode::Bounds and the catch block will
                 // return -1;
-                this->current_member_ = tc->member_label (i
-                                                          ACE_ENV_ARG_PARAMETER);
+                this->current_member_ = tc->member_label (i);
 
                 break;
               }
@@ -277,24 +270,21 @@ TAO_Log_Constraint_Visitor::visit_union_pos (
           return -1;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       return -1;
     }
-  ACE_ENDTRY;
 }
 
 int
 TAO_Log_Constraint_Visitor::visit_component_pos (TAO_ETCL_Component_Pos *pos)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // If we are here (from visit_component) the Any containing the
       // component as found in property_lookup_ will be in current_member_.
       CORBA::TypeCode_var tc = this->current_member_->type ();
-      CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
+      CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ());
 
       DynamicAny::DynAny_var member;
       CORBA::Boolean success = 0;
@@ -305,11 +295,9 @@ TAO_Log_Constraint_Visitor::visit_component_pos (TAO_ETCL_Component_Pos *pos)
         case CORBA::tk_enum:
           {
             TAO_DynEnum_i dyn_enum;
-            dyn_enum.init (this->current_member_.in ()
-                           ACE_ENV_ARG_PARAMETER);
+            dyn_enum.init (this->current_member_.in ());
 
-            success = dyn_enum.seek (slot
-                                     ACE_ENV_ARG_PARAMETER);
+            success = dyn_enum.seek (slot);
 
             if (success == 0)
               {
@@ -324,11 +312,9 @@ TAO_Log_Constraint_Visitor::visit_component_pos (TAO_ETCL_Component_Pos *pos)
         case CORBA::tk_struct:
           {
             TAO_DynStruct_i dyn_struct;
-            dyn_struct.init (this->current_member_.in ()
-                             ACE_ENV_ARG_PARAMETER);
+            dyn_struct.init (this->current_member_.in ());
 
-            success = dyn_struct.seek (slot
-                                       ACE_ENV_ARG_PARAMETER);
+            success = dyn_struct.seek (slot);
 
             if (success == 0)
               {
@@ -362,11 +348,10 @@ TAO_Log_Constraint_Visitor::visit_component_pos (TAO_ETCL_Component_Pos *pos)
           return comp->accept (this);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       return -1;
     }
-  ACE_ENDTRY;
 }
 
 int
@@ -416,14 +401,12 @@ TAO_Log_Constraint_Visitor::visit_component_array (
     TAO_ETCL_Component_Array *array
   )
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // If we are here (from visit_component) the Any containing the
       // component as found in property_lookup_ will be in current_member_.
       CORBA::TypeCode_var tc = this->current_member_->type ();
-      CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
+      CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ());
 
       DynamicAny::DynAny_var member;
       CORBA::Boolean success = 0;
@@ -434,11 +417,9 @@ TAO_Log_Constraint_Visitor::visit_component_array (
         case CORBA::tk_array:
           {
             TAO_DynEnum_i dyn_array;
-            dyn_array.init (this->current_member_.in ()
-                            ACE_ENV_ARG_PARAMETER);
+            dyn_array.init (this->current_member_.in ());
 
-            success = dyn_array.seek (slot
-                                      ACE_ENV_ARG_PARAMETER);
+            success = dyn_array.seek (slot);
 
             if (success == 0)
               {
@@ -452,11 +433,9 @@ TAO_Log_Constraint_Visitor::visit_component_array (
         case CORBA::tk_sequence:
           {
             TAO_DynStruct_i dyn_sequence;
-            dyn_sequence.init (this->current_member_.in ()
-                               ACE_ENV_ARG_PARAMETER);
+            dyn_sequence.init (this->current_member_.in ());
 
-            success = dyn_sequence.seek (slot
-                                         ACE_ENV_ARG_PARAMETER);
+            success = dyn_sequence.seek (slot);
 
             if (success == 0)
               {
@@ -490,18 +469,16 @@ TAO_Log_Constraint_Visitor::visit_component_array (
           return comp->accept (this);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       return -1;
     }
-  ACE_ENDTRY;
 }
 
 int
 TAO_Log_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::TypeCode_var tc = this->current_member_->type ();
 
@@ -524,8 +501,7 @@ TAO_Log_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
             // call to init() will raise an exception, and the
             // catch block will return -1;
             TAO_DynUnion_i dyn_union;
-            dyn_union.init (this->current_member_.in ()
-                            ACE_ENV_ARG_PARAMETER);
+            dyn_union.init (this->current_member_.in ());
 
             DynamicAny::DynAny_var disc =
               dyn_union.get_discriminator ();
@@ -556,11 +532,10 @@ TAO_Log_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
           return -1;
       }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       return -1;
     }
-  ACE_ENDTRY;
 }
 
 int
@@ -626,8 +601,7 @@ TAO_Log_Constraint_Visitor::visit_default (TAO_ETCL_Default *def)
       return -1;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::TypeCode_var tc = this->current_member_->type ();
 
@@ -650,11 +624,10 @@ TAO_Log_Constraint_Visitor::visit_default (TAO_ETCL_Default *def)
       TAO_ETCL_Literal_Constraint default_index_value (default_index);
       return (disc == default_index_value);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       return -1;
     }
-  ACE_ENDTRY;
 }
 
 int
@@ -973,18 +946,15 @@ TAO_Log_Constraint_Visitor::visit_in (
               const CORBA::Any *component = (const CORBA::Any *) bag;
               CORBA::TCKind kind = CORBA::tk_null;
 
-              ACE_DECLARE_NEW_CORBA_ENV;
-              ACE_TRY
+              try
                 {
                   CORBA::TypeCode_var tc = component->type ();
-                  kind = TAO_DynAnyFactory::unalias (tc.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+                  kind = TAO_DynAnyFactory::unalias (tc.in ());
                 }
-              ACE_CATCHANY
+              catch (const CORBA::Exception& ex)
                 {
                   return return_value;
                 }
-              ACE_ENDTRY;
 
               CORBA::Boolean result = 0;
 
@@ -1041,12 +1011,10 @@ TAO_Log_Constraint_Visitor::sequence_does_contain (
     TAO_ETCL_Literal_Constraint &item
   )
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::TypeCode_var type = any->type ();
-      CORBA::TCKind kind = TAO_DynAnyFactory::unalias (type.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
+      CORBA::TCKind kind = TAO_DynAnyFactory::unalias (type.in ());
 
       // The literal and the array elements must be
       // of the same simple type.
@@ -1059,8 +1027,7 @@ TAO_Log_Constraint_Visitor::sequence_does_contain (
         }
 
       TAO_DynSequence_i dyn_seq;
-      dyn_seq.init (*any
-                    ACE_ENV_ARG_PARAMETER);
+      dyn_seq.init (*any);
 
       DynamicAny::AnySeq_var any_seq =
         dyn_seq.get_elements ();
@@ -1077,11 +1044,10 @@ TAO_Log_Constraint_Visitor::sequence_does_contain (
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       return 0;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -1092,12 +1058,10 @@ TAO_Log_Constraint_Visitor::array_does_contain (
     TAO_ETCL_Literal_Constraint &item
   )
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::TypeCode_var type = any->type ();
-      CORBA::TCKind kind = TAO_DynAnyFactory::unalias (type.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
+      CORBA::TCKind kind = TAO_DynAnyFactory::unalias (type.in ());
 
       // The literal and the array elements must be
       // of the same simple type.
@@ -1110,8 +1074,7 @@ TAO_Log_Constraint_Visitor::array_does_contain (
         }
 
       TAO_DynArray_i dyn_array;
-      dyn_array.init (*any
-                      ACE_ENV_ARG_PARAMETER);
+      dyn_array.init (*any);
 
       DynamicAny::AnySeq_var any_seq =
         dyn_array.get_elements ();
@@ -1128,11 +1091,10 @@ TAO_Log_Constraint_Visitor::array_does_contain (
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       return 0;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -1143,12 +1105,10 @@ TAO_Log_Constraint_Visitor::struct_does_contain (
     TAO_ETCL_Literal_Constraint &item
   )
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       TAO_DynStruct_i dyn_struct;
-      dyn_struct.init (*any
-                       ACE_ENV_ARG_PARAMETER);
+      dyn_struct.init (*any);
 
       DynamicAny::NameValuePairSeq_var members =
         dyn_struct.get_members ();
@@ -1160,8 +1120,7 @@ TAO_Log_Constraint_Visitor::struct_does_contain (
       for (CORBA::ULong i = 0; i < length; ++i)
         {
           tc = members[i].value.type ();
-          kind = TAO_DynAnyFactory::unalias (tc.in ()
-                                             ACE_ENV_ARG_PARAMETER);
+          kind = TAO_DynAnyFactory::unalias (tc.in ());
 
           // The literal and the struct member must be
           // of the same simple type.
@@ -1181,11 +1140,10 @@ TAO_Log_Constraint_Visitor::struct_does_contain (
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       return 0;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -1196,12 +1154,10 @@ TAO_Log_Constraint_Visitor::union_does_contain (
     TAO_ETCL_Literal_Constraint &item
   )
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       TAO_DynUnion_i dyn_union;
-      dyn_union.init (*any
-                      ACE_ENV_ARG_PARAMETER);
+      dyn_union.init (*any);
 
       DynamicAny::DynAny_var cc =
         dyn_union.current_component ();
@@ -1209,8 +1165,7 @@ TAO_Log_Constraint_Visitor::union_does_contain (
       CORBA::Any_var member = cc->to_any ();
 
       CORBA::TypeCode_var tc = member->type ();
-      CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
+      CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ());
 
       // The literal and the union member must be
       // of the same simple type.
@@ -1226,11 +1181,10 @@ TAO_Log_Constraint_Visitor::union_does_contain (
 
       return (item == element);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       return 0;
     }
-  ACE_ENDTRY;
 }
 
 CORBA::Boolean
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp
index cc058cb2e49..a17fe88dd4e 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp
@@ -43,14 +43,13 @@ TAO_Log_Flush_Handler::cancel ()
 int
 TAO_Log_Flush_Handler::handle_timeout (const ACE_Time_Value&, const void *)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       log_->flush ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
index 3503452940a..605ca774d7c 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
@@ -46,13 +46,13 @@ void
 TAO_Log_i::init (void)
 {
   this->log_ =
-    logmgr_i_.create_log_reference (this->logid_ ACE_ENV_ARG_PARAMETER);
+    logmgr_i_.create_log_reference (this->logid_);
 
   this->recordstore_ =
-    logmgr_i_.get_log_record_store (this->logid_ ACE_ENV_ARG_PARAMETER);
+    logmgr_i_.get_log_record_store (this->logid_);
 
   if (this->recordstore_->open () ==-1)
-    ACE_THROW (CORBA::UNKNOWN ());
+    throw CORBA::UNKNOWN ();
 
   // fetch the capacity alarm thresholds from the log record store
   DsLogAdmin::CapacityAlarmThresholdList_var thresholds =
@@ -76,7 +76,7 @@ TAO_Log_i::init (void)
     this->recordstore_->get_week_mask ();
 
   // initialize the internal representation
-  this->reset_week_mask (week_mask.in () ACE_ENV_ARG_PARAMETER);
+  this->reset_week_mask (week_mask.in ());
 
 
   // fetch the maximum record life from the log record store
@@ -131,8 +131,7 @@ TAO_Log_i::get_log_qos (void)
 }
 
 void
-TAO_Log_i::set_log_qos (const DsLogAdmin::QoSList &qos
-                        ACE_ENV_ARG_DECL)
+TAO_Log_i::set_log_qos (const DsLogAdmin::QoSList &qos)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::UnsupportedQoS))
 {
@@ -167,7 +166,7 @@ TAO_Log_i::set_log_qos (const DsLogAdmin::QoSList &qos
   if (qos == old_qos.in ())
     return;
 
-  this->recordstore_->set_log_qos (qos ACE_ENV_ARG_PARAMETER);
+  this->recordstore_->set_log_qos (qos);
 
   reset_log_qos (qos);
 
@@ -176,8 +175,7 @@ TAO_Log_i::set_log_qos (const DsLogAdmin::QoSList &qos
       notifier_->quality_of_service_value_change (this->log_.in (),
                                                   this->logid_,
                                                   old_qos.in (),
-                                                  qos
-                                                  ACE_ENV_ARG_PARAMETER);
+                                                  qos);
     }
 }
 
@@ -195,8 +193,7 @@ TAO_Log_i::get_max_record_life (void)
 }
 
 void
-TAO_Log_i::set_max_record_life (CORBA::ULong life
-                                ACE_ENV_ARG_DECL)
+TAO_Log_i::set_max_record_life (CORBA::ULong life)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
@@ -218,7 +215,7 @@ TAO_Log_i::set_max_record_life (CORBA::ULong life
   if (life == old_life)
     return;
 
-  this->recordstore_->set_max_record_life (life ACE_ENV_ARG_PARAMETER);
+  this->recordstore_->set_max_record_life (life);
 
   if (life != 0)
     this->log_compaction_handler_.schedule();
@@ -230,8 +227,7 @@ TAO_Log_i::set_max_record_life (CORBA::ULong life
       notifier_->max_record_life_value_change (this->log_.in (),
                                                this->logid_,
                                                old_life,
-                                               life
-                                               ACE_ENV_ARG_PARAMETER);
+                                               life);
   }
 }
 
@@ -248,8 +244,7 @@ TAO_Log_i::get_max_size (void)
 }
 
 void
-TAO_Log_i::set_max_size (CORBA::ULongLong size
-                         ACE_ENV_ARG_DECL)
+TAO_Log_i::set_max_size (CORBA::ULongLong size)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidParam))
 {
@@ -279,18 +274,17 @@ TAO_Log_i::set_max_size (CORBA::ULongLong size
   this->recordstore_->get_current_size ();
 
       if (size < current_size)
-	ACE_THROW (DsLogAdmin::InvalidParam ());
+	throw DsLogAdmin::InvalidParam ();
     }
 
-  this->recordstore_->set_max_size (size ACE_ENV_ARG_PARAMETER);
+  this->recordstore_->set_max_size (size);
 
   if (notifier_)
     {
       notifier_->max_log_size_value_change (this->log_.in (),
 					    this->logid_,
 					    old_size,
-					    size
-					    ACE_ENV_ARG_PARAMETER);
+					    size);
     }
 
   // @@ The current revision of the specification (formal/03-07-01)
@@ -348,8 +342,7 @@ TAO_Log_i::get_log_full_action (void)
 }
 
 void
-TAO_Log_i::set_log_full_action (DsLogAdmin::LogFullActionType action
-                                ACE_ENV_ARG_DECL)
+TAO_Log_i::set_log_full_action (DsLogAdmin::LogFullActionType action)
   ACE_THROW_SPEC ((CORBA::SystemException,
 		   DsLogAdmin::InvalidLogFullAction))
 {
@@ -359,7 +352,7 @@ TAO_Log_i::set_log_full_action (DsLogAdmin::LogFullActionType action
 			    CORBA::INTERNAL ());
 
   if (action != DsLogAdmin::wrap && action != DsLogAdmin::halt)
-    ACE_THROW (DsLogAdmin::InvalidLogFullAction ());
+    throw DsLogAdmin::InvalidLogFullAction ();
 
   DsLogAdmin::LogFullActionType old_action =
     this->recordstore_->get_log_full_action ();
@@ -375,15 +368,14 @@ TAO_Log_i::set_log_full_action (DsLogAdmin::LogFullActionType action
   if (action == old_action)
     return;
 
-  this->recordstore_->set_log_full_action (action ACE_ENV_ARG_PARAMETER);
+  this->recordstore_->set_log_full_action (action);
 
   if (notifier_)
     {
       notifier_->log_full_action_value_change (this->log_.in (),
                                                this->logid_,
                                                old_action,
-                                               action
-                                               ACE_ENV_ARG_PARAMETER);
+                                               action);
    }
 
   // @@ The current revision of the specification (formal/03-07-01)
@@ -417,8 +409,7 @@ TAO_Log_i::get_administrative_state (void)
 }
 
 void
-TAO_Log_i::set_administrative_state (DsLogAdmin::AdministrativeState state
-                                     ACE_ENV_ARG_DECL)
+TAO_Log_i::set_administrative_state (DsLogAdmin::AdministrativeState state)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
@@ -440,14 +431,13 @@ TAO_Log_i::set_administrative_state (DsLogAdmin::AdministrativeState state
   if (state == old_state)
     return;
 
-  this->recordstore_->set_administrative_state (state ACE_ENV_ARG_PARAMETER);
+  this->recordstore_->set_administrative_state (state);
 
   if (notifier_)
     {
       notifier_->administrative_state_change (this->log_.in (),
                                               this->logid_,
-                                              state
-                                              ACE_ENV_ARG_PARAMETER);
+                                              state);
   }
 }
 
@@ -465,8 +455,7 @@ TAO_Log_i::get_forwarding_state (void)
 }
 
 void
-TAO_Log_i::set_forwarding_state (DsLogAdmin::ForwardingState state
-                                 ACE_ENV_ARG_DECL)
+TAO_Log_i::set_forwarding_state (DsLogAdmin::ForwardingState state)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
@@ -488,14 +477,13 @@ TAO_Log_i::set_forwarding_state (DsLogAdmin::ForwardingState state
   if (state == old_state)
     return;
 
-  this->recordstore_->set_forwarding_state (state ACE_ENV_ARG_PARAMETER);
+  this->recordstore_->set_forwarding_state (state);
 
   if (notifier_)
     {
       notifier_->forwarding_state_change (this->log_.in (),
                                           this->logid_,
-                                          state
-                                          ACE_ENV_ARG_PARAMETER);
+                                          state);
     }
 }
 
@@ -521,8 +509,7 @@ TAO_Log_i::get_interval (void)
 }
 
 void
-TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval
-                         ACE_ENV_ARG_DECL)
+TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidTime,
                    DsLogAdmin::InvalidTimeInterval))
@@ -536,7 +523,7 @@ TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval
   if (interval.start != 0)
     {
       if (interval.start >= interval.stop)
-        ACE_THROW (DsLogAdmin::InvalidTimeInterval ());
+        throw DsLogAdmin::InvalidTimeInterval ();
     }
 
   DsLogAdmin::TimeInterval old_interval =
@@ -553,7 +540,7 @@ TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval
   if (interval == old_interval)
     return;
 
-  this->recordstore_->set_interval (interval ACE_ENV_ARG_PARAMETER);
+  this->recordstore_->set_interval (interval);
 
   if (notifier_)
     {
@@ -562,8 +549,7 @@ TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval
           notifier_->start_time_value_change (this->log_.in (),
                                               this->logid_,
                                               old_interval.start,
-                                              interval.start
-                                              ACE_ENV_ARG_PARAMETER);
+                                              interval.start);
         }
 
       if (interval.stop != old_interval.stop)
@@ -571,8 +557,7 @@ TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval
           notifier_->stop_time_value_change (this->log_.in (),
                                              this->logid_,
                                              old_interval.stop,
-                                             interval.stop
-                                             ACE_ENV_ARG_PARAMETER);
+                                             interval.stop);
         }
     }
 }
@@ -633,8 +618,7 @@ TAO_Log_i::get_capacity_alarm_thresholds (void)
 void
 TAO_Log_i::set_capacity_alarm_thresholds (const
                                           DsLogAdmin::CapacityAlarmThresholdList
-                                          &threshs
-                                          ACE_ENV_ARG_DECL)
+                                          &threshs)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidThreshold))
 {
@@ -644,11 +628,10 @@ TAO_Log_i::set_capacity_alarm_thresholds (const
 			    CORBA::INTERNAL ());
 
   const CORBA::Boolean validated =
-    TAO_Log_i::validate_capacity_alarm_thresholds (threshs
-                                                   ACE_ENV_ARG_PARAMETER);
+    TAO_Log_i::validate_capacity_alarm_thresholds (threshs);
 
   if (!validated)
-    ACE_THROW (DsLogAdmin::InvalidThreshold ());
+    throw DsLogAdmin::InvalidThreshold ();
 
   DsLogAdmin::CapacityAlarmThresholdList_var old_threshs =
     this->recordstore_->get_capacity_alarm_thresholds ();
@@ -664,16 +647,14 @@ TAO_Log_i::set_capacity_alarm_thresholds (const
   if (threshs == old_threshs.in ())
       return;
 
-  this->recordstore_->set_capacity_alarm_thresholds (threshs
-						     ACE_ENV_ARG_PARAMETER);
+  this->recordstore_->set_capacity_alarm_thresholds (threshs);
 
   if (notifier_)
     {
       notifier_->capacity_alarm_threshold_value_change (this->log_.in (),
                                                         this->logid_,
                                                         old_threshs.in (),
-                                                        threshs
-                                                        ACE_ENV_ARG_PARAMETER);
+                                                        threshs);
     }
 
   // @@ The current revision of the specification (formal/03-07-01)
@@ -708,8 +689,7 @@ TAO_Log_i::get_week_mask (void)
 }
 
 void
-TAO_Log_i::set_week_mask (const DsLogAdmin::WeekMask &masks
-                          ACE_ENV_ARG_DECL)
+TAO_Log_i::set_week_mask (const DsLogAdmin::WeekMask &masks)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidTime,
                    DsLogAdmin::InvalidTimeInterval,
@@ -720,7 +700,7 @@ TAO_Log_i::set_week_mask (const DsLogAdmin::WeekMask &masks
 			    this->recordstore_->lock (),
 			    CORBA::INTERNAL ());
 
-  validate_week_mask (masks ACE_ENV_ARG_PARAMETER);
+  validate_week_mask (masks);
 
   DsLogAdmin::WeekMask_var old_masks =
     this->recordstore_->get_week_mask ();
@@ -736,25 +716,23 @@ TAO_Log_i::set_week_mask (const DsLogAdmin::WeekMask &masks
   if (masks == old_masks.in ())
     return;
 
-  this->recordstore_->set_week_mask (masks ACE_ENV_ARG_PARAMETER);
+  this->recordstore_->set_week_mask (masks);
 
-  this->reset_week_mask (masks ACE_ENV_ARG_PARAMETER);
+  this->reset_week_mask (masks);
 
   if (notifier_)
     {
       notifier_->week_mask_value_change (this->log_.in (),
                                          this->logid_,
                                          old_masks.in (),
-                                         masks
-                                         ACE_ENV_ARG_PARAMETER);
+                                         masks);
     }
 }
 
 DsLogAdmin::RecordList*
 TAO_Log_i::query (const char *grammar,
                   const char *constraint,
-                  DsLogAdmin::Iterator_out iter_out
-                  ACE_ENV_ARG_DECL)
+                  DsLogAdmin::Iterator_out iter_out)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidGrammar,
                    DsLogAdmin::InvalidConstraint))
@@ -766,15 +744,13 @@ TAO_Log_i::query (const char *grammar,
 
   return this->recordstore_->query (grammar,
 				    constraint,
-				    iter_out
-				    ACE_ENV_ARG_PARAMETER);
+				    iter_out);
 }
 
 DsLogAdmin::RecordList*
 TAO_Log_i::retrieve (DsLogAdmin::TimeT from_time,
                      CORBA::Long how_many,
-                     DsLogAdmin::Iterator_out iter_out
-                     ACE_ENV_ARG_DECL)
+                     DsLogAdmin::Iterator_out iter_out)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
@@ -784,14 +760,12 @@ TAO_Log_i::retrieve (DsLogAdmin::TimeT from_time,
 
   return this->recordstore_->retrieve (from_time,
 				       how_many,
-				       iter_out
-				       ACE_ENV_ARG_PARAMETER);
+				       iter_out);
 }
 
 CORBA::ULong
 TAO_Log_i::match (const char* grammar,
-                  const char *constraint
-                  ACE_ENV_ARG_DECL)
+                  const char *constraint)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidGrammar,
                    DsLogAdmin::InvalidConstraint))
@@ -803,16 +777,14 @@ TAO_Log_i::match (const char* grammar,
 
   const CORBA::ULong count =
     this->recordstore_->match (grammar,
-			       constraint
-			       ACE_ENV_ARG_PARAMETER);
+			       constraint);
 
   return count;
 }
 
 CORBA::ULong
 TAO_Log_i::delete_records (const char *grammar,
-                           const char *constraint
-                           ACE_ENV_ARG_DECL)
+                           const char *constraint)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint))
@@ -824,8 +796,7 @@ TAO_Log_i::delete_records (const char *grammar,
 
   const CORBA::ULong count =
     this->recordstore_->delete_records (grammar,
-					constraint
-					ACE_ENV_ARG_PARAMETER);
+					constraint);
 
   if (count > 0)
     {
@@ -850,8 +821,7 @@ TAO_Log_i::delete_records (const char *grammar,
 }
 
 CORBA::ULong
-TAO_Log_i::delete_records_by_id (const DsLogAdmin::RecordIdList &ids
-                                 ACE_ENV_ARG_DECL)
+TAO_Log_i::delete_records_by_id (const DsLogAdmin::RecordIdList &ids)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
@@ -860,7 +830,7 @@ TAO_Log_i::delete_records_by_id (const DsLogAdmin::RecordIdList &ids
 			    CORBA::INTERNAL ());
 
   const CORBA::ULong count =
-    this->recordstore_->delete_records_by_id (ids ACE_ENV_ARG_PARAMETER);
+    this->recordstore_->delete_records_by_id (ids);
 
   if (count > 0)
     {
@@ -885,8 +855,7 @@ TAO_Log_i::delete_records_by_id (const DsLogAdmin::RecordIdList &ids
 }
 
 void
-TAO_Log_i::write_records (const DsLogAdmin::Anys &records
-                          ACE_ENV_ARG_DECL)
+TAO_Log_i::write_records (const DsLogAdmin::Anys &records)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::LogFull,
                    DsLogAdmin::LogOffDuty,
@@ -902,12 +871,11 @@ TAO_Log_i::write_records (const DsLogAdmin::Anys &records
       reclist [i].info = records[i];
     }
 
-  this->write_recordlist (reclist ACE_ENV_ARG_PARAMETER);
+  this->write_recordlist (reclist);
 }
 
 void
-TAO_Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist
-                             ACE_ENV_ARG_DECL)
+TAO_Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::LogFull,
                    DsLogAdmin::LogOffDuty,
@@ -939,15 +907,15 @@ TAO_Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist
 
   if (admin_state == DsLogAdmin::locked)
     {
-      ACE_THROW (DsLogAdmin::LogLocked ());
+      throw DsLogAdmin::LogLocked ();
     }
   else if (this->op_state_ == DsLogAdmin::disabled)
     {
-      ACE_THROW (DsLogAdmin::LogDisabled ());
+      throw DsLogAdmin::LogDisabled ();
     }
   else if (avail_stat.off_duty == 1)
     {
-      ACE_THROW (DsLogAdmin::LogOffDuty ());
+      throw DsLogAdmin::LogOffDuty ();
     }
 
   CORBA::Short num_written (0);
@@ -956,7 +924,7 @@ TAO_Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist
     {
       // retval == 1 => log store reached max size.
 
-      int retval = this->recordstore_->log (reclist[i] ACE_ENV_ARG_PARAMETER);
+      int retval = this->recordstore_->log (reclist[i]);
 
       if (retval == 1)
 	{
@@ -965,14 +933,14 @@ TAO_Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist
 	  if (log_full_action == DsLogAdmin::halt)
 	    {
 	      avail_status_.log_full = 1;
-	      ACE_THROW (DsLogAdmin::LogFull (num_written));
+	      throw DsLogAdmin::LogFull (num_written);
 	    }
 
 	  // the policy is to wrap. for this we need to delete a few
 	  // records. let the record store decide how many.
 
     if (this->recordstore_->purge_old_records () == -1)
-	    ACE_THROW (CORBA::PERSIST_STORE ());
+	    throw CORBA::PERSIST_STORE ();
 
 	  // Now, we want to attempt to write the same record again
 	  // so decrement the index to balance the inc. in the for loop.
@@ -986,15 +954,14 @@ TAO_Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist
 	}
       else
 	{
-	  ACE_THROW (CORBA::PERSIST_STORE ());
+	  throw CORBA::PERSIST_STORE ();
 	}
     } // for
 }
 
 void
 TAO_Log_i::set_record_attribute (DsLogAdmin::RecordId id,
-                                 const DsLogAdmin::NVList &attr_list
-                                 ACE_ENV_ARG_DECL)
+                                 const DsLogAdmin::NVList &attr_list)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidRecordId,
                    DsLogAdmin::InvalidAttribute))
@@ -1004,15 +971,14 @@ TAO_Log_i::set_record_attribute (DsLogAdmin::RecordId id,
 			    this->recordstore_->lock (),
 			    CORBA::INTERNAL ());
 
-  this->recordstore_->set_record_attribute (id, attr_list
-					    ACE_ENV_ARG_PARAMETER);
+  this->recordstore_->set_record_attribute (id, attr_list);
 }
 
 CORBA::ULong
 TAO_Log_i::set_records_attribute (const char *grammar,
                                   const char *constraint,
                                   const DsLogAdmin::NVList
-                                  &attr_list ACE_ENV_ARG_DECL)
+                                  &attr_list)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint,
@@ -1025,13 +991,11 @@ TAO_Log_i::set_records_attribute (const char *grammar,
 
   return this->recordstore_->set_records_attribute (grammar,
 						    constraint,
-						    attr_list
-						    ACE_ENV_ARG_PARAMETER);
+						    attr_list);
 }
 
 DsLogAdmin::NVList*
-TAO_Log_i::get_record_attribute (DsLogAdmin::RecordId id
-                             ACE_ENV_ARG_DECL)
+TAO_Log_i::get_record_attribute (DsLogAdmin::RecordId id)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidRecordId))
 {
@@ -1041,8 +1005,7 @@ TAO_Log_i::get_record_attribute (DsLogAdmin::RecordId id
                            CORBA::INTERNAL ());
 
 
-  return this->recordstore_->get_record_attribute (id
-						   ACE_ENV_ARG_PARAMETER);
+  return this->recordstore_->get_record_attribute (id);
 }
 
 void
@@ -1107,63 +1070,53 @@ TAO_Log_i::scheduled (void)
 }
 
 void
-TAO_Log_i::copy_attributes (DsLogAdmin::Log_ptr log
-                            ACE_ENV_ARG_DECL)
+TAO_Log_i::copy_attributes (DsLogAdmin::Log_ptr log)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const DsLogAdmin::LogFullActionType log_full_action =
     this->get_log_full_action ();
 
-  log->set_log_full_action (log_full_action
-                            ACE_ENV_ARG_PARAMETER);
+  log->set_log_full_action (log_full_action);
 
   const CORBA::ULongLong max_size =
     this->get_max_size ();
 
-  log->set_max_size (max_size
-                     ACE_ENV_ARG_PARAMETER);
+  log->set_max_size (max_size);
 
   DsLogAdmin::QoSList_var log_qos =
     this->get_log_qos ();
 
-  log->set_log_qos (log_qos.in ()
-                    ACE_ENV_ARG_PARAMETER);
+  log->set_log_qos (log_qos.in ());
 
   const CORBA::ULong max_record_life =
     this->get_max_record_life ();
 
-  log->set_max_record_life (max_record_life
-                            ACE_ENV_ARG_PARAMETER);
+  log->set_max_record_life (max_record_life);
 
   const DsLogAdmin::AdministrativeState adminstrative_state =
     this->get_administrative_state ();
 
-  log->set_administrative_state (adminstrative_state
-                                 ACE_ENV_ARG_PARAMETER);
+  log->set_administrative_state (adminstrative_state);
 
   const DsLogAdmin::ForwardingState forwarding_state =
     this->get_forwarding_state ();
 
-  log->set_forwarding_state (forwarding_state
-                             ACE_ENV_ARG_PARAMETER);
+  log->set_forwarding_state (forwarding_state);
 
   const DsLogAdmin::TimeInterval interval =
     this->get_interval ();
 
-  log->set_interval (interval
-                     ACE_ENV_ARG_PARAMETER);
+  log->set_interval (interval);
 
   DsLogAdmin::CapacityAlarmThresholdList_var capacity_list =
     this->get_capacity_alarm_thresholds ();
 
-  log->set_capacity_alarm_thresholds (capacity_list.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+  log->set_capacity_alarm_thresholds (capacity_list.in ());
 
   DsLogAdmin::WeekMask_var week_mask =
     this->get_week_mask ();
 
-  log->set_week_mask (week_mask.in ()
-                      ACE_ENV_ARG_PARAMETER);
+  log->set_week_mask (week_mask.in ());
 }
 
 void
@@ -1229,8 +1182,7 @@ TAO_Log_i::check_capacity_alarm_threshold (void)
                 logid_,
                 this->thresholds_[this->current_threshold_],
                 percent,
-                severity
-                ACE_ENV_ARG_PARAMETER);
+                severity);
             }
           else
             {
@@ -1288,8 +1240,7 @@ TAO_Log_i::reset_capacity_alarm_threshold (void)
 
 CORBA::Boolean
 TAO_Log_i::validate_capacity_alarm_thresholds (
-    const DsLogAdmin::CapacityAlarmThresholdList & threshs
-    ACE_ENV_ARG_DECL_NOT_USED)
+    const DsLogAdmin::CapacityAlarmThresholdList & threshs)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   for (CORBA::ULong i = 0; i < threshs.length (); i++)
@@ -1311,8 +1262,7 @@ TAO_Log_i::validate_capacity_alarm_thresholds (
 }
 
 void
-TAO_Log_i::reset_log_qos (const DsLogAdmin::QoSList& qos
-			  ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Log_i::reset_log_qos (const DsLogAdmin::QoSList& qos)
 {
   // @@ The current revision of the specification (formal/03-07-01)
   // does not clearly define the semantics to follow when the QoSList
@@ -1339,8 +1289,7 @@ TAO_Log_i::reset_log_qos (const DsLogAdmin::QoSList& qos
 }
 
 void
-TAO_Log_i::validate_log_qos (const DsLogAdmin::QoSList& qos
-			     ACE_ENV_ARG_DECL)
+TAO_Log_i::validate_log_qos (const DsLogAdmin::QoSList& qos)
   ACE_THROW_SPEC ((DsLogAdmin::UnsupportedQoS))
 {
   DsLogAdmin::QoSList denied;
@@ -1363,13 +1312,12 @@ TAO_Log_i::validate_log_qos (const DsLogAdmin::QoSList& qos
   // exception.
   if (denied.length() != 0)
     {
-      ACE_THROW (DsLogAdmin::UnsupportedQoS (denied));
+      throw DsLogAdmin::UnsupportedQoS (denied);
     }
 }
 
 void
-TAO_Log_i::reset_week_mask (const DsLogAdmin::WeekMask& masks
-			    ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Log_i::reset_week_mask (const DsLogAdmin::WeekMask& masks)
 {
   CORBA::ULong count = 0;
   weekly_intervals_.length (100);
@@ -1409,8 +1357,7 @@ TAO_Log_i::reset_week_mask (const DsLogAdmin::WeekMask& masks
 }
 
 void
-TAO_Log_i::validate_week_mask (const DsLogAdmin::WeekMask& masks
-			       ACE_ENV_ARG_DECL)
+TAO_Log_i::validate_week_mask (const DsLogAdmin::WeekMask& masks)
   ACE_THROW_SPEC ((DsLogAdmin::InvalidTime,
 		   DsLogAdmin::InvalidTimeInterval,
 		   DsLogAdmin::InvalidMask))
@@ -1425,7 +1372,7 @@ TAO_Log_i::validate_week_mask (const DsLogAdmin::WeekMask& masks
                            DsLogAdmin::Friday +
                            DsLogAdmin::Saturday)
           )
-        ACE_THROW (DsLogAdmin::InvalidMask ());
+        throw DsLogAdmin::InvalidMask ();
 
       for (CORBA::ULong j = 0; j < masks[i].intervals.length (); ++j)
         {
@@ -1433,17 +1380,17 @@ TAO_Log_i::validate_week_mask (const DsLogAdmin::WeekMask& masks
               masks[i].intervals[j].start.minute > 59 ||
               masks[i].intervals[j].stop.hour > 23 ||
               masks[i].intervals[j].stop.minute > 59)
-            ACE_THROW (DsLogAdmin::InvalidTime ());
+            throw DsLogAdmin::InvalidTime ();
 
           if (masks[i].intervals[j].stop.hour <
               masks[i].intervals[j].start.hour)
-            ACE_THROW (DsLogAdmin::InvalidTimeInterval ());
+            throw DsLogAdmin::InvalidTimeInterval ();
 
           if (masks[i].intervals[j].stop.hour ==
               masks[i].intervals[j].start.hour &&
               masks[i].intervals[j].stop.minute <=
               masks[i].intervals[j].start.minute)
-            ACE_THROW (DsLogAdmin::InvalidTimeInterval ());
+            throw DsLogAdmin::InvalidTimeInterval ();
         }
     }
 }
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.h b/TAO/orbsvcs/orbsvcs/Log/Log_i.h
index f49b44d0f53..60caca26dfc 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.h
@@ -84,8 +84,7 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Set the list of the QoS properties supported by the log.
-  void set_log_qos (const DsLogAdmin::QoSList & qos
-                ACE_ENV_ARG_DECL)
+  void set_log_qos (const DsLogAdmin::QoSList & qos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::UnsupportedQoS));
 
@@ -96,8 +95,7 @@ public:
 
   /// Set the record life in seconds (0 infinite).
   void
-  set_max_record_life (CORBA::ULong life
-                       ACE_ENV_ARG_DECL)
+  set_max_record_life (CORBA::ULong life)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Get the maximum size in octets.
@@ -107,8 +105,7 @@ public:
 
   /// Set the maximum size in octets.
   void
-  set_max_size (CORBA::ULongLong size
-                ACE_ENV_ARG_DECL)
+  set_max_size (CORBA::ULongLong size)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidParam));
 
@@ -129,8 +126,7 @@ public:
 
   /// Set the action to be taken when the log reaches its maximum size.
   void
-  set_log_full_action (DsLogAdmin::LogFullActionType action
-                       ACE_ENV_ARG_DECL)
+  set_log_full_action (DsLogAdmin::LogFullActionType action)
     ACE_THROW_SPEC ((CORBA::SystemException,
 		     DsLogAdmin::InvalidLogFullAction));
 
@@ -141,8 +137,7 @@ public:
 
   /// Set the administrative state of the log.
   void
-  set_administrative_state (DsLogAdmin::AdministrativeState state
-                            ACE_ENV_ARG_DECL)
+  set_administrative_state (DsLogAdmin::AdministrativeState state)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Get the forwarding state of the log.
@@ -156,8 +151,7 @@ public:
   /// Set the forwarding state of the log.
   /// @@ Note: is it ok to make this method virtual?
   void
-    set_forwarding_state (DsLogAdmin::ForwardingState state
-                          ACE_ENV_ARG_DECL)
+    set_forwarding_state (DsLogAdmin::ForwardingState state)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Get the operational state of the log.
@@ -172,8 +166,7 @@ public:
 
   /// Set the log duration.
   void
-  set_interval (const DsLogAdmin::TimeInterval & interval
-                ACE_ENV_ARG_DECL)
+  set_interval (const DsLogAdmin::TimeInterval & interval)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidTime,
                      DsLogAdmin::InvalidTimeInterval));
@@ -198,8 +191,7 @@ public:
    */
   void
   set_capacity_alarm_thresholds
-  (const DsLogAdmin::CapacityAlarmThresholdList & threshs
-   ACE_ENV_ARG_DECL)
+  (const DsLogAdmin::CapacityAlarmThresholdList & threshs)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidThreshold));
 
@@ -210,8 +202,7 @@ public:
 
   /// Set the weekly scheduling parameters.
   void
-  set_week_mask (const DsLogAdmin::WeekMask & masks
-                 ACE_ENV_ARG_DECL)
+  set_week_mask (const DsLogAdmin::WeekMask & masks)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidTime,
                      DsLogAdmin::InvalidTimeInterval,
@@ -222,8 +213,7 @@ public:
   DsLogAdmin::RecordList*
   query (const char * grammar,
          const char * c,
-         DsLogAdmin::Iterator_out i
-         ACE_ENV_ARG_DECL)
+         DsLogAdmin::Iterator_out i)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint));
@@ -233,15 +223,13 @@ public:
   DsLogAdmin::RecordList*
   retrieve (DsLogAdmin::TimeT from_time,
             CORBA::Long how_many,
-            DsLogAdmin::Iterator_out i
-            ACE_ENV_ARG_DECL)
+            DsLogAdmin::Iterator_out i)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Returns the number of records matching constraint <c>.
   CORBA::ULong
   match (const char * grammar,
-         const char * c
-         ACE_ENV_ARG_DECL)
+         const char * c)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint));
@@ -249,23 +237,20 @@ public:
   /// Delete records matching constraint <c>.
   CORBA::ULong
   delete_records (const char * grammar,
-                  const char * c
-                  ACE_ENV_ARG_DECL)
+                  const char * c)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint));
 
   /// Delete records matching ids in <ids>
   CORBA::ULong
-  delete_records_by_id (const DsLogAdmin::RecordIdList & ids
-                        ACE_ENV_ARG_DECL)
+  delete_records_by_id (const DsLogAdmin::RecordIdList & ids)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
   /// Write records to the log storage.
   void
-  write_records (const DsLogAdmin::Anys & records
-                 ACE_ENV_ARG_DECL)
+  write_records (const DsLogAdmin::Anys & records)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::LogFull,
                      DsLogAdmin::LogOffDuty,
@@ -275,8 +260,7 @@ public:
   /// Write a list of record ids to storage. Raises DsLogAdmin::LogFull
   /// and DsLogAdmin::LogLocked
   void
-  write_recordlist (const DsLogAdmin::RecordList & list
-                    ACE_ENV_ARG_DECL)
+  write_recordlist (const DsLogAdmin::RecordList & list)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::LogFull,
                      DsLogAdmin::LogOffDuty,
@@ -286,8 +270,7 @@ public:
   /// Set single record attributes.
   void
   set_record_attribute (DsLogAdmin::RecordId id,
-                        const DsLogAdmin::NVList & attr_list
-                        ACE_ENV_ARG_DECL)
+                        const DsLogAdmin::NVList & attr_list)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidRecordId,
                      DsLogAdmin::InvalidAttribute));
@@ -297,8 +280,7 @@ public:
   CORBA::ULong
   set_records_attribute (const char * grammar,
                          const char * c,
-                         const DsLogAdmin::NVList & attr_list
-                         ACE_ENV_ARG_DECL)
+                         const DsLogAdmin::NVList & attr_list)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint,
@@ -307,8 +289,7 @@ public:
   /// Get the attributes of the record with id <id>. Raises
   /// DsLogAdmin::InvalidRecordId
   DsLogAdmin::NVList*
-  get_record_attribute (DsLogAdmin::RecordId id
-                        ACE_ENV_ARG_DECL)
+  get_record_attribute (DsLogAdmin::RecordId id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidRecordId));
 
@@ -337,8 +318,7 @@ protected:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Copy the attributes of the log being passed.
-  void copy_attributes (DsLogAdmin::Log_ptr log
-                        ACE_ENV_ARG_DECL)
+  void copy_attributes (DsLogAdmin::Log_ptr log)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Check if threshold reached.
@@ -351,17 +331,14 @@ protected:
 
   /// Check that valid threshold values have been given.
   static CORBA::Boolean validate_capacity_alarm_thresholds (
-    const DsLogAdmin::CapacityAlarmThresholdList & threshs
-   ACE_ENV_ARG_DECL)
+    const DsLogAdmin::CapacityAlarmThresholdList & threshs)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Reset Log QoS
-  void reset_log_qos (const DsLogAdmin::QoSList& qos
-		      ACE_ENV_ARG_DECL);
+  void reset_log_qos (const DsLogAdmin::QoSList& qos);
 
   /// Validate log QoS
-  void validate_log_qos (const DsLogAdmin::QoSList& qos
-			 ACE_ENV_ARG_DECL)
+  void validate_log_qos (const DsLogAdmin::QoSList& qos)
     ACE_THROW_SPEC ((DsLogAdmin::UnsupportedQoS));
 
   /// Reset Week Mask
@@ -370,16 +347,14 @@ protected:
   /// week mask list when the log service starts, and to reinitialize
   /// them when they are changed.
   ///
-  void reset_week_mask (const DsLogAdmin::WeekMask& masks
-			ACE_ENV_ARG_DECL);
+  void reset_week_mask (const DsLogAdmin::WeekMask& masks);
 
   /// Validate Week Mask
   ///
   /// Used to check whether week mask is valid.  If not, throws an
   /// InvalidTime, InvalidTimeInterval, or InvalidMask exception.
   ///
-  void validate_week_mask (const DsLogAdmin::WeekMask& masks
-			   ACE_ENV_ARG_DECL)
+  void validate_week_mask (const DsLogAdmin::WeekMask& masks)
     ACE_THROW_SPEC ((DsLogAdmin::InvalidTime,
                      DsLogAdmin::InvalidTimeInterval,
                      DsLogAdmin::InvalidMask));
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp
index 7e5fa4d9a17..226586b688b 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp
@@ -19,27 +19,25 @@ TAO_Notify_LogConsumer::~TAO_Notify_LogConsumer (void)
 
 void
 TAO_Notify_LogConsumer::connect (
-  CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-  ACE_ENV_ARG_DECL)
+  CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
 {
   // Activate the consumer with the default_POA_
   CosNotifyComm::PushConsumer_var objref =
     this->_this ();
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
-    consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::ANY_EVENT, proxy_supplier_id_ ACE_ENV_ARG_PARAMETER);
+    consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::ANY_EVENT, proxy_supplier_id_);
 
   ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ()));
 
   // narrow
   this->proxy_supplier_ =
     CosNotifyChannelAdmin::ProxyPushSupplier::
-    _narrow (proxysupplier.in () ACE_ENV_ARG_PARAMETER);
+    _narrow (proxysupplier.in ());
 
   ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ()));
 
-  proxy_supplier_->connect_any_push_consumer (objref.in ()
-                                              ACE_ENV_ARG_PARAMETER);
+  proxy_supplier_->connect_any_push_consumer (objref.in ());
 
 }
 
@@ -53,8 +51,7 @@ TAO_Notify_LogConsumer::disconnect (void)
 void
 TAO_Notify_LogConsumer::offer_change
    (const CosNotification::EventTypeSeq & /*added*/,
-    const CosNotification::EventTypeSeq & /*removed*/
-    ACE_ENV_ARG_DECL_NOT_USED)
+    const CosNotification::EventTypeSeq & /*removed*/)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         CosNotifyComm::InvalidEventType
@@ -65,8 +62,7 @@ TAO_Notify_LogConsumer::offer_change
 
 void
 TAO_Notify_LogConsumer::push
-   (const CORBA::Any& event
-    ACE_ENV_ARG_DECL)
+   (const CORBA::Any& event)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
@@ -102,28 +98,27 @@ TAO_Notify_LogConsumer::push
   //
   // I have submitted a defect report to the OMG for clarification.
   //    --jtc
-  ACE_TRY
+  try
     {
       // log the RecordList.
-      this->log_->write_recordlist (recList ACE_ENV_ARG_PARAMETER);
+      this->log_->write_recordlist (recList);
     }
-  ACE_CATCH (DsLogAdmin::LogFull, ex)
+  catch (const DsLogAdmin::LogFull& )
     {
-      ACE_THROW (CORBA::NO_RESOURCES ());
+      throw CORBA::NO_RESOURCES ();
     }
-  ACE_CATCH (DsLogAdmin::LogOffDuty, ex)
+  catch (const DsLogAdmin::LogOffDuty& )
     {
-      ACE_THROW (CORBA::NO_RESOURCES ());
+      throw CORBA::NO_RESOURCES ();
     }
-  ACE_CATCH (DsLogAdmin::LogLocked, ex)
+  catch (const DsLogAdmin::LogLocked& )
     {
-      ACE_THROW (CORBA::NO_PERMISSION ());
+      throw CORBA::NO_PERMISSION ();
     }
-  ACE_CATCH (DsLogAdmin::LogDisabled, ex)
+  catch (const DsLogAdmin::LogDisabled& )
     {
-      ACE_THROW (CORBA::TRANSIENT ());
+      throw CORBA::TRANSIENT ();
     }
-  ACE_ENDTRY;
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h
index bd9e1802acc..2739da295fb 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h
@@ -59,7 +59,7 @@ public:
   TAO_Notify_LogConsumer (TAO_NotifyLog_i *log);
 
   /// Connect to NotifyLog.
-  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL);
+  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin);
 
   /// Disconnect from NotifyLog.
   virtual void disconnect (void);
@@ -72,7 +72,6 @@ protected:
   virtual void offer_change (
       const CosNotification::EventTypeSeq & added,
       const CosNotification::EventTypeSeq & removed
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -82,7 +81,6 @@ protected:
   // = PushSupplier methods
   virtual void push (
       const CORBA::Any & event
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -90,7 +88,6 @@ protected:
      ));
 
   virtual void disconnect_push_consumer (
-      ACE_ENV_SINGLE_ARG_DECL
       )
     ACE_THROW_SPEC ((
       CORBA::SystemException
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
index 30dd0c98c71..102221bc7da 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
@@ -16,7 +16,6 @@ TAO_NotifyLogFactory_i::TAO_NotifyLogFactory_i (void)
 TAO_NotifyLogFactory_i::TAO_NotifyLogFactory_i (CosNotifyChannelAdmin::EventChannelFactory_ptr ecf)
 : notify_factory_ (ecf)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   CosNotifyChannelAdmin::ChannelID id;
   CosNotifyChannelAdmin::AdminID adminID = 0;
@@ -26,8 +25,7 @@ TAO_NotifyLogFactory_i::TAO_NotifyLogFactory_i (CosNotifyChannelAdmin::EventChan
   this->event_channel_ =
           this->notify_factory_->create_channel (initial_qos,
                                                  initial_admin,
-                                                 id
-                      ACE_ENV_ARG_PARAMETER);
+                                                 id);
 
   this->consumer_admin_ = this->event_channel_->new_for_consumers(CosNotifyChannelAdmin::OR_OP, adminID);
 
@@ -39,7 +37,7 @@ TAO_NotifyLogFactory_i::TAO_NotifyLogFactory_i (CosNotifyChannelAdmin::EventChan
   added[0].domain_name =  CORBA::string_dup ("*");
   added[0].type_name = CORBA::string_dup ("*");
 
-  this->consumer_admin_->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
+  this->consumer_admin_->subscription_change (added, removed);
 
     ACE_NEW_THROW_EX (this->notifier_,
                   TAO_NotifyLogNotification(this->event_channel_.in ()),
@@ -53,28 +51,23 @@ TAO_NotifyLogFactory_i::~TAO_NotifyLogFactory_i()
 
 DsNotifyLogAdmin::NotifyLogFactory_ptr
 TAO_NotifyLogFactory_i::activate (CORBA::ORB_ptr orb,
-                                  PortableServer::POA_ptr poa
-                                  ACE_ENV_ARG_DECL)
+                                  PortableServer::POA_ptr poa)
 {
-  TAO_LogMgr_i::init (orb, poa ACE_ENV_ARG_PARAMETER);
+  TAO_LogMgr_i::init (orb, poa);
 
 
   PortableServer::ObjectId_var oid =
-    this->factory_poa_->activate_object (this
-					 ACE_ENV_ARG_PARAMETER);
+    this->factory_poa_->activate_object (this);
 
   CORBA::Object_var obj =
-    this->factory_poa_->id_to_reference (oid.in ()
-					 ACE_ENV_ARG_PARAMETER);
+    this->factory_poa_->id_to_reference (oid.in ());
 
   // narrow and store the result..
   this->log_mgr_ =
-    DsLogAdmin::LogMgr::_narrow (obj.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+    DsLogAdmin::LogMgr::_narrow (obj.in ());
 
   DsNotifyLogAdmin::NotifyLogFactory_var v_return =
-    DsNotifyLogAdmin::NotifyLogFactory::_narrow (obj.in ()
-                                          ACE_ENV_ARG_PARAMETER);
+    DsNotifyLogAdmin::NotifyLogFactory::_narrow (obj.in ());
 
   return v_return._retn ();
 }
@@ -87,7 +80,6 @@ TAO_NotifyLogFactory_i::create (
         const CosNotification::QoSProperties & initial_qos,
         const CosNotification::AdminProperties & initial_admin,
         DsLogAdmin::LogId_out id_out
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -103,16 +95,15 @@ TAO_NotifyLogFactory_i::create (
   this->create_i (full_action,
 		  max_size,
 		  & thresholds,
-		  id_out
-		  ACE_ENV_ARG_PARAMETER);
+		  id_out);
   DsLogAdmin::LogId id = id_out;
 
 #if (TAO_HAS_MINIMUM_POA == 0)
   DsLogAdmin::Log_var log =
-    this->create_log_reference (id ACE_ENV_ARG_PARAMETER);
+    this->create_log_reference (id);
 #else
   DsLogAdmin::Log_var log =
-    this->create_log_object (id ACE_ENV_ARG_PARAMETER);
+    this->create_log_object (id);
 #endif
 
   // narrow to NotifyLog
@@ -120,7 +111,7 @@ TAO_NotifyLogFactory_i::create (
     DsNotifyLogAdmin::NotifyLog::_narrow (log.in ());
 
   // @@ JTC - squelch exception?
-  notifier_->object_creation (id ACE_ENV_ARG_PARAMETER);
+  notifier_->object_creation (id);
 
   return notify_log._retn ();
 }
@@ -133,7 +124,6 @@ TAO_NotifyLogFactory_i::create_with_id (
         const DsLogAdmin::CapacityAlarmThresholdList & thresholds,
         const CosNotification::QoSProperties & initial_qos,
         const CosNotification::AdminProperties & initial_admin
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -150,15 +140,14 @@ TAO_NotifyLogFactory_i::create_with_id (
   this->create_with_id_i (id,
 			  full_action,
 			  max_size,
-			  & thresholds
-			  ACE_ENV_ARG_PARAMETER);
+			  & thresholds);
 
 #if (TAO_HAS_MINIMUM_POA == 0)
   DsLogAdmin::Log_var log =
-    this->create_log_reference (id ACE_ENV_ARG_PARAMETER);
+    this->create_log_reference (id);
 #else
   DsLogAdmin::Log_var log =
-    this->create_log_object (id ACE_ENV_ARG_PARAMETER);
+    this->create_log_object (id);
 #endif
 
   // narrow to NotifyLog
@@ -166,7 +155,7 @@ TAO_NotifyLogFactory_i::create_with_id (
     DsNotifyLogAdmin::NotifyLog::_narrow (log.in ());
 
   // @@ JTC - squelch exception?
-  notifier_->object_creation (id ACE_ENV_ARG_PARAMETER);
+  notifier_->object_creation (id);
 
   return notify_log._retn();
 }
@@ -178,8 +167,7 @@ TAO_NotifyLogFactory_i::create_repositoryid ()
 }
 
 PortableServer::ServantBase*
-TAO_NotifyLogFactory_i::create_log_servant (DsLogAdmin::LogId id
-					    ACE_ENV_ARG_DECL)
+TAO_NotifyLogFactory_i::create_log_servant (DsLogAdmin::LogId id)
 {
   TAO_NotifyLog_i* notify_log_i;
 
@@ -239,12 +227,12 @@ TAO_NotifyLogFactory_i::priority_filter (void)
 }
 
 void
-TAO_NotifyLogFactory_i::priority_filter (CosNotifyFilter::MappingFilter_ptr filter ACE_ENV_ARG_DECL)
+TAO_NotifyLogFactory_i::priority_filter (CosNotifyFilter::MappingFilter_ptr filter)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
-  consumer_admin_->priority_filter(filter ACE_ENV_ARG_PARAMETER);
+  consumer_admin_->priority_filter(filter);
 }
 
 CosNotifyFilter::MappingFilter_ptr
@@ -257,12 +245,12 @@ TAO_NotifyLogFactory_i::lifetime_filter (void)
 }
 
 void
-TAO_NotifyLogFactory_i::lifetime_filter (CosNotifyFilter::MappingFilter_ptr filter ACE_ENV_ARG_DECL)
+TAO_NotifyLogFactory_i::lifetime_filter (CosNotifyFilter::MappingFilter_ptr filter)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
-  consumer_admin_->lifetime_filter (filter ACE_ENV_ARG_PARAMETER);
+  consumer_admin_->lifetime_filter (filter);
 }
 
 CosNotifyChannelAdmin::ProxyIDSeq*
@@ -285,42 +273,41 @@ TAO_NotifyLogFactory_i::push_suppliers (void)
 
 CosNotifyChannelAdmin::ProxySupplier_ptr
 TAO_NotifyLogFactory_i::get_proxy_supplier (
-  CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL)
+  CosNotifyChannelAdmin::ProxyID proxy_id)
     ACE_THROW_SPEC ((
       CosNotifyChannelAdmin::ProxyNotFound,
       CORBA::SystemException
     ))
 {
-  return consumer_admin_->get_proxy_supplier (proxy_id ACE_ENV_ARG_PARAMETER);
+  return consumer_admin_->get_proxy_supplier (proxy_id);
 }
 
 CosNotifyChannelAdmin::ProxySupplier_ptr
 TAO_NotifyLogFactory_i::obtain_notification_pull_supplier (
   CosNotifyChannelAdmin::ClientType ctype,
-  CosNotifyChannelAdmin::ProxyID& proxy_id ACE_ENV_ARG_DECL)
+  CosNotifyChannelAdmin::ProxyID& proxy_id)
     ACE_THROW_SPEC ((
       CosNotifyChannelAdmin::AdminLimitExceeded,
       CORBA::SystemException
     ))
 {
-  return consumer_admin_->obtain_notification_pull_supplier (ctype, proxy_id ACE_ENV_ARG_PARAMETER);
+  return consumer_admin_->obtain_notification_pull_supplier (ctype, proxy_id);
 }
 
 CosNotifyChannelAdmin::ProxySupplier_ptr
 TAO_NotifyLogFactory_i::obtain_notification_push_supplier (
   CosNotifyChannelAdmin::ClientType ctype,
-  CosNotifyChannelAdmin::ProxyID& proxy_id ACE_ENV_ARG_DECL)
+  CosNotifyChannelAdmin::ProxyID& proxy_id)
     ACE_THROW_SPEC ((
       CosNotifyChannelAdmin::AdminLimitExceeded,
       CORBA::SystemException
     ))
 {
-  return consumer_admin_->obtain_notification_push_supplier (ctype, proxy_id ACE_ENV_ARG_PARAMETER);
+  return consumer_admin_->obtain_notification_push_supplier (ctype, proxy_id);
 }
 
 CosEventChannelAdmin::ProxyPushSupplier_ptr
 TAO_NotifyLogFactory_i::obtain_push_supplier (
-        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -333,7 +320,6 @@ TAO_NotifyLogFactory_i::obtain_push_supplier (
 
 CosEventChannelAdmin::ProxyPullSupplier_ptr
 TAO_NotifyLogFactory_i::obtain_pull_supplier (
-        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -355,14 +341,13 @@ TAO_NotifyLogFactory_i::destroy (void)
 //CosNotifyComm::NotifySubscribe
 void
 TAO_NotifyLogFactory_i::subscription_change (const CosNotification::EventTypeSeq& added,
-                          const CosNotification::EventTypeSeq& removed
-                          ACE_ENV_ARG_DECL)
+                          const CosNotification::EventTypeSeq& removed)
     ACE_THROW_SPEC ((
       CosNotifyComm::InvalidEventType,
       CORBA::SystemException
     ))
 {
-  consumer_admin_->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
+  consumer_admin_->subscription_change (added, removed);
 }
 
 CosNotification::QoSProperties*
@@ -375,53 +360,52 @@ TAO_NotifyLogFactory_i::get_qos (void)
 }
 
 void
-TAO_NotifyLogFactory_i::set_qos (const CosNotification::QoSProperties& qos ACE_ENV_ARG_DECL)
+TAO_NotifyLogFactory_i::set_qos (const CosNotification::QoSProperties& qos)
     ACE_THROW_SPEC ((
       CosNotification::UnsupportedQoS,
       CORBA::SystemException
     ))
 {
-  consumer_admin_->set_qos (qos ACE_ENV_ARG_PARAMETER);
+  consumer_admin_->set_qos (qos);
 }
 
 void
 TAO_NotifyLogFactory_i::validate_qos (const CosNotification::QoSProperties& required_qos,
-                   CosNotification::NamedPropertyRangeSeq_out available_qos
-                   ACE_ENV_ARG_DECL)
+                   CosNotification::NamedPropertyRangeSeq_out available_qos)
     ACE_THROW_SPEC ((
       CosNotification::UnsupportedQoS,
       CORBA::SystemException
     ))
 {
-  consumer_admin_->validate_qos (required_qos, available_qos ACE_ENV_ARG_PARAMETER);
+  consumer_admin_->validate_qos (required_qos, available_qos);
 }
 
 CosNotifyFilter::FilterID
-TAO_NotifyLogFactory_i::add_filter (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL)
+TAO_NotifyLogFactory_i::add_filter (CosNotifyFilter::Filter_ptr filter)
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ))
 {
-  return consumer_admin_->add_filter (filter ACE_ENV_ARG_PARAMETER);
+  return consumer_admin_->add_filter (filter);
 }
 
 void
-TAO_NotifyLogFactory_i::remove_filter (CosNotifyFilter::FilterID id ACE_ENV_ARG_DECL)
+TAO_NotifyLogFactory_i::remove_filter (CosNotifyFilter::FilterID id)
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ))
 {
-  consumer_admin_->remove_filter (id ACE_ENV_ARG_PARAMETER);
+  consumer_admin_->remove_filter (id);
 }
 
 CosNotifyFilter::Filter_ptr
-TAO_NotifyLogFactory_i::get_filter (CosNotifyFilter::FilterID id ACE_ENV_ARG_DECL)
+TAO_NotifyLogFactory_i::get_filter (CosNotifyFilter::FilterID id)
     ACE_THROW_SPEC ((
       CosNotifyFilter::FilterNotFound,
       CORBA::SystemException
     ))
 {
-  return consumer_admin_->get_filter (id ACE_ENV_ARG_PARAMETER);
+  return consumer_admin_->get_filter (id);
 }
 
 CosNotifyFilter::FilterIDSeq*
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h
index c76098a88ac..89ba2e56282 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h
@@ -62,8 +62,7 @@ public:
   /// Activate this servant with the ORB and POA passed in.
   DsNotifyLogAdmin::NotifyLogFactory_ptr
     activate (CORBA::ORB_ptr orb,
-              PortableServer::POA_ptr poa
-              ACE_ENV_ARG_DECL);
+              PortableServer::POA_ptr poa);
 
   /// Used to create an NotifyLog.
   DsNotifyLogAdmin::NotifyLog_ptr create (
@@ -73,7 +72,6 @@ public:
         const CosNotification::QoSProperties & initial_qos,
         const CosNotification::AdminProperties & initial_admin,
         DsLogAdmin::LogId_out id
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -91,7 +89,6 @@ public:
         const DsLogAdmin::CapacityAlarmThresholdList & thresholds,
         const CosNotification::QoSProperties & initial_qos,
         const CosNotification::AdminProperties & initial_admin
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -123,7 +120,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  void priority_filter (CosNotifyFilter::MappingFilter_ptr ACE_ENV_ARG_DECL)
+  void priority_filter (CosNotifyFilter::MappingFilter_ptr)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
@@ -132,7 +129,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  void lifetime_filter (CosNotifyFilter::MappingFilter_ptr ACE_ENV_ARG_DECL)
+  void lifetime_filter (CosNotifyFilter::MappingFilter_ptr)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
@@ -147,7 +144,7 @@ public:
     ));
 
   CosNotifyChannelAdmin::ProxySupplier_ptr get_proxy_supplier (
-    CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL)
+    CosNotifyChannelAdmin::ProxyID proxy_id)
     ACE_THROW_SPEC ((
       CosNotifyChannelAdmin::ProxyNotFound,
       CORBA::SystemException
@@ -155,7 +152,7 @@ public:
 
   CosNotifyChannelAdmin::ProxySupplier_ptr obtain_notification_pull_supplier (
     CosNotifyChannelAdmin::ClientType ctype,
-    CosNotifyChannelAdmin::ProxyID& proxy_id ACE_ENV_ARG_DECL)
+    CosNotifyChannelAdmin::ProxyID& proxy_id)
     ACE_THROW_SPEC ((
       CosNotifyChannelAdmin::AdminLimitExceeded,
       CORBA::SystemException
@@ -163,21 +160,19 @@ public:
 
   CosNotifyChannelAdmin::ProxySupplier_ptr obtain_notification_push_supplier (
     CosNotifyChannelAdmin::ClientType ctype,
-    CosNotifyChannelAdmin::ProxyID& id ACE_ENV_ARG_DECL)
+    CosNotifyChannelAdmin::ProxyID& id)
     ACE_THROW_SPEC ((
       CosNotifyChannelAdmin::AdminLimitExceeded,
       CORBA::SystemException
     ));
 
   CosEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier (
-          ACE_ENV_SINGLE_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
 
   CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier (
-          ACE_ENV_SINGLE_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -190,8 +185,7 @@ public:
 
   /// CosNotifyComm::NotifySubscribe.
   void subscription_change (const CosNotification::EventTypeSeq& added,
-                            const CosNotification::EventTypeSeq& removed
-                            ACE_ENV_ARG_DECL)
+                            const CosNotification::EventTypeSeq& removed)
     ACE_THROW_SPEC ((
       CosNotifyComm::InvalidEventType,
       CORBA::SystemException
@@ -202,29 +196,28 @@ public:
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
-  void set_qos (const CosNotification::QoSProperties& ACE_ENV_ARG_DECL)
+  void set_qos (const CosNotification::QoSProperties&)
     ACE_THROW_SPEC ((
       CosNotification::UnsupportedQoS,
       CORBA::SystemException
     ));
   void validate_qos (const CosNotification::QoSProperties&,
-                     CosNotification::NamedPropertyRangeSeq_out
-                     ACE_ENV_ARG_DECL)
+                     CosNotification::NamedPropertyRangeSeq_out)
     ACE_THROW_SPEC ((
       CosNotification::UnsupportedQoS,
       CORBA::SystemException
     ));
 
   /// CosNotifyFilter::FilterAdmin.
-  CosNotifyFilter::FilterID add_filter (CosNotifyFilter::Filter_ptr ACE_ENV_ARG_DECL)
+  CosNotifyFilter::FilterID add_filter (CosNotifyFilter::Filter_ptr)
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
-  void remove_filter (CosNotifyFilter::FilterID ACE_ENV_ARG_DECL)
+  void remove_filter (CosNotifyFilter::FilterID)
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
-  CosNotifyFilter::Filter_ptr get_filter (CosNotifyFilter::FilterID ACE_ENV_ARG_DECL)
+  CosNotifyFilter::Filter_ptr get_filter (CosNotifyFilter::FilterID)
     ACE_THROW_SPEC ((
       CosNotifyFilter::FilterNotFound,
       CORBA::SystemException
@@ -243,8 +236,7 @@ protected:
     create_repositoryid ();
 
   virtual PortableServer::ServantBase*
-    create_log_servant (DsLogAdmin::LogId id
-			ACE_ENV_ARG_DECL);
+    create_log_servant (DsLogAdmin::LogId id);
 
   /// Our object ref. after <active>ation.
   DsLogAdmin::LogMgr_var log_mgr_;
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp
index f8feede1227..e3f5117bedf 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp
@@ -15,7 +15,6 @@ TAO_NotifyLogNotification::TAO_NotifyLogNotification (
   : TAO_LogNotification (),
     event_channel_ (CosNotifyChannelAdmin::EventChannel::_duplicate (ec))
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   CosNotifyComm::PushSupplier_var objref =
     this->_this ();
@@ -28,18 +27,17 @@ TAO_NotifyLogNotification::TAO_NotifyLogNotification (
   ACE_ASSERT (!CORBA::is_nil (supplier_admin.in ()));
 
   CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer =
-    supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::ANY_EVENT, proxy_consumer_id_ ACE_ENV_ARG_PARAMETER);
+    supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::ANY_EVENT, proxy_consumer_id_);
 
   ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ()));
 
   // narrow
   this->proxy_consumer_ =
-    CosNotifyChannelAdmin::ProxyPushConsumer::_narrow (proxyconsumer.in () ACE_ENV_ARG_PARAMETER);
+    CosNotifyChannelAdmin::ProxyPushConsumer::_narrow (proxyconsumer.in ());
 
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
-  proxy_consumer_->connect_any_push_supplier (objref.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+  proxy_consumer_->connect_any_push_supplier (objref.in ());
 }
 
 TAO_NotifyLogNotification::~TAO_NotifyLogNotification (void)
@@ -59,8 +57,7 @@ TAO_NotifyLogNotification::send_notification (const CORBA::Any& any)
 void
 TAO_NotifyLogNotification::subscription_change
    (const CosNotification::EventTypeSeq & /*added*/,
-    const CosNotification::EventTypeSeq & /*removed */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    const CosNotification::EventTypeSeq & /*removed */)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyComm::InvalidEventType
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h
index 00e86066473..5d39f68220a 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h
@@ -68,7 +68,6 @@ protected:
   virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -77,7 +76,6 @@ protected:
 
   // = StructuredPushSupplier method
     virtual void disconnect_push_supplier (
-        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
index 05c9b970d77..22c4f8e7d8f 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
@@ -22,7 +22,6 @@ TAO_NotifyLog_i::TAO_NotifyLog_i (CORBA::ORB_ptr orb,
     notify_factory_ (CosNotifyChannelAdmin::EventChannelFactory::_duplicate (ecf)),
     poa_ (PortableServer::POA::_duplicate (poa))
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   CosNotifyChannelAdmin::ChannelID channel_id;
 
@@ -35,8 +34,7 @@ TAO_NotifyLog_i::TAO_NotifyLog_i (CORBA::ORB_ptr orb,
   this->event_channel_ =
           this->notify_factory_->create_channel (initial_qos,
                                                  initial_admin,
-                                                 channel_id
-                                                 ACE_ENV_ARG_PARAMETER);
+                                                 channel_id);
 }
 
 TAO_NotifyLog_i::~TAO_NotifyLog_i ()
@@ -45,13 +43,13 @@ TAO_NotifyLog_i::~TAO_NotifyLog_i ()
 }
 
 DsLogAdmin::Log_ptr
-TAO_NotifyLog_i::copy (DsLogAdmin::LogId &id ACE_ENV_ARG_DECL)
+TAO_NotifyLog_i::copy (DsLogAdmin::LogId &id)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
   DsNotifyLogAdmin::NotifyLogFactory_var notifyLogFactory =
-    DsNotifyLogAdmin::NotifyLogFactory::_narrow (factory_.in () ACE_ENV_ARG_PARAMETER);
+    DsNotifyLogAdmin::NotifyLogFactory::_narrow (factory_.in ());
 
   CosNotification::QoSProperties* qos = get_qos ();
 
@@ -61,19 +59,19 @@ TAO_NotifyLog_i::copy (DsLogAdmin::LogId &id ACE_ENV_ARG_DECL)
     notifyLogFactory->create (DsLogAdmin::halt, 0, thresholds_, static_cast<const CosNotification::QoSProperties> (*qos),
                                static_cast<const CosNotification::AdminProperties> (*admin), id);
 
-  this->copy_attributes (log.in () ACE_ENV_ARG_PARAMETER);
+  this->copy_attributes (log.in ());
 
   return log._retn ();
 }
 
 DsLogAdmin::Log_ptr
-TAO_NotifyLog_i::copy_with_id (DsLogAdmin::LogId id ACE_ENV_ARG_DECL)
+TAO_NotifyLog_i::copy_with_id (DsLogAdmin::LogId id)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
   DsNotifyLogAdmin::NotifyLogFactory_var notifyLogFactory =
-    DsNotifyLogAdmin::NotifyLogFactory::_narrow (factory_.in () ACE_ENV_ARG_PARAMETER);
+    DsNotifyLogAdmin::NotifyLogFactory::_narrow (factory_.in ());
 
   CosNotification::QoSProperties* qos = get_qos ();
 
@@ -83,7 +81,7 @@ TAO_NotifyLog_i::copy_with_id (DsLogAdmin::LogId id ACE_ENV_ARG_DECL)
     notifyLogFactory->create_with_id (id, DsLogAdmin::halt, 0, thresholds_, static_cast<const CosNotification::QoSProperties> (*qos),
                                static_cast<const CosNotification::AdminProperties> (*admin));
 
-  this->copy_attributes (log.in () ACE_ENV_ARG_PARAMETER);
+  this->copy_attributes (log.in ());
 
   return log._retn ();
 }
@@ -93,19 +91,16 @@ void
 TAO_NotifyLog_i::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  notifier_->object_deletion (logid_ ACE_ENV_ARG_PARAMETER);
+  notifier_->object_deletion (logid_);
 
   // Remove ourselves from the list of logs.
-  this->logmgr_i_.remove (this->logid_
-			  ACE_ENV_ARG_PARAMETER);
+  this->logmgr_i_.remove (this->logid_);
 
   // Deregister with POA.
   PortableServer::ObjectId_var id =
-    this->poa_->servant_to_id (this
-                               ACE_ENV_ARG_PARAMETER);
+    this->poa_->servant_to_id (this);
 
-  this->poa_->deactivate_object (id.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+  this->poa_->deactivate_object (id.in ());
 }
 
 void
@@ -117,7 +112,7 @@ TAO_NotifyLog_i::activate (void)
     CosNotifyChannelAdmin::OR_OP;
 
   this->consumer_admin_ =
-    this->event_channel_->new_for_consumers (ifgop, adminid ACE_ENV_ARG_PARAMETER);
+    this->event_channel_->new_for_consumers (ifgop, adminid);
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
 
@@ -126,7 +121,7 @@ TAO_NotifyLog_i::activate (void)
 
   // setup a filter at the consumer admin
   CosNotifyFilter::Filter_var ca_filter =
-    ffact->create_filter (TCL_GRAMMAR ACE_ENV_ARG_PARAMETER);
+    ffact->create_filter (TCL_GRAMMAR);
 
   ACE_ASSERT (!CORBA::is_nil (ca_filter.in ()));
 
@@ -136,9 +131,9 @@ TAO_NotifyLog_i::activate (void)
   constraint_list[0].event_types.length (0);
   constraint_list[0].constraint_expr = CORBA::string_dup (CA_FILTER);
 
-  ca_filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
+  ca_filter->add_constraints (constraint_list);
 
-  consumer_admin_->add_filter (ca_filter.in () ACE_ENV_ARG_PARAMETER);
+  consumer_admin_->add_filter (ca_filter.in ());
 
   // Setup the CA to receive all type of events
   CosNotification::EventTypeSeq added(1);
@@ -149,13 +144,13 @@ TAO_NotifyLog_i::activate (void)
   added[0].domain_name =  CORBA::string_dup ("*");
   added[0].type_name = CORBA::string_dup ("*");
 
-  this->consumer_admin_->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
+  this->consumer_admin_->subscription_change (added, removed);
 
   ACE_NEW_THROW_EX (this->my_log_consumer_,
                     TAO_Notify_LogConsumer (this),
                     CORBA::NO_MEMORY ());
 
-  this->my_log_consumer_->connect (this->consumer_admin_.in () ACE_ENV_ARG_PARAMETER);
+  this->my_log_consumer_->connect (this->consumer_admin_.in ());
 }
 
 //IDL to C++
@@ -170,13 +165,12 @@ TAO_NotifyLog_i::get_filter (void)
 }
 
 void
-TAO_NotifyLog_i::set_filter (CosNotifyFilter::Filter_ptr /* filter */
-                             ACE_ENV_ARG_DECL)
+TAO_NotifyLog_i::set_filter (CosNotifyFilter::Filter_ptr /* filter */)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 
   //TODO: need to add impl
 }
@@ -220,42 +214,42 @@ TAO_NotifyLog_i::default_filter_factory (void)
 
 CosNotifyChannelAdmin::ConsumerAdmin_ptr
 TAO_NotifyLog_i::new_for_consumers (CosNotifyChannelAdmin::InterFilterGroupOperator op,
-    CosNotifyChannelAdmin::AdminID& id ACE_ENV_ARG_DECL)
+    CosNotifyChannelAdmin::AdminID& id)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
-  return this->event_channel_->new_for_consumers (op,id ACE_ENV_ARG_PARAMETER);
+  return this->event_channel_->new_for_consumers (op,id);
 }
 
 CosNotifyChannelAdmin::SupplierAdmin_ptr
 TAO_NotifyLog_i::new_for_suppliers (CosNotifyChannelAdmin::InterFilterGroupOperator op,
-    CosNotifyChannelAdmin::AdminID& id ACE_ENV_ARG_DECL)
+    CosNotifyChannelAdmin::AdminID& id)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
-  return this->event_channel_->new_for_suppliers (op,id ACE_ENV_ARG_PARAMETER);
+  return this->event_channel_->new_for_suppliers (op,id);
 }
 
 CosNotifyChannelAdmin::ConsumerAdmin_ptr
-TAO_NotifyLog_i::get_consumeradmin (CosNotifyChannelAdmin::AdminID id ACE_ENV_ARG_DECL)
+TAO_NotifyLog_i::get_consumeradmin (CosNotifyChannelAdmin::AdminID id)
     ACE_THROW_SPEC ((
       CosNotifyChannelAdmin::AdminNotFound,
       CORBA::SystemException
     ))
 {
-  return this->event_channel_->get_consumeradmin (id ACE_ENV_ARG_PARAMETER);
+  return this->event_channel_->get_consumeradmin (id);
 }
 
 CosNotifyChannelAdmin::SupplierAdmin_ptr
-TAO_NotifyLog_i::get_supplieradmin (CosNotifyChannelAdmin::AdminID id ACE_ENV_ARG_DECL)
+TAO_NotifyLog_i::get_supplieradmin (CosNotifyChannelAdmin::AdminID id)
     ACE_THROW_SPEC ((
       CosNotifyChannelAdmin::AdminNotFound,
       CORBA::SystemException
     ))
 {
-  return this->event_channel_->get_supplieradmin (id ACE_ENV_ARG_PARAMETER);
+  return this->event_channel_->get_supplieradmin (id);
 }
 
 CosNotifyChannelAdmin::AdminIDSeq*
@@ -286,13 +280,13 @@ TAO_NotifyLog_i::get_admin (void)
 }
 
 void
-TAO_NotifyLog_i::set_admin (const CosNotification::AdminProperties& admin ACE_ENV_ARG_DECL)
+TAO_NotifyLog_i::set_admin (const CosNotification::AdminProperties& admin)
     ACE_THROW_SPEC ((
       CosNotification::UnsupportedAdmin,
       CORBA::SystemException
     ))
 {
-  this->event_channel_->set_admin (admin ACE_ENV_ARG_PARAMETER);
+  this->event_channel_->set_admin (admin);
 }
 
 CosNotification::QoSProperties*
@@ -306,26 +300,24 @@ TAO_NotifyLog_i::get_qos (void)
 }
 
 void
-TAO_NotifyLog_i::set_qos (const CosNotification::QoSProperties& /* qos */
-                          ACE_ENV_ARG_DECL)
+TAO_NotifyLog_i::set_qos (const CosNotification::QoSProperties& /* qos */)
     ACE_THROW_SPEC ((
       CosNotification::UnsupportedQoS,
       CORBA::SystemException
     ))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
   //TODO: need to add later
 }
 
 void
 TAO_NotifyLog_i::validate_qos (
     const CosNotification::QoSProperties& /* required_qos */,
-    CosNotification::NamedPropertyRangeSeq_out /* available_qos */
-    ACE_ENV_ARG_DECL)
+    CosNotification::NamedPropertyRangeSeq_out /* available_qos */)
   ACE_THROW_SPEC ((CosNotification::UnsupportedQoS,
                    CORBA::SystemException))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 
   //TODO: need to add later
 }
@@ -341,7 +333,6 @@ TAO_NotifyLog_i::for_consumers (void)
 
 CosEventChannelAdmin::SupplierAdmin_ptr
 TAO_NotifyLog_i::for_suppliers (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h
index d28cb229b6b..08e111ff2c9 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h
@@ -70,13 +70,13 @@ public:
   ~TAO_NotifyLog_i ();
 
   /// Duplicate the log.
-  virtual DsLogAdmin::Log_ptr copy (DsLogAdmin::LogId &id ACE_ENV_ARG_DECL)
+  virtual DsLogAdmin::Log_ptr copy (DsLogAdmin::LogId &id)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
   /// Duplicate the log specifying an id.
-  virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id ACE_ENV_ARG_DECL)
+  virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
@@ -97,7 +97,7 @@ public:
       CORBA::SystemException
     ));
 
-  void set_filter (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL)
+  void set_filter (CosNotifyFilter::Filter_ptr filter)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
@@ -128,27 +128,27 @@ public:
 
   CosNotifyChannelAdmin::ConsumerAdmin_ptr
   new_for_consumers (CosNotifyChannelAdmin::InterFilterGroupOperator op,
-    CosNotifyChannelAdmin::AdminID& id ACE_ENV_ARG_DECL)
+    CosNotifyChannelAdmin::AdminID& id)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
   CosNotifyChannelAdmin::SupplierAdmin_ptr
   new_for_suppliers (CosNotifyChannelAdmin::InterFilterGroupOperator op,
-    CosNotifyChannelAdmin::AdminID& id ACE_ENV_ARG_DECL)
+    CosNotifyChannelAdmin::AdminID& id)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
   CosNotifyChannelAdmin::ConsumerAdmin_ptr
-  get_consumeradmin (CosNotifyChannelAdmin::AdminID id ACE_ENV_ARG_DECL)
+  get_consumeradmin (CosNotifyChannelAdmin::AdminID id)
     ACE_THROW_SPEC ((
       CosNotifyChannelAdmin::AdminNotFound,
       CORBA::SystemException
     ));
 
   CosNotifyChannelAdmin::SupplierAdmin_ptr
-  get_supplieradmin (CosNotifyChannelAdmin::AdminID id ACE_ENV_ARG_DECL)
+  get_supplieradmin (CosNotifyChannelAdmin::AdminID id)
     ACE_THROW_SPEC ((
       CosNotifyChannelAdmin::AdminNotFound,
       CORBA::SystemException
@@ -172,7 +172,7 @@ public:
       CORBA::SystemException
     ));
 
-  void set_admin (const CosNotification::AdminProperties& admin ACE_ENV_ARG_DECL)
+  void set_admin (const CosNotification::AdminProperties& admin)
     ACE_THROW_SPEC ((
       CosNotification::UnsupportedAdmin,
       CORBA::SystemException
@@ -184,14 +184,14 @@ public:
       CORBA::SystemException
     ));
 
-  void set_qos (const CosNotification::QoSProperties& ACE_ENV_ARG_DECL)
+  void set_qos (const CosNotification::QoSProperties&)
     ACE_THROW_SPEC ((
       CosNotification::UnsupportedQoS,
       CORBA::SystemException
     ));
 
   void validate_qos (const CosNotification::QoSProperties&,
-    CosNotification::NamedPropertyRangeSeq_out ACE_ENV_ARG_DECL)
+    CosNotification::NamedPropertyRangeSeq_out)
     ACE_THROW_SPEC ((
       CosNotification::UnsupportedQoS,
       CORBA::SystemException
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp
index ec298fc21e1..9bc54b2d479 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp
@@ -42,7 +42,7 @@ TAO_Rtec_LogConsumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer
 }
 
 void
-TAO_Rtec_LogConsumer::push (const RtecEventComm::EventSet& events ACE_ENV_ARG_DECL)
+TAO_Rtec_LogConsumer::push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // create a record list...
@@ -51,7 +51,7 @@ TAO_Rtec_LogConsumer::push (const RtecEventComm::EventSet& events ACE_ENV_ARG_DE
 
   recList [0].info <<= events;
 
-  this->log_->write_recordlist (recList ACE_ENV_ARG_PARAMETER);
+  this->log_->write_recordlist (recList);
 
 
 }
@@ -60,8 +60,7 @@ void
 TAO_Rtec_LogConsumer::disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->supplier_proxy_->disconnect_push_supplier (
-    ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->supplier_proxy_->disconnect_push_supplier ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h
index 676f984c689..86f0976f833 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h
@@ -74,7 +74,7 @@ private:
 
   /// This method will call TAO_Log_i::log() to write
   /// the event to the Log.
-  void push (const RtecEventComm::EventSet& events ACE_ENV_ARG_DECL)
+  void push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// ProxyPushSupplier used to connect to RTEventLog.
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
index bb267fc1758..69f700e5210 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
@@ -34,10 +34,9 @@ TAO_RTEventLogFactory_i::~TAO_RTEventLogFactory_i()
 
 int
 TAO_RTEventLogFactory_i::init (CORBA::ORB_ptr orb,
-                               PortableServer::POA_ptr poa
-                               ACE_ENV_ARG_DECL)
+                               PortableServer::POA_ptr poa)
 {
-  TAO_LogMgr_i::init (orb, poa ACE_ENV_ARG_PARAMETER);
+  TAO_LogMgr_i::init (orb, poa);
 
 
   PortableServer::POA_var defPOA =
@@ -54,13 +53,12 @@ TAO_RTEventLogFactory_i::init (CORBA::ORB_ptr orb,
 
   impl->activate ();
 
-  PortableServer::ObjectId_var oidec = poa_->activate_object (ec.get ()
-                                       ACE_ENV_ARG_PARAMETER);
+  PortableServer::ObjectId_var oidec = poa_->activate_object (ec.get ());
 
   ec.release ();
 
   CORBA::Object_var objec =
-    poa_->id_to_reference (oidec.in () ACE_ENV_ARG_PARAMETER);
+    poa_->id_to_reference (oidec.in ());
 
   this->event_channel_ = RtecEventChannelAdmin::EventChannel::_narrow (objec.in ());
 
@@ -79,21 +77,17 @@ TAO_RTEventLogFactory_i::activate (void)
   RTEventLogAdmin::EventLogFactory_var v_return;
 
   PortableServer::ObjectId_var oid =
-    this->factory_poa_->activate_object (this
-					 ACE_ENV_ARG_PARAMETER);
+    this->factory_poa_->activate_object (this);
 
   CORBA::Object_var obj =
-    this->factory_poa_->id_to_reference (oid.in ()
-					 ACE_ENV_ARG_PARAMETER);
+    this->factory_poa_->id_to_reference (oid.in ());
 
   // narrow and store the result..
   this->log_mgr_ =
-    DsLogAdmin::LogMgr::_narrow (obj.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+    DsLogAdmin::LogMgr::_narrow (obj.in ());
 
   v_return =
-    RTEventLogAdmin::EventLogFactory::_narrow (obj.in ()
-                                          ACE_ENV_ARG_PARAMETER);
+    RTEventLogAdmin::EventLogFactory::_narrow (obj.in ());
 
   return v_return._retn ();
 }
@@ -104,7 +98,6 @@ TAO_RTEventLogFactory_i::create (
         CORBA::ULongLong max_size,
         const DsLogAdmin::CapacityAlarmThresholdList & thresholds,
         DsLogAdmin::LogId_out id_out
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -115,16 +108,15 @@ TAO_RTEventLogFactory_i::create (
   this->create_i (full_action,
 		  max_size,
 		  & thresholds,
-		  id_out
-		  ACE_ENV_ARG_PARAMETER);
+		  id_out);
   DsLogAdmin::LogId id = id_out;
 
 #if (TAO_HAS_MINIMUM_POA == 0)
   DsLogAdmin::Log_var log =
-    this->create_log_reference (id ACE_ENV_ARG_PARAMETER);
+    this->create_log_reference (id);
 #else
   DsLogAdmin::Log_var log =
-    this->create_log_object (id ACE_ENV_ARG_PARAMETER);
+    this->create_log_object (id);
 #endif
 
   // narrow to EventLog
@@ -132,7 +124,7 @@ TAO_RTEventLogFactory_i::create (
     RTEventLogAdmin::EventLog::_narrow (log.in ());
 
   // @@ JTC - squelch exception?
-  notifier_->object_creation (id ACE_ENV_ARG_PARAMETER);
+  notifier_->object_creation (id);
 
   return event_log._retn();
 }
@@ -143,7 +135,6 @@ TAO_RTEventLogFactory_i::create_with_id (
         DsLogAdmin::LogFullActionType full_action,
         CORBA::ULongLong max_size,
         const DsLogAdmin::CapacityAlarmThresholdList & thresholds
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -155,15 +146,14 @@ TAO_RTEventLogFactory_i::create_with_id (
   this->create_with_id_i (id,
 			  full_action,
 			  max_size,
-			  & thresholds
-			  ACE_ENV_ARG_PARAMETER);
+			  & thresholds);
 
 #if (TAO_HAS_MINIMUM_POA == 0)
   DsLogAdmin::Log_var log =
-    this->create_log_reference (id ACE_ENV_ARG_PARAMETER);
+    this->create_log_reference (id);
 #else
   DsLogAdmin::Log_var log =
-    this->create_log_object (id ACE_ENV_ARG_PARAMETER);
+    this->create_log_object (id);
 #endif
 
   // narrow to EventLog
@@ -171,7 +161,7 @@ TAO_RTEventLogFactory_i::create_with_id (
     RTEventLogAdmin::EventLog::_narrow (log.in ());
 
   // @@ JTC - squelch exception?
-  notifier_->object_creation (id ACE_ENV_ARG_PARAMETER);
+  notifier_->object_creation (id);
 
   return event_log._retn ();
 }
@@ -183,8 +173,7 @@ TAO_RTEventLogFactory_i::create_repositoryid ()
 }
 
 PortableServer::ServantBase*
-TAO_RTEventLogFactory_i::create_log_servant (DsLogAdmin::LogId id
-					     ACE_ENV_ARG_DECL)
+TAO_RTEventLogFactory_i::create_log_servant (DsLogAdmin::LogId id)
 {
   TAO_RTEventLog_i* event_log_i;
 
@@ -209,7 +198,6 @@ TAO_RTEventLogFactory_i::create_log_servant (DsLogAdmin::LogId id
 
 RtecEventChannelAdmin::ProxyPushSupplier_ptr
 TAO_RTEventLogFactory_i::obtain_push_supplier (
-        ACE_ENV_SINGLE_ARG_DECL_NOT_USED
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h
index 335f2d86a52..4b2d5889cb2 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h
@@ -63,8 +63,7 @@ public:
   /// pointer to it.
   int
   init (CORBA::ORB_ptr orb,
-        PortableServer::POA_ptr poa
-        ACE_ENV_ARG_DECL);
+        PortableServer::POA_ptr poa);
 
   /// Activate this servant
   RTEventLogAdmin::EventLogFactory_ptr
@@ -76,7 +75,6 @@ public:
         CORBA::ULongLong max_size,
         const DsLogAdmin::CapacityAlarmThresholdList & thresholds,
         DsLogAdmin::LogId_out id
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -90,7 +88,6 @@ public:
         DsLogAdmin::LogFullActionType full_action,
         CORBA::ULongLong max_size,
         const DsLogAdmin::CapacityAlarmThresholdList & thresholds
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -101,7 +98,6 @@ public:
 
    // = Implementation of the RtecEventChannelAdmin::ConsumerAdmin methods.
   RtecEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier (
-        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -112,8 +108,7 @@ protected:
     create_repositoryid ();
 
   virtual PortableServer::ServantBase*
-    create_log_servant (DsLogAdmin::LogId id
-			ACE_ENV_ARG_DECL);
+    create_log_servant (DsLogAdmin::LogId id);
 
   /// Our object ref. after <active>ation.
   DsLogAdmin::LogMgr_var log_mgr_;
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp
index 8c43975ff2f..ad1a4b1fafa 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp
@@ -29,7 +29,6 @@ TAO_RTEventLogNotification::TAO_RTEventLogNotification (
   : TAO_LogNotification (),
     event_channel_ (RtecEventChannelAdmin::EventChannel::_duplicate (ec))
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   obtainProxyConsumer ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
index 425c5807ad7..3cd28485e62 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
@@ -31,7 +31,6 @@ TAO_RTEventLog_i::TAO_RTEventLog_i (CORBA::ORB_ptr orb,
     poa_ (PortableServer::POA::_duplicate (poa)),
     log_poa_ (PortableServer::POA::_duplicate (log_poa))
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   TAO_EC_Event_Channel_Attributes attr (poa_.in(), poa_.in());
 
@@ -49,33 +48,33 @@ TAO_RTEventLog_i::~TAO_RTEventLog_i ()
 
 
 DsLogAdmin::Log_ptr
-TAO_RTEventLog_i::copy (DsLogAdmin::LogId &id ACE_ENV_ARG_DECL)
+TAO_RTEventLog_i::copy (DsLogAdmin::LogId &id)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RTEventLogAdmin::EventLogFactory_var eventLogFactory =
-    RTEventLogAdmin::EventLogFactory::_narrow (factory_.in () ACE_ENV_ARG_PARAMETER);
+    RTEventLogAdmin::EventLogFactory::_narrow (factory_.in ());
 
   RTEventLogAdmin::EventLog_var log =
     eventLogFactory->create (DsLogAdmin::halt, 0, thresholds_,
-                             id ACE_ENV_ARG_PARAMETER);
+                             id);
 
-  copy_attributes (log.in () ACE_ENV_ARG_PARAMETER);
+  copy_attributes (log.in ());
 
   return log._retn ();
 }
 
 DsLogAdmin::Log_ptr
-TAO_RTEventLog_i::copy_with_id (DsLogAdmin::LogId id ACE_ENV_ARG_DECL)
+TAO_RTEventLog_i::copy_with_id (DsLogAdmin::LogId id)
     ACE_THROW_SPEC ((DsLogAdmin::LogIdAlreadyExists, CORBA::SystemException))
 {
   RTEventLogAdmin::EventLogFactory_var eventLogFactory =
-    RTEventLogAdmin::EventLogFactory::_narrow (factory_.in () ACE_ENV_ARG_PARAMETER);
+    RTEventLogAdmin::EventLogFactory::_narrow (factory_.in ());
 
   RTEventLogAdmin::EventLog_var log =
     eventLogFactory->create_with_id (id, DsLogAdmin::halt, 0,
-                                     thresholds_ ACE_ENV_ARG_PARAMETER);
+                                     thresholds_);
 
-  copy_attributes (log.in () ACE_ENV_ARG_PARAMETER);
+  copy_attributes (log.in ());
 
   return log._retn ();
 }
@@ -84,19 +83,16 @@ void
 TAO_RTEventLog_i::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  notifier_->object_deletion (logid_ ACE_ENV_ARG_PARAMETER);
+  notifier_->object_deletion (logid_);
 
   // Remove ourselves from the list of logs.
-  this->logmgr_i_.remove (this->logid_
-			  ACE_ENV_ARG_PARAMETER);
+  this->logmgr_i_.remove (this->logid_);
 
   // Deregister with POA.
   PortableServer::ObjectId_var id =
-    this->log_poa_->servant_to_id (this
-                                   ACE_ENV_ARG_PARAMETER);
+    this->log_poa_->servant_to_id (this);
 
-  this->log_poa_->deactivate_object (id.in ()
-                                     ACE_ENV_ARG_PARAMETER);
+  this->log_poa_->deactivate_object (id.in ());
 }
 
 void
@@ -118,7 +114,6 @@ TAO_RTEventLog_i::for_consumers (void)
 
 RtecEventChannelAdmin::SupplierAdmin_ptr
 TAO_RTEventLog_i::for_suppliers (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -129,27 +124,24 @@ TAO_RTEventLog_i::for_suppliers (
 
 RtecEventChannelAdmin::Observer_Handle
 TAO_RTEventLog_i::append_observer (
-       RtecEventChannelAdmin::Observer_ptr observer
-       ACE_ENV_ARG_DECL)
+       RtecEventChannelAdmin::Observer_ptr observer)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
         RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER))
 {
-  return this->observer_strategy_->append_observer (observer
-                                                    ACE_ENV_ARG_PARAMETER);
+  return this->observer_strategy_->append_observer (observer);
 }
 
 void
 TAO_RTEventLog_i::remove_observer (
-       RtecEventChannelAdmin::Observer_Handle handle
-       ACE_ENV_ARG_DECL)
+       RtecEventChannelAdmin::Observer_Handle handle)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
         RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER))
 {
-  this->observer_strategy_->remove_observer (handle ACE_ENV_ARG_PARAMETER);
+  this->observer_strategy_->remove_observer (handle);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h
index fca0ae6e58f..01f965c729a 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h
@@ -72,11 +72,11 @@ public:
   ~TAO_RTEventLog_i ();
 
   /// Duplicate the log.
-  virtual DsLogAdmin::Log_ptr copy (DsLogAdmin::LogId &id ACE_ENV_ARG_DECL)
+  virtual DsLogAdmin::Log_ptr copy (DsLogAdmin::LogId &id)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Duplicate the log specifying an id.
-  virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id ACE_ENV_ARG_DECL)
+  virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id)
     ACE_THROW_SPEC ((DsLogAdmin::LogIdAlreadyExists, CORBA::SystemException));
 
   /// Destroy the log object and all contained records.
@@ -98,15 +98,13 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual RtecEventChannelAdmin::Observer_Handle
-      append_observer (RtecEventChannelAdmin::Observer_ptr
-                       ACE_ENV_ARG_DECL)
+      append_observer (RtecEventChannelAdmin::Observer_ptr)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
           RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER));
   virtual void
-      remove_observer (RtecEventChannelAdmin::Observer_Handle
-                       ACE_ENV_ARG_DECL)
+      remove_observer (RtecEventChannelAdmin::Observer_Handle)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp
index 52effe3ddb0..fa88db9070a 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp
@@ -214,8 +214,7 @@ TAO_Metrics_Logger::svc (void)
 // Sends a banner to be written to the log file and to the visualization browser.
 
 void
-TAO_Metrics_Logger::send_banner (const char *banner
-                                 ACE_ENV_ARG_DECL)
+TAO_Metrics_Logger::send_banner (const char *banner)
   throw (CORBA::SystemException)
 {
   // Package up the data and put it on the task queue.
@@ -278,8 +277,7 @@ TAO_Metrics_Logger::process_banner (const char *banner)
 
 void
 TAO_Metrics_Logger::log_aggregate_QoS (const Metrics::QoSParameter_Set & qos_params,
-                                       Metrics::Time interval
-                                       ACE_ENV_ARG_DECL)
+                                       Metrics::Time interval)
   throw (CORBA::SystemException)
 {
 // This is a temporary patch to eliminate this data from the log.  It was
@@ -400,18 +398,18 @@ TAO_Metrics_Logger::process_aggregate_QoS (const Metrics::QoSParameter_Set & qos
       // Push an event to the visualization browser.
       CORBA::Any any;
 
-      ACE_TRY_NEW_ENV
+      try
         {
           any.replace (Metrics::_tc_QoSData, &qos_data_, 0, ACE_TRY_ENV);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
 #if defined (METRICS_LOGGER_ERROR_OUTPUT_ENABLED)
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Metrics_Logger::process_aggregate_QoS");
+          ex._tao_print_exception (
+            "TAO_Metrics_Logger::process_aggregate_QoS");
 #endif
           return;
         }
-      ACE_ENDTRY;
 
       this->dove_supplier_.notify (any);
     }
@@ -433,20 +431,17 @@ TAO_Metrics_Logger::process_aggregate_QoS (const Metrics::QoSParameter_Set & qos
 
 void
 TAO_Metrics_Logger::set_identities (const Metrics::ProbeIdentity_Set &
-                                      probe_identities
-                                    ACE_ENV_ARG_DECL)
+                                      probe_identities)
   throw (CORBA::SystemException)
 {
   for (u_long i = 0; i < probe_identities.length (); ++i)
     {
-      this->set_identity (probe_identities [i]
-                          ACE_ENV_ARG_DECL);
+      this->set_identity (probe_identities [i]);
     }
 }
 
 void
-TAO_Metrics_Logger::set_identity (const Metrics::ProbeIdentity_t & probe_identity
-                                  ACE_ENV_ARG_DECL)
+TAO_Metrics_Logger::set_identity (const Metrics::ProbeIdentity_t & probe_identity)
   throw (CORBA::SystemException)
 {
   // Look up the existing name that is bound, creating one if there is
@@ -500,8 +495,7 @@ TAO_Metrics_Logger::set_identity (const Metrics::ProbeIdentity_t & probe_identit
 void
 TAO_Metrics_Logger::log_timeprobe_data (const Metrics::TimeprobeParameter_Set &
                                         timeprobe_params,
-                                        Metrics::Time interval
-                                        ACE_ENV_ARG_DECL)
+                                        Metrics::Time interval)
   throw (CORBA::SystemException)
 {
   // Package up the data and put it on the task queue.
@@ -833,18 +827,18 @@ TAO_Metrics_Logger::process_timeprobe_data (const Metrics::TimeprobeParameter_Se
             static_cast<CORBA::Double> (ACE_UINT64_DBLCAST_ADAPTER (queue_time))
             / static_cast<CORBA::Double> (ACE_UINT64_DBLCAST_ADAPTER (interval));
 
-          ACE_TRY_NEW_ENV
+          try
             {
               any.replace (Metrics::_tc_UtilData, &util_data_, 0, ACE_TRY_ENV);
             }
-          ACE_CATCHANY
+          catch (const CORBA::Exception& ex)
             {
 #if defined (METRICS_LOGGER_ERROR_OUTPUT_ENABLED)
-              ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Metrics_Logger::process_aggregate_QoS");
+              ex._tao_print_exception (
+                "TAO_Metrics_Logger::process_aggregate_QoS");
 #endif
               return;
             }
-          ACE_ENDTRY;
 
           this->dove_supplier_.notify (any);
         }
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h
index f836ca5faf3..5d24ea4a7c9 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h
@@ -122,8 +122,7 @@ public:
   virtual int svc (void);
   // Active object loop for processing logged data.
 
-  void send_banner (const char *banner
-                   ACE_ENV_ARG_DECL)
+  void send_banner (const char *banner)
     throw (CORBA::SystemException);
   // Sends a banner to be written to the log file and to the visualization browser.
 
@@ -131,8 +130,7 @@ public:
   // Writes banner to the log file and/or to the visualization browser.
 
   void log_aggregate_QoS (const Metrics::QoSParameter_Set & qos_params,
-                          Metrics::Time interval
-                          ACE_ENV_ARG_DECL)
+                          Metrics::Time interval)
     throw (CORBA::SystemException);
   // Reports the aggregate QoS information for all operations
   // to the passed QoS logger.
@@ -142,21 +140,18 @@ public:
   // Processes the aggregate QoS information for all operations
   // to the passed QoS logger.
 
-  void set_identities (const Metrics::ProbeIdentity_Set & probe_identities
-                       ACE_ENV_ARG_DECL)
+  void set_identities (const Metrics::ProbeIdentity_Set & probe_identities)
     throw (CORBA::SystemException);
   // Binds the names of various timeprobes to their identifiers so
   // that ids alone can be used (for efficiency) in passing data.
 
-  void set_identity (const Metrics::ProbeIdentity_t & probe_identity
-                     ACE_ENV_ARG_DECL)
+  void set_identity (const Metrics::ProbeIdentity_t & probe_identity)
     throw (CORBA::SystemException);
   // Binds the names of various timeprobes to their identifiers so
   // that ids alone can be used (for efficiency) in passing data.
 
   void log_timeprobe_data (const Metrics::TimeprobeParameter_Set & timeprobe_params,
-                           Metrics::Time interval
-                           ACE_ENV_ARG_DECL)
+                           Metrics::Time interval)
     throw (CORBA::SystemException);
   // Reports timeprobe data collected since last run.
 
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h
index da8e9fcce41..b7bdbb44e29 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h
@@ -70,7 +70,6 @@ public:
 
   virtual void
   report_made_deadline (RtecScheduler::handle_t handle
-                        ACE_ENV_ARG_DECL
                           )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_0));
@@ -78,7 +77,6 @@ public:
 
   virtual void
   report_missed_deadline (RtecScheduler::handle_t handle
-                          ACE_ENV_ARG_DECL
                           )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_1));
@@ -87,7 +85,6 @@ public:
   virtual void
   get_aggregate_QoS (RtecScheduler::handle_t handle,
                      Metrics::QoSParameter_t_out qos
-                     ACE_ENV_ARG_DECL
                      )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_2,
@@ -96,8 +93,7 @@ public:
 
   virtual void get_aggregate_QoS_set (
       const Metrics::Handle_Set_t & handle_set,
-      Metrics::QoSParameter_Set_out qos_set
-      ACE_ENV_ARG_DECL)
+      Metrics::QoSParameter_Set_out qos_set)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_4,
                      Metrics::INTERNAL_5));
@@ -105,8 +101,7 @@ public:
   // passed set.
 
   virtual void
-  reset_statistics (RtecScheduler::handle_t handle
-                    ACE_ENV_ARG_DECL)
+  reset_statistics (RtecScheduler::handle_t handle)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_7,
                      Metrics::INTERNAL_8));
@@ -171,23 +166,20 @@ public:
   // Destructor.
 
   virtual void
-  report_made_deadline (RtecScheduler::handle_t handle
-                        ACE_ENV_ARG_DECL)
+  report_made_deadline (RtecScheduler::handle_t handle)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_0));
   // Reports a successful upcall.
 
   virtual void
-  report_missed_deadline (RtecScheduler::handle_t handle
-                          ACE_ENV_ARG_DECL)
+  report_missed_deadline (RtecScheduler::handle_t handle)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_1));
   // Reports an unsuccessful upcall.
 
   virtual void
   get_aggregate_QoS (RtecScheduler::handle_t handle,
-                     Metrics::QoSParameter_t_out qos
-                     ACE_ENV_ARG_DECL)
+                     Metrics::QoSParameter_t_out qos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_2,
                      Metrics::INTERNAL_3));
@@ -195,8 +187,7 @@ public:
 
   virtual void get_aggregate_QoS_set (
       const Metrics::Handle_Set_t & handle_set,
-      Metrics::QoSParameter_Set_out qos_set
-      ACE_ENV_ARG_DECL)
+      Metrics::QoSParameter_Set_out qos_set)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_4,
                      Metrics::INTERNAL_5));
@@ -205,16 +196,14 @@ public:
 
   virtual void report_aggregate_QoS (
       Metrics::QoSLogger_ptr logger,
-      Metrics::Time interval
-      ACE_ENV_ARG_DECL)
+      Metrics::Time interval)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::NIL_LOGGER,
                      Metrics::INTERNAL_6));
   // Report the aggregate QoS statistics to the logger.
 
   virtual void
-  reset_statistics (RtecScheduler::handle_t handle
-                    ACE_ENV_ARG_DECL)
+  reset_statistics (RtecScheduler::handle_t handle)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_7,
                      Metrics::INTERNAL_8));
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.inl b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.inl
index 9b028ba293b..2dedbc81e8f 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.inl
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.inl
@@ -39,8 +39,7 @@ TAO_Metrics_UpcallMonitor::~TAO_Metrics_UpcallMonitor ()
 
 ACE_INLINE void
 TAO_Metrics_UpcallMonitor::
-report_made_deadline (RtecScheduler::handle_t handle
-                      ACE_ENV_ARG_DECL)
+report_made_deadline (RtecScheduler::handle_t handle)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_0))
 {
@@ -51,7 +50,7 @@ report_made_deadline (RtecScheduler::handle_t handle
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Failed trybind for handle %u in made map\n", handle));
-      ACE_THROW (Metrics::INTERNAL_0 ());
+      throw Metrics::INTERNAL_0 ();
     }
 
   ++entry->int_id_;
@@ -61,8 +60,7 @@ report_made_deadline (RtecScheduler::handle_t handle
 
 ACE_INLINE void
 TAO_Metrics_UpcallMonitor::
-report_missed_deadline (RtecScheduler::handle_t handle
-                        ACE_ENV_ARG_DECL)
+report_missed_deadline (RtecScheduler::handle_t handle)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_1))
 {
@@ -73,7 +71,7 @@ report_missed_deadline (RtecScheduler::handle_t handle
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Failed trybind for handle %u in missed map\n", handle));
-      ACE_THROW (Metrics::INTERNAL_1 ());
+      throw Metrics::INTERNAL_1 ();
     }
 
   ++entry->int_id_;
@@ -84,8 +82,7 @@ report_missed_deadline (RtecScheduler::handle_t handle
 
 ACE_INLINE void
 TAO_Metrics_UpcallMonitor::get_aggregate_QoS (RtecScheduler::handle_t handle,
-                                              Metrics::QoSParameter_t_out qos
-                                              ACE_ENV_ARG_DECL)
+                                              Metrics::QoSParameter_t_out qos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_2,
                      Metrics::INTERNAL_3))
@@ -99,14 +96,14 @@ TAO_Metrics_UpcallMonitor::get_aggregate_QoS (RtecScheduler::handle_t handle,
     {
       ACE_DEBUG ((LM_DEBUG, "TAO_Metrics_UpcallMonitor::get_aggregate_QoS: "
                   "Failed trybind for handle %u in made map\n", handle));
-      ACE_THROW (Metrics::INTERNAL_2 ());
+      throw Metrics::INTERNAL_2 ();
     }
 
   if (missed_map_.trybind (handle, missed_count, missed_entry) < 0)
     {
       ACE_DEBUG ((LM_DEBUG, "TAO_Metrics_UpcallMonitor::get_aggregate_QoS: "
                   "Failed trybind for handle %u in missed map\n", handle));
-      ACE_THROW (Metrics::INTERNAL_3 ());
+      throw Metrics::INTERNAL_3 ();
     }
 
   ACE_NEW_THROW_EX (qos,
@@ -127,8 +124,7 @@ TAO_Metrics_UpcallMonitor::get_aggregate_QoS (RtecScheduler::handle_t handle,
 ACE_INLINE void
 TAO_Metrics_UpcallMonitor::get_aggregate_QoS_set (
       const Metrics::Handle_Set_t & handle_set,
-      Metrics::QoSParameter_Set_out qos_set
-      ACE_ENV_ARG_DECL)
+      Metrics::QoSParameter_Set_out qos_set)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_4,
                      Metrics::INTERNAL_5))
@@ -157,7 +153,7 @@ TAO_Metrics_UpcallMonitor::get_aggregate_QoS_set (
                       "TAO_Metrics_UpcallMonitor::get_aggregate_QoS_set: "
                       "Failed trybind for handle_set [%d] = %u in made map\n",
                       i, handle_set [i]));
-          ACE_THROW (Metrics::INTERNAL_4 ());
+          throw Metrics::INTERNAL_4 ();
         }
 
       if (missed_map_.trybind (handle_set [i], missed_count, missed_entry) < 0)
@@ -166,7 +162,7 @@ TAO_Metrics_UpcallMonitor::get_aggregate_QoS_set (
                       "TAO_Metrics_UpcallMonitor::get_aggregate_QoS_set: "
                       "Failed trybind for handle_set[%d]=%u in missed map\n",
                       i, handle_set [i]));
-          ACE_THROW (Metrics::INTERNAL_5 ());
+          throw Metrics::INTERNAL_5 ();
         }
 
       qos_set [i].handle = handle_set [i];
@@ -182,8 +178,7 @@ TAO_Metrics_UpcallMonitor::get_aggregate_QoS_set (
 // Resets the aggregate QoS information for the given operation.
 
 ACE_INLINE void
-TAO_Metrics_UpcallMonitor::reset_statistics (RtecScheduler::handle_t handle
-                                             ACE_ENV_ARG_DECL)
+TAO_Metrics_UpcallMonitor::reset_statistics (RtecScheduler::handle_t handle)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_7,
                      Metrics::INTERNAL_8))
@@ -192,12 +187,12 @@ TAO_Metrics_UpcallMonitor::reset_statistics (RtecScheduler::handle_t handle
 
   if (made_map_.rebind (handle, count) < 0)
     {
-      ACE_THROW (Metrics::INTERNAL_7 ());
+      throw Metrics::INTERNAL_7 ();
     }
 
   if (missed_map_.rebind (handle, count) < 0)
     {
-      ACE_THROW (Metrics::INTERNAL_8 ());
+      throw Metrics::INTERNAL_8 ();
     }
 }
 
@@ -242,26 +237,22 @@ TAO_Metrics_ReportingUpcallMonitor::~TAO_Metrics_ReportingUpcallMonitor ()
 
 ACE_INLINE void
 TAO_Metrics_ReportingUpcallMonitor::
-report_made_deadline (RtecScheduler::handle_t handle
-                      ACE_ENV_ARG_DECL)
+report_made_deadline (RtecScheduler::handle_t handle)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_0))
 {
-  monitor_.report_made_deadline (handle
-                                 ACE_ENV_ARG_DECL);
+  monitor_.report_made_deadline (handle);
 }
 
 // Reports an unsuccessful upcall.
 
 ACE_INLINE void
 TAO_Metrics_ReportingUpcallMonitor::
-report_missed_deadline (RtecScheduler::handle_t handle
-                        ACE_ENV_ARG_DECL)
+report_missed_deadline (RtecScheduler::handle_t handle)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_1))
 {
-  monitor_.report_missed_deadline (handle
-                                   ACE_ENV_ARG_DECL);
+  monitor_.report_missed_deadline (handle);
 }
 
 
@@ -269,15 +260,13 @@ report_missed_deadline (RtecScheduler::handle_t handle
 
 ACE_INLINE void
 TAO_Metrics_ReportingUpcallMonitor::get_aggregate_QoS (RtecScheduler::handle_t handle,
-                                              Metrics::QoSParameter_t_out qos
-                                              ACE_ENV_ARG_DECL)
+                                              Metrics::QoSParameter_t_out qos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_2,
                      Metrics::INTERNAL_3))
 {
   monitor_.get_aggregate_QoS (handle,
-                              qos
-                              ACE_ENV_ARG_DECL);
+                              qos);
 }
 
 
@@ -287,15 +276,13 @@ TAO_Metrics_ReportingUpcallMonitor::get_aggregate_QoS (RtecScheduler::handle_t h
 ACE_INLINE void
 TAO_Metrics_ReportingUpcallMonitor::get_aggregate_QoS_set (
       const Metrics::Handle_Set_t & handle_set,
-      Metrics::QoSParameter_Set_out qos_set
-      ACE_ENV_ARG_DECL)
+      Metrics::QoSParameter_Set_out qos_set)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_4,
                      Metrics::INTERNAL_5))
 {
   monitor_.get_aggregate_QoS_set (handle_set,
-                                  qos_set
-                                  ACE_ENV_ARG_DECL);
+                                  qos_set);
 }
 
 
@@ -303,14 +290,12 @@ TAO_Metrics_ReportingUpcallMonitor::get_aggregate_QoS_set (
 // Resets the aggregate QoS information for the given operation.
 
 ACE_INLINE void
-TAO_Metrics_ReportingUpcallMonitor::reset_statistics (RtecScheduler::handle_t handle
-                                                      ACE_ENV_ARG_DECL)
+TAO_Metrics_ReportingUpcallMonitor::reset_statistics (RtecScheduler::handle_t handle)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_7,
                      Metrics::INTERNAL_8))
 {
-  monitor_.reset_statistics (handle
-                             ACE_ENV_ARG_DECL);
+  monitor_.reset_statistics (handle);
 }
 
 
@@ -319,15 +304,14 @@ TAO_Metrics_ReportingUpcallMonitor::reset_statistics (RtecScheduler::handle_t ha
 ACE_INLINE void
 TAO_Metrics_ReportingUpcallMonitor::report_aggregate_QoS (
       Metrics::QoSLogger_ptr logger,
-      Metrics::Time interval
-      ACE_ENV_ARG_DECL)
+      Metrics::Time interval)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::NIL_LOGGER,
                      Metrics::INTERNAL_6))
 {
   if (CORBA::is_nil (logger))
     {
-      ACE_THROW (Metrics::NIL_LOGGER ());
+      throw Metrics::NIL_LOGGER ();
     }
 
   Metrics::QoSParameter_Set qos_set;
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp
index 3f4cbe72fa2..442c931ff2a 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp
@@ -58,20 +58,18 @@ TAO_Metrics_Utils::set_mission_state (int i, Metrics::QoSLogger_ptr logger)
   ACE_OS::memset (banner, 0, TAO_Metrics_Utils::METRICS_BUFSIZE);
   ACE_OS::sprintf (banner, "\n\n*** Mission State %d ***\n\n", i);
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      logger->send_banner (banner
-                           ACE_ENV_ARG_DECL);
+      logger->send_banner (banner);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
 #if defined (METRICS_UTILS_ERROR_OUTPUT_ENABLED)
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            "TAO_Metrics_LocalCache::set_mission_state:"
                            " logger call failed\n");
 #endif
     }
-  ACE_ENDTRY;
 }
 
 // Sets the logger reference.
@@ -83,7 +81,7 @@ TAO_Metrics_Utils::get_logger (const char * logger_ior_str,
   Metrics::QoSLogger_var logger;
   if (logger_ior_str && orb)
     {
-      ACE_TRY_NEW_ENV
+      try
         {
           CORBA::Object_var obj =
             orb->string_to_object (logger_ior_str);
@@ -115,15 +113,14 @@ TAO_Metrics_Utils::get_logger (const char * logger_ior_str,
                 }
             }
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
 #if defined (METRICS_UTILS_ERROR_OUTPUT_ENABLED)
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+          ACE_PRINT_EXCEPTION (ex,
                                "TAO_Metrics_LocalCache::set_logger exception");
 #endif
           return logger;
         }
-      ACE_ENDTRY;
     }
 #if defined (METRICS_UTILS_ERROR_OUTPUT_ENABLED)
   else
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
index 51db42e913c..deacbd41cf5 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
@@ -29,7 +29,6 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::TAO_Bindings_Iterator (
 template <class ITERATOR, class TABLE_ENTRY>
 TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::~TAO_Bindings_Iterator (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
   delete hash_iter_;
 
   // Since we are going away, decrement the reference count on the
@@ -39,16 +38,14 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::~TAO_Bindings_Iterator (void)
 
 // Return the Default POA of this Servant
 template <class ITERATOR, class TABLE_ENTRY> PortableServer::POA_ptr
-TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::_default_POA (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 template <class ITERATOR, class TABLE_ENTRY> CORBA::Boolean
 TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one (
-    CosNaming::Binding_out b
-    ACE_ENV_ARG_DECL)
+    CosNaming::Binding_out b)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNaming::Binding *binding;
@@ -103,8 +100,7 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one (
 template <class ITERATOR, class TABLE_ENTRY> CORBA::Boolean
 TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_n (
     CORBA::ULong how_many,
-    CosNaming::BindingList_out bl
-    ACE_ENV_ARG_DECL)
+    CosNaming::BindingList_out bl)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // We perform an allocation before obtaining the lock so that an out
@@ -177,17 +173,15 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::destroy (void)
 
   // Check to make sure this object is still valid.
   if (this->destroyed_)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   // Mark the object invalid.
   this->destroyed_ = 1;
 
   PortableServer::ObjectId_var id =
-    poa_->servant_to_id (this
-                         ACE_ENV_ARG_PARAMETER);
+    poa_->servant_to_id (this);
 
-  poa_->deactivate_object (id.in ()
-                           ACE_ENV_ARG_PARAMETER);
+  poa_->deactivate_object (id.in ());
 }
 
 template <class ITERATOR, class TABLE_ENTRY> int
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h
index 23bbbfd4c3d..d5ad7132c66 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h
@@ -73,8 +73,7 @@ public:
 
   /// This operation passes back the next unseen binding.  True is
   /// returned if a binding is passed back, and false is returned otherwise.
-  CORBA::Boolean next_one (CosNaming::Binding_out b
-                           ACE_ENV_ARG_DECL)
+  CORBA::Boolean next_one (CosNaming::Binding_out b)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -83,8 +82,7 @@ public:
    * returned if no bindings were passed back.
    */
   CORBA::Boolean next_n (CORBA::ULong how_many,
-                         CosNaming::BindingList_out bl
-                         ACE_ENV_ARG_DECL)
+                         CosNaming::BindingList_out bl)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// This operation destroys the iterator.
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
index 5c076bbfc44..cf12f6b92af 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
@@ -60,8 +60,7 @@ TAO_Hash_Naming_Context::_default_POA (void)
 }
 
 CosNaming::NamingContext_ptr
-TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name
-                                      ACE_ENV_ARG_DECL)
+TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name)
 {
   // Naming context we will return.
   CosNaming::NamingContext_var result =
@@ -74,17 +73,15 @@ TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name
   CosNaming::Name comp_name (name.maximum (),
                              name_len - 1,
                              const_cast<CosNaming::NameComponent*> (name.get_buffer ()));
-  ACE_TRY
+  try
     {
       // Resolve the name.
-      CORBA::Object_var context = resolve (comp_name
-                                           ACE_ENV_ARG_PARAMETER);
+      CORBA::Object_var context = resolve (comp_name);
 
       // Try narrowing object reference to the NamingContext type.
-      result = CosNaming::NamingContext::_narrow (context.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
+      result = CosNaming::NamingContext::_narrow (context.in ());
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+  catch (CosNaming::NamingContext::NotFound& ex)
     {
       // Add the last component of the name, which was stripped before
       // the call to resolve.
@@ -92,9 +89,8 @@ TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name
       ex.rest_of_name.length (rest_len);
       ex.rest_of_name[rest_len - 1] = name[name_len - 1];
 
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
 
   if (CORBA::is_nil (result.in ()))
     {
@@ -114,8 +110,7 @@ TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name
 
 void
 TAO_Hash_Naming_Context::bind (const CosNaming::Name& n,
-                               CORBA::Object_ptr obj
-                               ACE_ENV_ARG_DECL)
+                               CORBA::Object_ptr obj)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX,
                       ace_mon, this->lock_,
@@ -124,14 +119,14 @@ TAO_Hash_Naming_Context::bind (const CosNaming::Name& n,
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
   if (this->destroyed_)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   // Get the length of the name.
   CORBA::ULong name_len = n.length ();
 
   // Check for invalid name.
   if (name_len == 0)
-    ACE_THROW (CosNaming::NamingContext::InvalidName());
+    throw CosNaming::NamingContext::InvalidName();
 
   // If we received compound name, resolve it to get the context in
   // which the binding should take place, then perform the binding on
@@ -139,21 +134,22 @@ TAO_Hash_Naming_Context::bind (const CosNaming::Name& n,
   if (name_len > 1)
     {
       CosNaming::NamingContext_var context =
-        this->get_context (n ACE_ENV_ARG_PARAMETER);
+        this->get_context (n);
 
       CosNaming::Name simple_name;
       simple_name.length (1);
       simple_name[0] = n[name_len - 1];
-      ACE_TRY
+      try
         {
-          context->bind (simple_name, obj ACE_ENV_ARG_PARAMETER);
+          context->bind (simple_name, obj);
         }
-      ACE_CATCH (CORBA::TIMEOUT, timeoutEx)
+      catch (const CORBA::TIMEOUT& timeoutEx)
         {
-          ACE_TRY_THROW (CosNaming::NamingContext::CannotProceed
-                         (context.in (), simple_name));
+          throw CosNaming::NamingContext::CannotProceed(
+            context.in (
+              ),
+            simple_name);
         }
-      ACE_ENDTRY;
     }
   // If we received a simple name, we need to bind it in this context.
   else
@@ -164,18 +160,17 @@ TAO_Hash_Naming_Context::bind (const CosNaming::Name& n,
                                         obj,
                                         CosNaming::nobject);
       if (result == 1)
-        ACE_THROW (CosNaming::NamingContext::AlreadyBound());
+        throw CosNaming::NamingContext::AlreadyBound();
 
       // Something went wrong with the internal structure
       else if (result == -1)
-        ACE_THROW (CORBA::INTERNAL ());
+        throw CORBA::INTERNAL ();
     }
 }
 
 void
 TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n,
-                                 CORBA::Object_ptr obj
-                                 ACE_ENV_ARG_DECL)
+                                 CORBA::Object_ptr obj)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon,
                       this->lock_,
@@ -184,14 +179,14 @@ TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n,
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
   if (this->destroyed_)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   // Get the length of the name.
   CORBA::ULong name_len = n.length ();
 
   // Check for invalid name.
   if (name_len == 0)
-    ACE_THROW (CosNaming::NamingContext::InvalidName());
+    throw CosNaming::NamingContext::InvalidName();
 
   // If we received compound name, resolve it to get the context in
   // which the rebinding should take place, then perform the rebinding
@@ -199,21 +194,22 @@ TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n,
   if (name_len > 1)
     {
       CosNaming::NamingContext_var context =
-        get_context (n ACE_ENV_ARG_PARAMETER);
+        get_context (n);
 
       CosNaming::Name simple_name;
       simple_name.length (1);
       simple_name[0] = n[name_len - 1];
-      ACE_TRY
+      try
         {
-          context->rebind (simple_name, obj ACE_ENV_ARG_PARAMETER);
+          context->rebind (simple_name, obj);
         }
-      ACE_CATCH (CORBA::TIMEOUT, timeoutEx)
+      catch (const CORBA::TIMEOUT& timeoutEx)
         {
-          ACE_TRY_THROW (CosNaming::NamingContext::CannotProceed
-                         (context.in (), simple_name));
+          throw CosNaming::NamingContext::CannotProceed(
+            context.in (
+              ),
+            simple_name);
         }
-      ACE_ENDTRY;
     }
   else
     // If we received a simple name, we need to rebind it in this
@@ -225,19 +221,18 @@ TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n,
                                            CosNaming::nobject);
       // Check for error conditions.
       if (result == -1)
-        ACE_THROW (CORBA::INTERNAL ());
+        throw CORBA::INTERNAL ();
 
       else if (result == -2)
-        ACE_THROW (CosNaming::NamingContext::NotFound
-                   (CosNaming::NamingContext::not_object,
-                    n));
+        throw CosNaming::NamingContext::NotFound(
+          CosNaming::NamingContext::not_object,
+          n);
     }
 }
 
 void
 TAO_Hash_Naming_Context::bind_context (const CosNaming::Name &n,
-                                       CosNaming::NamingContext_ptr nc
-                                       ACE_ENV_ARG_DECL)
+                                       CosNaming::NamingContext_ptr nc)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon,
                       this->lock_,
@@ -246,18 +241,18 @@ TAO_Hash_Naming_Context::bind_context (const CosNaming::Name &n,
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
   if (this->destroyed_)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   // Do not allow binding of nil context reference.
   if (CORBA::is_nil (nc))
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   // Get the length of the name.
   CORBA::ULong name_len = n.length ();
 
   // Check for invalid name.
   if (name_len == 0)
-    ACE_THROW (CosNaming::NamingContext::InvalidName());
+    throw CosNaming::NamingContext::InvalidName();
 
   // If we received compound name, resolve it to get the context in
   // which the binding should take place, then perform the binding on
@@ -265,21 +260,22 @@ TAO_Hash_Naming_Context::bind_context (const CosNaming::Name &n,
   if (name_len > 1)
     {
       CosNaming::NamingContext_var context =
-        get_context (n ACE_ENV_ARG_PARAMETER);
+        get_context (n);
 
       CosNaming::Name simple_name;
       simple_name.length (1);
       simple_name[0] = n[name_len - 1];
-      ACE_TRY
+      try
         {
-          context->bind_context (simple_name, nc ACE_ENV_ARG_PARAMETER);
+          context->bind_context (simple_name, nc);
         }
-      ACE_CATCH (CORBA::TIMEOUT, timeoutEx)
+      catch (const CORBA::TIMEOUT& timeoutEx)
         {
-          ACE_TRY_THROW (CosNaming::NamingContext::CannotProceed
-                         (context.in (), simple_name));
+          throw CosNaming::NamingContext::CannotProceed(
+            context.in (
+              ),
+            simple_name);
         }
-      ACE_ENDTRY;
     }
   // If we received a simple name, we need to bind it in this context.
   else
@@ -290,18 +286,17 @@ TAO_Hash_Naming_Context::bind_context (const CosNaming::Name &n,
                                         nc,
                                         CosNaming::ncontext);
       if (result == 1)
-        ACE_THROW (CosNaming::NamingContext::AlreadyBound());
+        throw CosNaming::NamingContext::AlreadyBound();
 
       // Something went wrong with the internal structure
       else if (result == -1)
-        ACE_THROW (CORBA::INTERNAL ());
+        throw CORBA::INTERNAL ();
     }
 }
 
 void
 TAO_Hash_Naming_Context::rebind_context (const CosNaming::Name &n,
-                                         CosNaming::NamingContext_ptr nc
-                                         ACE_ENV_ARG_DECL)
+                                         CosNaming::NamingContext_ptr nc)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon,
                       this->lock_,
@@ -310,14 +305,14 @@ TAO_Hash_Naming_Context::rebind_context (const CosNaming::Name &n,
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
   if (this->destroyed_)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   // Get the length of the name.
   CORBA::ULong name_len = n.length ();
 
   // Check for invalid name.
   if (name_len == 0)
-    ACE_THROW (CosNaming::NamingContext::InvalidName());
+    throw CosNaming::NamingContext::InvalidName();
 
   // If we received compound name, resolve it to get the context in
   // which the rebinding should take place, then perform the rebinding
@@ -325,21 +320,22 @@ TAO_Hash_Naming_Context::rebind_context (const CosNaming::Name &n,
   if (name_len > 1)
     {
       CosNaming::NamingContext_var context =
-        get_context (n ACE_ENV_ARG_PARAMETER);
+        get_context (n);
 
       CosNaming::Name simple_name;
       simple_name.length (1);
       simple_name[0] = n[name_len - 1];
-      ACE_TRY
+      try
         {
-          context->rebind_context (simple_name, nc ACE_ENV_ARG_PARAMETER);
+          context->rebind_context (simple_name, nc);
         }
-      ACE_CATCH (CORBA::TIMEOUT, timeoutEx)
+      catch (const CORBA::TIMEOUT& timeoutEx)
         {
-          ACE_TRY_THROW (CosNaming::NamingContext::CannotProceed
-                         (context.in (), simple_name));
+          throw CosNaming::NamingContext::CannotProceed(
+            context.in (
+              ),
+            simple_name);
         }
-      ACE_ENDTRY;
     }
   else
     // If we received a simple name, we need to rebind it in this
@@ -351,18 +347,17 @@ TAO_Hash_Naming_Context::rebind_context (const CosNaming::Name &n,
                                            CosNaming::ncontext);
       // Check for error conditions.
       if (result == -1)
-        ACE_THROW (CORBA::INTERNAL ());
+        throw CORBA::INTERNAL ();
 
       else if (result == -2)
-        ACE_THROW (CosNaming::NamingContext::NotFound
-                   (CosNaming::NamingContext::not_context,
-                    n));
+        throw CosNaming::NamingContext::NotFound(
+          CosNaming::NamingContext::not_context,
+          n);
     }
 }
 
 CORBA::Object_ptr
-TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n
-                                  ACE_ENV_ARG_DECL)
+TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
@@ -408,8 +403,7 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n
       if (type == CosNaming::ncontext)
         {
           // Narrow to NamingContext.
-          context = CosNaming::NamingContext::_narrow (result.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
+          context = CosNaming::NamingContext::_narrow (result.in ());
         }
       else
         // The first name component wasn't bound to a NamingContext.
@@ -440,19 +434,19 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n
              + 1);
 
           // If there are any exceptions, they will propagate up.
-          ACE_TRY
+          try
             {
               CORBA::Object_ptr resolved_ref;
-              resolved_ref = context->resolve (rest_of_name
-                                               ACE_ENV_ARG_PARAMETER);
+              resolved_ref = context->resolve (rest_of_name);
               return resolved_ref;
             }
-          ACE_CATCH (CORBA::TIMEOUT, timeoutEx)
+          catch (const CORBA::TIMEOUT& timeoutEx)
             {
-              ACE_TRY_THROW (CosNaming::NamingContext::CannotProceed
-                             (context.in (), rest_of_name));
+              throw CosNaming::NamingContext::CannotProceed(
+                context.in (
+                  ),
+                rest_of_name);
             }
-          ACE_ENDTRY;
         }
     }
   // If the name we had to resolve was simple, we just need to return
@@ -461,8 +455,7 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n
 }
 
 void
-TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n
-                                 ACE_ENV_ARG_DECL)
+TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon,
                       this->lock_,
@@ -471,14 +464,14 @@ TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
   if (this->destroyed_)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   // Get the length of the name.
   CORBA::ULong name_len = n.length ();
 
   // Check for invalid name.
   if (name_len == 0)
-    ACE_THROW (CosNaming::NamingContext::InvalidName());
+    throw CosNaming::NamingContext::InvalidName();
 
   // If we received compound name, resolve it to get the context in
   // which the unbinding should take place, then perform the unbinding
@@ -486,35 +479,35 @@ TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n
   if (name_len > 1)
     {
       CosNaming::NamingContext_var context =
-        get_context (n ACE_ENV_ARG_PARAMETER);
+        get_context (n);
 
       CosNaming::Name simple_name;
       simple_name.length (1);
       simple_name[0] = n[name_len - 1];
-      ACE_TRY
+      try
         {
-          context->unbind (simple_name ACE_ENV_ARG_PARAMETER);
+          context->unbind (simple_name);
         }
-      ACE_CATCH (CORBA::TIMEOUT, timeoutEx)
+      catch (const CORBA::TIMEOUT& timeoutEx)
         {
-          ACE_TRY_THROW (CosNaming::NamingContext::CannotProceed
-                         (context.in (), simple_name));
+          throw CosNaming::NamingContext::CannotProceed(
+            context.in (
+              ),
+            simple_name);
         }
-      ACE_ENDTRY;
     }
   // If we received a simple name, we need to unbind it in this
   // context.
   else
     if (this->context_->unbind (n[0].id,
                                 n[0].kind) == -1)
-      ACE_THROW (CosNaming::NamingContext::NotFound
-                 (CosNaming::NamingContext::missing_node,
-                  n));
+      throw CosNaming::NamingContext::NotFound(
+        CosNaming::NamingContext::missing_node,
+        n);
 }
 
 CosNaming::NamingContext_ptr
-TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n
-                                           ACE_ENV_ARG_DECL)
+TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX,
                       ace_mon,
@@ -541,12 +534,12 @@ TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n
   if (name_len > 1)
     {
       CosNaming::NamingContext_var context =
-        get_context (n ACE_ENV_ARG_PARAMETER);
+        get_context (n);
 
       CosNaming::Name simple_name;
       simple_name.length (1);
       simple_name[0] = n[name_len - 1];
-      return context->bind_new_context (simple_name ACE_ENV_ARG_PARAMETER);
+      return context->bind_new_context (simple_name);
     }
 
   // If we received a simple name, we need to bind it in this context.
@@ -559,33 +552,28 @@ TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n
   result = new_context ();
 
   // Bind the new context to the name.
-  ACE_TRY
+  try
     {
       bind_context (n,
-                    result.in ()
-                    ACE_ENV_ARG_PARAMETER);
+                    result.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // If the bind() operation fails we must destroy the recently
       // created context, should any exceptions be raised by the
       // destroy() operation we want to ignore them.
       {
-        ACE_DECLARE_NEW_CORBA_ENV;
-        ACE_TRY_EX(DESTROY)
+        try
           {
             result->destroy ();
-            ACE_TRY_CHECK_EX(DESTROY);
           }
-        ACE_CATCHANY
+        catch (const CORBA::Exception& ex)
           {
           }
-        ACE_ENDTRY;
       }
       // Re-raise the exception in bind_context()
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
   return result._retn ();
 }
 
@@ -600,10 +588,10 @@ TAO_Hash_Naming_Context::destroy (void)
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
   if (this->destroyed_)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   if (this->context_->current_size () != 0)
-    ACE_THROW (CosNaming::NamingContext::NotEmpty());
+    throw CosNaming::NamingContext::NotEmpty();
 
   // Destroy is a no-op on a root context.
   if (root ())
@@ -624,8 +612,7 @@ TAO_Hash_Naming_Context::destroy (void)
         PortableServer::string_to_ObjectId (poa_id_.fast_rep ());
 
 
-      poa->deactivate_object (id.in ()
-                              ACE_ENV_ARG_PARAMETER);
+      poa->deactivate_object (id.in ());
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
index 2b5c6a26183..c9090d987f8 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
@@ -152,8 +152,7 @@ public:
    * participate in name resolution later.
    */
   virtual void bind (const CosNaming::Name &n,
-                     CORBA::Object_ptr obj
-                     ACE_ENV_ARG_DECL);
+                     CORBA::Object_ptr obj);
 
   /**
    * This is similar to <bind> operation above, except for when the
@@ -162,8 +161,7 @@ public:
    * new one.
    */
   virtual void rebind (const CosNaming::Name &n,
-                       CORBA::Object_ptr obj
-                       ACE_ENV_ARG_DECL);
+                       CORBA::Object_ptr obj);
 
   /**
    * This is the version of <bind> specifically for binding naming
@@ -171,8 +169,7 @@ public:
    * compound names are passed to be resolved.
    */
   virtual void bind_context (const CosNaming::Name &n,
-                             CosNaming::NamingContext_ptr nc
-                             ACE_ENV_ARG_DECL);
+                             CosNaming::NamingContext_ptr nc);
 
   /**
    * This is a version of <rebind> specifically for naming contexts,
@@ -180,8 +177,7 @@ public:
    * names are passed.
    */
    virtual void rebind_context (const CosNaming::Name &n,
-                               CosNaming::NamingContext_ptr nc
-                               ACE_ENV_ARG_DECL);
+                               CosNaming::NamingContext_ptr nc);
 
   /**
    * Return object reference that is bound to the name.  Compound name
@@ -190,16 +186,14 @@ public:
    * does not return the type of the object.  Clients are responsible
    * for "narrowing" the object to the appropriate type.
    */
-  virtual CORBA::Object_ptr resolve (const CosNaming::Name &n
-                                     ACE_ENV_ARG_DECL);
+  virtual CORBA::Object_ptr resolve (const CosNaming::Name &n);
 
   /**
    * Remove the name binding from the context.  When compound names
    * are used, unbind is defined as follows: ctx->unbind (<c1; c2;
    * cn>) = (ctx->resolve (<c1; c2; cn-1>))->unbind (<cn>)
    */
-  virtual void unbind (const CosNaming::Name &n
-                       ACE_ENV_ARG_DECL);
+  virtual void unbind (const CosNaming::Name &n);
 
   /**
    * This operation creates a new context and binds it to the name
@@ -207,8 +201,7 @@ public:
    * implemented by the same server as the context in which it was
    * bound (the name argument excluding the last component).
    */
-  virtual CosNaming::NamingContext_ptr bind_new_context (const CosNaming::Name &n
-                                                         ACE_ENV_ARG_DECL);
+  virtual CosNaming::NamingContext_ptr bind_new_context (const CosNaming::Name &n);
 
   /**
    * Delete the naming context.  The user should take care to <unbind> any
@@ -233,8 +226,7 @@ protected:
    * component that doesn't need to be resolved), and returns a
    * pointer to the target context.
    */
-  CosNaming::NamingContext_ptr get_context (const CosNaming::Name &name
-                                            ACE_ENV_ARG_DECL);
+  CosNaming::NamingContext_ptr get_context (const CosNaming::Name &name);
 
   /**
    * Pointer to the data structure used to store this Naming Context's
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp
index c9b7f15e84d..1ebd2d7e6ef 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp
@@ -27,26 +27,23 @@ int
 TAO_Naming_Client::init (CORBA::ORB_ptr orb,
                          ACE_Time_Value *timeout)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService", timeout ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("NameService", timeout);
 
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize the NameService.\n"),
                           -1);
       this->naming_context_ =
-        CosNaming::NamingContext::_narrow (naming_obj.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Naming_Client::init");
+      ex._tao_print_exception ("TAO_Naming_Client::init");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
index c272071a325..001c4d51bc5 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
@@ -31,81 +31,75 @@ TAO_Naming_Context::~TAO_Naming_Context (void)
 }
 
 PortableServer::POA_ptr
-TAO_Naming_Context::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*env*/)
+TAO_Naming_Context::_default_POA (/*env*/)
 {
   return impl_->_default_POA ();
 }
 
 void
 TAO_Naming_Context::bind (const CosNaming::Name &n,
-                          CORBA::Object_ptr obj
-                          ACE_ENV_ARG_DECL)
+                          CORBA::Object_ptr obj)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNaming::NamingContext::NotFound,
                      CosNaming::NamingContext::CannotProceed,
                      CosNaming::NamingContext::InvalidName,
                      CosNaming::NamingContext::AlreadyBound))
 {
-  impl_->bind (n, obj ACE_ENV_ARG_PARAMETER);
+  impl_->bind (n, obj);
 }
 
 void
 TAO_Naming_Context::rebind (const CosNaming::Name &n,
-                            CORBA::Object_ptr obj
-                            ACE_ENV_ARG_DECL)
+                            CORBA::Object_ptr obj)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
                        CosNaming::NamingContext::InvalidName))
 {
-  impl_->rebind (n, obj ACE_ENV_ARG_PARAMETER);
+  impl_->rebind (n, obj);
 }
 
 void
 TAO_Naming_Context::bind_context (const CosNaming::Name &n,
-                                  CosNaming::NamingContext_ptr nc
-                                  ACE_ENV_ARG_DECL)
+                                  CosNaming::NamingContext_ptr nc)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
                        CosNaming::NamingContext::InvalidName,
                        CosNaming::NamingContext::AlreadyBound))
 {
-  impl_->bind_context (n, nc ACE_ENV_ARG_PARAMETER);
+  impl_->bind_context (n, nc);
 }
 
 void
 TAO_Naming_Context::rebind_context (const CosNaming::Name &n,
-                                    CosNaming::NamingContext_ptr nc
-                                    ACE_ENV_ARG_DECL)
+                                    CosNaming::NamingContext_ptr nc)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
                        CosNaming::NamingContext::InvalidName))
 {
-  impl_->rebind_context (n, nc ACE_ENV_ARG_PARAMETER);
+  impl_->rebind_context (n, nc);
 }
 
 CORBA::Object_ptr
-TAO_Naming_Context::resolve (const CosNaming::Name &n
-                             ACE_ENV_ARG_DECL)
+TAO_Naming_Context::resolve (const CosNaming::Name &n)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
                        CosNaming::NamingContext::InvalidName))
 {
-  return impl_->resolve (n ACE_ENV_ARG_PARAMETER);
+  return impl_->resolve (n);
 }
 
 void
-TAO_Naming_Context::unbind (const CosNaming::Name &n
-                            ACE_ENV_ARG_DECL)
+TAO_Naming_Context::unbind (const CosNaming::Name &n)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
                        CosNaming::NamingContext::InvalidName))
 {
-  impl_->unbind (n ACE_ENV_ARG_PARAMETER);
+  impl_->unbind (n);
 }
 
 CosNaming::NamingContext_ptr
@@ -116,15 +110,14 @@ TAO_Naming_Context::new_context (void)
 }
 
 CosNaming::NamingContext_ptr
-TAO_Naming_Context::bind_new_context (const CosNaming::Name &n
-                                      ACE_ENV_ARG_DECL)
+TAO_Naming_Context::bind_new_context (const CosNaming::Name &n)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::AlreadyBound,
                        CosNaming::NamingContext::CannotProceed,
                        CosNaming::NamingContext::InvalidName))
 {
-  return impl_->bind_new_context (n ACE_ENV_ARG_PARAMETER);
+  return impl_->bind_new_context (n);
 }
 
 void
@@ -138,11 +131,10 @@ TAO_Naming_Context::destroy (void)
 void
 TAO_Naming_Context::list (CORBA::ULong how_many,
                           CosNaming::BindingList_out bl,
-                          CosNaming::BindingIterator_out bi
-                          ACE_ENV_ARG_DECL)
+                          CosNaming::BindingIterator_out bi)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  impl_->list (how_many, bl, bi ACE_ENV_ARG_PARAMETER);
+  impl_->list (how_many, bl, bi);
 }
 
 void
@@ -177,8 +169,7 @@ to_string_helper_assign (char * &k, const char * &src)
 }
 
 char *
-TAO_Naming_Context::to_string (const CosNaming::Name &n
-                               ACE_ENV_ARG_DECL)
+TAO_Naming_Context::to_string (const CosNaming::Name &n)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNaming::NamingContext::InvalidName))
 {
@@ -292,8 +283,7 @@ to_name_helper (char *dest, const char*& src, Hint hint)
 }
 
 CosNaming::Name *
-TAO_Naming_Context::to_name (const char *sn
-                             ACE_ENV_ARG_DECL)
+TAO_Naming_Context::to_name (const char *sn)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNaming::NamingContext::InvalidName))
 {
@@ -411,8 +401,7 @@ TAO_Naming_Context::to_url_is_alnum_or_punctuation (char c)
 size_t
 TAO_Naming_Context::to_url_validate_and_compute_size (
     const char *addr,
-    const char *sn
-    ACE_ENV_ARG_DECL)
+    const char *sn)
 {
   size_t addr_len = ACE_OS::strlen (addr);
 
@@ -442,16 +431,14 @@ TAO_Naming_Context::to_url_validate_and_compute_size (
 
 char *
 TAO_Naming_Context::to_url (const char * addr,
-                            const char * sn
-                            ACE_ENV_ARG_DECL)
+                            const char * sn)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNaming::NamingContextExt::InvalidAddress,
                    CosNaming::NamingContext::InvalidName))
 {
   /// Compute how many characters will be required for the URL
   size_t no_char =
-    TAO_Naming_Context::to_url_validate_and_compute_size (addr, sn
-                                                          ACE_ENV_ARG_PARAMETER);
+    TAO_Naming_Context::to_url_validate_and_compute_size (addr, sn);
 
 
   // The 'corbaname:' tag is to be prepended at the starting of the
@@ -512,8 +499,7 @@ TAO_Naming_Context::to_url (const char * addr,
 }
 
 CORBA::Object_ptr
-TAO_Naming_Context::resolve_str (const char * n
-                                 ACE_ENV_ARG_DECL)
+TAO_Naming_Context::resolve_str (const char * n)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNaming::NamingContext::NotFound,
                    CosNaming::NamingContext::CannotProceed,
@@ -524,10 +510,10 @@ TAO_Naming_Context::resolve_str (const char * n
   // argument instead of a Name.
 
   // Get the unstrigified name.
-  CosNaming::Name_var name = this->to_name (n ACE_ENV_ARG_PARAMETER);
+  CosNaming::Name_var name = this->to_name (n);
 
   // Pass this unstringified name to resolve and return an Object_ptr
-  return this->resolve (name.in () ACE_ENV_ARG_PARAMETER);
+  return this->resolve (name.in ());
 }
 
 TAO_Naming_Context_Impl::~TAO_Naming_Context_Impl (void)
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
index f79adf8dc28..586c06bea3b 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
@@ -67,8 +67,7 @@ public:
    * participate in name resolution later.
    */
   virtual void bind (const CosNaming::Name &n,
-                     CORBA::Object_ptr obj
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                     CORBA::Object_ptr obj)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNaming::NamingContext::NotFound,
                      CosNaming::NamingContext::CannotProceed,
@@ -82,8 +81,7 @@ public:
    * new one.
    */
   virtual void rebind (const CosNaming::Name &n,
-                       CORBA::Object_ptr obj
-                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                       CORBA::Object_ptr obj)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
@@ -95,8 +93,7 @@ public:
    * compound names are passed to be resolved.
    */
   virtual void bind_context (const CosNaming::Name &n,
-                             CosNaming::NamingContext_ptr nc
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                             CosNaming::NamingContext_ptr nc)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
@@ -109,8 +106,7 @@ public:
    * names are passed.
    */
   virtual void rebind_context (const CosNaming::Name &n,
-                               CosNaming::NamingContext_ptr nc
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                               CosNaming::NamingContext_ptr nc)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
@@ -123,8 +119,7 @@ public:
    * does not return the type of the object.  Clients are responsible
    * for "narrowing" the object to the appropriate type.
    */
-  virtual CORBA::Object_ptr resolve (const CosNaming::Name &n
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Object_ptr resolve (const CosNaming::Name &n)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
@@ -135,8 +130,7 @@ public:
    * are used, unbind is defined as follows: ctx->unbind (<c1; c2;
    * cn>) = (ctx->resolve (<c1; c2; cn-1>))->unbind (<cn>)
    */
-  virtual void unbind (const CosNaming::Name &n
-                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void unbind (const CosNaming::Name &n)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
@@ -148,8 +142,7 @@ public:
    * same naming server in which the operation was invoked.  The
    * context is not bound.
    */
-  virtual CosNaming::NamingContext_ptr new_context (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CosNaming::NamingContext_ptr new_context ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -159,8 +152,7 @@ public:
    * bound (the name argument excluding the last component).
    */
   virtual CosNaming::NamingContext_ptr bind_new_context (
-      const CosNaming::Name &n
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CosNaming::Name &n)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::AlreadyBound,
@@ -187,8 +179,7 @@ public:
    */
   virtual void list (CORBA::ULong how_many,
                      CosNaming::BindingList_out bl,
-                     CosNaming::BindingIterator_out bi
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                     CosNaming::BindingIterator_out bi)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -197,8 +188,7 @@ public:
    * is invalid i.e. if the number of characters in the name is zero,
    * an InvalidName exception is to be raised.
    */
-  virtual char * to_string (const CosNaming::Name &n
-                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual char * to_string (const CosNaming::Name &n)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNaming::NamingContext::InvalidName));
 
@@ -207,8 +197,7 @@ public:
    * escape character '\' and destringifies the stringified name and returns
    * it.
    */
-  virtual CosNaming::Name * to_name (const char *sn
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual CosNaming::Name * to_name (const char *sn)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNaming::NamingContext::InvalidName));
 
@@ -219,8 +208,7 @@ public:
    * iiopname://1.1@myhost.555xyz.com:9999/a/b/c
    */
   virtual char * to_url ( const char * addr,
-                          const char * sn
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                          const char * sn)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosNaming::NamingContextExt::InvalidAddress,
@@ -284,8 +272,7 @@ private:
   /// Validate the to_url() method input, and compute the size of the
   /// returned URL address.
   static size_t to_url_validate_and_compute_size (const char *add,
-                                                  const char *sn
-                                                  ACE_ENV_ARG_DECL);
+                                                  const char *sn);
 
 protected:
 
@@ -322,8 +309,7 @@ public:
    * participate in name resolution later.
    */
   virtual void bind (const CosNaming::Name &n,
-                     CORBA::Object_ptr obj
-                     ACE_ENV_ARG_DECL) = 0;
+                     CORBA::Object_ptr obj) = 0;
 
   /**
    * This is similar to <bind> operation above, except for when the
@@ -332,8 +318,7 @@ public:
    * new one.
    */
   virtual void rebind (const CosNaming::Name &n,
-                       CORBA::Object_ptr obj
-                       ACE_ENV_ARG_DECL) = 0;
+                       CORBA::Object_ptr obj) = 0;
 
   /**
    * This is the version of <bind> specifically for binding naming
@@ -341,8 +326,7 @@ public:
    * compound names are passed to be resolved.
    */
   virtual void bind_context (const CosNaming::Name &n,
-                             CosNaming::NamingContext_ptr nc
-                             ACE_ENV_ARG_DECL) = 0;
+                             CosNaming::NamingContext_ptr nc) = 0;
 
   /**
    * This is a version of <rebind> specifically for naming contexts,
@@ -350,8 +334,7 @@ public:
    * names are passed.
    */
   virtual void rebind_context (const CosNaming::Name &n,
-                               CosNaming::NamingContext_ptr nc
-                               ACE_ENV_ARG_DECL) = 0;
+                               CosNaming::NamingContext_ptr nc) = 0;
 
   /**
    * Return object reference that is bound to the name.  Compound name
@@ -360,16 +343,14 @@ public:
    * does not return the type of the object.  Clients are responsible
    * for "narrowing" the object to the appropriate type.
    */
-  virtual CORBA::Object_ptr resolve (const CosNaming::Name &n
-                                     ACE_ENV_ARG_DECL) = 0;
+  virtual CORBA::Object_ptr resolve (const CosNaming::Name &n) = 0;
 
   /**
    * Remove the name binding from the context.  When compound names
    * are used, unbind is defined as follows: ctx->unbind (<c1; c2;
    * cn>) = (ctx->resolve (<c1; c2; cn-1>))->unbind (<cn>)
    */
-  virtual void unbind (const CosNaming::Name &n
-                       ACE_ENV_ARG_DECL) = 0;
+  virtual void unbind (const CosNaming::Name &n) = 0;
 
   /**
    * This operation returns a new naming context implemented by the
@@ -384,8 +365,7 @@ public:
    * implemented by the same server as the context in which it was
    * bound (the name argument excluding the last component).
    */
-  virtual CosNaming::NamingContext_ptr bind_new_context (const CosNaming::Name &n
-                                                         ACE_ENV_ARG_DECL) = 0;
+  virtual CosNaming::NamingContext_ptr bind_new_context (const CosNaming::Name &n) = 0;
 
   /**
    * Delete the naming context.  The user should take care to <unbind> any
@@ -405,8 +385,7 @@ public:
    */
   virtual void list (CORBA::ULong how_many,
                      CosNaming::BindingList_out &bl,
-                     CosNaming::BindingIterator_out &bi
-                     ACE_ENV_ARG_DECL) = 0;
+                     CosNaming::BindingIterator_out &bi) = 0;
 
   /// Returns the Default POA of this Servant object
   virtual PortableServer::POA_ptr _default_POA (void) = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
index b91e73189d3..e9f01058bb2 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
@@ -35,8 +35,7 @@ TAO_Naming_Loader::~TAO_Naming_Loader (void)
 int
 TAO_Naming_Loader::init (int argc, ACE_TCHAR *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Copy command line parameter.
       ACE_Argv_Type_Converter command_line(argc, argv);
@@ -45,22 +44,19 @@ TAO_Naming_Loader::init (int argc, ACE_TCHAR *argv[])
       CORBA::ORB_var orb =
         CORBA::ORB_init (command_line.get_argc(),
                          command_line.get_ASCII_argv(),
-                         0
-                         ACE_ENV_ARG_PARAMETER);
+                         0);
 
       // This function call initializes the Naming Service
       CORBA::Object_var object =
         this->create_object (orb.in (),
                              command_line.get_argc(),
-                             command_line.get_TCHAR_argv ()
-                             ACE_ENV_ARG_PARAMETER);
+                             command_line.get_TCHAR_argv ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // @@ Should we log this???
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -74,8 +70,7 @@ TAO_Naming_Loader::fini (void)
 CORBA::Object_ptr
 TAO_Naming_Loader::create_object (CORBA::ORB_ptr orb,
                                   int argc,
-                                  ACE_TCHAR *argv[]
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+                                  ACE_TCHAR *argv[])
    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Initializes the Naming Service. Returns -1
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
index c5ac13bfa05..eb89e194d69 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
@@ -111,14 +111,12 @@ TAO_Naming_Server::init (CORBA::ORB_ptr orb,
 {
   if (resolve_for_existing_naming_service)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
+      try
         {
           // Try to find an existing Naming Service.
           CORBA::Object_var naming_obj =
             orb->resolve_initial_references ("NameService",
-                                             timeout
-                                             ACE_ENV_ARG_PARAMETER);
+                                             timeout);
 
           if (!CORBA::is_nil (naming_obj.in ()))
             {
@@ -130,21 +128,18 @@ TAO_Naming_Server::init (CORBA::ORB_ptr orb,
                             "\nNameService found!\n"));
 
               this->naming_context_ =
-                CosNaming::NamingContext::_narrow (naming_obj.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
+                CosNaming::NamingContext::_narrow (naming_obj.in ());
 
               this->naming_service_ior_ =
-                orb->object_to_string (naming_obj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+                orb->object_to_string (naming_obj.in ());
 
               return 0;
             }
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Naming_Server::init");
+          ex._tao_print_exception ("TAO_Naming_Server::init");
         }
-      ACE_ENDTRY;
     }
 
   if (TAO_debug_level > 0)
@@ -274,15 +269,14 @@ TAO_Naming_Server::init_with_orb (int argc,
 {
   int result;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Duplicate the ORB
       this->orb_ = CORBA::ORB::_duplicate (orb);
 
       // Get the POA from the ORB.
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         {
@@ -300,8 +294,7 @@ TAO_Naming_Server::init_with_orb (int argc,
         return result;
 
       // Get the POA object.
-      this->root_poa_ = PortableServer::POA::_narrow (poa_object.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
+      this->root_poa_ = PortableServer::POA::_narrow (poa_object.in ());
 
       // Get the POA_Manager.
       PortableServer::POAManager_var poa_manager =
@@ -326,26 +319,22 @@ TAO_Naming_Server::init_with_orb (int argc,
 
       // Id Assignment policy
       policies[0] =
-        this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID
-                                                      ACE_ENV_ARG_PARAMETER);
+        this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID);
 
       // Lifespan policy
       policies[1] =
-        this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT
-                                                 ACE_ENV_ARG_PARAMETER);
+        this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT);
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT)
       if (this->use_servant_activator_)
         {
           // Request Processing Policy
           policies[2] =
-            this->root_poa_->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER
-                                                               ACE_ENV_ARG_PARAMETER);
+            this->root_poa_->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER);
 
           // Servant Retention Policy
           policies[3] =
-            this->root_poa_->create_servant_retention_policy (PortableServer::RETAIN
-                                                              ACE_ENV_ARG_PARAMETER);
+            this->root_poa_->create_servant_retention_policy (PortableServer::RETAIN);
         }
 #endif /* TAO_HAS_MINIMUM_POA */
 
@@ -353,8 +342,7 @@ TAO_Naming_Server::init_with_orb (int argc,
       // the object key each time it invokes the server.
       this->ns_poa_ = this->root_poa_->create_POA ("NameService",
                                                    poa_manager.in (),
-                                                   policies
-                                                   ACE_ENV_ARG_PARAMETER);
+                                                   policies);
       // Warning!  If create_POA fails, then the policies won't be
       // destroyed and there will be hell to pay in memory leaks!
 
@@ -381,12 +369,12 @@ TAO_Naming_Server::init_with_orb (int argc,
       if (result == -1)
         return result;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Naming_Server::init_with_orb");
+      ex._tao_print_exception (
+        "TAO_Naming_Server::init_with_orb");
       return -1;
     }
-  ACE_ENDTRY;
 
   if (this->ior_file_name_ != 0)
     {
@@ -433,8 +421,7 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
                                     int round_trip_timeout,
                                     int use_round_trip_timeout)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       if (use_storable_context)
         {
@@ -483,8 +470,7 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
                                                        0,
                                                        persFactory.get(),
                                                        persistence_location,
-                                                       use_redundancy_
-                                                       ACE_ENV_ARG_PARAMETER);
+                                                       use_redundancy_);
 
           if (this->use_servant_activator_)
             persFactory.release();
@@ -521,8 +507,7 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
           this->naming_context_ =
             TAO_Transient_Naming_Context::make_new_context (poa,
                                                             TAO_ROOT_NAMING_CONTEXT,
-                                                            context_size
-                                                            ACE_ENV_ARG_PARAMETER);
+                                                            context_size);
 
         }
 
@@ -530,19 +515,17 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
       // mechanism.  Primarily useful for dynamically loaded Name
       // Services.
       orb->register_initial_reference ("NameService",
-                                       this->naming_context_.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+                                       this->naming_context_.in ());
 
       // Set the ior of the root Naming Context.
       this->naming_service_ior_=
-        orb->object_to_string (this->naming_context_.in ()
-                               ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (this->naming_context_.in ());
 
       CORBA::Object_var table_object =
-        orb->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("IORTable");
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
+        IORTable::Table::_narrow (table_object.in ());
       if (CORBA::is_nil (adapter.in ()))
         {
           ACE_ERROR ((LM_ERROR, "Nil IORTable\n"));
@@ -550,9 +533,8 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
       else
         {
           CORBA::String_var ior =
-            orb->object_to_string (this->naming_context_.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-          adapter->bind ("NameService", ior.in () ACE_ENV_ARG_PARAMETER);
+            orb->object_to_string (this->naming_context_.in ());
+          adapter->bind ("NameService", ior.in ());
         }
 
 #if defined (ACE_HAS_IP_MULTICAST)
@@ -645,8 +627,7 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
         // set a timeout on the orb
         //
         CORBA::Object_var orbPolicyManagerObj =
-          orb->resolve_initial_references ("ORBPolicyManager"
-                                           ACE_ENV_ARG_PARAMETER);
+          orb->resolve_initial_references ("ORBPolicyManager");
 
         CORBA::PolicyManager_var orbPolicyManager =
           CORBA::PolicyManager::_narrow (orbPolicyManagerObj.in ());
@@ -659,12 +640,12 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
   ACE_UNUSED_ARG (use_round_trip_timeout);
 #endif /* TAO_HAS_CORBA_MESSAGING */
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Naming_Server::init_new_naming");
+      ex._tao_print_exception (
+        "TAO_Naming_Server::init_new_naming");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -674,31 +655,29 @@ TAO_Naming_Server::fini (void)
 {
   // Destroy the child POA ns_poa that is created when initializing
   // the Naming Service
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->ns_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      this->ns_poa_->destroy (1, 1);
 
 
       CORBA::Object_var table_object =
-        this->orb_->resolve_initial_references ("IORTable"
-                                                ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("IORTable");
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
+        IORTable::Table::_narrow (table_object.in ());
       if (CORBA::is_nil (adapter.in ()))
         {
           ACE_ERROR ((LM_ERROR, "Nil IORTable\n"));
         }
       else
         {
-          adapter->unbind ("NameService" ACE_ENV_ARG_PARAMETER);
+          adapter->unbind ("NameService");
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore
     }
-  ACE_ENDTRY;
 
 
   if (this->ior_multicast_ != 0)
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
index fd126538867..e7244a6b396 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
@@ -141,14 +141,12 @@ TAO_Persistent_Context_Index::init (size_t context_size)
     // CASE 1:there are no Naming Contexts registered.  We need to create
     // one.
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
 
       this->root_context_ =
         TAO_Persistent_Naming_Context::make_new_context (poa_.in (),
                                                          TAO_ROOT_NAMING_CONTEXT,
                                                          context_size,
-                                                         this
-                                                         ACE_ENV_ARG_PARAMETER);
+                                                         this);
     }
 
   else
@@ -213,13 +211,11 @@ TAO_Persistent_Context_Index::recreate_all (void)
       PortableServer::ServantBase_var s = context;
 
       // Register with the POA.
-      ACE_DECLARE_NEW_CORBA_ENV;
       PortableServer::ObjectId_var id =
         PortableServer::string_to_ObjectId (entry->ext_id_.poa_id_);
 
       this->poa_->activate_object_with_id (id.in (),
-                                           context
-                                           ACE_ENV_ARG_PARAMETER);
+                                           context);
 
       CosNaming::NamingContext_var result = context->_this ();
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
index 7668d6c26e1..1daca1ca553 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
@@ -73,8 +73,7 @@ TAO_Persistent_Bindings_Map::find (const char *id,
     return -1;
   else
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      obj = orb_->string_to_object (entry.ref_ ACE_ENV_ARG_PARAMETER);
+      obj = orb_->string_to_object (entry.ref_);
       type = entry.type_;
 
       return 0;
@@ -163,8 +162,7 @@ TAO_Persistent_Bindings_Map::shared_bind (const char * id,
                                           int rebind)
 {
   // Obtain a stringified ior of <obj> (i.e., the representation we can store).
-  ACE_DECLARE_NEW_CORBA_ENV;
-  CORBA::String_var ref = orb_->object_to_string (obj ACE_ENV_ARG_PARAMETER);
+  CORBA::String_var ref = orb_->object_to_string (obj);
 
   // Calculate and allocate the memory we need to store this name to
   // object binding.
@@ -321,8 +319,7 @@ CosNaming::NamingContext_ptr
 TAO_Persistent_Naming_Context::make_new_context (PortableServer::POA_ptr poa,
                                                  const char *poa_id,
                                                  size_t context_size,
-                                                 TAO_Persistent_Context_Index * ind
-                                                 ACE_ENV_ARG_DECL)
+                                                 TAO_Persistent_Context_Index * ind)
 {
   // Store the stub we will return here.
   CosNaming::NamingContext_var result;
@@ -373,8 +370,7 @@ TAO_Persistent_Naming_Context::make_new_context (PortableServer::POA_ptr poa,
     PortableServer::string_to_ObjectId (poa_id);
 
   poa->activate_object_with_id (id.in (),
-                                context
-                                ACE_ENV_ARG_PARAMETER);
+                                context);
 
   result = context->_this ();
 
@@ -409,8 +405,7 @@ TAO_Persistent_Naming_Context::new_context (void)
     make_new_context (this->poa_.in (),
                       poa_id,
                       this->persistent_context_->total_size (),
-                      this->index_
-                      ACE_ENV_ARG_PARAMETER);
+                      this->index_);
 
   return result._retn ();
 }
@@ -418,8 +413,7 @@ TAO_Persistent_Naming_Context::new_context (void)
 void
 TAO_Persistent_Naming_Context::list (CORBA::ULong how_many,
                                      CosNaming::BindingList_out &bl,
-                                     CosNaming::BindingIterator_out &bi
-                                     ACE_ENV_ARG_DECL)
+                                     CosNaming::BindingIterator_out &bi)
 {
   // Allocate nil out parameters in case we won't be able to complete
   // the operation.
@@ -437,7 +431,7 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many,
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
   if (this->destroyed_)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   // Dynamically allocate hash map iterator.
   HASH_MAP::ITERATOR *hash_iter = 0;
@@ -481,7 +475,7 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many,
       hash_iter->advance ();
 
       if (ITER_SERVANT::populate_binding (hash_entry, bl[i]) == 0)
-          ACE_THROW (CORBA::NO_MEMORY());
+          throw CORBA::NO_MEMORY();
     }
 
   // Now we are done with the BindingsList, and we can follow up on
@@ -516,8 +510,7 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many,
         PortableServer::string_to_ObjectId (poa_id);
 
       this->poa_->activate_object_with_id (id.in (),
-                                           bind_iter
-                                           ACE_ENV_ARG_PARAMETER);
+                                           bind_iter);
 
       bi = bind_iter->_this ();
     }
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
index eb2b9b0bc11..8659c497466 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
@@ -204,8 +204,7 @@ public:
   static CosNaming::NamingContext_ptr make_new_context (PortableServer::POA_ptr poa,
                                                         const char *poa_id,
                                                         size_t context_size,
-                                                        TAO_Persistent_Context_Index *ind
-                                                        ACE_ENV_ARG_DECL);
+                                                        TAO_Persistent_Context_Index *ind);
 
   // = Methods not implemented in TAO_Hash_Naming_Context.
 
@@ -224,8 +223,7 @@ public:
    */
   virtual void list (CORBA::ULong how_many,
                      CosNaming::BindingList_out &bl,
-                     CosNaming::BindingIterator_out &bi
-                     ACE_ENV_ARG_DECL);
+                     CosNaming::BindingIterator_out &bi);
 
 protected:
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
index eb4c84cd229..8d421d257c4 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
@@ -181,8 +181,7 @@ TAO_Storable_Bindings_Map::find (const char *id,
     }
   else
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      obj = orb_->string_to_object (entry.ref_.in() ACE_ENV_ARG_PARAMETER);
+      obj = orb_->string_to_object (entry.ref_.in());
       type = entry.type_;
 
       return 0;
@@ -351,8 +350,7 @@ void TAO_Storable_Naming_Context::Write(TAO_Storable_Base& wrtr)
 
 // Helper function to load a new context into the binding_map
 int
-TAO_Storable_Naming_Context::load_map(File_Open_Lock_and_Check *flck
-                                      ACE_ENV_ARG_DECL)
+TAO_Storable_Naming_Context::load_map(File_Open_Lock_and_Check *flck)
 {
   ACE_TRACE("load_map");
   // assume file already open for reading
@@ -422,8 +420,7 @@ TAO_Storable_Naming_Context::load_map(File_Open_Lock_and_Check *flck
 TAO_Storable_Naming_Context::
 File_Open_Lock_and_Check::File_Open_Lock_and_Check(
                                  TAO_Storable_Naming_Context * context,
-                                 const char * mode
-                                 ACE_ENV_ARG_DECL)
+                                 const char * mode)
 :closed_(1),
  context_(context)
 {
@@ -446,7 +443,7 @@ File_Open_Lock_and_Check::File_Open_Lock_and_Check(
   if( rwflags_ <= 0 )
   {
     errno = EINVAL;
-    ACE_THROW(CORBA::PERSIST_STORE());
+    throw CORBA::PERSIST_STORE();
   }
 
   // build the file name
@@ -461,7 +458,7 @@ File_Open_Lock_and_Check::File_Open_Lock_and_Check(
     if (fl_->open() != 0)
       {
         delete fl_;
-        ACE_THROW(CORBA::PERSIST_STORE());
+        throw CORBA::PERSIST_STORE();
       }
 
     // acquire a lock on it
@@ -469,7 +466,7 @@ File_Open_Lock_and_Check::File_Open_Lock_and_Check(
       {
          fl_->close();
          delete fl_;
-         ACE_THROW(CORBA::INTERNAL());
+         throw CORBA::INTERNAL();
       }
 
     // now that the file is successfully opened and locked it must be
@@ -486,7 +483,7 @@ File_Open_Lock_and_Check::File_Open_Lock_and_Check(
          // Throw our map away
          delete context->storable_context_;
          // and build a new one from disk
-         context->load_map(this ACE_ENV_ARG_PARAMETER);
+         context->load_map(this);
        }
     }
   }
@@ -495,7 +492,7 @@ File_Open_Lock_and_Check::File_Open_Lock_and_Check(
     if (fl_->open() != 0)
       {
         delete fl_;
-        ACE_THROW(CORBA::PERSIST_STORE());
+        throw CORBA::PERSIST_STORE();
       }
 
     // now that the file is successfully opened
@@ -505,7 +502,7 @@ File_Open_Lock_and_Check::File_Open_Lock_and_Check(
     if(!context->storable_context_)
     {
       // Load the map from disk
-      context->load_map(this ACE_ENV_ARG_PARAMETER);
+      context->load_map(this);
     }
   }
   else
@@ -610,8 +607,7 @@ TAO_Storable_Naming_Context::make_new_context (
                               size_t context_size,
                               TAO_Naming_Service_Persistence_Factory *factory,
                               const ACE_TCHAR *persistence_directory,
-                              TAO_Storable_Naming_Context **new_context
-                              ACE_ENV_ARG_DECL)
+                              TAO_Storable_Naming_Context **new_context)
 {
   ACE_TRACE("make_new_context");
   // Store the stub we will return here.
@@ -655,18 +651,16 @@ TAO_Storable_Naming_Context::make_new_context (
   // thrown which is transmitted as a CORBA::UNKNOWN on the wire. To rectify
   // this problem, we explicitly throw the correct INS exception in
   // this situation.
-  ACE_TRY
+  try
     {
       poa->activate_object_with_id (id.in (),
-                                    context
-                                    ACE_ENV_ARG_PARAMETER);
+                                    context);
     }
-  ACE_CATCH (PortableServer::POA::ObjectAlreadyActive, ex)
+  catch (const PortableServer::POA::ObjectAlreadyActive& ex)
     {
       ACE_THROW_RETURN (CosNaming::NamingContext::AlreadyBound(),
                         CosNaming::NamingContext::_nil ());
     }
-  ACE_ENDTRY;
 
 
   result = context->_this ();
@@ -688,8 +682,7 @@ TAO_Storable_Naming_Context::new_context (void)
 
   {
     // Open the backing file
-    File_Open_Lock_and_Check flck(this, "r"
-                                       ACE_ENV_ARG_PARAMETER);
+    File_Open_Lock_and_Check flck(this, "r");
 
     // Check to make sure this object didn't have <destroy> method
     // invoked on it.
@@ -750,8 +743,7 @@ TAO_Storable_Naming_Context::new_context (void)
                       this->storable_context_->total_size (),
                       this->factory_,
                       ACE_TEXT_CHAR_TO_TCHAR (this->persistence_directory_.c_str ()),
-                      &new_context
-                      ACE_ENV_ARG_PARAMETER);
+                      &new_context);
 
   // Since this is a new context, make an empty map in it
   ACE_NEW_THROW_EX (new_context->storable_context_,
@@ -759,7 +751,7 @@ TAO_Storable_Naming_Context::new_context (void)
                     CORBA::NO_MEMORY ());
   new_context->context_ = new_context->storable_context_;
 
-  File_Open_Lock_and_Check flck(new_context, "wc" ACE_ENV_ARG_PARAMETER);
+  File_Open_Lock_and_Check flck(new_context, "wc");
   new_context->Write(flck.peer());
 
   return result._retn ();
@@ -767,8 +759,7 @@ TAO_Storable_Naming_Context::new_context (void)
 
 void
 TAO_Storable_Naming_Context::rebind (const CosNaming::Name& n,
-                                     CORBA::Object_ptr obj
-                                     ACE_ENV_ARG_DECL)
+                                     CORBA::Object_ptr obj)
 {
   ACE_TRACE("rebind");
   // Get the length of the name.
@@ -776,7 +767,7 @@ TAO_Storable_Naming_Context::rebind (const CosNaming::Name& n,
 
   // Check for invalid name.
   if (name_len == 0)
-    ACE_THROW (CosNaming::NamingContext::InvalidName());
+    throw CosNaming::NamingContext::InvalidName();
 
   // we didn't need a lock to check the input arg, but now we do
   ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon,
@@ -784,13 +775,12 @@ TAO_Storable_Naming_Context::rebind (const CosNaming::Name& n,
                       CORBA::INTERNAL ());
 
   // Open the backing file
-  File_Open_Lock_and_Check flck(this, name_len > 1 ? "r" : "rw"
-                                     ACE_ENV_ARG_PARAMETER);
+  File_Open_Lock_and_Check flck(this, name_len > 1 ? "r" : "rw");
 
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
   if (this->destroyed_)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   // If we received compound name, resolve it to get the context in
   // which the rebinding should take place, then perform the rebinding
@@ -801,12 +791,12 @@ TAO_Storable_Naming_Context::rebind (const CosNaming::Name& n,
       flck.release();
 
       CosNaming::NamingContext_var context =
-        get_context (n ACE_ENV_ARG_PARAMETER);
+        get_context (n);
 
       CosNaming::Name simple_name;
       simple_name.length (1);
       simple_name[0] = n[name_len - 1];
-      context->rebind (simple_name, obj ACE_ENV_ARG_PARAMETER);
+      context->rebind (simple_name, obj);
     }
   // If we received a simple name, we need to rebind it in this
   // context.
@@ -819,11 +809,12 @@ TAO_Storable_Naming_Context::rebind (const CosNaming::Name& n,
 
       // Check for error conditions.
       if (result == -1)
-        ACE_THROW (CORBA::INTERNAL ());
+        throw CORBA::INTERNAL ();
 
       else if (result == -2)
-        ACE_THROW (CosNaming::NamingContext::NotFound
-                   (CosNaming::NamingContext::not_object, n));
+        throw CosNaming::NamingContext::NotFound(
+          CosNaming::NamingContext::not_object,
+          n);
 
       this->Write(flck.peer());
     }
@@ -831,8 +822,7 @@ TAO_Storable_Naming_Context::rebind (const CosNaming::Name& n,
 
 void
 TAO_Storable_Naming_Context::bind_context (const CosNaming::Name &n,
-                                           CosNaming::NamingContext_ptr nc
-                                           ACE_ENV_ARG_DECL)
+                                           CosNaming::NamingContext_ptr nc)
 {
   ACE_TRACE("TAO_Storable_Naming_Context::bind_context");
   // Get the length of the name.
@@ -840,11 +830,11 @@ TAO_Storable_Naming_Context::bind_context (const CosNaming::Name &n,
 
   // Check for invalid name.
   if (name_len == 0)
-    ACE_THROW (CosNaming::NamingContext::InvalidName());
+    throw CosNaming::NamingContext::InvalidName();
 
   // Do not allow binding of nil context reference.
   if (CORBA::is_nil (nc))
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   // we didn't need a lock to check the input arg, but now we do
   ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon,
@@ -852,13 +842,12 @@ TAO_Storable_Naming_Context::bind_context (const CosNaming::Name &n,
                       CORBA::INTERNAL ());
 
   // Open the backing file
-  File_Open_Lock_and_Check flck(this, name_len > 1 ? "r" : "rw"
-                                     ACE_ENV_ARG_PARAMETER);
+  File_Open_Lock_and_Check flck(this, name_len > 1 ? "r" : "rw");
 
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
   if (this->destroyed_)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   // If we received compound name, resolve it to get the context in
   // which the binding should take place, then perform the binding
@@ -869,12 +858,12 @@ TAO_Storable_Naming_Context::bind_context (const CosNaming::Name &n,
       flck.release();
 
       CosNaming::NamingContext_var context =
-        get_context (n ACE_ENV_ARG_PARAMETER);
+        get_context (n);
 
       CosNaming::Name simple_name;
       simple_name.length (1);
       simple_name[0] = n[name_len - 1];
-      context->bind_context (simple_name, nc ACE_ENV_ARG_PARAMETER);
+      context->bind_context (simple_name, nc);
     }
   // If we received a simple name, we need to bind it in this context.
   else
@@ -885,11 +874,11 @@ TAO_Storable_Naming_Context::bind_context (const CosNaming::Name &n,
                                          nc,
                                          CosNaming::ncontext);
       if (result == 1)
-        ACE_THROW (CosNaming::NamingContext::AlreadyBound());
+        throw CosNaming::NamingContext::AlreadyBound();
 
       // Something went wrong with the internal structure
       else if (result == -1)
-        ACE_THROW (CORBA::INTERNAL ());
+        throw CORBA::INTERNAL ();
 
       this->Write(flck.peer());
     }
@@ -897,8 +886,7 @@ TAO_Storable_Naming_Context::bind_context (const CosNaming::Name &n,
 
 void
 TAO_Storable_Naming_Context::rebind_context (const CosNaming::Name &n,
-                                         CosNaming::NamingContext_ptr nc
-                                         ACE_ENV_ARG_DECL)
+                                         CosNaming::NamingContext_ptr nc)
 {
   ACE_TRACE("rebind_context");
   // Get the length of the name.
@@ -906,7 +894,7 @@ TAO_Storable_Naming_Context::rebind_context (const CosNaming::Name &n,
 
   // Check for invalid name.
   if (name_len == 0)
-    ACE_THROW (CosNaming::NamingContext::InvalidName());
+    throw CosNaming::NamingContext::InvalidName();
 
   // we didn't need a lock to check the input arg, but now we do
   ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon,
@@ -914,13 +902,12 @@ TAO_Storable_Naming_Context::rebind_context (const CosNaming::Name &n,
                       CORBA::INTERNAL ());
 
   // Open the backing file
-  File_Open_Lock_and_Check flck(this, name_len > 1 ? "r" : "rw"
-                                     ACE_ENV_ARG_PARAMETER);
+  File_Open_Lock_and_Check flck(this, name_len > 1 ? "r" : "rw");
 
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
   if (this->destroyed_)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   // If we received compound name, resolve it to get the context in
   // which the rebinding should take place, then perform the rebinding
@@ -931,12 +918,12 @@ TAO_Storable_Naming_Context::rebind_context (const CosNaming::Name &n,
       flck.release();
 
       CosNaming::NamingContext_var context =
-        get_context (n ACE_ENV_ARG_PARAMETER);
+        get_context (n);
 
       CosNaming::Name simple_name;
       simple_name.length (1);
       simple_name[0] = n[name_len - 1];
-      context->rebind_context (simple_name, nc ACE_ENV_ARG_PARAMETER);
+      context->rebind_context (simple_name, nc);
     }
   // If we received a simple name, we need to rebind it in this
   // context.
@@ -948,18 +935,18 @@ TAO_Storable_Naming_Context::rebind_context (const CosNaming::Name &n,
                                            CosNaming::ncontext);
       // Check for error conditions.
       if (result == -1)
-        ACE_THROW (CORBA::INTERNAL ());
+        throw CORBA::INTERNAL ();
       else if (result == -2)
-        ACE_THROW (CosNaming::NamingContext::NotFound
-                   (CosNaming::NamingContext::not_context, n));
+        throw CosNaming::NamingContext::NotFound(
+          CosNaming::NamingContext::not_context,
+          n);
 
       this->Write(flck.peer());
     }
 }
 
 CORBA::Object_ptr
-TAO_Storable_Naming_Context::resolve (const CosNaming::Name& n
-                                      ACE_ENV_ARG_DECL)
+TAO_Storable_Naming_Context::resolve (const CosNaming::Name& n)
 {
   ACE_TRACE("resolve");
   // Get the length of the name.
@@ -975,8 +962,7 @@ TAO_Storable_Naming_Context::resolve (const CosNaming::Name& n
                       CORBA::INTERNAL ());
 
   // Open the backing file
-  File_Open_Lock_and_Check flck(this, "r"
-                                     ACE_ENV_ARG_PARAMETER);
+  File_Open_Lock_and_Check flck(this, "r");
 
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
@@ -1013,8 +999,7 @@ TAO_Storable_Naming_Context::resolve (const CosNaming::Name& n
       if (type == CosNaming::ncontext)
         {
           // Narrow to NamingContext.
-          context = CosNaming::NamingContext::_narrow (result.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
+          context = CosNaming::NamingContext::_narrow (result.in ());
         }
       else
         // The first name component wasn't bound to a NamingContext.
@@ -1043,8 +1028,7 @@ TAO_Storable_Naming_Context::resolve (const CosNaming::Name& n
              const_cast<CosNaming::NameComponent*> (n.get_buffer ()) + 1);
 
           // If there are any exceptions, they will propagate up.
-          return context->resolve (rest_of_name
-                                   ACE_ENV_ARG_PARAMETER);
+          return context->resolve (rest_of_name);
         }
     }
   // If the name we had to resolve was simple, we just need to return
@@ -1053,8 +1037,7 @@ TAO_Storable_Naming_Context::resolve (const CosNaming::Name& n
 }
 
 void
-TAO_Storable_Naming_Context::unbind (const CosNaming::Name& n
-                                 ACE_ENV_ARG_DECL)
+TAO_Storable_Naming_Context::unbind (const CosNaming::Name& n)
 {
   ACE_TRACE("unbind");
   // Get the length of the name.
@@ -1062,7 +1045,7 @@ TAO_Storable_Naming_Context::unbind (const CosNaming::Name& n
 
   // Check for invalid name.
   if (name_len == 0)
-    ACE_THROW (CosNaming::NamingContext::InvalidName());
+    throw CosNaming::NamingContext::InvalidName();
 
   // we didn't need a lock to check the input arg, but now we do
   ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon,
@@ -1070,13 +1053,12 @@ TAO_Storable_Naming_Context::unbind (const CosNaming::Name& n
                       CORBA::INTERNAL ());
 
   // Open the backing file
-  File_Open_Lock_and_Check flck(this, name_len > 1 ? "r" : "rw"
-                                     ACE_ENV_ARG_PARAMETER);
+  File_Open_Lock_and_Check flck(this, name_len > 1 ? "r" : "rw");
 
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
   if (this->destroyed_)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   // If we received compound name, resolve it to get the context in
   // which the unbinding should take place, then perform the unbinding
@@ -1087,12 +1069,12 @@ TAO_Storable_Naming_Context::unbind (const CosNaming::Name& n
       flck.release();
 
       CosNaming::NamingContext_var context =
-        get_context (n ACE_ENV_ARG_PARAMETER);
+        get_context (n);
 
       CosNaming::Name simple_name;
       simple_name.length (1);
       simple_name[0] = n[name_len - 1];
-      context->unbind (simple_name ACE_ENV_ARG_PARAMETER);
+      context->unbind (simple_name);
     }
   // If we received a simple name, we need to unbind it in this
   // context.
@@ -1100,16 +1082,16 @@ TAO_Storable_Naming_Context::unbind (const CosNaming::Name& n
     {
       if (this->context_->unbind (n[0].id,
                                   n[0].kind) == -1)
-        ACE_THROW (CosNaming::NamingContext::NotFound
-                    (CosNaming::NamingContext::missing_node, n));
+        throw CosNaming::NamingContext::NotFound(
+          CosNaming::NamingContext::missing_node,
+          n);
 
       this->Write(flck.peer());
     }
 }
 
 CosNaming::NamingContext_ptr
-TAO_Storable_Naming_Context::bind_new_context (const CosNaming::Name& n
-                                               ACE_ENV_ARG_DECL)
+TAO_Storable_Naming_Context::bind_new_context (const CosNaming::Name& n)
 {
   ACE_TRACE("bind_new_context");
   // Get the length of the name.
@@ -1132,8 +1114,7 @@ TAO_Storable_Naming_Context::bind_new_context (const CosNaming::Name& n
                       CosNaming::NamingContext::_nil ());
 
   // Open the backing file
-  File_Open_Lock_and_Check flck(this, name_len > 1 ? "r" : "rw"
-                                     ACE_ENV_ARG_PARAMETER);
+  File_Open_Lock_and_Check flck(this, name_len > 1 ? "r" : "rw");
 
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
@@ -1150,12 +1131,12 @@ TAO_Storable_Naming_Context::bind_new_context (const CosNaming::Name& n
       flck.release();
 
       CosNaming::NamingContext_var context =
-        get_context (n ACE_ENV_ARG_PARAMETER);
+        get_context (n);
 
       CosNaming::Name simple_name;
       simple_name.length (1);
       simple_name[0] = n[name_len - 1];
-      return context->bind_new_context (simple_name ACE_ENV_ARG_PARAMETER);
+      return context->bind_new_context (simple_name);
     }
   // If we received a simple name, we need to bind it in this context.
 
@@ -1170,31 +1151,26 @@ TAO_Storable_Naming_Context::bind_new_context (const CosNaming::Name& n
   result = new_context ();
 
   // Bind the new context to the name.
-  ACE_TRY
+  try
     {
       bind_context (n,
-                    result.in ()
-                    ACE_ENV_ARG_PARAMETER);
+                    result.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       {
-        ACE_DECLARE_NEW_CORBA_ENV;
-        ACE_TRY_EX(DESTROY)
+        try
           {
             result->destroy ();
-            ACE_TRY_CHECK_EX(DESTROY);
           }
-        ACE_CATCHANY
+        catch (const CORBA::Exception& ex)
           {
             // Do nothing?
           }
-        ACE_ENDTRY;
       }
       // Re-raise the exception in bind_context()
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
   return result._retn ();
 }
 
@@ -1208,16 +1184,15 @@ TAO_Storable_Naming_Context::destroy (void)
                       CORBA::INTERNAL ());
 
   // Open the backing file
-  File_Open_Lock_and_Check flck(this, "rw"
-                                     ACE_ENV_ARG_PARAMETER);
+  File_Open_Lock_and_Check flck(this, "rw");
 
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
   if (this->destroyed_)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   if (this->context_->current_size () != 0)
-    ACE_THROW (CosNaming::NamingContext::NotEmpty());
+    throw CosNaming::NamingContext::NotEmpty();
 
   // Destroy is a no-op on a root context.
   if (root ())
@@ -1238,8 +1213,7 @@ TAO_Storable_Naming_Context::destroy (void)
         PortableServer::string_to_ObjectId (poa_id_.fast_rep ());
 
 
-      poa->deactivate_object (id.in ()
-                              ACE_ENV_ARG_PARAMETER);
+      poa->deactivate_object (id.in ());
 
       this->Write(flck.peer());
     }
@@ -1248,8 +1222,7 @@ TAO_Storable_Naming_Context::destroy (void)
 
 void
 TAO_Storable_Naming_Context::bind (const CosNaming::Name& n,
-                               CORBA::Object_ptr obj
-                               ACE_ENV_ARG_DECL)
+                               CORBA::Object_ptr obj)
 {
   ACE_TRACE("TAO_Storable_Naming_Context::bind");
   // Get the length of the name.
@@ -1257,7 +1230,7 @@ TAO_Storable_Naming_Context::bind (const CosNaming::Name& n,
 
   // Check for invalid name.
   if (name_len == 0)
-    ACE_THROW (CosNaming::NamingContext::InvalidName());
+    throw CosNaming::NamingContext::InvalidName();
 
   // we didn't need a lock to check the input arg, but now we do
   ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon,
@@ -1265,13 +1238,12 @@ TAO_Storable_Naming_Context::bind (const CosNaming::Name& n,
                       CORBA::INTERNAL ());
 
   // Open the backing file
-  File_Open_Lock_and_Check flck(this, name_len > 1 ? "r" : "rw"
-                                     ACE_ENV_ARG_PARAMETER);
+  File_Open_Lock_and_Check flck(this, name_len > 1 ? "r" : "rw");
 
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
   if (this->destroyed_)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   // If we received compound name, resolve it to get the context in
   // which the binding should take place, then perform the binding
@@ -1282,12 +1254,12 @@ TAO_Storable_Naming_Context::bind (const CosNaming::Name& n,
       flck.release();
 
       CosNaming::NamingContext_var context =
-        get_context (n ACE_ENV_ARG_PARAMETER);
+        get_context (n);
 
       CosNaming::Name simple_name;
       simple_name.length (1);
       simple_name[0] = n[name_len - 1];
-      context->bind (simple_name, obj ACE_ENV_ARG_PARAMETER);
+      context->bind (simple_name, obj);
     }
   // If we received a simple name, we need to bind it in this context.
   else
@@ -1298,11 +1270,11 @@ TAO_Storable_Naming_Context::bind (const CosNaming::Name& n,
                                          obj,
                                          CosNaming::nobject);
       if (result == 1)
-        ACE_THROW (CosNaming::NamingContext::AlreadyBound());
+        throw CosNaming::NamingContext::AlreadyBound();
 
       // Something went wrong with the internal structure
       else if (result == -1)
-        ACE_THROW (CORBA::INTERNAL ());
+        throw CORBA::INTERNAL ();
 
       this->Write(flck.peer());
     }
@@ -1312,8 +1284,7 @@ TAO_Storable_Naming_Context::bind (const CosNaming::Name& n,
 void
 TAO_Storable_Naming_Context::list (CORBA::ULong how_many,
                                    CosNaming::BindingList_out &bl,
-                                   CosNaming::BindingIterator_out &bi
-                                   ACE_ENV_ARG_DECL)
+                                   CosNaming::BindingIterator_out &bi)
 {
   ACE_TRACE("list");
   // Allocate nil out parameters in case we won't be able to complete
@@ -1330,13 +1301,12 @@ TAO_Storable_Naming_Context::list (CORBA::ULong how_many,
                       CORBA::INTERNAL ());
 
   // Open the backing file
-  File_Open_Lock_and_Check flck(this, "r"
-                                     ACE_ENV_ARG_PARAMETER);
+  File_Open_Lock_and_Check flck(this, "r");
 
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
   if (this->destroyed_)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   // We have the map in memory, let the disk go
   flck.release();
@@ -1386,7 +1356,7 @@ TAO_Storable_Naming_Context::list (CORBA::ULong how_many,
       hash_iter->advance ();
 
       if (ITER_SERVANT::populate_binding (hash_entry, bl[i]) == 0)
-          ACE_THROW (CORBA::NO_MEMORY());
+          throw CORBA::NO_MEMORY();
     }
 
   // Now we are done with the BindingsList, and we can follow up on
@@ -1399,7 +1369,7 @@ TAO_Storable_Naming_Context::list (CORBA::ULong how_many,
     {
       //  ***  This is a problem.  Is there an exception we can throw? ***
       ACE_UNUSED_ARG (bind_iter);
-      ACE_THROW (CORBA::NO_IMPLEMENT ());
+      throw CORBA::NO_IMPLEMENT ();
 
 #if 0
       // Create a BindingIterator for return.
@@ -1427,8 +1397,7 @@ TAO_Storable_Naming_Context::list (CORBA::ULong how_many,
         PortableServer::string_to_ObjectId (poa_id);
 
       this->poa_->activate_object_with_id (id.in (),
-                                           bind_iter
-                                           ACE_ENV_ARG_PARAMETER);
+                                           bind_iter);
 
       bi = bind_iter->_this ();
 #endif  /* 0 */
@@ -1449,8 +1418,7 @@ CosNaming::NamingContext_ptr TAO_Storable_Naming_Context::recreate_all(
                                int reentering,
                                TAO_Naming_Service_Persistence_Factory *factory,
                                const ACE_TCHAR *persistence_directory,
-                               int use_redundancy
-                               ACE_ENV_ARG_DECL)
+                               int use_redundancy)
 {
   ACE_TRACE("recreate_all");
 
@@ -1471,8 +1439,7 @@ CosNaming::NamingContext_ptr TAO_Storable_Naming_Context::recreate_all(
                       context_size,
                       factory,
                       persistence_directory,
-                      &new_context
-                      ACE_ENV_ARG_PARAMETER);
+                      &new_context);
 
   // Now does this already exist on disk?
   ACE_TString file_name(persistence_directory);
@@ -1482,7 +1449,7 @@ CosNaming::NamingContext_ptr TAO_Storable_Naming_Context::recreate_all(
   if (fl->exists())
   {
     // Load the map from disk
-    File_Open_Lock_and_Check flck(new_context, "r" ACE_ENV_ARG_PARAMETER);
+    File_Open_Lock_and_Check flck(new_context, "r");
   }
   else
   {
@@ -1491,7 +1458,7 @@ CosNaming::NamingContext_ptr TAO_Storable_Naming_Context::recreate_all(
                       TAO_Storable_Bindings_Map (context_size,orb),
                       CORBA::NO_MEMORY ());
     new_context->context_ = new_context->storable_context_;
-    File_Open_Lock_and_Check flck(new_context, "wc" ACE_ENV_ARG_PARAMETER);
+    File_Open_Lock_and_Check flck(new_context, "wc");
     new_context->Write(flck.peer());
   }
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h
index 752bbf23345..3f9179fcd8f 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h
@@ -252,8 +252,7 @@ public:
                                size_t context_size,
                                TAO_Naming_Service_Persistence_Factory *factory,
                                const ACE_TCHAR *persistence_directory,
-                               TAO_Storable_Naming_Context **new_context
-                               ACE_ENV_ARG_DECL);
+                               TAO_Storable_Naming_Context **new_context);
 
   // = Methods not implemented in TAO_Hash_Naming_Context.
 
@@ -265,8 +264,7 @@ public:
                               int reentering,
                               TAO_Naming_Service_Persistence_Factory *factory,
                               const ACE_TCHAR *persistence_directory,
-                              int use_redundancy
-                              ACE_ENV_ARG_DECL);
+                              int use_redundancy);
 
 
   /**
@@ -284,13 +282,11 @@ public:
    */
   virtual void list (CORBA::ULong how_many,
                      CosNaming::BindingList_out &bl,
-                     CosNaming::BindingIterator_out &bi
-                     ACE_ENV_ARG_DECL);
+                     CosNaming::BindingIterator_out &bi);
 
 
   virtual void rebind (const CosNaming::Name& n,
-                       CORBA::Object_ptr obj
-                       ACE_ENV_ARG_DECL);
+                       CORBA::Object_ptr obj);
 
   /**
    * Create a binding for name <n> and object <obj> in the naming
@@ -302,8 +298,7 @@ public:
    * participate in name resolution later.
    */
   virtual void bind (const CosNaming::Name &n,
-                     CORBA::Object_ptr obj
-                     ACE_ENV_ARG_DECL);
+                     CORBA::Object_ptr obj);
 
 
   /**
@@ -312,8 +307,7 @@ public:
    * compound names are passed to be resolved.
    */
   virtual void bind_context (const CosNaming::Name &n,
-                             CosNaming::NamingContext_ptr nc
-                             ACE_ENV_ARG_DECL);
+                             CosNaming::NamingContext_ptr nc);
 
   /**
    * This is a version of <rebind> specifically for naming contexts,
@@ -321,8 +315,7 @@ public:
    * names are passed.
    */
    virtual void rebind_context (const CosNaming::Name &n,
-                                CosNaming::NamingContext_ptr nc
-                                ACE_ENV_ARG_DECL);
+                                CosNaming::NamingContext_ptr nc);
 
   /**
    * Return object reference that is bound to the name.  Compound name
@@ -331,16 +324,14 @@ public:
    * does not return the type of the object.  Clients are responsible
    * for "narrowing" the object to the appropriate type.
    */
-  virtual CORBA::Object_ptr resolve (const CosNaming::Name &n
-                                     ACE_ENV_ARG_DECL);
+  virtual CORBA::Object_ptr resolve (const CosNaming::Name &n);
 
   /**
    * Remove the name binding from the context.  When compound names
    * are used, unbind is defined as follows: ctx->unbind (<c1; c2;
    * cn>) = (ctx->resolve (<c1; c2; cn-1>))->unbind (<cn>)
    */
-  virtual void unbind (const CosNaming::Name &n
-                       ACE_ENV_ARG_DECL);
+  virtual void unbind (const CosNaming::Name &n);
 
   /**
    * This operation creates a new context and binds it to the name
@@ -349,8 +340,7 @@ public:
    * bound (the name argument excluding the last component).
    */
   virtual CosNaming::NamingContext_ptr bind_new_context (
-                                const CosNaming::Name &n
-                                ACE_ENV_ARG_DECL);
+                                const CosNaming::Name &n);
 
   /**
    * Delete the naming context.  The user should take care to <unbind> any
@@ -427,8 +417,7 @@ public:
 
   /// Constructor - we always need the object which we guard.
   File_Open_Lock_and_Check(TAO_Storable_Naming_Context * context,
-                                const char * mode
-                                ACE_ENV_ARG_DECL);
+                                const char * mode);
 
   /// Destructor
   ~File_Open_Lock_and_Check(void);
@@ -461,7 +450,7 @@ private:
 
   friend class File_Open_Lock_and_Check;
 
-  int load_map(File_Open_Lock_and_Check *flck ACE_ENV_ARG_DECL);
+  int load_map(File_Open_Lock_and_Check *flck);
 
   void Write(TAO_Storable_Base& wrtr);
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp
index 07e9e8d10aa..53afd9176ab 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp
@@ -42,8 +42,7 @@ TAO_Storable_Naming_Context_Activator::~TAO_Storable_Naming_Context_Activator ()
 PortableServer::Servant
 TAO_Storable_Naming_Context_Activator::incarnate (
     const PortableServer::ObjectId &oid,
-    PortableServer::POA_ptr poa
-    ACE_ENV_ARG_DECL)
+    PortableServer::POA_ptr poa)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::ForwardRequest))
 {
@@ -109,8 +108,7 @@ TAO_Storable_Naming_Context_Activator::etherealize (
     PortableServer::POA_ptr /*adapter*/,
     PortableServer::Servant servant,
     CORBA::Boolean /*cleanup_in_progress*/,
-    CORBA::Boolean remaining_activations
-    ACE_ENV_ARG_DECL_NOT_USED)
+    CORBA::Boolean remaining_activations)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (!remaining_activations) {
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h
index 9583e094808..3a7034bbbf2 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h
@@ -59,8 +59,7 @@ public:
    * and the servant implementing this reference does not yet exist.
    */
   virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid,
-                                             PortableServer::POA_ptr poa
-                                             ACE_ENV_ARG_DECL)
+                                             PortableServer::POA_ptr poa)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::ForwardRequest));
 
@@ -71,8 +70,7 @@ public:
                             PortableServer::POA_ptr adapter,
                             PortableServer::Servant servant,
                             CORBA::Boolean cleanup_in_progress,
-                            CORBA::Boolean remaining_activations
-                            ACE_ENV_ARG_DECL)
+                            CORBA::Boolean remaining_activations)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
index 61f3fab9594..e4433dec433 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
@@ -144,8 +144,7 @@ TAO_Transient_Naming_Context::~TAO_Transient_Naming_Context (void)
 CosNaming::NamingContext_ptr
 TAO_Transient_Naming_Context::make_new_context (PortableServer::POA_ptr poa,
                                                 const char *poa_id,
-                                                size_t context_size
-                                                ACE_ENV_ARG_DECL)
+                                                size_t context_size)
 {
   // Store the stub we will return here.
   CosNaming::NamingContext_var result;
@@ -181,8 +180,7 @@ TAO_Transient_Naming_Context::make_new_context (PortableServer::POA_ptr poa,
     PortableServer::string_to_ObjectId (poa_id);
 
   poa->activate_object_with_id (id.in (),
-                                context
-                                ACE_ENV_ARG_PARAMETER);
+                                context);
 
   result = context->_this ();
 
@@ -214,8 +212,7 @@ TAO_Transient_Naming_Context::new_context (void)
   CosNaming::NamingContext_var result =
     make_new_context (this->poa_.in (),
                       poa_id,
-                      this->transient_context_->total_size ()
-                      ACE_ENV_ARG_PARAMETER);
+                      this->transient_context_->total_size ());
 
   return result._retn ();
 }
@@ -223,8 +220,7 @@ TAO_Transient_Naming_Context::new_context (void)
 void
 TAO_Transient_Naming_Context::list (CORBA::ULong how_many,
                                     CosNaming::BindingList_out &bl,
-                                    CosNaming::BindingIterator_out &bi
-                                    ACE_ENV_ARG_DECL)
+                                    CosNaming::BindingIterator_out &bi)
 {
   // Allocate nil out parameters in case we won't be able to complete
   // the operation.
@@ -242,7 +238,7 @@ TAO_Transient_Naming_Context::list (CORBA::ULong how_many,
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
   if (this->destroyed_)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   // Dynamically allocate iterator for traversing the underlying hash map.
   HASH_MAP::ITERATOR *hash_iter = 0;
@@ -286,7 +282,7 @@ TAO_Transient_Naming_Context::list (CORBA::ULong how_many,
       hash_iter->advance ();
 
       if (ITER_SERVANT::populate_binding (hash_entry, bl[i]) == 0)
-          ACE_THROW (CORBA::NO_MEMORY());
+          throw CORBA::NO_MEMORY();
     }
 
   // Now we are done with the BindingsList, and we can follow up on
@@ -321,8 +317,7 @@ TAO_Transient_Naming_Context::list (CORBA::ULong how_many,
         PortableServer::string_to_ObjectId (poa_id);
 
       this->poa_->activate_object_with_id (id.in (),
-                                           bind_iter
-                                           ACE_ENV_ARG_PARAMETER);
+                                           bind_iter);
 
       bi = bind_iter->_this ();
     }
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
index 9cefdaa03bf..4cae61f9209 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
@@ -159,8 +159,7 @@ public:
    */
   static CosNaming::NamingContext_ptr make_new_context (PortableServer::POA_ptr poa,
                                                         const char *poa_id,
-                                                        size_t context_size
-                                                        ACE_ENV_ARG_DECL);
+                                                        size_t context_size);
 
   // = Methods not implemented in TAO_Hash_Naming_Context.
 
@@ -179,8 +178,7 @@ public:
    */
   virtual void list (CORBA::ULong how_many,
                      CosNaming::BindingList_out &bl,
-                     CosNaming::BindingIterator_out &bi
-                     ACE_ENV_ARG_DECL);
+                     CosNaming::BindingIterator_out &bi);
 
 protected:
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
index 3c14110da0a..d523ab94b65 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
@@ -47,7 +47,7 @@ TAO_Notify_Admin::~TAO_Notify_Admin ()
 }
 
 void
-TAO_Notify_Admin::init (TAO_Notify::Topology_Parent* parent ACE_ENV_ARG_DECL)
+TAO_Notify_Admin::init (TAO_Notify::Topology_Parent* parent)
 {
   ACE_ASSERT (this->ec_.get() == 0);
 
@@ -55,7 +55,7 @@ TAO_Notify_Admin::init (TAO_Notify::Topology_Parent* parent ACE_ENV_ARG_DECL)
   ACE_ASSERT (this->ec_.get() != 0);
 
   // this-> on the following line confuses VC6
-  initialize (parent ACE_ENV_ARG_PARAMETER);
+  initialize (parent);
 
   TAO_Notify_Proxy_Container* proxy_container = 0;
   ACE_NEW_THROW_EX (proxy_container,
@@ -68,13 +68,13 @@ TAO_Notify_Admin::init (TAO_Notify::Topology_Parent* parent ACE_ENV_ARG_DECL)
 }
 
 void
-TAO_Notify_Admin::remove (TAO_Notify_Proxy* proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Admin::remove (TAO_Notify_Proxy* proxy)
 {
-  this->proxy_container().remove (proxy ACE_ENV_ARG_PARAMETER);
+  this->proxy_container().remove (proxy);
 }
 
 void
-TAO_Notify_Admin::subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types ACE_ENV_ARG_DECL)
+TAO_Notify_Admin::subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
@@ -100,13 +100,13 @@ TAO_Notify_Admin::shutdown (void)
 }
 
 void
-TAO_Notify_Admin::insert (TAO_Notify_Proxy* proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Admin::insert (TAO_Notify_Proxy* proxy)
 {
-  this->proxy_container().insert (proxy ACE_ENV_ARG_PARAMETER);
+  this->proxy_container().insert (proxy);
 }
 
 void
-TAO_Notify_Admin::save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL)
+TAO_Notify_Admin::save_persistent (TAO_Notify::Topology_Saver& saver)
 {
   bool changed = this->children_changed_;
   this->children_changed_ = false;
@@ -120,24 +120,22 @@ TAO_Notify_Admin::save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG
       const char* type = this->get_admin_type_name();
 
       bool want_all_children =
-        saver.begin_object(this->id(), type, attrs, changed
-                           ACE_ENV_ARG_PARAMETER);
+        saver.begin_object(this->id(), type, attrs, changed);
 
       if (want_all_children || this->filter_admin_.is_changed ())
         {
-          this->filter_admin_.save_persistent(saver ACE_ENV_ARG_PARAMETER);
+          this->filter_admin_.save_persistent(saver);
         }
       if (want_all_children || this->subscribed_types_.is_changed ())
         {
-          this->subscribed_types_.save_persistent(saver ACE_ENV_ARG_PARAMETER);
+          this->subscribed_types_.save_persistent(saver);
         }
 
       TAO_Notify::Save_Persist_Worker<TAO_Notify_Proxy>
         wrk(saver, want_all_children);
-      this->proxy_container().collection()->for_each(&wrk
-                                                     ACE_ENV_ARG_PARAMETER);
+      this->proxy_container().collection()->for_each(&wrk);
 
-      saver.end_object(this->id(), type ACE_ENV_ARG_PARAMETER);
+      saver.end_object(this->id(), type);
     }
 }
 
@@ -172,8 +170,7 @@ TAO_Notify_Admin::load_attrs(const TAO_Notify::NVPList& attrs)
 TAO_Notify::Topology_Object*
 TAO_Notify_Admin::load_child (const ACE_CString &type,
                               CORBA::Long id,
-                              const TAO_Notify::NVPList& attrs
-                              ACE_ENV_ARG_DECL_NOT_USED)
+                              const TAO_Notify::NVPList& attrs)
 {
   ACE_UNUSED_ARG (attrs);
   TAO_Notify::Topology_Object* result = this;
@@ -205,7 +202,7 @@ void
 TAO_Notify_Admin::reconnect (void)
 {
   TAO_Notify::Reconnect_Worker<TAO_Notify_Proxy> wrk;
-  this->proxy_container().collection()->for_each(&wrk ACE_ENV_ARG_PARAMETER);
+  this->proxy_container().collection()->for_each(&wrk);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.h b/TAO/orbsvcs/orbsvcs/Notify/Admin.h
index e7612b1359b..dc5774daf09 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Admin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.h
@@ -51,13 +51,13 @@ public:
   virtual ~TAO_Notify_Admin ();
 
   /// Init
-  void init (TAO_Notify::Topology_Parent * parent ACE_ENV_ARG_DECL);
+  void init (TAO_Notify::Topology_Parent * parent);
 
   /// Insert the proxy in the <proxy_container_>.
-  void insert (TAO_Notify_Proxy* proxy ACE_ENV_ARG_DECL);
+  void insert (TAO_Notify_Proxy* proxy);
 
   /// Remove type from container_
-  void remove (TAO_Notify_Proxy *proxy ACE_ENV_ARG_DECL);
+  void remove (TAO_Notify_Proxy *proxy);
 
   /// Access Admin FilterAdmin.
   TAO_Notify_FilterAdmin& filter_admin (void);
@@ -71,16 +71,15 @@ public:
   CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator (void);
 
   /// Obtain the Admin's subscribed types.
-  void subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types
-                         ACE_ENV_ARG_DECL);
+  void subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types);
 
   TAO_Notify_EventChannel * event_channel () const;
   /// Shutdown
   virtual int shutdown (void);
 
-  virtual void save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL);
+  virtual void save_persistent (TAO_Notify::Topology_Saver& saver);
   virtual TAO_Notify::Topology_Object* load_child (const ACE_CString &type,
-    CORBA::Long id, const TAO_Notify::NVPList& attrs ACE_ENV_ARG_DECL);
+    CORBA::Long id, const TAO_Notify::NVPList& attrs);
   virtual void reconnect (void);
 
   void set_default (bool is_default);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
index e8391596dfd..ee6d772f2bd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
@@ -40,55 +40,55 @@ TAO_Notify_AnyEvent_No_Copy::convert (CosNotification::StructuredEvent& notifica
 }
 
 CORBA::Boolean
-TAO_Notify_AnyEvent_No_Copy::do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL) const
+TAO_Notify_AnyEvent_No_Copy::do_match (CosNotifyFilter::Filter_ptr filter) const
 {
   if (DEBUG_LEVEL > 0)
     ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - "
                 "TAO_Notify_AnyEvent::do_match ()\n"));
 
-  return filter->match(*this->event_ ACE_ENV_ARG_PARAMETER);
+  return filter->match(*this->event_);
 }
 
 void
-TAO_Notify_AnyEvent_No_Copy::push (TAO_Notify_Consumer* consumer ACE_ENV_ARG_DECL) const
+TAO_Notify_AnyEvent_No_Copy::push (TAO_Notify_Consumer* consumer) const
 {
   if (DEBUG_LEVEL > 0)
     ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - "
                 "TAO_Notify_AnyEvent::push \n"));
 
-  consumer->push (*this->event_ ACE_ENV_ARG_PARAMETER);
+  consumer->push (*this->event_);
 }
 
 void
-TAO_Notify_AnyEvent_No_Copy::push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
+TAO_Notify_AnyEvent_No_Copy::push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder) const
 {
   CosNotification::StructuredEvent notification;
 
   TAO_Notify_Event::translate (*this->event_, notification);
 
-  forwarder->forward_structured (notification ACE_ENV_ARG_PARAMETER);
+  forwarder->forward_structured (notification);
 }
 
 void
-TAO_Notify_AnyEvent_No_Copy::push_no_filtering (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
+TAO_Notify_AnyEvent_No_Copy::push_no_filtering (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder) const
 {
   CosNotification::StructuredEvent notification;
 
   TAO_Notify_Event::translate (*this->event_, notification);
 
-  forwarder->forward_structured_no_filtering (notification ACE_ENV_ARG_PARAMETER);
+  forwarder->forward_structured_no_filtering (notification);
 }
 
 void
-TAO_Notify_AnyEvent_No_Copy::push (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
+TAO_Notify_AnyEvent_No_Copy::push (Event_Forwarder::ProxyPushSupplier_ptr forwarder) const
 {
-  forwarder->forward_any (*this->event_ ACE_ENV_ARG_PARAMETER);
+  forwarder->forward_any (*this->event_);
 }
 
 void
-TAO_Notify_AnyEvent_No_Copy::push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
+TAO_Notify_AnyEvent_No_Copy::push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder) const
 {
-  forwarder->forward_any_no_filtering (*this->event_ ACE_ENV_ARG_PARAMETER);
+  forwarder->forward_any_no_filtering (*this->event_);
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h
index 8be01ffb9e0..863f1bbbcfc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h
@@ -49,25 +49,25 @@ public:
   /// Get the event type.
   virtual const TAO_Notify_EventType& type (void) const;
 
-  CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL) const;
+  CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter) const;
 
   /// Convert to CosNotification::Structured type
   virtual void convert (CosNotification::StructuredEvent& notification) const;
 
   /// Push event to consumer
-  virtual void push (TAO_Notify_Consumer* consumer ACE_ENV_ARG_DECL) const;
+  virtual void push (TAO_Notify_Consumer* consumer) const;
 
   /// Push event to the Event_Forwarder interface
-  virtual void push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const;
+  virtual void push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder) const;
 
   /// Push event to the Event_Forwarder interface
-  virtual void push_no_filtering (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const;
+  virtual void push_no_filtering (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder) const;
 
   /// Push event to the Event_Forwarder interface
-  virtual void push (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const;
+  virtual void push (Event_Forwarder::ProxyPushSupplier_ptr forwarder) const;
 
   /// Push event to the Event_Forwarder interface
-  virtual void push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const;
+  virtual void push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder) const;
 
   /// marshal this event into a CDR buffer (for persistence)
   virtual void marshal (TAO_OutputCDR & cdr) const;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp
index 8127458dc43..75a8fc7f028 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp
@@ -29,7 +29,7 @@ TAO_Notify_CosEC_ProxyPushConsumer::release (void)
 }
 
 void
-TAO_Notify_CosEC_ProxyPushConsumer::push (const CORBA::Any& any ACE_ENV_ARG_DECL)
+TAO_Notify_CosEC_ProxyPushConsumer::push (const CORBA::Any& any)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventComm::Disconnected
@@ -38,22 +38,22 @@ TAO_Notify_CosEC_ProxyPushConsumer::push (const CORBA::Any& any ACE_ENV_ARG_DECL
   // Check if we should proceed at all.
   if (this->admin_properties().reject_new_events () == 1
       && this->admin_properties().queue_full ())
-    ACE_THROW (CORBA::IMP_LIMIT ());
+    throw CORBA::IMP_LIMIT ();
 
   if (this->is_connected () == 0)
     {
-      ACE_THROW (CosEventComm::Disconnected ());
+      throw CosEventComm::Disconnected ();
     }
 
   TAO_Notify_AnyEvent_No_Copy event (any);
 
   TAO_Notify_Method_Request_Lookup_No_Copy request (&event, this);
 
-  this->execute_task (request ACE_ENV_ARG_PARAMETER);
+  this->execute_task (request);
 }
 
 void
-TAO_Notify_CosEC_ProxyPushConsumer::connect_push_supplier (CosEventComm::PushSupplier_ptr push_supplier ACE_ENV_ARG_DECL)
+TAO_Notify_CosEC_ProxyPushConsumer::connect_push_supplier (CosEventComm::PushSupplier_ptr push_supplier)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventChannelAdmin::AlreadyConnected
@@ -65,9 +65,9 @@ TAO_Notify_CosEC_ProxyPushConsumer::connect_push_supplier (CosEventComm::PushSup
                     TAO_Notify_PushSupplier (this),
                     CORBA::NO_MEMORY ());
 
-  supplier->init (push_supplier ACE_ENV_ARG_PARAMETER);
+  supplier->init (push_supplier);
 
-  this->connect (supplier ACE_ENV_ARG_PARAMETER);
+  this->connect (supplier);
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h
index b60eb88a621..e577ce6264e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h
@@ -54,13 +54,13 @@ public:
 protected:
   ///= CosNotifyChannelAdmin::ProxyPushConsumer methods
 
-  virtual void push (const CORBA::Any & data ACE_ENV_ARG_DECL)
+  virtual void push (const CORBA::Any & data)
     ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
                    ));
 
-  virtual void connect_push_supplier (CosEventComm::PushSupplier_ptr push_supplier ACE_ENV_ARG_DECL)
+  virtual void connect_push_supplier (CosEventComm::PushSupplier_ptr push_supplier)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosEventChannelAdmin::AlreadyConnected
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp
index 5df37a9f493..8ac351b2ebd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp
@@ -26,8 +26,7 @@ TAO_Notify_CosEC_ProxyPushSupplier::release (void)
 }
 
 void
-TAO_Notify_CosEC_ProxyPushSupplier::connect_push_consumer (CosEventComm::PushConsumer_ptr push_consumer
-                                                       ACE_ENV_ARG_DECL)
+TAO_Notify_CosEC_ProxyPushSupplier::connect_push_consumer (CosEventComm::PushConsumer_ptr push_consumer)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventChannelAdmin::AlreadyConnected,
@@ -40,9 +39,9 @@ TAO_Notify_CosEC_ProxyPushSupplier::connect_push_consumer (CosEventComm::PushCon
                     TAO_Notify_PushConsumer (this),
                     CORBA::NO_MEMORY ());
 
-  consumer->init (push_consumer ACE_ENV_ARG_PARAMETER);
+  consumer->init (push_consumer);
 
-  this->connect (consumer ACE_ENV_ARG_PARAMETER);
+  this->connect (consumer);
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h
index 0858c51475e..da3bad8b1d0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h
@@ -58,7 +58,6 @@ public:
   // = Interface methods
   virtual void connect_push_consumer (
     CosEventComm::PushConsumer_ptr push_consumer
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -67,7 +66,6 @@ public:
   ));
 
   virtual void disconnect_push_supplier (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
index 1dc113b8651..08045f4d155 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
@@ -37,7 +37,7 @@ TAO_Notify_ProxyPushConsumer::MyType (void)
 }
 
 void
-TAO_Notify_ProxyPushConsumer::push (const CORBA::Any& any ACE_ENV_ARG_DECL)
+TAO_Notify_ProxyPushConsumer::push (const CORBA::Any& any)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventComm::Disconnected
@@ -46,19 +46,19 @@ TAO_Notify_ProxyPushConsumer::push (const CORBA::Any& any ACE_ENV_ARG_DECL)
   // Check if we should proceed at all.
   if (this->admin_properties().reject_new_events () == 1
       && this->admin_properties().queue_full ())
-    ACE_THROW (CORBA::IMP_LIMIT ());
+    throw CORBA::IMP_LIMIT ();
 
   if (this->is_connected () == 0)
     {
-      ACE_THROW (CosEventComm::Disconnected ());
+      throw CosEventComm::Disconnected ();
     }
 
   TAO_Notify_AnyEvent_No_Copy event (any);
-  this->push_i (&event ACE_ENV_ARG_PARAMETER);
+  this->push_i (&event);
 }
 
 void
-TAO_Notify_ProxyPushConsumer::connect_any_push_supplier (CosEventComm::PushSupplier_ptr push_supplier ACE_ENV_ARG_DECL)
+TAO_Notify_ProxyPushConsumer::connect_any_push_supplier (CosEventComm::PushSupplier_ptr push_supplier)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventChannelAdmin::AlreadyConnected
@@ -70,9 +70,9 @@ TAO_Notify_ProxyPushConsumer::connect_any_push_supplier (CosEventComm::PushSuppl
                     TAO_Notify_PushSupplier (this),
                     CORBA::NO_MEMORY ());
 
-  supplier->init (push_supplier ACE_ENV_ARG_PARAMETER);
+  supplier->init (push_supplier);
 
-  this->connect (supplier ACE_ENV_ARG_PARAMETER);
+  this->connect (supplier);
   this->self_change ();
 }
 
@@ -100,27 +100,25 @@ TAO_Notify_ProxyPushConsumer::load_attrs (const TAO_Notify::NVPList& attrs)
   if (attrs.load("PeerIOR", ior))
     {
       CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
+      try
         {
           CosNotifyComm::PushSupplier_var ps = CosNotifyComm::PushSupplier::_nil();
           if ( ior.length() > 0 )
             {
               CORBA::Object_var obj =
-                orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
-              ps = CosNotifyComm::PushSupplier::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+                orb->string_to_object(ior.c_str());
+              ps = CosNotifyComm::PushSupplier::_unchecked_narrow(obj.in());
             }
           // minor hack: suppress generating subscription updates during reload.
           bool save_updates = this->updates_off_;
           this->updates_off_ = true;
-          this->connect_any_push_supplier(ps.in() ACE_ENV_ARG_PARAMETER);
+          this->connect_any_push_supplier(ps.in());
           this->updates_off_ = save_updates;
         }
-      ACE_CATCHALL
+      catch (...)
         {
           ACE_ASSERT(0);
         }
-      ACE_ENDTRY;
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h
index 27fe56d4d77..b4361e2b400 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h
@@ -51,7 +51,7 @@ public:
   virtual ~TAO_Notify_ProxyPushConsumer ();
 
 
-//  virtual void save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL);
+//  virtual void save_persistent (TAO_Notify::Topology_Saver& saver);
   virtual const char * get_proxy_type_name (void) const;
 
   virtual void load_attrs (const TAO_Notify::NVPList& attrs);
@@ -64,13 +64,13 @@ protected:
                      CORBA::SystemException
                      ));
 
-  virtual void push (const CORBA::Any & data ACE_ENV_ARG_DECL)
+  virtual void push (const CORBA::Any & data)
     ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
                    ));
 
-  virtual void connect_any_push_supplier (CosEventComm::PushSupplier_ptr push_supplier ACE_ENV_ARG_DECL)
+  virtual void connect_any_push_supplier (CosEventComm::PushSupplier_ptr push_supplier)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosEventChannelAdmin::AlreadyConnected
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp
index dbfd412363f..d6988e64edb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp
@@ -26,8 +26,7 @@ TAO_Notify_ProxyPushSupplier::release (void)
 }
 
 void
-TAO_Notify_ProxyPushSupplier::connect_any_push_consumer (CosEventComm::PushConsumer_ptr push_consumer
-                                                     ACE_ENV_ARG_DECL)
+TAO_Notify_ProxyPushSupplier::connect_any_push_consumer (CosEventComm::PushConsumer_ptr push_consumer)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventChannelAdmin::AlreadyConnected,
@@ -40,9 +39,9 @@ TAO_Notify_ProxyPushSupplier::connect_any_push_consumer (CosEventComm::PushConsu
                     TAO_Notify_PushConsumer (this),
                     CORBA::NO_MEMORY ());
 
-  consumer->init (push_consumer ACE_ENV_ARG_PARAMETER);
+  consumer->init (push_consumer);
 
-  this->connect (consumer ACE_ENV_ARG_PARAMETER);
+  this->connect (consumer);
   this->self_change ();
 }
 
@@ -80,24 +79,22 @@ TAO_Notify_ProxyPushSupplier::load_attrs (const TAO_Notify::NVPList& attrs)
   if (attrs.load("PeerIOR", ior))
     {
       CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
+      try
         {
           CosNotifyComm::PushConsumer_var pc =
             CosNotifyComm::PushConsumer::_nil();
           if (ior.length() > 0)
             {
               CORBA::Object_var obj =
-                orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
-              pc = CosNotifyComm::PushConsumer::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+                orb->string_to_object(ior.c_str());
+              pc = CosNotifyComm::PushConsumer::_unchecked_narrow(obj.in());
             }
-          this->connect_any_push_consumer(pc.in() ACE_ENV_ARG_PARAMETER);
+          this->connect_any_push_consumer(pc.in());
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           // if we can't reconnect, tough...
         }
-      ACE_ENDTRY;
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h
index 430c1747f0d..415db2a8d6d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h
@@ -67,7 +67,6 @@ public:
 
   virtual void connect_any_push_consumer (
     CosEventComm::PushConsumer_ptr push_consumer
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -76,7 +75,6 @@ public:
   ));
 
   virtual void disconnect_push_supplier (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
index 6baa5f766d7..7bd7ea2fbe8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
@@ -25,8 +25,7 @@ TAO_Notify_PushConsumer::~TAO_Notify_PushConsumer ()
 }
 
 void
-TAO_Notify_PushConsumer::init (CosEventComm::PushConsumer_ptr push_consumer
-                               ACE_ENV_ARG_DECL)
+TAO_Notify_PushConsumer::init (CosEventComm::PushConsumer_ptr push_consumer)
 {
   // Initialize only once
   ACE_ASSERT( CORBA::is_nil (this->push_consumer_.in()) );
@@ -34,17 +33,17 @@ TAO_Notify_PushConsumer::init (CosEventComm::PushConsumer_ptr push_consumer
   // push_consumer not optional
   if (CORBA::is_nil (push_consumer))
   {
-    ACE_THROW (CORBA::BAD_PARAM());
+    throw CORBA::BAD_PARAM();
   }
 
-  ACE_TRY
+  try
   {
     if (!TAO_Notify_PROPERTIES::instance()->separate_dispatching_orb ())
       {
         this->push_consumer_ = CosEventComm::PushConsumer::_duplicate (push_consumer);
 
         this->publish_ =
-          CosNotifyComm::NotifyPublish::_narrow (push_consumer ACE_ENV_ARG_PARAMETER);
+          CosNotifyComm::NotifyPublish::_narrow (push_consumer);
       }
     else
       {
@@ -56,7 +55,7 @@ TAO_Notify_PushConsumer::init (CosEventComm::PushConsumer_ptr push_consumer
           TAO_Notify_PROPERTIES::instance()->dispatching_orb()->string_to_object(temp.in());
 
         CosEventComm::PushConsumer_var new_cos_comm_pc =
-          CosEventComm::PushConsumer::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+          CosEventComm::PushConsumer::_unchecked_narrow(obj.in());
 
         this->push_consumer_ =
           CosEventComm::PushConsumer::_duplicate (new_cos_comm_pc.in());
@@ -71,8 +70,7 @@ TAO_Notify_PushConsumer::init (CosEventComm::PushConsumer_ptr push_consumer
         // If any other use is made of this data member, then the code to validate
         // the actual type of the target object must be refactored.
         this->publish_ =
-          CosNotifyComm::NotifyPublish::_unchecked_narrow (obj.in()
-                                                           ACE_ENV_ARG_PARAMETER);
+          CosNotifyComm::NotifyPublish::_unchecked_narrow (obj.in());
 
 
         //--cj verify dispatching ORB
@@ -84,16 +82,15 @@ TAO_Notify_PushConsumer::init (CosEventComm::PushConsumer_ptr push_consumer
         //--cj end
       }
   }
-  ACE_CATCH (CORBA::TRANSIENT, ex)
+  catch (const CORBA::TRANSIENT& ex)
     {
-      ACE_PRINT_EXCEPTION (ex, "Got a TRANSIENT in NS_PushConsumer::init");
+      ex._tao_print_exception ("Got a TRANSIENT in NS_PushConsumer::init");
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) got it for NS_PushConsumer %@\n", this));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // _narrow failed which probably means the interface is CosEventComm type.
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -104,7 +101,7 @@ TAO_Notify_PushConsumer::release (void)
 }
 
 void
-TAO_Notify_PushConsumer::push (const CORBA::Any& payload ACE_ENV_ARG_DECL)
+TAO_Notify_PushConsumer::push (const CORBA::Any& payload)
 {
   //--cj verify dispatching ORB
   if (TAO_debug_level >= 10) {
@@ -113,22 +110,22 @@ TAO_Notify_PushConsumer::push (const CORBA::Any& payload ACE_ENV_ARG_DECL)
   }
   //--cj end
 
-  this->push_consumer_->push (payload ACE_ENV_ARG_PARAMETER);
+  this->push_consumer_->push (payload);
 }
 
 void
-TAO_Notify_PushConsumer::push (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL)
+TAO_Notify_PushConsumer::push (const CosNotification::StructuredEvent& event)
 {
   CORBA::Any any;
 
   TAO_Notify_Event::translate (event, any);
 
-  this->push_consumer_->push (any ACE_ENV_ARG_PARAMETER);
+  this->push_consumer_->push (any);
 }
 
 /// Push a batch of events to this consumer.
 void
-TAO_Notify_PushConsumer::push (const CosNotification::EventBatch& event ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_PushConsumer::push (const CosNotification::EventBatch& event)
 {
   ACE_ASSERT(false);
   ACE_UNUSED_ARG (event);
@@ -140,28 +137,25 @@ TAO_Notify_PushConsumer::get_ior (void) const
 {
   ACE_CString result;
   CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      CORBA::String_var ior = orb->object_to_string(this->push_consumer_.in() ACE_ENV_ARG_PARAMETER);
+      CORBA::String_var ior = orb->object_to_string(this->push_consumer_.in());
       result = static_cast<const char*> (ior.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       result.fast_clear();
     }
-  ACE_ENDTRY;
   return result;
 }
 
 void
-TAO_Notify_PushConsumer::reconnect_from_consumer (TAO_Notify_Consumer* old_consumer
-    ACE_ENV_ARG_DECL)
+TAO_Notify_PushConsumer::reconnect_from_consumer (TAO_Notify_Consumer* old_consumer)
 {
   TAO_Notify_PushConsumer* tmp =
     dynamic_cast<TAO_Notify_PushConsumer*> (old_consumer);
   ACE_ASSERT(tmp != 0);
-  this->init(tmp->push_consumer_.in() ACE_ENV_ARG_PARAMETER);
+  this->init(tmp->push_consumer_.in());
   this->schedule_timer(false);
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h
index b6d8a5827e2..cb396ac1b13 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h
@@ -40,19 +40,19 @@ public:
   virtual ~TAO_Notify_PushConsumer ();
 
   /// Init
-  void init (CosEventComm::PushConsumer_ptr push_consumer ACE_ENV_ARG_DECL);
+  void init (CosEventComm::PushConsumer_ptr push_consumer);
 
   /// Push <event> to this consumer.
-//  virtual void push_i (const TAO_Notify_Event* event ACE_ENV_ARG_DECL);
+//  virtual void push_i (const TAO_Notify_Event* event);
 
   /// Push <event> to this consumer.
-  virtual void push (const CORBA::Any& event ACE_ENV_ARG_DECL);
+  virtual void push (const CORBA::Any& event);
 
   /// Push <event> to this consumer.
-  virtual void push (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL);
+  virtual void push (const CosNotification::StructuredEvent& event);
 
   /// Push a batch of events to this consumer.
-  virtual void push (const CosNotification::EventBatch& event ACE_ENV_ARG_DECL);
+  virtual void push (const CosNotification::EventBatch& event);
 
   /// Retrieve the ior of this peer
   virtual ACE_CString get_ior (void) const;
@@ -60,8 +60,7 @@ public:
   /// on reconnect we need to move events from the old consumer
   /// to the new one
   virtual void reconnect_from_consumer (
-    TAO_Notify_Consumer* old_consumer
-    ACE_ENV_ARG_DECL);
+    TAO_Notify_Consumer* old_consumer);
 
 protected:
   /// The Consumer
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp
index cca08ba88c6..97784153c56 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp
@@ -17,21 +17,20 @@ TAO_Notify_PushSupplier::~TAO_Notify_PushSupplier ()
 }
 
 void
-TAO_Notify_PushSupplier::init (CosEventComm::PushSupplier_ptr push_supplier ACE_ENV_ARG_DECL)
+TAO_Notify_PushSupplier::init (CosEventComm::PushSupplier_ptr push_supplier)
 {
   // TODO: verify single init call
   // push_supplier is optional
   this->push_supplier_ = CosEventComm::PushSupplier::_duplicate (push_supplier);
 
-  ACE_TRY
+  try
     {
-      this->subscribe_ = CosNotifyComm::NotifySubscribe::_narrow (push_supplier ACE_ENV_ARG_PARAMETER);
+      this->subscribe_ = CosNotifyComm::NotifySubscribe::_narrow (push_supplier);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // _narrow failed which probably means the interface is CosEventComm type.
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -46,17 +45,15 @@ TAO_Notify_PushSupplier::get_ior (void) const
 {
   ACE_CString result;
   CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
-    CORBA::String_var ior = orb->object_to_string(this->push_supplier_.in() ACE_ENV_ARG_PARAMETER);
+    CORBA::String_var ior = orb->object_to_string(this->push_supplier_.in());
     result = static_cast<const char*> (ior.in ());
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
     result.fast_clear();
   }
-  ACE_ENDTRY;
   return result;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h
index 47b7c94d0a7..cc58272b6d1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h
@@ -43,7 +43,7 @@ public:
   virtual ~TAO_Notify_PushSupplier ();
 
   /// Init
-  void init (CosEventComm::PushSupplier_ptr push_supplier ACE_ENV_ARG_DECL);
+  void init (CosEventComm::PushSupplier_ptr push_supplier);
 
   /// Retrieve the ior of this peer
   virtual ACE_CString get_ior (void) const;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp
index 84fd5bde0e8..60d125850f9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp
@@ -48,50 +48,49 @@ class TAO_Notify_Proxy_Builder_T
 public:
   PROXY_PTR
   build (PARENT *parent, CosNotifyChannelAdmin::ProxyID_out proxy_id
-         , const CosNotification::QoSProperties & initial_qos ACE_ENV_ARG_DECL)
+         , const CosNotification::QoSProperties & initial_qos)
   {
     PROXY_VAR proxy_ret;
 
     TAO_Notify_Factory* factory = TAO_Notify_PROPERTIES::instance ()->factory ();
 
     PROXY_IMPL* proxy = 0;
-    factory->create (proxy ACE_ENV_ARG_PARAMETER);
+    factory->create (proxy);
 
     PortableServer::ServantBase_var servant (proxy);
 
-    proxy->init (parent ACE_ENV_ARG_PARAMETER);
+    proxy->init (parent);
 
-    proxy->set_qos (initial_qos ACE_ENV_ARG_PARAMETER);
+    proxy->set_qos (initial_qos);
 
-    CORBA::Object_var obj = proxy->activate (proxy ACE_ENV_ARG_PARAMETER);
+    CORBA::Object_var obj = proxy->activate (proxy);
 
     proxy_id = proxy->id ();
 
-    proxy_ret = PROXY::_narrow (obj.in() ACE_ENV_ARG_PARAMETER);
+    proxy_ret = PROXY::_narrow (obj.in());
 
     // insert proxy in admin container.
-    parent->insert (proxy ACE_ENV_ARG_PARAMETER);
+    parent->insert (proxy);
 
     return proxy_ret._retn ();
   }
 
   PROXY_IMPL*
-  build (PARENT *parent, const CosNotifyChannelAdmin::ProxyID proxy_id
-         ACE_ENV_ARG_DECL)
+  build (PARENT *parent, const CosNotifyChannelAdmin::ProxyID proxy_id)
   {
     TAO_Notify_Factory* factory = TAO_Notify_PROPERTIES::instance ()->factory ();
 
     PROXY_IMPL* proxy = 0;
-    factory->create (proxy ACE_ENV_ARG_PARAMETER);
+    factory->create (proxy);
 
     PortableServer::ServantBase_var servant (proxy);
 
-    proxy->init (parent ACE_ENV_ARG_PARAMETER);
+    proxy->init (parent);
 
-    proxy->activate (proxy, proxy_id ACE_ENV_ARG_PARAMETER);
+    proxy->activate (proxy, proxy_id);
 
     // insert proxy in admin container.
-    parent->insert (proxy ACE_ENV_ARG_PARAMETER);
+    parent->insert (proxy);
 
     return proxy;
   }
@@ -180,11 +179,11 @@ TAO_Notify_Builder::build_filter_factory (void)
 
   PortableServer::POA_var default_poa = TAO_Notify_PROPERTIES::instance ()->default_poa ();
 
-  return ff->create (default_poa ACE_ENV_ARG_PARAMETER);
+  return ff->create (default_poa);
 }
 
 CosNotifyChannelAdmin::EventChannelFactory_ptr
-TAO_Notify_Builder::build_event_channel_factory (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL)
+TAO_Notify_Builder::build_event_channel_factory (PortableServer::POA_ptr poa)
 {
   CosNotifyChannelAdmin::EventChannelFactory_var ecf_ret;
 
@@ -192,9 +191,9 @@ TAO_Notify_Builder::build_event_channel_factory (PortableServer::POA_ptr poa ACE
 
   // Create ECF
   TAO_Notify_EventChannelFactory* ecf = 0;
-  factory->create (ecf ACE_ENV_ARG_PARAMETER);
+  factory->create (ecf);
 
-  ecf->init (poa ACE_ENV_ARG_PARAMETER);
+  ecf->init (poa);
   ecf_ret = ecf->activate_self ();
 
   return (ecf_ret._retn ());
@@ -205,26 +204,26 @@ TAO_Notify_Builder::build_event_channel (
   TAO_Notify_EventChannelFactory* ecf,
   const CosNotification::QoSProperties & initial_qos,
   const CosNotification::AdminProperties & initial_admin,
-  CosNotifyChannelAdmin::ChannelID_out id ACE_ENV_ARG_DECL)
+  CosNotifyChannelAdmin::ChannelID_out id)
 {
   CosNotifyChannelAdmin::EventChannel_var ec_ret;
 
   TAO_Notify_Factory* factory = TAO_Notify_PROPERTIES::instance ()->factory ();
 
   TAO_Notify_EventChannel* ec = 0;
-  factory->create (ec ACE_ENV_ARG_PARAMETER);
+  factory->create (ec);
 
-  ec->init (ecf, initial_qos, initial_admin ACE_ENV_ARG_PARAMETER);
+  ec->init (ecf, initial_qos, initial_admin);
 
   // insert ec in ec container.
-  ecf->ec_container().insert (ec ACE_ENV_ARG_PARAMETER);
+  ecf->ec_container().insert (ec);
 
-  CORBA::Object_var obj = ec->activate (ec ACE_ENV_ARG_PARAMETER);
+  CORBA::Object_var obj = ec->activate (ec);
 
   // Populate the ID to return.
   id = ec->id ();
 
-  ec_ret = CosNotifyChannelAdmin::EventChannel::_narrow (obj.in() ACE_ENV_ARG_PARAMETER);
+  ec_ret = CosNotifyChannelAdmin::EventChannel::_narrow (obj.in());
 
   return ec_ret._retn ();
 }
@@ -232,19 +231,19 @@ TAO_Notify_Builder::build_event_channel (
 TAO_Notify_EventChannel *
 TAO_Notify_Builder::build_event_channel (
   TAO_Notify_EventChannelFactory* ecf,
-  const CosNotifyChannelAdmin::ChannelID id ACE_ENV_ARG_DECL)
+  const CosNotifyChannelAdmin::ChannelID id)
 {
   TAO_Notify_Factory* factory = TAO_Notify_PROPERTIES::instance ()->factory ();
 
   TAO_Notify_EventChannel* ec = 0;
-  factory->create (ec ACE_ENV_ARG_PARAMETER);
+  factory->create (ec);
 
-  ec->init (ecf ACE_ENV_ARG_PARAMETER); //, initial_qos, initial_admin
+  ec->init (ecf); //, initial_qos, initial_admin
 
   // insert ec in ec container.
-  ecf->ec_container().insert (ec ACE_ENV_ARG_PARAMETER);
+  ecf->ec_container().insert (ec);
 
-  ec->activate (ec, id ACE_ENV_ARG_PARAMETER);
+  ec->activate (ec, id);
 
   return ec;
 }
@@ -253,27 +252,27 @@ CosNotifyChannelAdmin::ConsumerAdmin_ptr
 TAO_Notify_Builder::build_consumer_admin (
     TAO_Notify_EventChannel* ec,
     CosNotifyChannelAdmin::InterFilterGroupOperator op,
-    CosNotifyChannelAdmin::AdminID_out id ACE_ENV_ARG_DECL)
+    CosNotifyChannelAdmin::AdminID_out id)
 {
   CosNotifyChannelAdmin::ConsumerAdmin_var ca_ret;
 
   TAO_Notify_Factory* factory = TAO_Notify_PROPERTIES::instance ()->factory ();
 
   TAO_Notify_ConsumerAdmin* ca = 0;
-  factory->create (ca ACE_ENV_ARG_PARAMETER);
+  factory->create (ca);
 
-  ca->init (ec ACE_ENV_ARG_PARAMETER);
+  ca->init (ec);
 
   ca->filter_operator (op);
 
-  CORBA::Object_var obj = ca->activate (ca ACE_ENV_ARG_PARAMETER);
+  CORBA::Object_var obj = ca->activate (ca);
 
   id = ca->id ();
 
-  ca_ret = CosNotifyChannelAdmin::ConsumerAdmin::_narrow (obj.in() ACE_ENV_ARG_PARAMETER);
+  ca_ret = CosNotifyChannelAdmin::ConsumerAdmin::_narrow (obj.in());
 
   // insert admin in CA container.
-  ec->ca_container_->insert (ca ACE_ENV_ARG_PARAMETER);
+  ec->ca_container_->insert (ca);
 
   return ca_ret._retn ();
 }
@@ -281,44 +280,43 @@ TAO_Notify_Builder::build_consumer_admin (
 TAO_Notify_ConsumerAdmin *
 TAO_Notify_Builder::build_consumer_admin (
   TAO_Notify_EventChannel* ec,
-  const CosNotifyChannelAdmin::ChannelID id
-  ACE_ENV_ARG_DECL)
+  const CosNotifyChannelAdmin::ChannelID id)
 {
   TAO_Notify_Factory* factory = TAO_Notify_PROPERTIES::instance ()->factory ();
   TAO_Notify_ConsumerAdmin * ca = 0;
-  factory->create (ca ACE_ENV_ARG_PARAMETER);
+  factory->create (ca);
 
-  ca->init (ec ACE_ENV_ARG_PARAMETER);
+  ca->init (ec);
 
-  CORBA::Object_var obj = ca->activate (ca, id ACE_ENV_ARG_PARAMETER);
+  CORBA::Object_var obj = ca->activate (ca, id);
 
   // insert admin in CA container.
-  ec->ca_container_->insert (ca ACE_ENV_ARG_PARAMETER);
+  ec->ca_container_->insert (ca);
   return ca;
 }
 
 CosNotifyChannelAdmin::SupplierAdmin_ptr
-TAO_Notify_Builder::build_supplier_admin (TAO_Notify_EventChannel* ec, CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id ACE_ENV_ARG_DECL)
+TAO_Notify_Builder::build_supplier_admin (TAO_Notify_EventChannel* ec, CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id)
 {
   CosNotifyChannelAdmin::SupplierAdmin_var sa_ret;
 
   TAO_Notify_Factory* factory = TAO_Notify_PROPERTIES::instance ()->factory ();
 
   TAO_Notify_SupplierAdmin* sa = 0;
-  factory->create (sa ACE_ENV_ARG_PARAMETER);
+  factory->create (sa);
 
-  sa->init (ec ACE_ENV_ARG_PARAMETER);
+  sa->init (ec);
 
   sa->filter_operator (op);
 
-  CORBA::Object_var obj = sa->activate (sa ACE_ENV_ARG_PARAMETER);
+  CORBA::Object_var obj = sa->activate (sa);
 
   id = sa->id ();
 
-  sa_ret = CosNotifyChannelAdmin::SupplierAdmin::_narrow (obj.in() ACE_ENV_ARG_PARAMETER);
+  sa_ret = CosNotifyChannelAdmin::SupplierAdmin::_narrow (obj.in());
 
   // insert admin in SA container.
-  ec->sa_container().insert (sa ACE_ENV_ARG_PARAMETER);
+  ec->sa_container().insert (sa);
 
   return sa_ret._retn ();
 }
@@ -326,19 +324,18 @@ TAO_Notify_Builder::build_supplier_admin (TAO_Notify_EventChannel* ec, CosNotify
 TAO_Notify_SupplierAdmin *
 TAO_Notify_Builder::build_supplier_admin (
   TAO_Notify_EventChannel* ec,
-  const CosNotifyChannelAdmin::ChannelID id
-  ACE_ENV_ARG_DECL)
+  const CosNotifyChannelAdmin::ChannelID id)
 {
   TAO_Notify_Factory* factory = TAO_Notify_PROPERTIES::instance ()->factory ();
   TAO_Notify_SupplierAdmin * sa = 0;
-  factory->create (sa ACE_ENV_ARG_PARAMETER);
+  factory->create (sa);
 
-  sa->init (ec ACE_ENV_ARG_PARAMETER);
+  sa->init (ec);
 
-  CORBA::Object_var obj = sa->activate (sa, id ACE_ENV_ARG_PARAMETER);
+  CORBA::Object_var obj = sa->activate (sa, id);
 
   // insert admin in CA container.
-  ec->sa_container().insert (sa ACE_ENV_ARG_PARAMETER);
+  ec->sa_container().insert (sa);
 
   return sa;
 }
@@ -347,29 +344,28 @@ CosNotifyChannelAdmin::ProxyConsumer_ptr
 TAO_Notify_Builder::build_proxy(TAO_Notify_SupplierAdmin* sa
                             , CosNotifyChannelAdmin::ClientType ctype
                             , CosNotifyChannelAdmin::ProxyID_out proxy_id
-                            , const CosNotification::QoSProperties & initial_qos
-                            ACE_ENV_ARG_DECL)
+                            , const CosNotification::QoSProperties & initial_qos)
 {
   switch (ctype)
     {
     case CosNotifyChannelAdmin::ANY_EVENT:
       {
         TAO_Notify_ProxyPushConsumer_Builder pb;
-        return pb.build (sa, proxy_id, initial_qos ACE_ENV_ARG_PARAMETER);
+        return pb.build (sa, proxy_id, initial_qos);
       }
     break;
 
     case CosNotifyChannelAdmin::STRUCTURED_EVENT:
       {
         TAO_Notify_StructuredProxyPushConsumer_Builder pb;
-        return pb.build (sa, proxy_id, initial_qos ACE_ENV_ARG_PARAMETER);
+        return pb.build (sa, proxy_id, initial_qos);
       }
     break;
 
     case CosNotifyChannelAdmin::SEQUENCE_EVENT:
      {
        TAO_Notify_SequenceProxyPushConsumer_Builder pb;
-       return pb.build (sa, proxy_id, initial_qos ACE_ENV_ARG_PARAMETER);
+       return pb.build (sa, proxy_id, initial_qos);
      }
       break;
 
@@ -383,29 +379,28 @@ CosNotifyChannelAdmin::ProxySupplier_ptr
 TAO_Notify_Builder::build_proxy(TAO_Notify_ConsumerAdmin* ca
                             , CosNotifyChannelAdmin::ClientType ctype
                             , CosNotifyChannelAdmin::ProxyID_out proxy_id
-                            , const CosNotification::QoSProperties & initial_qos
-                            ACE_ENV_ARG_DECL)
+                            , const CosNotification::QoSProperties & initial_qos)
 {
   switch (ctype)
     {
     case CosNotifyChannelAdmin::ANY_EVENT:
       {
         TAO_Notify_ProxyPushSupplier_Builder pb;
-        return pb.build (ca, proxy_id, initial_qos ACE_ENV_ARG_PARAMETER);
+        return pb.build (ca, proxy_id, initial_qos);
       }
       break;
 
     case CosNotifyChannelAdmin::STRUCTURED_EVENT:
       {
         TAO_Notify_StructuredProxyPushSupplier_Builder pb;
-        return pb.build (ca, proxy_id, initial_qos ACE_ENV_ARG_PARAMETER);
+        return pb.build (ca, proxy_id, initial_qos);
       }
     break;
 
     case CosNotifyChannelAdmin::SEQUENCE_EVENT:
       {
         TAO_Notify_SequenceProxyPushSupplier_Builder pb;
-        return pb.build (ca, proxy_id, initial_qos ACE_ENV_ARG_PARAMETER);
+        return pb.build (ca, proxy_id, initial_qos);
       }
       break;
 
@@ -418,29 +413,28 @@ TAO_Notify_Builder::build_proxy(TAO_Notify_ConsumerAdmin* ca
 TAO_Notify_ProxyConsumer *
 TAO_Notify_Builder::build_proxy(TAO_Notify_SupplierAdmin* sa
                             , CosNotifyChannelAdmin::ClientType ctype
-                            , const CosNotifyChannelAdmin::ProxyID proxy_id
-                            ACE_ENV_ARG_DECL)
+                            , const CosNotifyChannelAdmin::ProxyID proxy_id)
 {
   switch (ctype)
     {
     case CosNotifyChannelAdmin::ANY_EVENT:
       {
         TAO_Notify_ProxyPushConsumer_Builder pb;
-        return pb.build (sa, proxy_id ACE_ENV_ARG_PARAMETER);
+        return pb.build (sa, proxy_id);
       }
     break;
 
     case CosNotifyChannelAdmin::STRUCTURED_EVENT:
       {
         TAO_Notify_StructuredProxyPushConsumer_Builder pb;
-        return pb.build (sa, proxy_id ACE_ENV_ARG_PARAMETER);
+        return pb.build (sa, proxy_id);
       }
     break;
 
     case CosNotifyChannelAdmin::SEQUENCE_EVENT:
      {
        TAO_Notify_SequenceProxyPushConsumer_Builder pb;
-       return pb.build (sa, proxy_id ACE_ENV_ARG_PARAMETER);
+       return pb.build (sa, proxy_id);
      }
       break;
 
@@ -453,29 +447,28 @@ TAO_Notify_Builder::build_proxy(TAO_Notify_SupplierAdmin* sa
 TAO_Notify_ProxySupplier *
 TAO_Notify_Builder::build_proxy(TAO_Notify_ConsumerAdmin* ca
                             , CosNotifyChannelAdmin::ClientType ctype
-                            , const CosNotifyChannelAdmin::ProxyID proxy_id
-                            ACE_ENV_ARG_DECL)
+                            , const CosNotifyChannelAdmin::ProxyID proxy_id)
 {
   switch (ctype)
     {
     case CosNotifyChannelAdmin::ANY_EVENT:
       {
         TAO_Notify_ProxyPushSupplier_Builder pb;
-        return pb.build (ca, proxy_id ACE_ENV_ARG_PARAMETER);
+        return pb.build (ca, proxy_id);
       }
       break;
 
     case CosNotifyChannelAdmin::STRUCTURED_EVENT:
       {
         TAO_Notify_StructuredProxyPushSupplier_Builder pb;
-        return pb.build (ca, proxy_id ACE_ENV_ARG_PARAMETER);
+        return pb.build (ca, proxy_id);
       }
     break;
 
     case CosNotifyChannelAdmin::SEQUENCE_EVENT:
       {
         TAO_Notify_SequenceProxyPushSupplier_Builder pb;
-        return pb.build (ca, proxy_id ACE_ENV_ARG_PARAMETER);
+        return pb.build (ca, proxy_id);
       }
       break;
 
@@ -486,7 +479,7 @@ TAO_Notify_Builder::build_proxy(TAO_Notify_ConsumerAdmin* ca
 }
 
 CosEventChannelAdmin::ProxyPushSupplier_ptr
-TAO_Notify_Builder::build_proxy (TAO_Notify_ConsumerAdmin* ca ACE_ENV_ARG_DECL)
+TAO_Notify_Builder::build_proxy (TAO_Notify_ConsumerAdmin* ca)
 {
   CosNotifyChannelAdmin::ProxyID proxy_id;
 
@@ -494,11 +487,11 @@ TAO_Notify_Builder::build_proxy (TAO_Notify_ConsumerAdmin* ca ACE_ENV_ARG_DECL)
 
   CosNotification::QoSProperties initial_qos;
 
-  return pb.build (ca, proxy_id, initial_qos ACE_ENV_ARG_PARAMETER);
+  return pb.build (ca, proxy_id, initial_qos);
 }
 
 CosEventChannelAdmin::ProxyPushConsumer_ptr
-TAO_Notify_Builder::build_proxy (TAO_Notify_SupplierAdmin* sa ACE_ENV_ARG_DECL)
+TAO_Notify_Builder::build_proxy (TAO_Notify_SupplierAdmin* sa)
 {
   CosNotifyChannelAdmin::ProxyID proxy_id;
 
@@ -506,11 +499,11 @@ TAO_Notify_Builder::build_proxy (TAO_Notify_SupplierAdmin* sa ACE_ENV_ARG_DECL)
 
   CosNotification::QoSProperties initial_qos;
 
-  return pb.build (sa, proxy_id, initial_qos ACE_ENV_ARG_PARAMETER);
+  return pb.build (sa, proxy_id, initial_qos);
 }
 
 void
-TAO_Notify_Builder::apply_reactive_concurrency (TAO_Notify_Object& object ACE_ENV_ARG_DECL)
+TAO_Notify_Builder::apply_reactive_concurrency (TAO_Notify_Object& object)
 {
   TAO_Notify_Reactive_Task* worker_task;
 
@@ -524,7 +517,7 @@ TAO_Notify_Builder::apply_reactive_concurrency (TAO_Notify_Object& object ACE_EN
 }
 
 void
-TAO_Notify_Builder::apply_thread_pool_concurrency (TAO_Notify_Object& object, const NotifyExt::ThreadPoolParams& tp_params ACE_ENV_ARG_DECL)
+TAO_Notify_Builder::apply_thread_pool_concurrency (TAO_Notify_Object& object, const NotifyExt::ThreadPoolParams& tp_params)
 {
   TAO_Notify_ThreadPool_Task* worker_task;
 
@@ -534,14 +527,14 @@ TAO_Notify_Builder::apply_thread_pool_concurrency (TAO_Notify_Object& object, co
 
   object.set_worker_task (worker_task);
 
-  worker_task->init (tp_params, object.admin_properties_ ACE_ENV_ARG_PARAMETER);
+  worker_task->init (tp_params, object.admin_properties_);
 }
 
 void
-TAO_Notify_Builder::apply_lane_concurrency (TAO_Notify_Object& /*object*/, const NotifyExt::ThreadPoolLanesParams& /*tpl_params*/ ACE_ENV_ARG_DECL)
+TAO_Notify_Builder::apply_lane_concurrency (TAO_Notify_Object& /*object*/, const NotifyExt::ThreadPoolLanesParams& /*tpl_params*/)
 {
   // No lane support
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.h b/TAO/orbsvcs/orbsvcs/Notify/Builder.h
index 7ed2c219c65..42d695e2658 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.h
@@ -56,11 +56,10 @@ public:
 
   /// Build EventChannel Factory.
   virtual CosNotifyChannelAdmin::EventChannelFactory_ptr
-  build_event_channel_factory (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL);
+  build_event_channel_factory (PortableServer::POA_ptr poa);
 
   /// Build the Filter Factory.
   virtual CosNotifyFilter::FilterFactory_ptr build_filter_factory (
-      ACE_ENV_SINGLE_ARG_DECL
     );
 
   /// Build EventChannel.
@@ -68,22 +67,19 @@ public:
   build_event_channel (TAO_Notify_EventChannelFactory* ecf
                        , const CosNotification::QoSProperties & initial_qos
                        , const CosNotification::AdminProperties & initial_admin
-                       , CosNotifyChannelAdmin::ChannelID_out id
-                       ACE_ENV_ARG_DECL);
+                       , CosNotifyChannelAdmin::ChannelID_out id);
 
 
   virtual TAO_Notify_EventChannel *
   build_event_channel (TAO_Notify_EventChannelFactory* ecf
-                       , const CosNotifyChannelAdmin::ChannelID id
-                       ACE_ENV_ARG_DECL);
+                       , const CosNotifyChannelAdmin::ChannelID id);
 
 
   /// Build ConsumerAdmin
   virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr
   build_consumer_admin (TAO_Notify_EventChannel* ec
                         , CosNotifyChannelAdmin::InterFilterGroupOperator op
-                        , CosNotifyChannelAdmin::AdminID_out id
-                        ACE_ENV_ARG_DECL);
+                        , CosNotifyChannelAdmin::AdminID_out id);
 
   /// Build ConsumerAdmin during topology restore
   /// TODO: this returns a reference to the actual type
@@ -92,14 +88,13 @@ public:
   virtual TAO_Notify_ConsumerAdmin *
   build_consumer_admin (TAO_Notify_EventChannel* ec
                         , const CosNotifyChannelAdmin::AdminID id //CORBA::Long id          // note: an in parameter!
-                        ACE_ENV_ARG_DECL);
+                        );
 
   /// Build SupplierAdmin
   virtual CosNotifyChannelAdmin::SupplierAdmin_ptr
   build_supplier_admin (TAO_Notify_EventChannel * ec
                         , CosNotifyChannelAdmin::InterFilterGroupOperator op
-                        , CosNotifyChannelAdmin::AdminID_out id
-                        ACE_ENV_ARG_DECL);
+                        , CosNotifyChannelAdmin::AdminID_out id);
 
   /// Build ConsumerAdmin during topology restore
   /// TODO: this returns a reference to the actual type
@@ -108,63 +103,57 @@ public:
   virtual TAO_Notify_SupplierAdmin *
   build_supplier_admin (TAO_Notify_EventChannel * ec
                         , const CosNotifyChannelAdmin::AdminID id //CORBA::Long id          // note: an in parameter!
-                        ACE_ENV_ARG_DECL);
+                        );
 
   /// Build ProxyConsumer
   virtual CosNotifyChannelAdmin::ProxyConsumer_ptr
   build_proxy (TAO_Notify_SupplierAdmin* sa
                , CosNotifyChannelAdmin::ClientType ctype
                , CosNotifyChannelAdmin::ProxyID_out proxy_id
-               , const CosNotification::QoSProperties & initial_qos
-               ACE_ENV_ARG_DECL);
+               , const CosNotification::QoSProperties & initial_qos);
 
   /// Reload ProxyConsumer
   virtual TAO_Notify_ProxyConsumer *
   build_proxy (TAO_Notify_SupplierAdmin* sa
                , CosNotifyChannelAdmin::ClientType ctype
-               , const CosNotifyChannelAdmin::ProxyID proxy_id
-               ACE_ENV_ARG_DECL);
+               , const CosNotifyChannelAdmin::ProxyID proxy_id);
 
   /// Build ProxySupplier.
   virtual CosNotifyChannelAdmin::ProxySupplier_ptr
   build_proxy (TAO_Notify_ConsumerAdmin* ca
                , CosNotifyChannelAdmin::ClientType ctype
                , CosNotifyChannelAdmin::ProxyID_out proxy_id
-               , const CosNotification::QoSProperties & initial_qos
-               ACE_ENV_ARG_DECL);
+               , const CosNotification::QoSProperties & initial_qos);
 
   /// Reload ProxySupplier.
   virtual TAO_Notify_ProxySupplier *
   build_proxy (TAO_Notify_ConsumerAdmin* ca
                , CosNotifyChannelAdmin::ClientType ctype
-               , const CosNotifyChannelAdmin::ProxyID proxy_id
-               ACE_ENV_ARG_DECL);
+               , const CosNotifyChannelAdmin::ProxyID proxy_id);
 
   /// Build CosEC style ProxySupplier.
   virtual CosEventChannelAdmin::ProxyPushSupplier_ptr
-  build_proxy (TAO_Notify_ConsumerAdmin* ca ACE_ENV_ARG_DECL);
+  build_proxy (TAO_Notify_ConsumerAdmin* ca);
 
   /// Build CosEC style ProxyConsumer.
   virtual CosEventChannelAdmin::ProxyPushConsumer_ptr
-  build_proxy (TAO_Notify_SupplierAdmin* sa ACE_ENV_ARG_DECL);
+  build_proxy (TAO_Notify_SupplierAdmin* sa);
 
   /// Apply Reactive concurrency.
   virtual void apply_reactive_concurrency (
-      TAO_Notify_Object& object ACE_ENV_ARG_DECL
+      TAO_Notify_Object& object
     );
 
   /// Apply Thread Pools.
   virtual void apply_thread_pool_concurrency (
       TAO_Notify_Object& object,
       const NotifyExt::ThreadPoolParams& tp_params
-      ACE_ENV_ARG_DECL
     );
 
   /// Apply Thread Pools with Lanes.
   virtual void apply_lane_concurrency (
       TAO_Notify_Object& object,
       const NotifyExt::ThreadPoolLanesParams& tpl_params
-      ACE_ENV_ARG_DECL
     );
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
index 8f57e06a484..b5cd82bae96 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
@@ -75,8 +75,7 @@ TAO_Notify_Consumer::resume (void)
 
 void
 TAO_Notify_Consumer::enqueue_request (
-  TAO_Notify_Method_Request_Event * request
-  ACE_ENV_ARG_DECL)
+  TAO_Notify_Method_Request_Event * request)
 {
   TAO_Notify_Event::Ptr event (
     request->event ()->queueable_copy ());
@@ -97,7 +96,7 @@ TAO_Notify_Consumer::enqueue_request (
 }
 
 bool
-TAO_Notify_Consumer::enqueue_if_necessary (TAO_Notify_Method_Request_Event * request ACE_ENV_ARG_DECL)
+TAO_Notify_Consumer::enqueue_if_necessary (TAO_Notify_Method_Request_Event * request)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, *this->proxy_lock (), false);
   if (! this->pending_events().is_empty ())
@@ -142,13 +141,12 @@ TAO_Notify_Consumer::enqueue_if_necessary (TAO_Notify_Method_Request_Event * req
 }
 
 void
-TAO_Notify_Consumer::deliver (TAO_Notify_Method_Request_Event * request
-                              ACE_ENV_ARG_DECL)
+TAO_Notify_Consumer::deliver (TAO_Notify_Method_Request_Event * request)
 {
   // Increment reference counts (safely) to prevent this object and its proxy
   // from being deleted while the push is in progress.
   TAO_Notify_Proxy::Ptr proxy_guard (this->proxy ());
-  bool queued = enqueue_if_necessary (request ACE_ENV_ARG_PARAMETER);
+  bool queued = enqueue_if_necessary (request);
   if (!queued)
     {
       DispatchStatus status = this->dispatch_request (request);
@@ -167,7 +165,7 @@ TAO_Notify_Consumer::deliver (TAO_Notify_Method_Request_Event * request
                           ACE_TEXT ("to failed dispatch.\n"),
                           static_cast<int> (this->proxy ()->id ()),
                           request->sequence ()));
-            this->enqueue_request (request ACE_ENV_ARG_PARAMETER);
+            this->enqueue_request (request);
             this->schedule_timer (true);
             break;
           }
@@ -193,17 +191,15 @@ TAO_Notify_Consumer::deliver (TAO_Notify_Method_Request_Event * request
                           request->sequence ()
                           ));
             request->complete ();
-            ACE_DECLARE_NEW_ENV;
-            ACE_TRY
+            try
               {
                 this->proxy_supplier ()->destroy ();
               }
-            ACE_CATCHANY
+            catch (const CORBA::Exception& ex)
               {
                 // todo is there something meaningful we can do here?
                 ;
               }
-            ACE_ENDTRY;
             break;
           }
         }
@@ -214,10 +210,9 @@ TAO_Notify_Consumer::DispatchStatus
 TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request)
 {
   DispatchStatus result = DISPATCH_SUCCESS;
-  ACE_DECLARE_NEW_ENV;
-  ACE_TRY
+  try
     {
-      request->event ()->push (this ACE_ENV_ARG_PARAMETER);
+      request->event ()->push (this);
       if (DEBUG_LEVEL  > 8)
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("Consumer %d dispatched single event %d.\n"),
@@ -225,7 +220,7 @@ TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request
                     request->sequence ()
                     ));
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+  catch (const CORBA::OBJECT_NOT_EXIST& ex)
     {
       if (DEBUG_LEVEL  > 0)
         {
@@ -238,7 +233,7 @@ TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request
         }
       result = DISPATCH_FAIL;
     }
-  ACE_CATCH (CORBA::TRANSIENT, ex)
+  catch (const CORBA::TRANSIENT& ex)
     {
       if (DEBUG_LEVEL  > 0)
         ACE_DEBUG ((LM_ERROR,
@@ -278,7 +273,7 @@ TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request
             } break;
         }
     }
-  ACE_CATCH (CORBA::TIMEOUT, ex)
+  catch (const CORBA::TIMEOUT& ex)
     {
       if (DEBUG_LEVEL  > 0)
         ACE_DEBUG ((LM_ERROR,
@@ -289,7 +284,7 @@ TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request
                     ));
       result = DISPATCH_FAIL;
     }
-  ACE_CATCH (CORBA::COMM_FAILURE, ex)
+  catch (const CORBA::COMM_FAILURE& ex)
     {
       if (DEBUG_LEVEL  > 0)
         ACE_DEBUG ((LM_ERROR,
@@ -300,7 +295,7 @@ TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request
                     ));
       result = DISPATCH_FAIL;
     }
-  ACE_CATCH (CORBA::SystemException, ex)
+  catch (const CORBA::SystemException& ex)
     {
       if (DEBUG_LEVEL  > 0)
         {
@@ -313,7 +308,7 @@ TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request
         }
       result = DISPATCH_DISCARD;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_ERROR ( (LM_ERROR,
                    ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::push "
@@ -323,7 +318,6 @@ TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request
                    ));
       result = DISPATCH_DISCARD;
     }
-  ACE_ENDTRY;
 
   // for persistent events that haven't timed out
   // convert "FAIL" & "DISCARD" to "RETRY"
@@ -350,12 +344,11 @@ TAO_Notify_Consumer::DispatchStatus
 TAO_Notify_Consumer::dispatch_batch (const CosNotification::EventBatch& batch)
 {
   DispatchStatus result = DISPATCH_SUCCESS;
-  ACE_DECLARE_NEW_ENV;
-  ACE_TRY
+  try
     {
-      this->push (batch ACE_ENV_ARG_PARAMETER);
+      this->push (batch);
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+  catch (const CORBA::OBJECT_NOT_EXIST& ex)
     {
       if (DEBUG_LEVEL  > 0)
         ACE_DEBUG ((LM_ERROR,
@@ -366,7 +359,7 @@ TAO_Notify_Consumer::dispatch_batch (const CosNotification::EventBatch& batch)
                     ));
       result = DISPATCH_FAIL;
     }
-  ACE_CATCH (CORBA::TRANSIENT, ex)
+  catch (const CORBA::TRANSIENT& ex)
     {
       if (DEBUG_LEVEL  > 0)
         ACE_DEBUG ((LM_ERROR,
@@ -406,7 +399,7 @@ TAO_Notify_Consumer::dispatch_batch (const CosNotification::EventBatch& batch)
             } break;
         }
     }
-  ACE_CATCH (CORBA::TIMEOUT, ex)
+  catch (const CORBA::TIMEOUT& ex)
     {
       if (DEBUG_LEVEL  > 0)
         ACE_DEBUG ((LM_ERROR,
@@ -417,7 +410,7 @@ TAO_Notify_Consumer::dispatch_batch (const CosNotification::EventBatch& batch)
                     ));
       result = DISPATCH_FAIL;
     }
-  ACE_CATCH (CORBA::COMM_FAILURE, ex)
+  catch (const CORBA::COMM_FAILURE& ex)
     {
       if (DEBUG_LEVEL  > 0)
         ACE_DEBUG ((LM_ERROR,
@@ -428,7 +421,7 @@ TAO_Notify_Consumer::dispatch_batch (const CosNotification::EventBatch& batch)
                     ));
       result = DISPATCH_FAIL;
     }
-  ACE_CATCH (CORBA::SystemException, ex)
+  catch (const CORBA::SystemException& ex)
     {
       if (DEBUG_LEVEL  > 0)
         {
@@ -441,7 +434,7 @@ TAO_Notify_Consumer::dispatch_batch (const CosNotification::EventBatch& batch)
         }
       result = DISPATCH_DISCARD;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT ("(%P|%t) TAO_Notify_Consumer "
@@ -451,7 +444,6 @@ TAO_Notify_Consumer::dispatch_batch (const CosNotification::EventBatch& batch)
                   ));
       result = DISPATCH_DISCARD;
     }
-  ACE_ENDTRY;
   return result;
 }
 
@@ -549,16 +541,14 @@ TAO_Notify_Consumer::dispatch_from_queue (Request_Queue & requests, ACE_Guard <T
                 ace_mon.acquire ();
               }
             ace_mon.release ();
-            ACE_DECLARE_NEW_ENV;
-            ACE_TRY
+            try
               {
                 this->proxy_supplier ()->destroy ();
               }
-            ACE_CATCHANY
+            catch (const CORBA::Exception& ex)
               {
                 // todo is there something reasonable to do here?
               }
-            ACE_ENDTRY;
             ace_mon.acquire ();
             result = true;
             break;
@@ -644,15 +634,13 @@ TAO_Notify_Consumer::handle_timeout (const ACE_Time_Value&, const void*)
 {
   TAO_Notify_Consumer::Ptr grd (this);
   this->timer_id_ = -1;  // This must come first, because dispatch_pending may try to resched
-  ACE_DECLARE_NEW_ENV;
-  ACE_TRY
+  try
     {
       this->dispatch_pending ();
     }
-  ACE_CATCHALL
+  catch (...)
     {
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -668,18 +656,16 @@ TAO_Notify_Consumer::shutdown (void)
 }
 
 void
-TAO_Notify_Consumer::dispatch_updates_i (const CosNotification::EventTypeSeq& added, const CosNotification::EventTypeSeq& removed
-                                         ACE_ENV_ARG_DECL)
+TAO_Notify_Consumer::dispatch_updates_i (const CosNotification::EventTypeSeq& added, const CosNotification::EventTypeSeq& removed)
 {
   if (this->have_not_yet_verified_publish_)
     {
       this->have_not_yet_verified_publish_ = false; // no need to check again
-      if (! this->publish_->_is_a ("IDL:omg.org/CosNotifyComm/NotifyPublish:1.0"
-                                   ACE_ENV_ARG_PARAMETER))
+      if (! this->publish_->_is_a ("IDL:omg.org/CosNotifyComm/NotifyPublish:1.0"))
         this->publish_ = CosNotifyComm::NotifyPublish::_nil();
     }
   if (! CORBA::is_nil (this->publish_.in ()))
-    this->publish_->offer_change (added, removed ACE_ENV_ARG_PARAMETER);
+    this->publish_->offer_change (added, removed);
 }
 
 TAO_SYNCH_MUTEX*
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
index 68e14d7535d..19eabddd0b8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
@@ -68,16 +68,16 @@ public:
   virtual TAO_Notify_Proxy* proxy (void);
 
   /// Dispatch Event to consumer
-  void deliver (TAO_Notify_Method_Request_Event * request ACE_ENV_ARG_DECL);
+  void deliver (TAO_Notify_Method_Request_Event * request);
 
   /// Push <event> to this consumer.
-  virtual void push (const CORBA::Any& event ACE_ENV_ARG_DECL) = 0;
+  virtual void push (const CORBA::Any& event) = 0;
 
   /// Push <event> to this consumer.
-  virtual void push (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL) = 0;
+  virtual void push (const CosNotification::StructuredEvent& event) = 0;
 
   /// Push a batch of events to this consumer.
-  virtual void push (const CosNotification::EventBatch& event ACE_ENV_ARG_DECL) = 0;
+  virtual void push (const CosNotification::EventBatch& event) = 0;
 
   /// Dispatch the batch of events to the attached consumer
   DispatchStatus dispatch_batch (const CosNotification::EventBatch& batch);
@@ -100,8 +100,7 @@ public:
   /// on reconnect we need to move events from the old consumer
   /// to the new one
   virtual void reconnect_from_consumer (
-    TAO_Notify_Consumer* old_consumer
-    ACE_ENV_ARG_DECL) = 0;
+    TAO_Notify_Consumer* old_consumer) = 0;
 
   /// Override, Peer::qos_changed
   virtual void qos_changed (const TAO_Notify_QoSProperties& qos_properties);
@@ -125,19 +124,17 @@ protected:
     Request_Queue & requests,
     ACE_Guard <TAO_SYNCH_MUTEX> & ace_mon);
 
-  void enqueue_request(TAO_Notify_Method_Request_Event * request ACE_ENV_ARG_DECL);
+  void enqueue_request(TAO_Notify_Method_Request_Event * request);
 
   /// Add request to a queue if necessary.
   /// Overridden by sequence consumer to "always" put incoming events into the queue.
   /// @returns true the request has been enqueued; false the request should be handled now.
   virtual bool enqueue_if_necessary(
-    TAO_Notify_Method_Request_Event * request
-    ACE_ENV_ARG_DECL);
+    TAO_Notify_Method_Request_Event * request);
 
   // Dispatch updates
   virtual void dispatch_updates_i (const CosNotification::EventTypeSeq& added,
-                                   const CosNotification::EventTypeSeq& removed
-                                   ACE_ENV_ARG_DECL);
+                                   const CosNotification::EventTypeSeq& removed);
 
   /// Get the shared Proxy Lock
   TAO_SYNCH_MUTEX* proxy_lock (void);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
index 3d5bca9accf..495aa338b2a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
@@ -55,14 +55,14 @@ TAO_Notify_ConsumerAdmin::~TAO_Notify_ConsumerAdmin ()
 }
 
 void
-TAO_Notify_ConsumerAdmin::init (TAO_Notify_EventChannel *ec ACE_ENV_ARG_DECL)
+TAO_Notify_ConsumerAdmin::init (TAO_Notify_EventChannel *ec)
 {
-  TAO_Notify_Admin::init (ec ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Admin::init (ec);
 
   const CosNotification::QoSProperties &default_ca_qos =
     TAO_Notify_PROPERTIES::instance ()->default_consumer_admin_qos_properties ();
 
-  this->set_qos (default_ca_qos ACE_ENV_ARG_PARAMETER);
+  this->set_qos (default_ca_qos);
 }
 
 void
@@ -94,13 +94,13 @@ TAO_Notify_ConsumerAdmin::destroy (void)
   if ( result == 1)
     return;
 
-  this->ec_->remove (this ACE_ENV_ARG_PARAMETER);
+  this->ec_->remove (this);
 }
 
 
 TAO_Notify::Topology_Object*
 TAO_Notify_ConsumerAdmin::load_child (const ACE_CString &type,
-  CORBA::Long id, const TAO_Notify::NVPList& attrs ACE_ENV_ARG_DECL)
+  CORBA::Long id, const TAO_Notify::NVPList& attrs)
 {
   TAO_Notify::Topology_Object* result = this;
   if (type == "proxy_push_supplier")
@@ -109,7 +109,7 @@ TAO_Notify_ConsumerAdmin::load_child (const ACE_CString &type,
       ACE_TEXT ("(%P|%t) Admin reload proxy %d\n")
       , static_cast<int> (id)
       ));
-    result = this->load_proxy(id, CosNotifyChannelAdmin::ANY_EVENT, attrs ACE_ENV_ARG_PARAMETER);
+    result = this->load_proxy(id, CosNotifyChannelAdmin::ANY_EVENT, attrs);
   }
   else if (type == "structured_proxy_push_supplier")
   {
@@ -117,7 +117,7 @@ TAO_Notify_ConsumerAdmin::load_child (const ACE_CString &type,
       ACE_TEXT ("(%P|%t) Admin reload proxy %d\n")
       , static_cast<int> (id)
       ));
-    result = this->load_proxy(id, CosNotifyChannelAdmin::STRUCTURED_EVENT, attrs ACE_ENV_ARG_PARAMETER);
+    result = this->load_proxy(id, CosNotifyChannelAdmin::STRUCTURED_EVENT, attrs);
   }
   else if (type == "sequence_proxy_push_supplier")
   {
@@ -125,7 +125,7 @@ TAO_Notify_ConsumerAdmin::load_child (const ACE_CString &type,
       ACE_TEXT ("(%P|%t) Admin reload proxy %d\n")
       , static_cast<int> (id)
       ));
-    result = this->load_proxy(id, CosNotifyChannelAdmin::SEQUENCE_EVENT, attrs ACE_ENV_ARG_PARAMETER);
+    result = this->load_proxy(id, CosNotifyChannelAdmin::SEQUENCE_EVENT, attrs);
   }
 #if 0
   else if (type == "ec_proxy_push_supplier")
@@ -134,12 +134,12 @@ TAO_Notify_ConsumerAdmin::load_child (const ACE_CString &type,
       ACE_TEXT ("(%P|%t) Admin reload proxy %d\n")
       , static_cast<int> (id)
       ));
-    result = this->load_proxy(id, attrs ACE_ENV_ARG_PARAMETER);
+    result = this->load_proxy(id, attrs);
   }
 #endif
   else
   {
-    result = TAO_Notify_Admin::load_child (type, id, attrs ACE_ENV_ARG_PARAMETER);
+    result = TAO_Notify_Admin::load_child (type, id, attrs);
   }
   return result;
 }
@@ -148,14 +148,13 @@ TAO_Notify::Topology_Object*
 TAO_Notify_ConsumerAdmin::load_proxy (
   CORBA::Long id,
   CosNotifyChannelAdmin::ClientType ctype,
-  const TAO_Notify::NVPList& attrs ACE_ENV_ARG_DECL)
+  const TAO_Notify::NVPList& attrs)
 {
   TAO_Notify_Builder* bld = TAO_Notify_PROPERTIES::instance()->builder();
   TAO_Notify_ProxySupplier * proxy =
     bld->build_proxy (this
                , ctype
-               , id
-               ACE_ENV_ARG_PARAMETER);
+               , id);
   ACE_ASSERT(proxy != 0);
   proxy->load_attrs (attrs);
   return proxy;
@@ -164,7 +163,6 @@ TAO_Notify_ConsumerAdmin::load_proxy (
 CosNotifyChannelAdmin::ProxySupplier_ptr
 TAO_Notify_ConsumerAdmin::obtain_notification_push_supplier (CosNotifyChannelAdmin::ClientType ctype,
                                                          CosNotifyChannelAdmin::ProxyID_out proxy_id
-                                                         ACE_ENV_ARG_DECL
                                                          )
   ACE_THROW_SPEC ((
                    CORBA::SystemException
@@ -177,8 +175,7 @@ TAO_Notify_ConsumerAdmin::obtain_notification_push_supplier (CosNotifyChannelAdm
     TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this
                                                                 , ctype
                                                                 , proxy_id
-                                                                , initial_qos
-                                                                ACE_ENV_ARG_PARAMETER);
+                                                                , initial_qos);
   this->self_change ();
   return proxy._retn ();
 }
@@ -187,7 +184,6 @@ CosNotifyChannelAdmin::ProxySupplier_ptr
 TAO_Notify_ConsumerAdmin::obtain_notification_push_supplier_with_qos (CosNotifyChannelAdmin::ClientType ctype,
                                                                   CosNotifyChannelAdmin::ProxyID_out proxy_id,
                                                                   const CosNotification::QoSProperties & initial_qos
-                                                                  ACE_ENV_ARG_DECL
                                                                   )
     ACE_THROW_SPEC ((
                      CORBA::SystemException
@@ -199,8 +195,7 @@ TAO_Notify_ConsumerAdmin::obtain_notification_push_supplier_with_qos (CosNotifyC
     TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this
                                                                 , ctype
                                                                 , proxy_id
-                                                                , initial_qos
-                                                                ACE_ENV_ARG_PARAMETER);
+                                                                , initial_qos);
   this->self_change ();
   return proxy._retn ();
 }
@@ -212,7 +207,7 @@ TAO_Notify_ConsumerAdmin::obtain_push_supplier (void)
                    ))
 {
   CosEventChannelAdmin::ProxyPushSupplier_var proxy =
-    TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this ACE_ENV_ARG_PARAMETER);
+    TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this);
   this->self_change ();
   return proxy._retn ();
 }
@@ -252,11 +247,11 @@ TAO_Notify_ConsumerAdmin::push_suppliers (void)
 {
   TAO_Notify_Proxy_Seq_Worker seq_worker;
 
-  return seq_worker.create (this->proxy_container() ACE_ENV_ARG_PARAMETER);
+  return seq_worker.create (this->proxy_container());
 }
 
 CosNotifyChannelAdmin::ProxySupplier_ptr
-TAO_Notify_ConsumerAdmin::get_proxy_supplier (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL)
+TAO_Notify_ConsumerAdmin::get_proxy_supplier (CosNotifyChannelAdmin::ProxyID proxy_id)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotifyChannelAdmin::ProxyNotFound
@@ -264,16 +259,16 @@ TAO_Notify_ConsumerAdmin::get_proxy_supplier (CosNotifyChannelAdmin::ProxyID pro
 {
   TAO_Notify_ProxySupplier_Find_Worker find_worker;
 
-  return find_worker.resolve (proxy_id, this->proxy_container() ACE_ENV_ARG_PARAMETER);
+  return find_worker.resolve (proxy_id, this->proxy_container());
 }
 
-void TAO_Notify_ConsumerAdmin::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_ARG_DECL)
+void TAO_Notify_ConsumerAdmin::set_qos (const CosNotification::QoSProperties & qos)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotification::UnsupportedQoS
                    ))
 {
-  this->TAO_Notify_Object::set_qos (qos ACE_ENV_ARG_PARAMETER);
+  this->TAO_Notify_Object::set_qos (qos);
 }
 
 
@@ -289,7 +284,6 @@ TAO_Notify_ConsumerAdmin::get_qos (void)
 void
 TAO_Notify_ConsumerAdmin::subscription_change (const CosNotification::EventTypeSeq & added,
                                            const CosNotification::EventTypeSeq & removed
-                                           ACE_ENV_ARG_DECL
                                            )
   ACE_THROW_SPEC ((
                    CORBA::SystemException
@@ -307,41 +301,41 @@ TAO_Notify_ConsumerAdmin::subscription_change (const CosNotification::EventTypeS
 
     TAO_Notify_Subscription_Change_Worker worker (added, removed);
 
-    this->proxy_container().collection()->for_each (&worker ACE_ENV_ARG_PARAMETER);
+    this->proxy_container().collection()->for_each (&worker);
   }
   this->self_change ();
 }
 
 CosNotifyFilter::FilterID
-TAO_Notify_ConsumerAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter ACE_ENV_ARG_DECL)
+TAO_Notify_ConsumerAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   CosNotifyFilter::FilterID fid =
-    this->filter_admin_.add_filter (new_filter ACE_ENV_ARG_PARAMETER);
+    this->filter_admin_.add_filter (new_filter);
   this->self_change ();
   return fid;
 }
 
 void
-TAO_Notify_ConsumerAdmin::remove_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL)
+TAO_Notify_ConsumerAdmin::remove_filter (CosNotifyFilter::FilterID filter)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotifyFilter::FilterNotFound
                    ))
 {
-  this->filter_admin_.remove_filter (filter ACE_ENV_ARG_PARAMETER);
+  this->filter_admin_.remove_filter (filter);
 }
 
 ::CosNotifyFilter::Filter_ptr
-TAO_Notify_ConsumerAdmin::get_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL)
+TAO_Notify_ConsumerAdmin::get_filter (CosNotifyFilter::FilterID filter)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotifyFilter::FilterNotFound
                    ))
 {
-  return this->filter_admin_.get_filter (filter ACE_ENV_ARG_PARAMETER);
+  return this->filter_admin_.get_filter (filter);
 }
 
 ::CosNotifyFilter::FilterIDSeq*
@@ -374,13 +368,13 @@ TAO_Notify_ConsumerAdmin::priority_filter (void)
 }
 
 void
-TAO_Notify_ConsumerAdmin::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/ ACE_ENV_ARG_DECL)
+TAO_Notify_ConsumerAdmin::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 CosNotifyFilter::MappingFilter_ptr
@@ -394,12 +388,12 @@ TAO_Notify_ConsumerAdmin::lifetime_filter (void)
 }
 
 void
-TAO_Notify_ConsumerAdmin::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/ ACE_ENV_ARG_DECL)
+TAO_Notify_ConsumerAdmin::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 ::CosNotifyChannelAdmin::ProxyIDSeq*
@@ -413,8 +407,7 @@ TAO_Notify_ConsumerAdmin::pull_suppliers (void)
 
 CosNotifyChannelAdmin::ProxySupplier_ptr
 TAO_Notify_ConsumerAdmin::obtain_notification_pull_supplier (CosNotifyChannelAdmin::ClientType /*ctype*/,
-                                                         CosNotifyChannelAdmin::ProxyID_out /*proxy_id*/
-                                                         ACE_ENV_ARG_DECL)
+                                                         CosNotifyChannelAdmin::ProxyID_out /*proxy_id*/)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotifyChannelAdmin::AdminLimitExceeded
@@ -427,14 +420,13 @@ TAO_Notify_ConsumerAdmin::obtain_notification_pull_supplier (CosNotifyChannelAdm
 void
 TAO_Notify_ConsumerAdmin::validate_qos (const CosNotification::QoSProperties & /*required_qos*/,
                                     CosNotification::NamedPropertyRangeSeq_out /*available_qos*/
-                                    ACE_ENV_ARG_DECL
                                     )
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotification::UnsupportedQoS
                    ))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 CosEventChannelAdmin::ProxyPullSupplier_ptr
@@ -449,15 +441,14 @@ TAO_Notify_ConsumerAdmin::obtain_pull_supplier (void)
 TAO_Notify_ProxySupplier *
 TAO_Notify_ConsumerAdmin::find_proxy_supplier (
     TAO_Notify::IdVec & id_path,
-    size_t position
-    ACE_ENV_ARG_DECL)
+    size_t position)
 {
   TAO_Notify_ProxySupplier * result = 0;
   size_t path_size = id_path.size ();
   if (position < path_size)
   {
     TAO_Notify_ProxySupplier_Find_Worker find_worker;
-    TAO_Notify_Proxy * proxy = find_worker.find (id_path[position], this->proxy_container() ACE_ENV_ARG_PARAMETER);
+    TAO_Notify_Proxy * proxy = find_worker.find (id_path[position], this->proxy_container());
     result = dynamic_cast <TAO_Notify_ProxySupplier *> (proxy);
   }
   return result;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
index 6680e7126b0..41f573aef56 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
@@ -51,7 +51,7 @@ public:
   virtual ~TAO_Notify_ConsumerAdmin ();
 
   /// Init
-  void init (TAO_Notify_EventChannel *ec ACE_ENV_ARG_DECL);
+  void init (TAO_Notify_EventChannel *ec);
 
   /// ServantBase refcount methods.
   virtual void _add_ref (void);
@@ -63,27 +63,23 @@ public:
   virtual TAO_Notify::Topology_Object* load_child (
     const ACE_CString &type,
     CORBA::Long id,
-    const TAO_Notify::NVPList& attrs
-    ACE_ENV_ARG_DECL);
+    const TAO_Notify::NVPList& attrs);
 
   TAO_Notify_ProxySupplier * find_proxy_supplier (
       TAO_Notify::IdVec & id_path,
-      size_t position
-      ACE_ENV_ARG_DECL);
+      size_t position);
 
 protected:
   TAO_Notify::Topology_Object *load_proxy (
     CORBA::Long id,
     CosNotifyChannelAdmin::ClientType ctype,
-    const TAO_Notify::NVPList& attrs
-    ACE_ENV_ARG_DECL);
+    const TAO_Notify::NVPList& attrs);
 
   /// = NotifyExt::ConsumerAdmin methods
   virtual CosNotifyChannelAdmin::ProxySupplier_ptr
   obtain_notification_push_supplier_with_qos (CosNotifyChannelAdmin::ClientType ctype,
                                               CosNotifyChannelAdmin::ProxyID_out proxy_id,
                                               const CosNotification::QoSProperties & initial_qos
-                                              ACE_ENV_ARG_DECL
                                               )
     ACE_THROW_SPEC ((
                      CORBA::SystemException
@@ -97,7 +93,7 @@ protected:
                      CORBA::SystemException
                      ));
 
-  virtual ::CosNotifyChannelAdmin::EventChannel_ptr MyChannel (ACE_ENV_SINGLE_ARG_DECL
+  virtual ::CosNotifyChannelAdmin::EventChannel_ptr MyChannel (
 
   )
     ACE_THROW_SPEC ((
@@ -109,14 +105,14 @@ protected:
                      CORBA::SystemException
                      ));
 
-  virtual ::CosNotifyFilter::MappingFilter_ptr priority_filter (ACE_ENV_SINGLE_ARG_DECL
+  virtual ::CosNotifyFilter::MappingFilter_ptr priority_filter (
 
   )
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual void priority_filter (CosNotifyFilter::MappingFilter_ptr priority_filter ACE_ENV_ARG_DECL)
+  virtual void priority_filter (CosNotifyFilter::MappingFilter_ptr priority_filter)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
@@ -126,8 +122,7 @@ protected:
                      CORBA::SystemException
                      ));
 
-  virtual void lifetime_filter (CosNotifyFilter::MappingFilter_ptr lifetime_filter
-                                ACE_ENV_ARG_DECL)
+  virtual void lifetime_filter (CosNotifyFilter::MappingFilter_ptr lifetime_filter)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
@@ -142,8 +137,7 @@ protected:
                      CORBA::SystemException
                      ));
 
-  virtual ::CosNotifyChannelAdmin::ProxySupplier_ptr get_proxy_supplier (CosNotifyChannelAdmin::ProxyID proxy_id
-                                                                         ACE_ENV_ARG_DECL)
+  virtual ::CosNotifyChannelAdmin::ProxySupplier_ptr get_proxy_supplier (CosNotifyChannelAdmin::ProxyID proxy_id)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      , CosNotifyChannelAdmin::ProxyNotFound
@@ -151,8 +145,7 @@ protected:
 
   virtual ::CosNotifyChannelAdmin::ProxySupplier_ptr
   obtain_notification_pull_supplier (CosNotifyChannelAdmin::ClientType ctype,
-                                     CosNotifyChannelAdmin::ProxyID_out proxy_id
-                                     ACE_ENV_ARG_DECL)
+                                     CosNotifyChannelAdmin::ProxyID_out proxy_id)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      , CosNotifyChannelAdmin::AdminLimitExceeded
@@ -160,8 +153,7 @@ protected:
 
   virtual ::CosNotifyChannelAdmin::ProxySupplier_ptr
   obtain_notification_push_supplier (CosNotifyChannelAdmin::ClientType ctype,
-                                     CosNotifyChannelAdmin::ProxyID_out proxy_id
-                                     ACE_ENV_ARG_DECL)
+                                     CosNotifyChannelAdmin::ProxyID_out proxy_id)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      , CosNotifyChannelAdmin::AdminLimitExceeded
@@ -177,41 +169,38 @@ protected:
                      CORBA::SystemException
                      ));
 
-  virtual void set_qos (const CosNotification::QoSProperties & qos
-                        ACE_ENV_ARG_DECL)
+  virtual void set_qos (const CosNotification::QoSProperties & qos)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      , CosNotification::UnsupportedQoS
                      ));
 
   virtual void validate_qos (const CosNotification::QoSProperties & required_qos,
-                             CosNotification::NamedPropertyRangeSeq_out available_qos
-                             ACE_ENV_ARG_DECL)
+                             CosNotification::NamedPropertyRangeSeq_out available_qos)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      , CosNotification::UnsupportedQoS
                      ));
 
   virtual void subscription_change (const CosNotification::EventTypeSeq & added,
-                                    const CosNotification::EventTypeSeq & removed
-                                    ACE_ENV_ARG_DECL)
+                                    const CosNotification::EventTypeSeq & removed)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      , CosNotifyComm::InvalidEventType
                      ));
 
-  virtual CosNotifyFilter::FilterID add_filter (CosNotifyFilter::Filter_ptr new_filter ACE_ENV_ARG_DECL)
+  virtual CosNotifyFilter::FilterID add_filter (CosNotifyFilter::Filter_ptr new_filter)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual void remove_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL)
+  virtual void remove_filter (CosNotifyFilter::FilterID filter)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      , CosNotifyFilter::FilterNotFound
                      ));
 
-  virtual ::CosNotifyFilter::Filter_ptr get_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL)
+  virtual ::CosNotifyFilter::Filter_ptr get_filter (CosNotifyFilter::FilterID filter)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      , CosNotifyFilter::FilterNotFound
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp
index f90aa3e3373..696af99cf6c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp
@@ -35,19 +35,19 @@ TAO_Notify_Container_T<TYPE>::shutdown (void)
 {
   TAO_ESF_Shutdown_Proxy<TYPE> shutdown_worker;
 
-  this->collection_->for_each (&shutdown_worker ACE_ENV_ARG_PARAMETER);
+  this->collection_->for_each (&shutdown_worker);
 }
 
 template<class TYPE> void
-TAO_Notify_Container_T<TYPE>::insert (TYPE* type ACE_ENV_ARG_DECL)
+TAO_Notify_Container_T<TYPE>::insert (TYPE* type)
 {
-  this->collection_->connected (type ACE_ENV_ARG_PARAMETER);
+  this->collection_->connected (type);
 }
 
 template<class TYPE> void
-TAO_Notify_Container_T<TYPE>::remove (TYPE* type ACE_ENV_ARG_DECL)
+TAO_Notify_Container_T<TYPE>::remove (TYPE* type)
 {
-  this->collection_->disconnected (type ACE_ENV_ARG_PARAMETER);
+  this->collection_->disconnected (type);
 }
 
 template<class TYPE> void
@@ -57,7 +57,7 @@ TAO_Notify_Container_T<TYPE>::init (void)
   TAO_Notify_Factory* factory = TAO_Notify_PROPERTIES::instance ()->factory ();
 
   // Init variables
-  factory->create (this->collection_ ACE_ENV_ARG_PARAMETER);
+  factory->create (this->collection_);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h
index 13cf3041e37..d120afcdf5e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h
@@ -47,10 +47,10 @@ class TAO_Notify_Serv_Export TAO_Notify_Container_T
   void init (void);
 
   /// Insert object to this container.
-  virtual void insert (TYPE* type ACE_ENV_ARG_DECL);
+  virtual void insert (TYPE* type);
 
   /// Remove type from container_
-  virtual void remove (TYPE* type ACE_ENV_ARG_DECL);
+  virtual void remove (TYPE* type);
 
   /// Shutdown
   virtual void shutdown (void);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
index 9db94d2b2b1..c8555faceea 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
@@ -218,7 +218,7 @@ TAO_CosNotify_Service::fini (void)
 }
 
 void
-TAO_CosNotify_Service::init_service (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+TAO_CosNotify_Service::init_service (CORBA::ORB_ptr orb)
 {
   ACE_DEBUG ((LM_DEBUG, "Loading the Cos Notification Service...\n"));
 
@@ -233,38 +233,38 @@ TAO_CosNotify_Service::init_service (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
           char *argv0 = 0;
           char **argv = &argv0;  // ansi requires argv be null terminated.
           CORBA::ORB_var dispatcher = CORBA::ORB_init (argc, argv,
-                                                       "default_dispatcher" ACE_ENV_ARG_PARAMETER);
+                                                       "default_dispatcher");
 
           TAO_Notify_PROPERTIES::instance()->dispatching_orb(dispatcher.in());
         }
 
-      this->init_i2 (orb, TAO_Notify_PROPERTIES::instance()->dispatching_orb() ACE_ENV_ARG_PARAMETER);
+      this->init_i2 (orb, TAO_Notify_PROPERTIES::instance()->dispatching_orb());
 
     }
   else
     {
-      this->init_i (orb ACE_ENV_ARG_PARAMETER);
+      this->init_i (orb);
     }
 }
 
 void
-TAO_CosNotify_Service::init_service2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_orb ACE_ENV_ARG_DECL)
+TAO_CosNotify_Service::init_service2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_orb)
 {
-  this->init_i2 (orb, dispatching_orb ACE_ENV_ARG_PARAMETER);
+  this->init_i2 (orb, dispatching_orb);
 }
 
 void
-TAO_CosNotify_Service::init_i (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+TAO_CosNotify_Service::init_i (CORBA::ORB_ptr orb)
 {
   // Obtain the Root POA
   CORBA::Object_var object  =
-    orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+    orb->resolve_initial_references("RootPOA");
 
   if (CORBA::is_nil (object.in ()))
     ACE_ERROR ((LM_ERROR,
                 " (%P|%t) Unable to resolve the RootPOA.\n"));
 
-  PortableServer::POA_var default_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+  PortableServer::POA_var default_poa = PortableServer::POA::_narrow (object.in ());
 
   // Set the properties
   TAO_Notify_Properties* properties = TAO_Notify_PROPERTIES::instance();
@@ -283,16 +283,16 @@ TAO_CosNotify_Service::init_i (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 }
 
 void
-TAO_CosNotify_Service::init_i2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_orb ACE_ENV_ARG_DECL)
+TAO_CosNotify_Service::init_i2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_orb)
 {
   // Obtain the Root POA
   CORBA::Object_var object  =
-    orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+    orb->resolve_initial_references("RootPOA");
 
   if (CORBA::is_nil (object.in ()))
     ACE_ERROR ((LM_ERROR, " (%P|%t) Unable to resolve the RootPOA.\n"));
 
-  PortableServer::POA_var default_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+  PortableServer::POA_var default_poa = PortableServer::POA::_narrow (object.in ());
 
   // Set the properties
   TAO_Notify_Properties* properties = TAO_Notify_PROPERTIES::instance();
@@ -338,13 +338,13 @@ TAO_CosNotify_Service::create_builder (void)
 }
 
 CosNotifyChannelAdmin::EventChannelFactory_ptr
-TAO_CosNotify_Service::create (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL)
+TAO_CosNotify_Service::create (PortableServer::POA_ptr poa)
 {
-  return this->builder().build_event_channel_factory (poa ACE_ENV_ARG_PARAMETER);
+  return this->builder().build_event_channel_factory (poa);
 }
 
 void
-TAO_CosNotify_Service::remove (TAO_Notify_EventChannelFactory* /*ecf*/ ACE_ENV_ARG_DECL_NOT_USED)
+TAO_CosNotify_Service::remove (TAO_Notify_EventChannelFactory* /*ecf*/)
 {
   // NOP.
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
index 45c881e6fff..109af701092 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
@@ -47,24 +47,24 @@ public:
   virtual int init (int argc, ACE_TCHAR *argv[]);
 
   /// Init the service from driver
-  virtual void init_service (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL);
+  virtual void init_service (CORBA::ORB_ptr orb);
 
   virtual int fini (void);
 
   /// separate dispatching orb Init
-  virtual void init_service2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_orb ACE_ENV_ARG_DECL);
+  virtual void init_service2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_orb);
 
   /// Create the Channel Factory.
-  virtual CosNotifyChannelAdmin::EventChannelFactory_ptr create (PortableServer::POA_ptr default_POA ACE_ENV_ARG_DECL);
+  virtual CosNotifyChannelAdmin::EventChannelFactory_ptr create (PortableServer::POA_ptr default_POA);
 
   /// Called by the factory when it is destroyed.
-  virtual void remove (TAO_Notify_EventChannelFactory* ecf ACE_ENV_ARG_DECL);
+  virtual void remove (TAO_Notify_EventChannelFactory* ecf);
 
 protected:
   /// Init the data members
-  virtual void init_i (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL);
+  virtual void init_i (CORBA::ORB_ptr orb);
   /// Init the data members separate dispatching orb
-  virtual void init_i2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_orb ACE_ENV_ARG_DECL);
+  virtual void init_i2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_orb);
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp
index 990da34bdbc..2301489e431 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp
@@ -36,7 +36,7 @@ public:
   typedef TAO_ESF_Copy_On_Write<PROXY, TAO_ESF_Proxy_List<PROXY>,PROXY_ITER, ACE_SYNCH> COLLECTION;
   typedef TAO_ESF_Proxy_Collection<PROXY> BASE_COLLECTION;
 
-  void create (BASE_COLLECTION* &collection ACE_ENV_ARG_DECL)
+  void create (BASE_COLLECTION* &collection)
   {
     ACE_NEW_THROW_EX (collection,
                       COLLECTION (),
@@ -53,49 +53,49 @@ TAO_Notify_Default_Factory::~TAO_Notify_Default_Factory ()
 }
 
 void
-TAO_Notify_Default_Factory::create (TAO_Notify_ProxySupplier_Collection* &collection ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_ProxySupplier_Collection* &collection)
 {
   COW_Collection_Default_Factory<TAO_Notify_ProxySupplier> f;
-  f.create (collection ACE_ENV_ARG_PARAMETER);
+  f.create (collection);
 }
 
 void
-TAO_Notify_Default_Factory::create (TAO_Notify_ProxyConsumer_Collection* &collection ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_ProxyConsumer_Collection* &collection)
 {
   COW_Collection_Default_Factory<TAO_Notify_ProxyConsumer> f;
-  f.create (collection ACE_ENV_ARG_PARAMETER);
+  f.create (collection);
 }
 
 void
-TAO_Notify_Default_Factory::create (TAO_Notify_EventChannel_Collection* &collection ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_EventChannel_Collection* &collection)
 {
   COW_Collection_Default_Factory<TAO_Notify_EventChannel> f;
-  f.create (collection ACE_ENV_ARG_PARAMETER);
+  f.create (collection);
 }
 
 void
-TAO_Notify_Default_Factory::create (TAO_Notify_ConsumerAdmin_Collection* &collection ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_ConsumerAdmin_Collection* &collection)
 {
   COW_Collection_Default_Factory<TAO_Notify_ConsumerAdmin> f;
-  f.create (collection ACE_ENV_ARG_PARAMETER);
+  f.create (collection);
 }
 
 void
-TAO_Notify_Default_Factory::create (TAO_Notify_SupplierAdmin_Collection* &collection ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_SupplierAdmin_Collection* &collection)
 {
   COW_Collection_Default_Factory<TAO_Notify_SupplierAdmin> f;
-  f.create (collection ACE_ENV_ARG_PARAMETER);
+  f.create (collection);
 }
 
 void
-TAO_Notify_Default_Factory::create (TAO_Notify_Proxy_Collection* &collection ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_Proxy_Collection* &collection)
 {
   COW_Collection_Default_Factory<TAO_Notify_Proxy> f;
-  f.create (collection ACE_ENV_ARG_PARAMETER);
+  f.create (collection);
 }
 
 void
-TAO_Notify_Default_Factory::create (TAO_Notify_EventChannelFactory*& factory ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_EventChannelFactory*& factory)
 {
   ACE_NEW_THROW_EX (factory,
                     TAO_Notify_EventChannelFactory (),
@@ -103,7 +103,7 @@ TAO_Notify_Default_Factory::create (TAO_Notify_EventChannelFactory*& factory ACE
 }
 
 void
-TAO_Notify_Default_Factory::create (TAO_Notify_EventChannel*& channel ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_EventChannel*& channel)
 {
   ACE_NEW_THROW_EX (channel,
                     TAO_Notify_EventChannel (),
@@ -112,7 +112,7 @@ TAO_Notify_Default_Factory::create (TAO_Notify_EventChannel*& channel ACE_ENV_AR
 
 
 void
-TAO_Notify_Default_Factory::create (TAO_Notify_SupplierAdmin*& admin ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_SupplierAdmin*& admin)
 {
   ACE_NEW_THROW_EX (admin,
                     TAO_Notify_SupplierAdmin (),
@@ -120,7 +120,7 @@ TAO_Notify_Default_Factory::create (TAO_Notify_SupplierAdmin*& admin ACE_ENV_ARG
 }
 
 void
-TAO_Notify_Default_Factory::create (TAO_Notify_ConsumerAdmin*& admin ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_ConsumerAdmin*& admin)
 {
   ACE_NEW_THROW_EX (admin,
                     TAO_Notify_ConsumerAdmin (),
@@ -128,7 +128,7 @@ TAO_Notify_Default_Factory::create (TAO_Notify_ConsumerAdmin*& admin ACE_ENV_ARG
 }
 
 void
-TAO_Notify_Default_Factory::create (TAO_Notify_StructuredProxyPushConsumer*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_StructuredProxyPushConsumer*& proxy)
 {
   ACE_NEW_THROW_EX (proxy,
                     TAO_Notify_StructuredProxyPushConsumer (),
@@ -136,7 +136,7 @@ TAO_Notify_Default_Factory::create (TAO_Notify_StructuredProxyPushConsumer*& pro
 }
 
 void
-TAO_Notify_Default_Factory::create (TAO_Notify_StructuredProxyPushSupplier*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_StructuredProxyPushSupplier*& proxy)
 {
   ACE_NEW_THROW_EX (proxy,
                     TAO_Notify_StructuredProxyPushSupplier (),
@@ -144,7 +144,7 @@ TAO_Notify_Default_Factory::create (TAO_Notify_StructuredProxyPushSupplier*& pro
 }
 
 void
-TAO_Notify_Default_Factory::create (TAO_Notify_ProxyPushConsumer*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_ProxyPushConsumer*& proxy)
 {
   ACE_NEW_THROW_EX (proxy,
                     TAO_Notify_ProxyPushConsumer (),
@@ -152,7 +152,7 @@ TAO_Notify_Default_Factory::create (TAO_Notify_ProxyPushConsumer*& proxy ACE_ENV
 }
 
 void
-TAO_Notify_Default_Factory::create (TAO_Notify_ProxyPushSupplier*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_ProxyPushSupplier*& proxy)
 {
   ACE_NEW_THROW_EX (proxy,
                     TAO_Notify_ProxyPushSupplier (),
@@ -160,7 +160,7 @@ TAO_Notify_Default_Factory::create (TAO_Notify_ProxyPushSupplier*& proxy ACE_ENV
 }
 
 void
-TAO_Notify_Default_Factory::create (TAO_Notify_CosEC_ProxyPushConsumer*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_CosEC_ProxyPushConsumer*& proxy)
 {
   ACE_NEW_THROW_EX (proxy,
                     TAO_Notify_CosEC_ProxyPushConsumer (),
@@ -168,7 +168,7 @@ TAO_Notify_Default_Factory::create (TAO_Notify_CosEC_ProxyPushConsumer*& proxy A
 }
 
 void
-TAO_Notify_Default_Factory::create (TAO_Notify_CosEC_ProxyPushSupplier*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_CosEC_ProxyPushSupplier*& proxy)
 {
   ACE_NEW_THROW_EX (proxy,
                     TAO_Notify_CosEC_ProxyPushSupplier (),
@@ -176,7 +176,7 @@ TAO_Notify_Default_Factory::create (TAO_Notify_CosEC_ProxyPushSupplier*& proxy A
 }
 
 void
-TAO_Notify_Default_Factory::create (TAO_Notify_SequenceProxyPushConsumer*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_SequenceProxyPushConsumer*& proxy)
 {
   ACE_NEW_THROW_EX (proxy,
                     TAO_Notify_SequenceProxyPushConsumer (),
@@ -184,7 +184,7 @@ TAO_Notify_Default_Factory::create (TAO_Notify_SequenceProxyPushConsumer*& proxy
 }
 
 void
-TAO_Notify_Default_Factory::create (TAO_Notify_SequenceProxyPushSupplier*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_SequenceProxyPushSupplier*& proxy)
 {
   ACE_NEW_THROW_EX (proxy,
                     TAO_Notify_SequenceProxyPushSupplier (),
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h
index 106d7cb265d..48ca8ef08c2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h
@@ -39,58 +39,58 @@ public:
   virtual ~TAO_Notify_Default_Factory ();
 
   /// Create ProxySupplier Collection
-  virtual void create (TAO_Notify_ProxySupplier_Collection*& collection ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_ProxySupplier_Collection*& collection);
 
   /// Create ProxyConsumer Collection
-  virtual void create (TAO_Notify_ProxyConsumer_Collection*& collection ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_ProxyConsumer_Collection*& collection);
 
   /// Create EventChannel Collection
-  virtual void create (TAO_Notify_EventChannel_Collection*& collection ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_EventChannel_Collection*& collection);
 
   /// Create ConsumerAdmin Collection
-  virtual void create (TAO_Notify_ConsumerAdmin_Collection*& collection ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_ConsumerAdmin_Collection*& collection);
 
   /// Create SupplierAdmin Collection
-  virtual void create (TAO_Notify_SupplierAdmin_Collection*& collection ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_SupplierAdmin_Collection*& collection);
 
   /// Create Proxy Collection
-  virtual void create (TAO_Notify_Proxy_Collection*& collection ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_Proxy_Collection*& collection);
 
   /// Create EventChannelDefault_Factory
-  virtual void create (TAO_Notify_EventChannelFactory*& channel_factory ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_EventChannelFactory*& channel_factory);
 
   /// Create EventChannel
-  virtual void create (TAO_Notify_EventChannel*& channel ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_EventChannel*& channel);
 
   /// Create SupplierAdmin
-  virtual void create (TAO_Notify_SupplierAdmin*& admin ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_SupplierAdmin*& admin);
 
   /// Create ConsumerAdmin
-  virtual void create (TAO_Notify_ConsumerAdmin*& admin ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_ConsumerAdmin*& admin);
 
   /// Create ProxyPushConsumer
-  virtual void create (TAO_Notify_ProxyPushConsumer*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_ProxyPushConsumer*& proxy);
 
   /// Create ProxyPushSupplier
-  virtual void create (TAO_Notify_ProxyPushSupplier*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_ProxyPushSupplier*& proxy);
 
   /// Create CosEC_ProxyPushConsumer
-  virtual void create (TAO_Notify_CosEC_ProxyPushConsumer*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_CosEC_ProxyPushConsumer*& proxy);
 
   /// Create CosEC_ProxyPushSupplier
-  virtual void create (TAO_Notify_CosEC_ProxyPushSupplier*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_CosEC_ProxyPushSupplier*& proxy);
 
   /// Create StructuredProxyPushConsumer
-  virtual void create (TAO_Notify_StructuredProxyPushConsumer*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_StructuredProxyPushConsumer*& proxy);
 
   /// Create StructuredProxyPushSupplier
-  virtual void create (TAO_Notify_StructuredProxyPushSupplier*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_StructuredProxyPushSupplier*& proxy);
 
   /// Create SequenceProxyPushConsumer
-  virtual void create (TAO_Notify_SequenceProxyPushConsumer*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_SequenceProxyPushConsumer*& proxy);
 
   /// Create SequenceProxyPushSupplier
-  virtual void create (TAO_Notify_SequenceProxyPushSupplier*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_SequenceProxyPushSupplier*& proxy);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp
index a40986b1a0c..8df40fe1a13 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp
@@ -87,9 +87,9 @@ Delivery_Request::should_retry () const
 void
 Delivery_Request::dispatch (
   TAO_Notify_ProxySupplier * proxy_supplier,
-  bool filter ACE_ENV_ARG_DECL)
+  bool filter)
 {
-  this->routing_slip_->dispatch (proxy_supplier, filter ACE_ENV_ARG_PARAMETER);
+  this->routing_slip_->dispatch (proxy_supplier, filter);
 }
 
 const Routing_Slip_Ptr &
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h
index 744bca7d733..f99f2084823 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h
@@ -101,7 +101,7 @@ public:
   bool should_retry () const;
 
   /// expose routing slip method
-  void dispatch (TAO_Notify_ProxySupplier * proxy_supplier, bool filter ACE_ENV_ARG_DECL);
+  void dispatch (TAO_Notify_ProxySupplier * proxy_supplier, bool filter);
 
   // Meaningless, but needed by ACE_Vector on some platforms (gcc2.x LynxOS)
   bool operator == (const Delivery_Request & rhs) const;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
index 3cbadd32339..c72a16116ae 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
@@ -19,18 +19,17 @@ TAO_Notify_ETCL_Filter::TAO_Notify_ETCL_Filter (void)
 
 TAO_Notify_ETCL_Filter::~TAO_Notify_ETCL_Filter ()
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       this->remove_all_constraints ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       if (TAO_debug_level)
         ACE_DEBUG ((LM_DEBUG, "Error in Filter dtor\n"));
 
       // @@ eat exception.
     }
-  ACE_ENDTRY;
 
   if (TAO_debug_level > 1)
       ACE_DEBUG ((LM_DEBUG, "Filter Destroyed\n"));
@@ -47,7 +46,6 @@ TAO_Notify_ETCL_Filter::constraint_grammar (void)
 
 void
 TAO_Notify_ETCL_Filter::add_constraints_i (const CosNotifyFilter::ConstraintInfoSeq& constraint_info_seq
-                                       ACE_ENV_ARG_DECL
                                        )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
@@ -67,14 +65,14 @@ TAO_Notify_ETCL_Filter::add_constraints_i (const CosNotifyFilter::ConstraintInfo
         constraint_info_seq[index].constraint_expression;
 
       notify_constr_expr->interpreter.
-        build_tree (expr.constraint_expr.in () ACE_ENV_ARG_PARAMETER);
+        build_tree (expr.constraint_expr.in ());
 
       notify_constr_expr->constr_expr = expr;
 
       CosNotifyFilter::ConstraintID cnstr_id = ++constraint_expr_ids_;
 
       if (this->constraint_expr_list_.bind (cnstr_id, notify_constr_expr) == -1)
-        ACE_THROW (CORBA::INTERNAL ());
+        throw CORBA::INTERNAL ();
 
       if (TAO_debug_level > 1)
         ACE_DEBUG ((LM_DEBUG, "Added constraint to filter %x\n", this, expr.constraint_expr.in ()));
@@ -85,7 +83,6 @@ TAO_Notify_ETCL_Filter::add_constraints_i (const CosNotifyFilter::ConstraintInfo
 
 CosNotifyFilter::ConstraintInfoSeq*
 TAO_Notify_ETCL_Filter::add_constraints (const CosNotifyFilter::ConstraintExpSeq& constraint_list
-                                ACE_ENV_ARG_DECL
                                 )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
@@ -125,7 +122,7 @@ TAO_Notify_ETCL_Filter::add_constraints (const CosNotifyFilter::ConstraintExpSeq
         }
     }
 
-  this->add_constraints_i (infoseq.in () ACE_ENV_ARG_PARAMETER);
+  this->add_constraints_i (infoseq.in ());
 
   return infoseq._retn ();
 }
@@ -133,7 +130,6 @@ TAO_Notify_ETCL_Filter::add_constraints (const CosNotifyFilter::ConstraintExpSeq
 void
 TAO_Notify_ETCL_Filter::modify_constraints (const CosNotifyFilter::ConstraintIDSeq & del_list,
                                    const CosNotifyFilter::ConstraintInfoSeq & modify_list
-                                   ACE_ENV_ARG_DECL
                                    )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
@@ -151,7 +147,7 @@ TAO_Notify_ETCL_Filter::modify_constraints (const CosNotifyFilter::ConstraintIDS
     {
       if (this->constraint_expr_list_.find (del_list [index]) == -1)
         {
-          ACE_THROW (CosNotifyFilter::ConstraintNotFound (del_list [index]));
+          throw CosNotifyFilter::ConstraintNotFound (del_list [index]);
         }
     }
 
@@ -159,7 +155,8 @@ TAO_Notify_ETCL_Filter::modify_constraints (const CosNotifyFilter::ConstraintIDS
     {
       if (this->constraint_expr_list_.find (modify_list [index].constraint_id) == -1)
         {
-          ACE_THROW (CosNotifyFilter::ConstraintNotFound (modify_list [index].constraint_id));
+          throw CosNotifyFilter::ConstraintNotFound (
+            modify_list [index].constraint_id);
         }
     }
 
@@ -180,12 +177,11 @@ TAO_Notify_ETCL_Filter::modify_constraints (const CosNotifyFilter::ConstraintIDS
 
   // Now add the new entries.
   // Keep a list of ids generated in this session.
-  ACE_TRY
+  try
     {
-      this->add_constraints_i (modify_list
-                               ACE_ENV_ARG_PARAMETER);
+      this->add_constraints_i (modify_list);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Restore,
       for (index = 0; index < modify_list.length (); ++index)
@@ -193,12 +189,11 @@ TAO_Notify_ETCL_Filter::modify_constraints (const CosNotifyFilter::ConstraintIDS
           CosNotifyFilter::ConstraintID cnstr_id = ++this->constraint_expr_ids_;
 
           if (constraint_expr_list_.bind (cnstr_id, constr_saved[index]) == -1)
-            ACE_THROW (CORBA::NO_RESOURCES ());
+            throw CORBA::NO_RESOURCES ();
         }
 
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
 
   // Now go around deleting...
   // for the del_list.
@@ -219,7 +214,6 @@ TAO_Notify_ETCL_Filter::modify_constraints (const CosNotifyFilter::ConstraintIDS
 
 CosNotifyFilter::ConstraintInfoSeq*
 TAO_Notify_ETCL_Filter::get_constraints (const CosNotifyFilter::ConstraintIDSeq & id_list
-                                ACE_ENV_ARG_DECL
                                 )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNotifyFilter::ConstraintNotFound))
@@ -342,8 +336,7 @@ TAO_Notify_ETCL_Filter::destroy (void)
 }
 
 CORBA::Boolean
-TAO_Notify_ETCL_Filter::match (const CORBA::Any & /*filterable_data */
-                           ACE_ENV_ARG_DECL)
+TAO_Notify_ETCL_Filter::match (const CORBA::Any & /*filterable_data */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNotifyFilter::UnsupportedFilterableData))
 {
@@ -353,7 +346,6 @@ TAO_Notify_ETCL_Filter::match (const CORBA::Any & /*filterable_data */
 
 CORBA::Boolean
 TAO_Notify_ETCL_Filter::match_structured (const CosNotification::StructuredEvent & filterable_data
-                                 ACE_ENV_ARG_DECL
                                  )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNotifyFilter::UnsupportedFilterableData))
@@ -390,7 +382,6 @@ TAO_Notify_ETCL_Filter::match_structured (const CosNotification::StructuredEvent
 CORBA::Boolean
 TAO_Notify_ETCL_Filter::match_typed (
                             const CosNotification::PropertySeq & /* filterable_data */
-                            ACE_ENV_ARG_DECL
                             )
   ACE_THROW_SPEC (( CORBA::SystemException,
                     CosNotifyFilter::UnsupportedFilterableData))
@@ -402,7 +393,6 @@ TAO_Notify_ETCL_Filter::match_typed (
 CosNotifyFilter::CallbackID
 TAO_Notify_ETCL_Filter::attach_callback (
                                 CosNotifyComm::NotifySubscribe_ptr /* callback */
-                                ACE_ENV_ARG_DECL
                                 )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -413,12 +403,11 @@ TAO_Notify_ETCL_Filter::attach_callback (
 void
 TAO_Notify_ETCL_Filter::detach_callback (
                                 CosNotifyFilter::CallbackID /* callback */
-                                ACE_ENV_ARG_DECL
                                 )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNotifyFilter::CallbackNotFound))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 CosNotifyFilter::CallbackIDSeq *
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
index 6e42fcb61b6..bbc47b4ec6f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
@@ -55,7 +55,7 @@ protected:
                      CORBA::SystemException
                      ));
 
-  virtual CosNotifyFilter::ConstraintInfoSeq * add_constraints (const CosNotifyFilter::ConstraintExpSeq & constraint_list ACE_ENV_ARG_DECL)
+  virtual CosNotifyFilter::ConstraintInfoSeq * add_constraints (const CosNotifyFilter::ConstraintExpSeq & constraint_list)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosNotifyFilter::InvalidConstraint
@@ -63,7 +63,6 @@ protected:
 
   virtual void modify_constraints (const CosNotifyFilter::ConstraintIDSeq & del_list,
                                    const CosNotifyFilter::ConstraintInfoSeq & modify_list
-                                   ACE_ENV_ARG_DECL
                                    )
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
@@ -71,7 +70,7 @@ protected:
                      CosNotifyFilter::ConstraintNotFound
                      ));
 
-  virtual CosNotifyFilter::ConstraintInfoSeq * get_constraints (const CosNotifyFilter::ConstraintIDSeq & id_list ACE_ENV_ARG_DECL)
+  virtual CosNotifyFilter::ConstraintInfoSeq * get_constraints (const CosNotifyFilter::ConstraintIDSeq & id_list)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosNotifyFilter::ConstraintNotFound
@@ -92,30 +91,30 @@ protected:
                      CORBA::SystemException
                      ));
 
-  virtual CORBA::Boolean match (const CORBA::Any & filterable_data ACE_ENV_ARG_DECL)
+  virtual CORBA::Boolean match (const CORBA::Any & filterable_data)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosNotifyFilter::UnsupportedFilterableData
                      ));
 
-  virtual CORBA::Boolean match_structured (const CosNotification::StructuredEvent & filterable_data ACE_ENV_ARG_DECL)
+  virtual CORBA::Boolean match_structured (const CosNotification::StructuredEvent & filterable_data)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosNotifyFilter::UnsupportedFilterableData
                      ));
 
-  virtual CORBA::Boolean match_typed (const CosNotification::PropertySeq & filterable_data ACE_ENV_ARG_DECL)
+  virtual CORBA::Boolean match_typed (const CosNotification::PropertySeq & filterable_data)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosNotifyFilter::UnsupportedFilterableData
                      ));
 
-  virtual CosNotifyFilter::CallbackID attach_callback (CosNotifyComm::NotifySubscribe_ptr callback ACE_ENV_ARG_DECL)
+  virtual CosNotifyFilter::CallbackID attach_callback (CosNotifyComm::NotifySubscribe_ptr callback)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual void detach_callback (CosNotifyFilter::CallbackID callback ACE_ENV_ARG_DECL)
+  virtual void detach_callback (CosNotifyFilter::CallbackID callback)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosNotifyFilter::CallbackNotFound
@@ -127,7 +126,7 @@ protected:
                      ));
 
 private:
-  void add_constraints_i (const CosNotifyFilter::ConstraintInfoSeq& constraint_info_seq ACE_ENV_ARG_DECL)
+  void add_constraints_i (const CosNotifyFilter::ConstraintInfoSeq& constraint_info_seq)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosNotifyFilter::InvalidConstraint
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
index 43eba4faad7..9c69dbad1d6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
@@ -17,7 +17,7 @@ TAO_Notify_ETCL_FilterFactory::~TAO_Notify_ETCL_FilterFactory ()
 }
 
 CosNotifyFilter::FilterFactory_ptr
-TAO_Notify_ETCL_FilterFactory::create (PortableServer::POA_var& filter_poa ACE_ENV_ARG_DECL)
+TAO_Notify_ETCL_FilterFactory::create (PortableServer::POA_var& filter_poa)
 {
   this->filter_poa_ = filter_poa; // save the filter poa.
 
@@ -27,7 +27,7 @@ TAO_Notify_ETCL_FilterFactory::create (PortableServer::POA_var& filter_poa ACE_E
 }
 
 CosNotifyFilter::Filter_ptr
-TAO_Notify_ETCL_FilterFactory::create_filter (const char *constraint_grammar ACE_ENV_ARG_DECL)
+TAO_Notify_ETCL_FilterFactory::create_filter (const char *constraint_grammar)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyFilter::InvalidGrammar
@@ -50,21 +50,17 @@ TAO_Notify_ETCL_FilterFactory::create_filter (const char *constraint_grammar ACE
   PortableServer::ServantBase_var filter_var (filter);
 
   PortableServer::ObjectId_var oid =
-    this->filter_poa_->activate_object (filter
-                                        ACE_ENV_ARG_PARAMETER);
+    this->filter_poa_->activate_object (filter);
 
   CORBA::Object_var obj =
-    this->filter_poa_->id_to_reference (oid.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+    this->filter_poa_->id_to_reference (oid.in ());
 
-  return CosNotifyFilter::Filter::_narrow (obj.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+  return CosNotifyFilter::Filter::_narrow (obj.in ());
 }
 
 CosNotifyFilter::MappingFilter_ptr
 TAO_Notify_ETCL_FilterFactory::create_mapping_filter (const char * /*constraint_grammar*/,
                                                   const CORBA::Any & /*default_value*/
-                                                  ACE_ENV_ARG_DECL
                                                   )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h
index 615f010c0cd..68da8ccda35 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h
@@ -52,14 +52,12 @@ public:
 
   virtual CosNotifyFilter::FilterFactory_ptr create (
       PortableServer::POA_var& filter_poa
-      ACE_ENV_ARG_DECL
     );
 
   ///= CosNotifyFilter::FilterFactory methods
 
   virtual CosNotifyFilter::Filter_ptr create_filter (
       const char * constraint_grammar
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
@@ -69,7 +67,6 @@ public:
   virtual CosNotifyFilter::MappingFilter_ptr create_mapping_filter (
       const char * constraint_grammar,
       const CORBA::Any & default_value
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.h b/TAO/orbsvcs/orbsvcs/Notify/Event.h
index 796d717836f..c2b62399db4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event.h
@@ -67,25 +67,25 @@ public:
   virtual const TAO_Notify_EventType& type (void) const = 0;
 
   /// Returns true if the filter matches.
-  virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL) const = 0;
+  virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter) const = 0;
 
   /// Convert to CosNotification::Structured type
   virtual void convert (CosNotification::StructuredEvent& notification) const = 0;
 
   /// Push event to consumer
-  virtual void push (TAO_Notify_Consumer* consumer ACE_ENV_ARG_DECL) const = 0;
+  virtual void push (TAO_Notify_Consumer* consumer) const = 0;
 
   /// Push event to the Event_Forwarder interface
-  virtual void push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const = 0;
+  virtual void push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder) const = 0;
 
   /// Push event to the Event_Forwarder interface
-  virtual void push_no_filtering (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const = 0;
+  virtual void push_no_filtering (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder) const = 0;
 
   /// Push event to the Event_Forwarder interface
-  virtual void push (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const = 0;
+  virtual void push (Event_Forwarder::ProxyPushSupplier_ptr forwarder) const = 0;
 
   /// Push event to the Event_Forwarder interface
-  virtual void push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const = 0;
+  virtual void push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder) const = 0;
 
   /// Return a pointer to a copy of this event on the heap
   TAO_Notify_Event* queueable_copy (void) const;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
index 5320a872059..8cbe6377a3f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
@@ -57,13 +57,12 @@ TAO_Notify_EventChannel::~TAO_Notify_EventChannel ()
 void
 TAO_Notify_EventChannel::init (TAO_Notify_EventChannelFactory* ecf
                            , const CosNotification::QoSProperties & initial_qos
-                           , const CosNotification::AdminProperties & initial_admin
-                           ACE_ENV_ARG_DECL)
+                           , const CosNotification::AdminProperties & initial_admin)
 {
   ACE_ASSERT (this->ca_container_.get() == 0);
 
   // this-> on the following line confuses VC6
-  initialize (ecf ACE_ENV_ARG_PARAMETER);
+  initialize (ecf);
 
   this->ecf_.reset (ecf);
 
@@ -104,11 +103,11 @@ TAO_Notify_EventChannel::init (TAO_Notify_EventChannelFactory* ecf
   const CosNotification::QoSProperties &default_ec_qos =
     TAO_Notify_PROPERTIES::instance ()->default_event_channel_qos_properties ();
 
-  this->set_qos (default_ec_qos ACE_ENV_ARG_PARAMETER);
+  this->set_qos (default_ec_qos);
 
-  this->set_qos (initial_qos ACE_ENV_ARG_PARAMETER);
+  this->set_qos (initial_qos);
 
-  this->set_admin (initial_admin ACE_ENV_ARG_PARAMETER);
+  this->set_admin (initial_admin);
 
   // Note originally default admins were allocated here, bt this caused problems
   // attempting to save the topology changes before the Event Channel was completely
@@ -118,11 +117,11 @@ TAO_Notify_EventChannel::init (TAO_Notify_EventChannelFactory* ecf
 
 
 void
-TAO_Notify_EventChannel::init (TAO_Notify::Topology_Parent* parent ACE_ENV_ARG_DECL)
+TAO_Notify_EventChannel::init (TAO_Notify::Topology_Parent* parent)
 {
   ACE_ASSERT (this->ecf_.get() == 0);
   // this-> on the following line confuses VC6
-  initialize (parent ACE_ENV_ARG_PARAMETER);
+  initialize (parent);
 
   this->ecf_.reset (dynamic_cast <TAO_Notify_EventChannelFactory*>(parent));
   ACE_ASSERT (this->ecf_.get() !=0);
@@ -164,7 +163,7 @@ TAO_Notify_EventChannel::init (TAO_Notify::Topology_Parent* parent ACE_ENV_ARG_D
   const CosNotification::QoSProperties &default_ec_qos =
     TAO_Notify_PROPERTIES::instance ()->default_event_channel_qos_properties ();
 
-  this->set_qos (default_ec_qos ACE_ENV_ARG_PARAMETER);
+  this->set_qos (default_ec_qos);
 
 }
 
@@ -217,32 +216,32 @@ TAO_Notify_EventChannel::destroy (void)
   if ( result == 1)
     return;
 
-  this->ecf_->remove (this ACE_ENV_ARG_PARAMETER);
+  this->ecf_->remove (this);
 
   this->sa_container_.reset( 0 );
   this->ca_container_.reset( 0 );
 }
 
 void
-TAO_Notify_EventChannel::remove (TAO_Notify_ConsumerAdmin* consumer_admin ACE_ENV_ARG_DECL)
+TAO_Notify_EventChannel::remove (TAO_Notify_ConsumerAdmin* consumer_admin)
 {
-  this->ca_container().remove (consumer_admin ACE_ENV_ARG_PARAMETER);
+  this->ca_container().remove (consumer_admin);
 }
 
 void
-TAO_Notify_EventChannel::remove (TAO_Notify_SupplierAdmin* supplier_admin ACE_ENV_ARG_DECL)
+TAO_Notify_EventChannel::remove (TAO_Notify_SupplierAdmin* supplier_admin)
 {
-  this->sa_container().remove (supplier_admin ACE_ENV_ARG_PARAMETER);
+  this->sa_container().remove (supplier_admin);
 }
 
 void
-TAO_Notify_EventChannel::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_ARG_DECL)
+TAO_Notify_EventChannel::set_qos (const CosNotification::QoSProperties & qos)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotification::UnsupportedQoS
                    ))
 {
-  this->TAO_Notify_Object::set_qos (qos ACE_ENV_ARG_PARAMETER);
+  this->TAO_Notify_Object::set_qos (qos);
 }
 
 CosNotification::QoSProperties*
@@ -275,12 +274,11 @@ TAO_Notify_EventChannel::default_consumer_admin (void)
       if (CORBA::is_nil (default_consumer_admin_.in ()))
         {
           CosNotifyChannelAdmin::AdminID id;
-          this->default_consumer_admin_ = this->new_for_consumers (CosNotifyChannelAdmin::OR_OP, id ACE_ENV_ARG_PARAMETER);
+          this->default_consumer_admin_ = this->new_for_consumers (CosNotifyChannelAdmin::OR_OP, id);
           // Wish there was a better way to do this!
           PortableServer::ServantBase * admin_servant =
             this->poa()->reference_to_servant (
-              this->default_consumer_admin_.in ()
-              ACE_ENV_ARG_PARAMETER);
+              this->default_consumer_admin_.in ());
           TAO_Notify_Admin * pAdmin = dynamic_cast <TAO_Notify_Admin *> (admin_servant);
           ACE_ASSERT (pAdmin != 0); // if this assert triggers, we have mixed implementations?
           if (pAdmin != 0)
@@ -304,11 +302,10 @@ TAO_Notify_EventChannel::default_supplier_admin (void)
       if (CORBA::is_nil (default_supplier_admin_.in ()))
         {
           CosNotifyChannelAdmin::AdminID id;
-          this->default_supplier_admin_ = this->new_for_suppliers (CosNotifyChannelAdmin::OR_OP, id ACE_ENV_ARG_PARAMETER);
+          this->default_supplier_admin_ = this->new_for_suppliers (CosNotifyChannelAdmin::OR_OP, id);
           PortableServer::ServantBase * admin_servant =
             this->poa()->poa()->reference_to_servant (
-              this->default_supplier_admin_.in ()
-              ACE_ENV_ARG_PARAMETER);
+              this->default_supplier_admin_.in ());
           TAO_Notify_Admin * pAdmin = dynamic_cast <TAO_Notify_Admin *> (admin_servant);
           ACE_ASSERT (pAdmin != 0); // if this assert triggers, we have mixed implementations?
           if (pAdmin != 0)
@@ -330,7 +327,7 @@ TAO_Notify_EventChannel::default_supplier_admin (void)
 
 ::CosNotifyChannelAdmin::ConsumerAdmin_ptr
 TAO_Notify_EventChannel::new_for_consumers (CosNotifyChannelAdmin::InterFilterGroupOperator op,
-                                        CosNotifyChannelAdmin::AdminID_out id ACE_ENV_ARG_DECL
+                                        CosNotifyChannelAdmin::AdminID_out id
                                         )
   ACE_THROW_SPEC ((
                    CORBA::SystemException
@@ -338,7 +335,7 @@ TAO_Notify_EventChannel::new_for_consumers (CosNotifyChannelAdmin::InterFilterGr
 
 {
   ::CosNotifyChannelAdmin::ConsumerAdmin_var ca =
-    TAO_Notify_PROPERTIES::instance()->builder()->build_consumer_admin (this, op, id ACE_ENV_ARG_PARAMETER);
+    TAO_Notify_PROPERTIES::instance()->builder()->build_consumer_admin (this, op, id);
   this->self_change ();
   return ca._retn ();
 }
@@ -346,20 +343,19 @@ TAO_Notify_EventChannel::new_for_consumers (CosNotifyChannelAdmin::InterFilterGr
 ::CosNotifyChannelAdmin::SupplierAdmin_ptr
 TAO_Notify_EventChannel::new_for_suppliers (CosNotifyChannelAdmin::InterFilterGroupOperator op,
                                         CosNotifyChannelAdmin::AdminID_out id
-                                        ACE_ENV_ARG_DECL
                                         )
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   ::CosNotifyChannelAdmin::SupplierAdmin_var sa =
-    TAO_Notify_PROPERTIES::instance()->builder()->build_supplier_admin (this, op, id ACE_ENV_ARG_PARAMETER);
+    TAO_Notify_PROPERTIES::instance()->builder()->build_supplier_admin (this, op, id);
   this->self_change ();
   return sa._retn ();
 }
 
 CosNotifyChannelAdmin::ConsumerAdmin_ptr
-TAO_Notify_EventChannel::get_consumeradmin (CosNotifyChannelAdmin::AdminID id ACE_ENV_ARG_DECL)
+TAO_Notify_EventChannel::get_consumeradmin (CosNotifyChannelAdmin::AdminID id)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotifyChannelAdmin::AdminNotFound
@@ -367,11 +363,11 @@ TAO_Notify_EventChannel::get_consumeradmin (CosNotifyChannelAdmin::AdminID id AC
 {
   TAO_Notify_ConsumerAdmin_Find_Worker find_worker;
 
-  return find_worker.resolve (id, this->ca_container() ACE_ENV_ARG_PARAMETER);
+  return find_worker.resolve (id, this->ca_container());
 }
 
 CosNotifyChannelAdmin::SupplierAdmin_ptr
-TAO_Notify_EventChannel::get_supplieradmin (CosNotifyChannelAdmin::AdminID id ACE_ENV_ARG_DECL)
+TAO_Notify_EventChannel::get_supplieradmin (CosNotifyChannelAdmin::AdminID id)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotifyChannelAdmin::AdminNotFound
@@ -379,7 +375,7 @@ TAO_Notify_EventChannel::get_supplieradmin (CosNotifyChannelAdmin::AdminID id AC
 {
   TAO_Notify_SupplierAdmin_Find_Worker find_worker;
 
-  return find_worker.resolve (id, this->sa_container() ACE_ENV_ARG_PARAMETER);
+  return find_worker.resolve (id, this->sa_container());
 }
 
 CosNotifyChannelAdmin::AdminIDSeq*
@@ -390,7 +386,7 @@ TAO_Notify_EventChannel::get_all_consumeradmins (void)
 {
   TAO_Notify_ConsumerAdmin_Seq_Worker seq_worker;
 
-  return seq_worker.create (this->ca_container() ACE_ENV_ARG_PARAMETER);
+  return seq_worker.create (this->ca_container());
 }
 
 CosNotifyChannelAdmin::AdminIDSeq*
@@ -401,11 +397,11 @@ TAO_Notify_EventChannel::get_all_supplieradmins (void)
 {
   TAO_Notify_SupplierAdmin_Seq_Worker seq_worker;
 
-  return seq_worker.create (this->sa_container() ACE_ENV_ARG_PARAMETER);
+  return seq_worker.create (this->sa_container());
 }
 
 void
-TAO_Notify_EventChannel::set_admin (const CosNotification::AdminProperties & admin ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_EventChannel::set_admin (const CosNotification::AdminProperties & admin)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotification::UnsupportedAdmin
@@ -452,18 +448,17 @@ TAO_Notify_EventChannel::for_suppliers (void)
 void
 TAO_Notify_EventChannel::validate_qos (const CosNotification::QoSProperties & /*required_qos*/,
                                    CosNotification::NamedPropertyRangeSeq_out /*available_qos*/
-                                   ACE_ENV_ARG_DECL
                                    )
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotification::UnsupportedQoS
                    ))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 void
-TAO_Notify_EventChannel::save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL)
+TAO_Notify_EventChannel::save_persistent (TAO_Notify::Topology_Saver& saver)
 {
   bool changed = this->self_changed_;
   this->self_changed_ = false;
@@ -475,16 +470,16 @@ TAO_Notify_EventChannel::save_persistent (TAO_Notify::Topology_Saver& saver ACE_
     this->save_attrs(attrs);
 
     bool want_all_children = saver.begin_object(
-      this->id(), "channel", attrs, changed ACE_ENV_ARG_PARAMETER);
+      this->id(), "channel", attrs, changed);
 
     TAO_Notify::Save_Persist_Worker<TAO_Notify_ConsumerAdmin> ca_wrk(saver, want_all_children);
 
-    this->ca_container().collection()->for_each(&ca_wrk ACE_ENV_ARG_PARAMETER);
+    this->ca_container().collection()->for_each(&ca_wrk);
 
     TAO_Notify::Save_Persist_Worker<TAO_Notify_SupplierAdmin> sa_wrk(saver, want_all_children);
-    this->sa_container().collection()->for_each(&sa_wrk ACE_ENV_ARG_PARAMETER);
+    this->sa_container().collection()->for_each(&sa_wrk);
 
-    saver.end_object(this->id(), "channel" ACE_ENV_ARG_PARAMETER);
+    saver.end_object(this->id(), "channel");
   }
 }
 
@@ -522,8 +517,7 @@ TAO_Notify_EventChannel::load_attrs(const TAO_Notify::NVPList& attrs)
 TAO_Notify::Topology_Object *
 TAO_Notify_EventChannel::load_child (const ACE_CString &type,
                                                   CORBA::Long id,
-                                                  const TAO_Notify::NVPList& attrs
-                                                  ACE_ENV_ARG_DECL)
+                                                  const TAO_Notify::NVPList& attrs)
 {
   TAO_Notify::Topology_Object* result = this;
   if (type == "consumer_admin")
@@ -537,15 +531,14 @@ TAO_Notify_EventChannel::load_child (const ACE_CString &type,
     TAO_Notify_Builder* bld = TAO_Notify_PROPERTIES::instance()->builder();
     TAO_Notify_ConsumerAdmin * ca = bld->build_consumer_admin (
       this,
-      id
-      ACE_ENV_ARG_PARAMETER);
+      id);
     ca->load_attrs (attrs);
     if (ca->is_default ())
       {
-        CORBA::Object_var caob = this->poa()->servant_to_reference (ca ACE_ENV_ARG_PARAMETER);
+        CORBA::Object_var caob = this->poa()->servant_to_reference (ca);
         this->default_consumer_admin_ =
           CosNotifyChannelAdmin::ConsumerAdmin::_narrow (
-          caob.in () ACE_ENV_ARG_PARAMETER);
+          caob.in ());
       }
     result = ca;
   }
@@ -559,53 +552,50 @@ TAO_Notify_EventChannel::load_child (const ACE_CString &type,
 
     TAO_Notify_SupplierAdmin * sa = bld->build_supplier_admin (
       this,
-      id
-      ACE_ENV_ARG_PARAMETER);
+      id);
     sa->load_attrs (attrs);
     if (sa->is_default ())
       {
-        CORBA::Object_var saob = this->poa()->servant_to_reference (sa ACE_ENV_ARG_PARAMETER);
+        CORBA::Object_var saob = this->poa()->servant_to_reference (sa);
         this->default_supplier_admin_ =
           CosNotifyChannelAdmin::SupplierAdmin::_narrow (
-          saob.in () ACE_ENV_ARG_PARAMETER);
+          saob.in ());
       }
     result = sa;
   }
   return result;
 }
 TAO_Notify_ProxyConsumer *
-TAO_Notify_EventChannel::find_proxy_consumer (TAO_Notify::IdVec & id_path, size_t position ACE_ENV_ARG_DECL)
+TAO_Notify_EventChannel::find_proxy_consumer (TAO_Notify::IdVec & id_path, size_t position)
 {
   TAO_Notify_ProxyConsumer * result = 0;
   size_t path_size = id_path.size ();
   if (position < path_size)
   {
     TAO_Notify_SupplierAdmin_Find_Worker find_worker;
-    TAO_Notify_SupplierAdmin * admin = find_worker.find (id_path[position], this->sa_container() ACE_ENV_ARG_PARAMETER);
+    TAO_Notify_SupplierAdmin * admin = find_worker.find (id_path[position], this->sa_container());
     ++position;
     if (admin != 0)
     {
-      result = admin->find_proxy_consumer (id_path, position
-        ACE_ENV_ARG_PARAMETER);
+      result = admin->find_proxy_consumer (id_path, position);
     }
   }
   return result;
 }
 
 TAO_Notify_ProxySupplier *
-TAO_Notify_EventChannel::find_proxy_supplier (TAO_Notify::IdVec & id_path, size_t position ACE_ENV_ARG_DECL)
+TAO_Notify_EventChannel::find_proxy_supplier (TAO_Notify::IdVec & id_path, size_t position)
 {
   TAO_Notify_ProxySupplier * result = 0;
   size_t path_size = id_path.size ();
   if (position < path_size)
   {
     TAO_Notify_ConsumerAdmin_Find_Worker find_worker;
-    TAO_Notify_ConsumerAdmin * admin = find_worker.find (id_path[position], this->ca_container() ACE_ENV_ARG_PARAMETER);
+    TAO_Notify_ConsumerAdmin * admin = find_worker.find (id_path[position], this->ca_container());
     ++position;
     if (admin != 0)
     {
-      result = admin->find_proxy_supplier (id_path, position
-        ACE_ENV_ARG_PARAMETER);
+      result = admin->find_proxy_supplier (id_path, position);
     }
   }
   return result;
@@ -616,10 +606,10 @@ void
 TAO_Notify_EventChannel::reconnect (void)
 {
   TAO_Notify::Reconnect_Worker<TAO_Notify_ConsumerAdmin> ca_wrk;
-  this->ca_container().collection()->for_each(&ca_wrk ACE_ENV_ARG_PARAMETER);
+  this->ca_container().collection()->for_each(&ca_wrk);
 
   TAO_Notify::Reconnect_Worker<TAO_Notify_SupplierAdmin> sa_wrk;
-  this->sa_container().collection()->for_each(&sa_wrk ACE_ENV_ARG_PARAMETER);
+  this->sa_container().collection()->for_each(&sa_wrk);
 }
 
 TAO_Notify_EventChannel::TAO_Notify_ConsumerAdmin_Container&
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
index bdcfc84df8c..f9abd36b7b1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
@@ -65,18 +65,16 @@ public:
   /// Init
   void init (TAO_Notify_EventChannelFactory* ecf
              , const CosNotification::QoSProperties & initial_qos
-             , const CosNotification::AdminProperties & initial_admin
-             ACE_ENV_ARG_DECL);
+             , const CosNotification::AdminProperties & initial_admin);
 
   /// Init (for reload)
-  void init (TAO_Notify::Topology_Parent * parent
-             ACE_ENV_ARG_DECL);
+  void init (TAO_Notify::Topology_Parent * parent);
 
   /// Remove ConsumerAdmin from its container.
-  void remove (TAO_Notify_ConsumerAdmin* consumer_admin ACE_ENV_ARG_DECL);
+  void remove (TAO_Notify_ConsumerAdmin* consumer_admin);
 
   /// Remove SupplierAdmin from its container.
-  void remove (TAO_Notify_SupplierAdmin* supplier_admin ACE_ENV_ARG_DECL);
+  void remove (TAO_Notify_SupplierAdmin* supplier_admin);
 
   /// ServantBase refcount methods.
   virtual void _add_ref (void);
@@ -84,17 +82,16 @@ public:
 
   // TAO_Notify::Topology_Parent
 
-  virtual void save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL);
+  virtual void save_persistent (TAO_Notify::Topology_Saver& saver);
   virtual TAO_Notify::Topology_Object* load_child (const ACE_CString &type,
                                                    CORBA::Long id,
-                                                   const TAO_Notify::NVPList& attrs
-                                                   ACE_ENV_ARG_DECL);
+                                                   const TAO_Notify::NVPList& attrs);
   virtual void reconnect (void);
 
   virtual TAO_Notify_Object::ID get_id () const {return id();}
 
-  TAO_Notify_ProxyConsumer * find_proxy_consumer (TAO_Notify::IdVec & id_path, size_t position  ACE_ENV_ARG_DECL);
-  TAO_Notify_ProxySupplier * find_proxy_supplier (TAO_Notify::IdVec & id_path, size_t position  ACE_ENV_ARG_DECL);
+  TAO_Notify_ProxyConsumer * find_proxy_consumer (TAO_Notify::IdVec & id_path, size_t position);
+  TAO_Notify_ProxySupplier * find_proxy_supplier (TAO_Notify::IdVec & id_path, size_t position);
 
   /// Shutdown
   virtual int shutdown (void);
@@ -125,20 +122,20 @@ private:
                      CORBA::SystemException
                      ));
 
-  virtual ::CosNotifyChannelAdmin::EventChannelFactory_ptr MyFactory (ACE_ENV_SINGLE_ARG_DECL
+  virtual ::CosNotifyChannelAdmin::EventChannelFactory_ptr MyFactory (
   )
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual ::CosNotifyChannelAdmin::ConsumerAdmin_ptr default_consumer_admin (ACE_ENV_SINGLE_ARG_DECL
+  virtual ::CosNotifyChannelAdmin::ConsumerAdmin_ptr default_consumer_admin (
 
   )
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual ::CosNotifyChannelAdmin::SupplierAdmin_ptr default_supplier_admin (ACE_ENV_SINGLE_ARG_DECL
+  virtual ::CosNotifyChannelAdmin::SupplierAdmin_ptr default_supplier_admin (
 
   )
     ACE_THROW_SPEC ((
@@ -151,28 +148,24 @@ private:
                      ));
 
   virtual ::CosNotifyChannelAdmin::ConsumerAdmin_ptr new_for_consumers (CosNotifyChannelAdmin::InterFilterGroupOperator op,
-                                                                        CosNotifyChannelAdmin::AdminID_out id
-                                                                        ACE_ENV_ARG_DECL)
+                                                                        CosNotifyChannelAdmin::AdminID_out id)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
   virtual ::CosNotifyChannelAdmin::SupplierAdmin_ptr new_for_suppliers (CosNotifyChannelAdmin::InterFilterGroupOperator op,
-                                                                        CosNotifyChannelAdmin::AdminID_out id
-                                                                        ACE_ENV_ARG_DECL)
+                                                                        CosNotifyChannelAdmin::AdminID_out id)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual ::CosNotifyChannelAdmin::ConsumerAdmin_ptr get_consumeradmin (CosNotifyChannelAdmin::AdminID id
-                                                                        ACE_ENV_ARG_DECL)
+  virtual ::CosNotifyChannelAdmin::ConsumerAdmin_ptr get_consumeradmin (CosNotifyChannelAdmin::AdminID id)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      , CosNotifyChannelAdmin::AdminNotFound
                      ));
 
-  virtual ::CosNotifyChannelAdmin::SupplierAdmin_ptr get_supplieradmin (CosNotifyChannelAdmin::AdminID id
-                                                                        ACE_ENV_ARG_DECL)
+  virtual ::CosNotifyChannelAdmin::SupplierAdmin_ptr get_supplieradmin (CosNotifyChannelAdmin::AdminID id)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      , CosNotifyChannelAdmin::AdminNotFound
@@ -193,16 +186,14 @@ private:
                      CORBA::SystemException
                      ));
 
-  virtual void set_qos (const CosNotification::QoSProperties & qos
-                        ACE_ENV_ARG_DECL)
+  virtual void set_qos (const CosNotification::QoSProperties & qos)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      , CosNotification::UnsupportedQoS
                      ));
 
   virtual void validate_qos (const CosNotification::QoSProperties & required_qos,
-                             CosNotification::NamedPropertyRangeSeq_out available_qos
-                             ACE_ENV_ARG_DECL)
+                             CosNotification::NamedPropertyRangeSeq_out available_qos)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      , CosNotification::UnsupportedQoS
@@ -213,7 +204,7 @@ private:
                      CORBA::SystemException
                      ));
 
-  virtual void set_admin (const CosNotification::AdminProperties & admin ACE_ENV_ARG_DECL)
+  virtual void set_admin (const CosNotification::AdminProperties & admin)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      , CosNotification::UnsupportedAdmin
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
index 7205d8831eb..6143846dde2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
@@ -79,7 +79,7 @@ TAO_Notify_EventChannelFactory::destroy (void)
 }
 
 void
-TAO_Notify_EventChannelFactory::init (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL)
+TAO_Notify_EventChannelFactory::init (PortableServer::POA_ptr poa)
 {
   ACE_ASSERT (this->ec_container_.get() == 0);
 
@@ -104,7 +104,7 @@ TAO_Notify_EventChannelFactory::init (PortableServer::POA_ptr poa ACE_ENV_ARG_DE
 
   ACE_Auto_Ptr<TAO_Notify_POA_Helper> auto_object_poa (object_poa);
 
-  object_poa->init (poa ACE_ENV_ARG_PARAMETER);
+  object_poa->init (poa);
 
   this->adopt_poa (auto_object_poa.release ());
 
@@ -138,9 +138,9 @@ TAO_Notify_EventChannelFactory::release (void)
 }
 
 void
-TAO_Notify_EventChannelFactory::remove (TAO_Notify_EventChannel* event_channel ACE_ENV_ARG_DECL)
+TAO_Notify_EventChannelFactory::remove (TAO_Notify_EventChannel* event_channel)
 {
-  this->ec_container().remove (event_channel ACE_ENV_ARG_PARAMETER);
+  this->ec_container().remove (event_channel);
   this->self_change ();
 }
 
@@ -166,7 +166,7 @@ TAO_Notify_EventChannelFactory::get_default_filter_factory (void)
 ::CosNotifyChannelAdmin::EventChannel_ptr TAO_Notify_EventChannelFactory::create_channel (
     const CosNotification::QoSProperties & initial_qos,
     const CosNotification::AdminProperties & initial_admin,
-    CosNotifyChannelAdmin::ChannelID_out id ACE_ENV_ARG_DECL
+    CosNotifyChannelAdmin::ChannelID_out id
   )
   ACE_THROW_SPEC ((
                    CORBA::SystemException
@@ -178,8 +178,7 @@ TAO_Notify_EventChannelFactory::get_default_filter_factory (void)
     TAO_Notify_PROPERTIES::instance()->builder()->build_event_channel (this
                                                                         , initial_qos
                                                                         , initial_admin
-                                                                        , id
-                                                                        ACE_ENV_ARG_PARAMETER);
+                                                                        , id);
   this->self_change ();
   return ec._retn ();
 }
@@ -192,11 +191,11 @@ TAO_Notify_EventChannelFactory::get_all_channels (void)
 {
   TAO_Notify_EventChannel_Seq_Worker seq_worker;
 
-  return seq_worker.create (this->ec_container() ACE_ENV_ARG_PARAMETER);
+  return seq_worker.create (this->ec_container());
 }
 
 CosNotifyChannelAdmin::EventChannel_ptr
-TAO_Notify_EventChannelFactory::get_event_channel (CosNotifyChannelAdmin::ChannelID id ACE_ENV_ARG_DECL)
+TAO_Notify_EventChannelFactory::get_event_channel (CosNotifyChannelAdmin::ChannelID id)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotifyChannelAdmin::ChannelNotFound
@@ -204,7 +203,7 @@ TAO_Notify_EventChannelFactory::get_event_channel (CosNotifyChannelAdmin::Channe
 {
   TAO_Notify_EventChannel_Find_Worker find_worker;
 
-  return find_worker.resolve (id, this->ec_container() ACE_ENV_ARG_PARAMETER);
+  return find_worker.resolve (id, this->ec_container());
 }
 
 void
@@ -229,7 +228,7 @@ TAO_Notify_EventChannelFactory::load_topology (void)
     auto_ptr<TAO_Notify::Topology_Loader> tl(this->topology_factory_->create_loader());
     if (tl.get () != 0)
     {
-      tl->load (this ACE_ENV_ARG_PARAMETER);
+      tl->load (this);
     }
   }
   else
@@ -246,7 +245,7 @@ TAO_Notify_EventChannelFactory::is_persistent () const
 }
 
 void
-TAO_Notify_EventChannelFactory::save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL)
+TAO_Notify_EventChannelFactory::save_persistent (TAO_Notify::Topology_Saver& saver)
 {
   bool changed = this->self_changed_;
   this->self_changed_ = false;
@@ -255,20 +254,20 @@ TAO_Notify_EventChannelFactory::save_persistent (TAO_Notify::Topology_Saver& sav
   TAO_Notify::NVPList attrs; // ECF has no attributes
 
   bool want_all_children =
-    saver.begin_object(0, "channel_factory", attrs, changed ACE_ENV_ARG_PARAMETER);
+    saver.begin_object(0, "channel_factory", attrs, changed);
 
   // for each deleted child
   //  delete_child  // if the child has persistence.
 
   TAO_Notify::Save_Persist_Worker<TAO_Notify_EventChannel> wrk(saver, want_all_children);
 
-  this->ec_container().collection()->for_each(&wrk ACE_ENV_ARG_PARAMETER);
+  this->ec_container().collection()->for_each(&wrk);
 
   if (want_all_children || this->reconnect_registry_.is_changed ())
   {
-    this->reconnect_registry_.save_persistent(saver ACE_ENV_ARG_PARAMETER);
+    this->reconnect_registry_.save_persistent(saver);
   }
-  saver.end_object(0, "channel_factory" ACE_ENV_ARG_PARAMETER);
+  saver.end_object(0, "channel_factory");
 }
 
 void
@@ -309,7 +308,7 @@ TAO_Notify_EventChannelFactory::load_event_persistence (void)
       ACE_ERROR ((LM_ERROR,
         ACE_TEXT ("(%P|%t) Notify Service: Configuration error.  Event Persistence requires Topology Persistence.\n")
         ));
-      ACE_THROW (CORBA::PERSIST_STORE());
+      throw CORBA::PERSIST_STORE();
     }
   }
 }
@@ -335,7 +334,7 @@ TAO_Notify_EventChannelFactory::change_to_parent (void)
         auto_ptr<TAO_Notify::Topology_Saver> saver(this->topology_factory_->create_saver());
         if (saver.get() != 0)
         {
-          this->save_persistent(*saver ACE_ENV_ARG_PARAMETER);
+          this->save_persistent(*saver);
           saver->close ();
         }
         this->topology_save_seq_ += 1;
@@ -349,8 +348,7 @@ TAO_Notify::Topology_Object*
 TAO_Notify_EventChannelFactory::load_child (const ACE_CString& type,
                                         CORBA::Long id,
                                         const TAO_Notify::
-                                        NVPList& attrs
-                                        ACE_ENV_ARG_DECL)
+                                        NVPList& attrs)
 {
   // ignore anything but our valid children (ie channel)
   TAO_Notify::Topology_Object * result = this;
@@ -364,8 +362,7 @@ TAO_Notify_EventChannelFactory::load_child (const ACE_CString& type,
     TAO_Notify_Builder* bld = TAO_Notify_PROPERTIES::instance()->builder();
     TAO_Notify_EventChannel * ec = bld->build_event_channel(
         this ,
-        id
-        ACE_ENV_ARG_PARAMETER);
+        id);
 
     ec->load_attrs (attrs);
 
@@ -384,11 +381,11 @@ TAO_Notify_EventChannelFactory::reconnect (void)
   // Reconnect all children first
   TAO_Notify::Reconnect_Worker<TAO_Notify_EventChannel> wrk;
 
-  this->ec_container().collection()->for_each(&wrk ACE_ENV_ARG_PARAMETER);
+  this->ec_container().collection()->for_each(&wrk);
 
   // Then send reconnection announcement to registered clients
   ACE_ASSERT (!CORBA::is_nil (this->channel_factory_.in ()));
-  this->reconnect_registry_.send_reconnect (this->channel_factory_.in () ACE_ENV_ARG_PARAMETER);
+  this->reconnect_registry_.send_reconnect (this->channel_factory_.in ());
 
   // reactivate events in-progress
   Routing_Slip_Set::CONST_ITERATOR iter (this->routing_slip_restart_set_);
@@ -402,24 +399,20 @@ TAO_Notify_EventChannelFactory::reconnect (void)
 
 NotifyExt::ReconnectionRegistry::ReconnectionID
 TAO_Notify_EventChannelFactory::register_callback (
-    NotifyExt::ReconnectionCallback_ptr reconnection
-    ACE_ENV_ARG_DECL)
+    NotifyExt::ReconnectionCallback_ptr reconnection)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->reconnect_registry_.register_callback (
-    reconnection
-    ACE_ENV_ARG_PARAMETER);
+    reconnection);
 }
 
 void
 TAO_Notify_EventChannelFactory::unregister_callback (
-    NotifyExt::ReconnectionRegistry::ReconnectionID id
-    ACE_ENV_ARG_DECL)
+    NotifyExt::ReconnectionRegistry::ReconnectionID id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->reconnect_registry_.unregister_callback (
-    id
-    ACE_ENV_ARG_PARAMETER);
+    id);
 }
 
 CORBA::Boolean
@@ -437,7 +430,7 @@ TAO_Notify_EventChannelFactory::save_topology (void)
 }
 
 TAO_Notify_ProxyConsumer *
-TAO_Notify_EventChannelFactory::find_proxy_consumer (TAO_Notify::IdVec & id_path, size_t position ACE_ENV_ARG_DECL)
+TAO_Notify_EventChannelFactory::find_proxy_consumer (TAO_Notify::IdVec & id_path, size_t position)
 {
   TAO_Notify_ProxyConsumer * result = 0;
   size_t path_size = id_path.size ();
@@ -452,19 +445,18 @@ TAO_Notify_EventChannelFactory::find_proxy_consumer (TAO_Notify::IdVec & id_path
   {
     TAO_Notify_EventChannel_Find_Worker find_worker;
 
-    TAO_Notify_EventChannel * ec = find_worker.find (id_path[position], this->ec_container() ACE_ENV_ARG_PARAMETER);
+    TAO_Notify_EventChannel * ec = find_worker.find (id_path[position], this->ec_container());
     ++position;
     if (ec != 0)
     {
-      result = ec->find_proxy_consumer (id_path, position
-        ACE_ENV_ARG_PARAMETER);
+      result = ec->find_proxy_consumer (id_path, position);
     }
   }
   return result;
 }
 
 TAO_Notify_ProxySupplier *
-TAO_Notify_EventChannelFactory::find_proxy_supplier (TAO_Notify::IdVec & id_path, size_t position ACE_ENV_ARG_DECL)
+TAO_Notify_EventChannelFactory::find_proxy_supplier (TAO_Notify::IdVec & id_path, size_t position)
 {
   TAO_Notify_ProxySupplier * result = 0;
   size_t path_size = id_path.size ();
@@ -478,12 +470,11 @@ TAO_Notify_EventChannelFactory::find_proxy_supplier (TAO_Notify::IdVec & id_path
   if (position < path_size)
   {
     TAO_Notify_EventChannel_Find_Worker find_worker;
-    TAO_Notify_EventChannel * ec = find_worker.find (id_path[position], this->ec_container() ACE_ENV_ARG_PARAMETER);
+    TAO_Notify_EventChannel * ec = find_worker.find (id_path[position], this->ec_container());
     ++position;
     if (ec != 0)
     {
-      result = ec->find_proxy_supplier (id_path, position
-        ACE_ENV_ARG_PARAMETER);
+      result = ec->find_proxy_supplier (id_path, position);
     }
   }
   return result;
@@ -492,12 +483,12 @@ TAO_Notify_EventChannelFactory::find_proxy_supplier (TAO_Notify::IdVec & id_path
 CosNotifyChannelAdmin::EventChannelFactory_ptr
 TAO_Notify_EventChannelFactory::activate_self (void)
 {
-  CORBA::Object_var obj = this->activate (this ACE_ENV_ARG_PARAMETER);
+  CORBA::Object_var obj = this->activate (this);
   this->channel_factory_
-    = CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in() ACE_ENV_ARG_PARAMETER);
-  CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in() ACE_ENV_ARG_PARAMETER);
+    = CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in());
+  CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in());
 
-  ACE_TRY_NEW_ENV
+  try
   {
     if (DEBUG_LEVEL > 9)
     {
@@ -505,11 +496,10 @@ TAO_Notify_EventChannelFactory::activate_self (void)
     }
     this->reconnect ();
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
     // ignore for now
   }
-  ACE_ENDTRY;
   return this->channel_factory_._retn();
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
index 5c631f67e8e..4f87d5f8e18 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
@@ -59,7 +59,7 @@ public:
   TAO_Notify_EventChannelFactory (void);
 
   /// Init the factory
-  void init (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL);
+  void init (PortableServer::POA_ptr poa);
 
   /// Destructor
   virtual ~TAO_Notify_EventChannelFactory ();
@@ -69,11 +69,10 @@ public:
   virtual void _remove_ref (void);
 
   /// Remove <channel> from the <ec_container_>
-  void remove (TAO_Notify_EventChannel* channel ACE_ENV_ARG_DECL);
+  void remove (TAO_Notify_EventChannel* channel);
 
   /// Accesor for the default filter factory shared by all EC's.
   virtual CosNotifyFilter::FilterFactory_ptr get_default_filter_factory (
-      ACE_ENV_SINGLE_ARG_DECL
     );
 
 
@@ -94,12 +93,11 @@ public:
 
   virtual bool is_persistent () const;
 
-  virtual void save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL);
+  virtual void save_persistent (TAO_Notify::Topology_Saver& saver);
   virtual bool change_to_parent (void);
   virtual TAO_Notify::Topology_Object* load_child (const ACE_CString &type,
                                                    CORBA::Long id,
-                                                   const TAO_Notify::NVPList& attrs
-                                                   ACE_ENV_ARG_DECL);
+                                                   const TAO_Notify::NVPList& attrs);
   CosNotifyChannelAdmin::EventChannelFactory_ptr activate_self (void);
   virtual void reconnect (void);
 
@@ -111,9 +109,9 @@ public:
   virtual void save_topology (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  TAO_Notify_ProxyConsumer * find_proxy_consumer (TAO_Notify::IdVec & id_path, size_t position  ACE_ENV_ARG_DECL);
-  TAO_Notify_ProxySupplier * find_proxy_supplier (TAO_Notify::IdVec & id_path, size_t position  ACE_ENV_ARG_DECL);
-  TAO_Notify_Object * follow_id_path (TAO_Notify::IdVec & id_path, size_t position  ACE_ENV_ARG_DECL);
+  TAO_Notify_ProxyConsumer * find_proxy_consumer (TAO_Notify::IdVec & id_path, size_t position);
+  TAO_Notify_ProxySupplier * find_proxy_supplier (TAO_Notify::IdVec & id_path, size_t position);
+  TAO_Notify_Object * follow_id_path (TAO_Notify::IdVec & id_path, size_t position);
   virtual TAO_Notify_Object::ID get_id () const;
 
 
@@ -135,13 +133,11 @@ public:
 
   virtual
   NotifyExt::ReconnectionRegistry::ReconnectionID register_callback (
-      NotifyExt::ReconnectionCallback_ptr reconnection
-      ACE_ENV_ARG_DECL)
+      NotifyExt::ReconnectionCallback_ptr reconnection)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void unregister_callback (
-      NotifyExt::ReconnectionRegistry::ReconnectionID id
-      ACE_ENV_ARG_DECL)
+      NotifyExt::ReconnectionRegistry::ReconnectionID id)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean is_alive (void)
@@ -153,20 +149,17 @@ public:
       const CosNotification::QoSProperties & initial_qos,
       const CosNotification::AdminProperties & initial_admin,
       CosNotifyChannelAdmin::ChannelID_out id
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNotification::UnsupportedQoS,
                      CosNotification::UnsupportedAdmin));
 
   virtual ::CosNotifyChannelAdmin::ChannelIDSeq * get_all_channels (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual ::CosNotifyChannelAdmin::EventChannel_ptr get_event_channel (
       CosNotifyChannelAdmin::ChannelID id
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNotifyChannelAdmin::ChannelNotFound));
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp
index 5866bfb9d54..b4306279eb0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp
@@ -163,16 +163,16 @@ bool TAO_Notify_EventType::init(const TAO_Notify::NVPList& attrs)
   // TAO_Notify::Topology_Object
 
 void
-TAO_Notify_EventType::save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL)
+TAO_Notify_EventType::save_persistent (TAO_Notify::Topology_Saver& saver)
 {
   TAO_Notify::NVPList attrs;
   bool changed = true;
 
   attrs.push_back(TAO_Notify::NVP("Domain", this->event_type_.domain_name.in()));
   attrs.push_back(TAO_Notify::NVP("Type", this->event_type_.type_name.in()));
-  saver.begin_object(0, "subscription", attrs, changed ACE_ENV_ARG_PARAMETER);
+  saver.begin_object(0, "subscription", attrs, changed);
 
-  saver.end_object(0, "subscription" ACE_ENV_ARG_PARAMETER);
+  saver.end_object(0, "subscription");
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.h b/TAO/orbsvcs/orbsvcs/Notify/EventType.h
index d6ba4bd1033..500b1dfaeb5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventType.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.h
@@ -79,7 +79,7 @@ public:
 
   // TAO_Notify::Topology_Object
 
-  virtual void save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL);
+  virtual void save_persistent (TAO_Notify::Topology_Saver& saver);
 
 protected:
   /// Init this object.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
index ec574b112bd..a318fcdd198 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
@@ -261,7 +261,7 @@ TAO_Notify_EventTypeSeq::dump (void) const
 
   // TAO_Notify::Topology_Object
 void
-TAO_Notify_EventTypeSeq::save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL)
+TAO_Notify_EventTypeSeq::save_persistent (TAO_Notify::Topology_Saver& saver)
 {
   bool changed = this->self_changed_;
   this->self_changed_ = false;
@@ -273,23 +273,23 @@ TAO_Notify_EventTypeSeq::save_persistent (TAO_Notify::Topology_Saver& saver ACE_
 
   if (this->size() != 0)
   {
-    saver.begin_object(0, "subscriptions", attrs, changed ACE_ENV_ARG_PARAMETER);
+    saver.begin_object(0, "subscriptions", attrs, changed);
     for (iter.first (); iter.next (event_type) != 0; iter.advance ())
     {
-      event_type->save_persistent(saver ACE_ENV_ARG_PARAMETER);
+      event_type->save_persistent(saver);
     }
 // todo:
 //    for all deleted children
 //    {
 //      saver.delete_child(child_type, child_id);
 //    }
-    saver.end_object(0, "subscriptions" ACE_ENV_ARG_PARAMETER);
+    saver.end_object(0, "subscriptions");
   }
 }
 
 TAO_Notify::Topology_Object*
 TAO_Notify_EventTypeSeq::load_child (const ACE_CString &type, CORBA::Long id,
-  const TAO_Notify::NVPList& attrs ACE_ENV_ARG_DECL_NOT_USED)
+  const TAO_Notify::NVPList& attrs)
 {
   ACE_UNUSED_ARG (id);
   TAO_Notify::Topology_Object *result = this;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
index cf66b603c04..b2b93b76d77 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
@@ -73,9 +73,9 @@ public:
 
   // TAO_Notify::Topology_Object
 
-  virtual void save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL);
+  virtual void save_persistent (TAO_Notify::Topology_Saver& saver);
   virtual TAO_Notify::Topology_Object* load_child (const ACE_CString &type, CORBA::Long id,
-    const TAO_Notify::NVPList& attrs ACE_ENV_ARG_DECL);
+    const TAO_Notify::NVPList& attrs);
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp
index 58025098ad4..dd5bd4600a6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp
@@ -32,7 +32,7 @@ public:
 
 protected:
   ///= TAO_ESF_Worker method
-  void work (TAO_Notify_ProxyConsumer* proxy ACE_ENV_ARG_DECL);
+  void work (TAO_Notify_ProxyConsumer* proxy);
 
   const TAO_Notify_EventTypeSeq& added_;
   const TAO_Notify_EventTypeSeq& removed_;
@@ -53,7 +53,7 @@ public:
 
 protected:
   ///= TAO_ESF_Worker method
-  void work (TAO_Notify_ProxySupplier* proxy ACE_ENV_ARG_DECL);
+  void work (TAO_Notify_ProxySupplier* proxy);
 
   const TAO_Notify_EventTypeSeq& added_;
   const TAO_Notify_EventTypeSeq& removed_;
@@ -107,60 +107,60 @@ TAO_Notify_Event_Manager::shutdown (void)
 }
 
 void
-TAO_Notify_Event_Manager::connect (TAO_Notify_ProxySupplier* proxy_supplier ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Manager::connect (TAO_Notify_ProxySupplier* proxy_supplier)
 {
-  this->consumer_map().connect (proxy_supplier ACE_ENV_ARG_PARAMETER);
+  this->consumer_map().connect (proxy_supplier);
 
   // Inform about offered types.
   TAO_Notify_EventTypeSeq removed;
-  proxy_supplier->types_changed (this->offered_types (), removed ACE_ENV_ARG_PARAMETER);
+  proxy_supplier->types_changed (this->offered_types (), removed);
 }
 
 void
-TAO_Notify_Event_Manager::disconnect (TAO_Notify_ProxySupplier* proxy_supplier ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Manager::disconnect (TAO_Notify_ProxySupplier* proxy_supplier)
 {
-  this->consumer_map().disconnect (proxy_supplier ACE_ENV_ARG_PARAMETER);
+  this->consumer_map().disconnect (proxy_supplier);
 }
 
 void
-TAO_Notify_Event_Manager::connect (TAO_Notify_ProxyConsumer* proxy_consumer ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Manager::connect (TAO_Notify_ProxyConsumer* proxy_consumer)
 {
-  this->supplier_map().connect (proxy_consumer ACE_ENV_ARG_PARAMETER);
+  this->supplier_map().connect (proxy_consumer);
   // Inform about subscription types.
   TAO_Notify_EventTypeSeq removed;
-  proxy_consumer->types_changed (this->subscription_types (), removed ACE_ENV_ARG_PARAMETER);
+  proxy_consumer->types_changed (this->subscription_types (), removed);
 }
 
 void
-TAO_Notify_Event_Manager::disconnect (TAO_Notify_ProxyConsumer* proxy_consumer ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Manager::disconnect (TAO_Notify_ProxyConsumer* proxy_consumer)
 {
-  this->supplier_map().disconnect (proxy_consumer ACE_ENV_ARG_PARAMETER);
+  this->supplier_map().disconnect (proxy_consumer);
 }
 
 void
-TAO_Notify_Event_Manager::offer_change (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Manager::offer_change (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed)
 {
   TAO_Notify_EventTypeSeq new_added, last_removed;
 
-  this->publish (proxy_consumer, added, new_added ACE_ENV_ARG_PARAMETER);
+  this->publish (proxy_consumer, added, new_added);
 
-  this->un_publish (proxy_consumer, removed, last_removed ACE_ENV_ARG_PARAMETER);
+  this->un_publish (proxy_consumer, removed, last_removed);
 
   TAO_Notify_Consumer_Map::ENTRY::COLLECTION* updates_collection = this->consumer_map().updates_collection ();
 
   TAO_Notify_ProxySupplier_Update_Worker worker (new_added, last_removed);
 
   if (updates_collection != 0)
-    updates_collection->for_each (&worker ACE_ENV_ARG_PARAMETER);
+    updates_collection->for_each (&worker);
 }
 
 void
-TAO_Notify_Event_Manager::subscription_change (TAO_Notify_ProxySupplier* proxy_supplier, const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Manager::subscription_change (TAO_Notify_ProxySupplier* proxy_supplier, const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed)
 {
   TAO_Notify_EventTypeSeq new_added, last_removed;
 
-  this->subscribe (proxy_supplier, added, new_added ACE_ENV_ARG_PARAMETER);
-  this->un_subscribe (proxy_supplier, removed, last_removed ACE_ENV_ARG_PARAMETER);
+  this->subscribe (proxy_supplier, added, new_added);
+  this->un_subscribe (proxy_supplier, removed, last_removed);
 
   TAO_Notify_Supplier_Map::ENTRY::COLLECTION* updates_collection = this->supplier_map().updates_collection ();
 
@@ -168,12 +168,12 @@ TAO_Notify_Event_Manager::subscription_change (TAO_Notify_ProxySupplier* proxy_s
 
   if (updates_collection != 0)
     {
-      updates_collection->for_each (&worker ACE_ENV_ARG_PARAMETER);
+      updates_collection->for_each (&worker);
     }
 }
 
 void
-TAO_Notify_Event_Manager::subscribe (TAO_Notify_ProxySupplier* proxy_supplier, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& new_seq ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Manager::subscribe (TAO_Notify_ProxySupplier* proxy_supplier, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& new_seq)
 {
   TAO_Notify_EventTypeSeq::CONST_ITERATOR iter (seq);
 
@@ -181,7 +181,7 @@ TAO_Notify_Event_Manager::subscribe (TAO_Notify_ProxySupplier* proxy_supplier, c
 
   for (iter.first (); iter.next (event_type) != 0; iter.advance ())
     {
-      int result = this->consumer_map().insert (proxy_supplier, *event_type ACE_ENV_ARG_PARAMETER);
+      int result = this->consumer_map().insert (proxy_supplier, *event_type);
 
       if (result == 1)
         new_seq.insert (*event_type);
@@ -189,7 +189,7 @@ TAO_Notify_Event_Manager::subscribe (TAO_Notify_ProxySupplier* proxy_supplier, c
 }
 
 void
-TAO_Notify_Event_Manager::un_subscribe (TAO_Notify_ProxySupplier* proxy_supplier, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& last_seq ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Manager::un_subscribe (TAO_Notify_ProxySupplier* proxy_supplier, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& last_seq)
 {
   TAO_Notify_EventTypeSeq::CONST_ITERATOR iter (seq);
 
@@ -197,7 +197,7 @@ TAO_Notify_Event_Manager::un_subscribe (TAO_Notify_ProxySupplier* proxy_supplier
 
   for (iter.first (); iter.next (event_type) != 0; iter.advance ())
     {
-      int result = this->consumer_map().remove (proxy_supplier, *event_type ACE_ENV_ARG_PARAMETER);
+      int result = this->consumer_map().remove (proxy_supplier, *event_type);
 
       if (result == 1)
         last_seq.insert (*event_type);
@@ -205,7 +205,7 @@ TAO_Notify_Event_Manager::un_subscribe (TAO_Notify_ProxySupplier* proxy_supplier
 }
 
 void
-TAO_Notify_Event_Manager::publish (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& new_seq ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Manager::publish (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& new_seq)
 {
   TAO_Notify_EventTypeSeq::CONST_ITERATOR iter (seq);
 
@@ -213,7 +213,7 @@ TAO_Notify_Event_Manager::publish (TAO_Notify_ProxyConsumer* proxy_consumer, con
 
   for (iter.first (); iter.next (event_type) != 0; iter.advance ())
     {
-      int result = supplier_map().insert (proxy_consumer, *event_type ACE_ENV_ARG_PARAMETER);
+      int result = supplier_map().insert (proxy_consumer, *event_type);
 
       if (result == 1)
         new_seq.insert (*event_type);
@@ -221,7 +221,7 @@ TAO_Notify_Event_Manager::publish (TAO_Notify_ProxyConsumer* proxy_consumer, con
 }
 
 void
-TAO_Notify_Event_Manager::un_publish (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& last_seq ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Manager::un_publish (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& last_seq)
 {
   TAO_Notify_EventTypeSeq::CONST_ITERATOR iter (seq);
 
@@ -229,7 +229,7 @@ TAO_Notify_Event_Manager::un_publish (TAO_Notify_ProxyConsumer* proxy_consumer,
 
   for (iter.first (); iter.next (event_type) != 0; iter.advance ())
     {
-      int result = supplier_map().remove (proxy_consumer, *event_type ACE_ENV_ARG_PARAMETER);
+      int result = supplier_map().remove (proxy_consumer, *event_type);
 
       if (result == 1)
         last_seq.insert (*event_type);
@@ -270,9 +270,9 @@ TAO_Notify_ProxyConsumer_Update_Worker::TAO_Notify_ProxyConsumer_Update_Worker (
 }
 
 void
-TAO_Notify_ProxyConsumer_Update_Worker::work (TAO_Notify_ProxyConsumer* proxy ACE_ENV_ARG_DECL)
+TAO_Notify_ProxyConsumer_Update_Worker::work (TAO_Notify_ProxyConsumer* proxy)
 {
-  proxy->types_changed (added_, removed_ ACE_ENV_ARG_PARAMETER);
+  proxy->types_changed (added_, removed_);
 }
 
 /*****************************************************************************/
@@ -283,9 +283,9 @@ TAO_Notify_ProxySupplier_Update_Worker::TAO_Notify_ProxySupplier_Update_Worker (
 }
 
 void
-TAO_Notify_ProxySupplier_Update_Worker::work (TAO_Notify_ProxySupplier* proxy ACE_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier_Update_Worker::work (TAO_Notify_ProxySupplier* proxy)
 {
-  proxy->types_changed (added_, removed_ ACE_ENV_ARG_PARAMETER);
+  proxy->types_changed (added_, removed_);
 }
 
 /*****************************************************************************/
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
index 29d578cad6c..38c577cdfd8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
@@ -74,26 +74,26 @@ public:
   void shutdown (void);
 
   /// Connect ProxySupplier
-  void connect (TAO_Notify_ProxySupplier* proxy_supplier ACE_ENV_ARG_DECL);
+  void connect (TAO_Notify_ProxySupplier* proxy_supplier);
 
   /// Disconnect ProxySupplier
-  void disconnect (TAO_Notify_ProxySupplier* proxy_supplier ACE_ENV_ARG_DECL);
+  void disconnect (TAO_Notify_ProxySupplier* proxy_supplier);
 
   /// Connect ProxyConsumer
-  void connect (TAO_Notify_ProxyConsumer* proxy_consumer ACE_ENV_ARG_DECL);
+  void connect (TAO_Notify_ProxyConsumer* proxy_consumer);
 
   /// Disconnect ProxyConsumer
-  void disconnect (TAO_Notify_ProxyConsumer* proxy_consumer ACE_ENV_ARG_DECL);
+  void disconnect (TAO_Notify_ProxyConsumer* proxy_consumer);
 
   /// Map accessors.
   TAO_Notify_Consumer_Map& consumer_map (void);
   TAO_Notify_Supplier_Map& supplier_map (void);
 
   /// Offer change received on <proxy_consumer>.
-  void offer_change (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed ACE_ENV_ARG_DECL);
+  void offer_change (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed);
 
   /// Subscription change received on <proxy_supplier>.
-  void subscription_change (TAO_Notify_ProxySupplier* proxy_supplier, const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed ACE_ENV_ARG_DECL);
+  void subscription_change (TAO_Notify_ProxySupplier* proxy_supplier, const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed);
 
   /// What are the types being offered.
   const TAO_Notify_EventTypeSeq& offered_types (void) const;
@@ -103,16 +103,16 @@ public:
 
 protected:
   /// Subscribe <proxy_supplier> to the event type sequence list <seq>.
-  void subscribe (TAO_Notify_ProxySupplier* proxy_supplier, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& new_seq ACE_ENV_ARG_DECL);
+  void subscribe (TAO_Notify_ProxySupplier* proxy_supplier, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& new_seq);
 
   /// Unsubscribe <proxy_supplier> to the event type sequence list <seq>.
-  void un_subscribe (TAO_Notify_ProxySupplier* proxy_supplier, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& last_seq ACE_ENV_ARG_DECL);
+  void un_subscribe (TAO_Notify_ProxySupplier* proxy_supplier, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& last_seq);
 
   /// Subscribe <proxy_consumer> to the event type sequence list <seq>.
-  void publish (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& new_seq ACE_ENV_ARG_DECL);
+  void publish (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& new_seq);
 
   /// Subscribe <proxy_consumer> to the event type sequence list <seq>.
-  void un_publish (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& last_seq ACE_ENV_ARG_DECL);
+  void un_publish (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& last_seq);
 
 private:
   // Disallow copying and assignment; we don't need them
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp
index 3435bf852c6..d270d180db0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp
@@ -36,20 +36,20 @@ TAO_Notify_Event_Map_Entry_T<PROXY>::init (void)
 {
   TAO_Notify_Factory* factory = TAO_Notify_PROPERTIES::instance ()->factory ();
 
-  factory->create (collection_ ACE_ENV_ARG_PARAMETER);
+  factory->create (collection_);
 }
 
 template <class PROXY> void
-TAO_Notify_Event_Map_Entry_T<PROXY>::connected (PROXY* proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Map_Entry_T<PROXY>::connected (PROXY* proxy)
 {
-  this->collection_->connected (proxy ACE_ENV_ARG_PARAMETER);
+  this->collection_->connected (proxy);
   ++count_;
 }
 
 template <class PROXY> void
-TAO_Notify_Event_Map_Entry_T<PROXY>::disconnected (PROXY* proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Map_Entry_T<PROXY>::disconnected (PROXY* proxy)
 {
-  this->collection_->disconnected (proxy ACE_ENV_ARG_PARAMETER);
+  this->collection_->disconnected (proxy);
   --count_;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h
index 960747ed964..08667996ee9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h
@@ -53,10 +53,10 @@ public:
   void init (void);
 
   /// Connect
-  void connected (PROXY* proxy ACE_ENV_ARG_DECL);
+  void connected (PROXY* proxy);
 
   /// Disconnect
-  void disconnected (PROXY* proxy ACE_ENV_ARG_DECL);
+  void disconnected (PROXY* proxy);
 
   /// Collection accessor
   COLLECTION* collection (void);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp
index 9b7119ee4a7..455f6b089a2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp
@@ -36,25 +36,25 @@ TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::init (void)
 }
 
 template <class PROXY, class ACE_LOCK> void
-TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::connect (PROXY* proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::connect (PROXY* proxy)
 {
-  this->updates_entry_.connected (proxy ACE_ENV_ARG_PARAMETER);
+  this->updates_entry_.connected (proxy);
 
   ACE_WRITE_GUARD (ACE_LOCK, ace_mon, this->lock_);
   ++this->proxy_count_;
 }
 
 template <class PROXY, class ACE_LOCK> void
-TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::disconnect (PROXY* proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::disconnect (PROXY* proxy)
 {
-  this->updates_entry_.disconnected (proxy ACE_ENV_ARG_PARAMETER);
+  this->updates_entry_.disconnected (proxy);
 
   ACE_WRITE_GUARD (ACE_LOCK, ace_mon, this->lock_);
   --this->proxy_count_;
 }
 
 template <class PROXY, class ACE_LOCK> int
-TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::insert (PROXY* proxy, const TAO_Notify_EventType& event_type ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::insert (PROXY* proxy, const TAO_Notify_EventType& event_type)
 {
   ENTRY* entry;
 
@@ -81,7 +81,7 @@ TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::insert (PROXY* proxy, const TAO_Notify_
 
     entry->init ();
 
-    entry->connected (proxy ACE_ENV_ARG_PARAMETER);
+    entry->connected (proxy);
 
     ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
@@ -95,14 +95,14 @@ TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::insert (PROXY* proxy, const TAO_Notify_
   }
   else // Add to existing entry or the broadcast entry.
     {
-      entry->connected (proxy ACE_ENV_ARG_PARAMETER);
+      entry->connected (proxy);
     }
 
   return 0;
 }
 
 template <class PROXY, class ACE_LOCK> int
-TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::remove (PROXY* proxy, const TAO_Notify_EventType& event_type ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::remove (PROXY* proxy, const TAO_Notify_EventType& event_type)
 {
   ENTRY* entry = 0;
 
@@ -110,7 +110,7 @@ TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::remove (PROXY* proxy, const TAO_Notify_
     {
       entry = &this->broadcast_entry_;
 
-      entry->disconnected (proxy ACE_ENV_ARG_PARAMETER);
+      entry->disconnected (proxy);
     }
   else
     {
@@ -124,7 +124,7 @@ TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::remove (PROXY* proxy, const TAO_Notify_
 
       if (result == 0)
         {
-          entry->disconnected (proxy ACE_ENV_ARG_PARAMETER);
+          entry->disconnected (proxy);
 
           if (entry->count () == 0)
             {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h
index fef3e1d77f6..d92dfde09fc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h
@@ -51,24 +51,24 @@ public:
   void init (void);
 
   /// Connect a PROXY
-  void connect (PROXY* proxy ACE_ENV_ARG_DECL);
+  void connect (PROXY* proxy);
 
   /// Disconnect a PROXY
-  void disconnect (PROXY* proxy ACE_ENV_ARG_DECL);
+  void disconnect (PROXY* proxy);
 
   /// Associate PROXY and event_type.
   /// Returns 1 if <event_type> is being seem for the 1st time otherwise returns 0.
   /// Returns -1 on error.
-  int insert (PROXY* proxy, const TAO_Notify_EventType& event_type ACE_ENV_ARG_DECL);
+  int insert (PROXY* proxy, const TAO_Notify_EventType& event_type);
 
   /// Remove association of PROXY and event_type.
   /// Returns 1 if <event_type> is being seem for the last time otherwise returns 0.
   /// Returns -1 on error.
-  int remove (PROXY* proxy, const TAO_Notify_EventType& event_type ACE_ENV_ARG_DECL);
+  int remove (PROXY* proxy, const TAO_Notify_EventType& event_type);
 
   /// Find the collection mapped to the <event_type>
   /// The usage_count on the entry returned is incremented.
-  ENTRY* find (const TAO_Notify_EventType& event_type ACE_ENV_ARG_DECL);
+  ENTRY* find (const TAO_Notify_EventType& event_type);
 
   /// Find the default broadcast list.
   typename ENTRY::COLLECTION* broadcast_collection (void);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl
index 2b485893049..d29a7b28afb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl
@@ -5,7 +5,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class PROXY, class ACE_LOCK> ACE_INLINE  TAO_Notify_Event_Map_Entry_T<PROXY>*
-TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::find (const TAO_Notify_EventType& event_type ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::find (const TAO_Notify_EventType& event_type)
 {
   TAO_Notify_Event_Map_Entry_T<PROXY>* entry;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Factory.h
index 22fc4dcf653..1ddb6f908c6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Factory.h
@@ -75,58 +75,58 @@ class /*TAO_Notify_Serv_Export*/ TAO_Notify_Factory : public ACE_Service_Object
 {
 public:
   /// Create ProxySupplier Collection
-  virtual void create (TAO_Notify_ProxySupplier_Collection*& collection ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_ProxySupplier_Collection*& collection) = 0;
 
   /// Create ProxyConsumer Collection
-  virtual void create (TAO_Notify_ProxyConsumer_Collection*& collection ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_ProxyConsumer_Collection*& collection) = 0;
 
   /// Create EventChannel Collection
-  virtual void create (TAO_Notify_EventChannel_Collection*& collection ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_EventChannel_Collection*& collection) = 0;
 
   /// Create ConsumerAdmin Collection
-  virtual void create (TAO_Notify_ConsumerAdmin_Collection*& collection ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_ConsumerAdmin_Collection*& collection) = 0;
 
   /// Create SupplierAdmin Collection
-  virtual void create (TAO_Notify_SupplierAdmin_Collection*& collection ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_SupplierAdmin_Collection*& collection) = 0;
 
   /// Create Proxy Collection
-  virtual void create (TAO_Notify_Proxy_Collection*& collection ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_Proxy_Collection*& collection) = 0;
 
   /// Create EventChannelFactory
-  virtual void create (TAO_Notify_EventChannelFactory*& channel_factory ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_EventChannelFactory*& channel_factory) = 0;
 
   /// Create EventChannel
-  virtual void create (TAO_Notify_EventChannel*& channel ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_EventChannel*& channel) = 0;
 
   /// Create SupplierAdmin
-  virtual void create (TAO_Notify_SupplierAdmin*& admin ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_SupplierAdmin*& admin) = 0;
 
   /// Create ConsumerAdmin
-  virtual void create (TAO_Notify_ConsumerAdmin*& admin ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_ConsumerAdmin*& admin) = 0;
 
   /// Create ProxyPushConsumer
-  virtual void create (TAO_Notify_ProxyPushConsumer*& proxy ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_ProxyPushConsumer*& proxy) = 0;
 
   /// Create ProxyPushSupplier
-  virtual void create (TAO_Notify_ProxyPushSupplier*& proxy ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_ProxyPushSupplier*& proxy) = 0;
 
   /// Create CosEC_ProxyPushConsumer
-  virtual void create (TAO_Notify_CosEC_ProxyPushConsumer*& proxy ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_CosEC_ProxyPushConsumer*& proxy) = 0;
 
   /// Create CosEC_ProxyPushSupplier
-  virtual void create (TAO_Notify_CosEC_ProxyPushSupplier*& proxy ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_CosEC_ProxyPushSupplier*& proxy) = 0;
 
   /// Create StructuredProxyPushConsumer
-  virtual void create (TAO_Notify_StructuredProxyPushConsumer*& proxy ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_StructuredProxyPushConsumer*& proxy) = 0;
 
   /// Create StructuredProxyPushSupplier
-  virtual void create (TAO_Notify_StructuredProxyPushSupplier*& proxy ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_StructuredProxyPushSupplier*& proxy) = 0;
 
   /// Create SequenceProxyPushConsumer
-  virtual void create (TAO_Notify_SequenceProxyPushConsumer*& proxy ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_SequenceProxyPushConsumer*& proxy) = 0;
 
   /// Create SequenceProxyPushSupplier
-  virtual void create (TAO_Notify_SequenceProxyPushSupplier*& proxy ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_SequenceProxyPushSupplier*& proxy) = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
index 61c39483ae5..618e08e0955 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
@@ -25,7 +25,7 @@ TAO_Notify_FilterAdmin::~TAO_Notify_FilterAdmin (void)
 }
 
 CosNotifyFilter::FilterID
-TAO_Notify_FilterAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter ACE_ENV_ARG_DECL)
+TAO_Notify_FilterAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (new_filter))
@@ -47,7 +47,7 @@ TAO_Notify_FilterAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter ACE_E
 }
 
 void
-TAO_Notify_FilterAdmin::remove_filter (CosNotifyFilter::FilterID filter_id ACE_ENV_ARG_DECL)
+TAO_Notify_FilterAdmin::remove_filter (CosNotifyFilter::FilterID filter_id)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyFilter::FilterNotFound
@@ -57,11 +57,11 @@ TAO_Notify_FilterAdmin::remove_filter (CosNotifyFilter::FilterID filter_id ACE_E
                       CORBA::INTERNAL ());
 
   if (this->filter_list_.unbind (filter_id) == -1)
-    ACE_THROW (CosNotifyFilter::FilterNotFound ());
+    throw CosNotifyFilter::FilterNotFound ();
 }
 
 CosNotifyFilter::Filter_ptr
-TAO_Notify_FilterAdmin::get_filter (CosNotifyFilter::FilterID filter_id ACE_ENV_ARG_DECL)
+TAO_Notify_FilterAdmin::get_filter (CosNotifyFilter::FilterID filter_id)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyFilter::FilterNotFound
@@ -127,7 +127,7 @@ TAO_Notify_FilterAdmin::remove_all_filters (void)
 }
 
 void
-TAO_Notify_FilterAdmin::save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL)
+TAO_Notify_FilterAdmin::save_persistent (TAO_Notify::Topology_Saver& saver)
 {
   if (this->filter_list_.current_size() == 0)
     return;
@@ -135,7 +135,7 @@ TAO_Notify_FilterAdmin::save_persistent (TAO_Notify::Topology_Saver& saver ACE_E
   bool changed = true;
 
   TAO_Notify::NVPList attrs;
-  bool want_children = saver.begin_object(0, "filter_admin", attrs, changed ACE_ENV_ARG_PARAMETER);
+  bool want_children = saver.begin_object(0, "filter_admin", attrs, changed);
   if (want_children)
   {
     FILTER_LIST::ITERATOR iter (this->filter_list_);
@@ -149,19 +149,19 @@ TAO_Notify_FilterAdmin::save_persistent (TAO_Notify::Topology_Saver& saver ACE_E
     {
       TAO_Notify::NVPList fattrs;
       CORBA::Long id = entry->ext_id_;
-      CORBA::String_var ior = orb->object_to_string(entry->int_id_.in() ACE_ENV_ARG_PARAMETER);
+      CORBA::String_var ior = orb->object_to_string(entry->int_id_.in());
       fattrs.push_back(TAO_Notify::NVP("IOR", ior.in()));
-      saver.begin_object(id, "filter", fattrs, changed ACE_ENV_ARG_PARAMETER);
-      saver.end_object(id, "filter" ACE_ENV_ARG_PARAMETER);
+      saver.begin_object(id, "filter", fattrs, changed);
+      saver.end_object(id, "filter");
     }
   }
 
-  saver.end_object(0, "filter_admin" ACE_ENV_ARG_PARAMETER);
+  saver.end_object(0, "filter_admin");
 }
 
 TAO_Notify::Topology_Object*
 TAO_Notify_FilterAdmin::load_child (const ACE_CString &type, CORBA::Long id,
-  const TAO_Notify::NVPList& attrs ACE_ENV_ARG_DECL)
+  const TAO_Notify::NVPList& attrs)
 {
   if (type == "filter")
   {
@@ -171,8 +171,8 @@ TAO_Notify_FilterAdmin::load_child (const ACE_CString &type, CORBA::Long id,
     ACE_CString ior;
     attrs.load("IOR", ior);
 
-    CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
-    CosNotifyFilter::Filter_var filter = CosNotifyFilter::Filter::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+    CORBA::Object_var obj = orb->string_to_object(ior.c_str());
+    CosNotifyFilter::Filter_var filter = CosNotifyFilter::Filter::_unchecked_narrow(obj.in());
     if (! CORBA::is_nil(filter.in()))
     {
       this->filter_ids_.set_last_used(id);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
index 3e254ad37ed..d332011a4f4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
@@ -46,7 +46,7 @@ class TAO_Notify_Serv_Export TAO_Notify_FilterAdmin
 
   // = match operation on all the filters
   /// See if any of the filters match.
-  CORBA::Boolean match (const TAO_Notify_Event::Ptr &event ACE_ENV_ARG_DECL)
+  CORBA::Boolean match (const TAO_Notify_Event::Ptr &event)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosNotifyFilter::UnsupportedFilterableData
@@ -54,22 +54,22 @@ class TAO_Notify_Serv_Export TAO_Notify_FilterAdmin
 
   // = match operation on all the filters
   /// See if any of the filters match.
-  CORBA::Boolean match (const TAO_Notify_Event* event ACE_ENV_ARG_DECL)
+  CORBA::Boolean match (const TAO_Notify_Event* event)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosNotifyFilter::UnsupportedFilterableData
                      ));
 
-  virtual CosNotifyFilter::FilterID add_filter (CosNotifyFilter::Filter_ptr new_filter ACE_ENV_ARG_DECL)
+  virtual CosNotifyFilter::FilterID add_filter (CosNotifyFilter::Filter_ptr new_filter)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void remove_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL)
+  virtual void remove_filter (CosNotifyFilter::FilterID filter)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosNotifyFilter::FilterNotFound
                      ));
 
-  virtual CosNotifyFilter::Filter_ptr get_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL)
+  virtual CosNotifyFilter::Filter_ptr get_filter (CosNotifyFilter::FilterID filter)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosNotifyFilter::FilterNotFound
@@ -88,9 +88,9 @@ class TAO_Notify_Serv_Export TAO_Notify_FilterAdmin
 
   // TAO_Notify::Topology_Object
 
-  virtual void save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL);
+  virtual void save_persistent (TAO_Notify::Topology_Saver& saver);
   virtual TAO_Notify::Topology_Object* load_child (const ACE_CString &type, CORBA::Long id,
-    const TAO_Notify::NVPList& attrs ACE_ENV_ARG_DECL);
+    const TAO_Notify::NVPList& attrs);
  private:
   typedef ACE_Hash_Map_Manager <CosNotifyFilter::FilterID, CosNotifyFilter::Filter_var, ACE_SYNCH_NULL_MUTEX> FILTER_LIST;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl
index ba180b7ca6b..7fd08855554 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl
@@ -5,7 +5,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE CORBA::Boolean
-TAO_Notify_FilterAdmin::match (const TAO_Notify_Event* event ACE_ENV_ARG_DECL)
+TAO_Notify_FilterAdmin::match (const TAO_Notify_Event* event)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyFilter::UnsupportedFilterableData
@@ -25,7 +25,7 @@ TAO_Notify_FilterAdmin::match (const TAO_Notify_Event* event ACE_ENV_ARG_DECL)
 
   for (; iter.next (entry); iter.advance ())
     {
-      ret_val = event->do_match (entry->int_id_.in () ACE_ENV_ARG_PARAMETER);
+      ret_val = event->do_match (entry->int_id_.in ());
 
       if (ret_val == 1)
         return 1;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h
index a806f8d9437..bc8e6a4e164 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h
@@ -38,8 +38,7 @@ public:
   /// Factory method to create a FilterFactory reference
   /// The Factory is activated in the default POA. The filters created are activated in the <filter_poa>.
   virtual CosNotifyFilter::FilterFactory_ptr create (
-      PortableServer::POA_var& filter_poa 
-      ACE_ENV_ARG_DECL) = 0;
+      PortableServer::POA_var& filter_poa) = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp
index b0ed1a62f7e..b487a8f01d9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp
@@ -18,19 +18,19 @@ TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::TAO_Notify_Fin
 }
 
 template<class TYPE, class INTERFACE, class INTERFACE_PTR, class EXCEPTION> TYPE*
-TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::find (const TAO_Notify_Object::ID id, CONTAINER& container ACE_ENV_ARG_DECL)
+TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::find (const TAO_Notify_Object::ID id, CONTAINER& container)
 {
   this->id_ = id;
 
-  container.collection ()->for_each (this ACE_ENV_ARG_PARAMETER);
+  container.collection ()->for_each (this);
 
   return this->result_;
 }
 
 template<class TYPE, class INTERFACE, class INTERFACE_PTR, class EXCEPTION> INTERFACE_PTR
-TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::resolve (const TAO_Notify_Object::ID id, CONTAINER& container ACE_ENV_ARG_DECL)
+TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::resolve (const TAO_Notify_Object::ID id, CONTAINER& container)
 {
-  this->find (id, container ACE_ENV_ARG_PARAMETER);
+  this->find (id, container);
 
   if (this->result_ == 0)
     ACE_THROW_RETURN (EXCEPTION ()
@@ -38,7 +38,7 @@ TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::resolve (const
 
   CORBA::Object_var object = this->result_->ref ();
 
-  return INTERFACE::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+  return INTERFACE::_narrow (object.in ());
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h
index c9c09eca0fa..858dc0ad848 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h
@@ -43,14 +43,14 @@ public:
   TAO_Notify_Find_Worker_T (void);
 
   /// Find the Type.
-  TYPE* find (const TAO_Notify_Object::ID id, CONTAINER& container ACE_ENV_ARG_DECL);
+  TYPE* find (const TAO_Notify_Object::ID id, CONTAINER& container);
 
   /// Find and resolve to the Interface.
-  INTERFACE_PTR resolve (const TAO_Notify_Object::ID id, CONTAINER& container ACE_ENV_ARG_DECL);
+  INTERFACE_PTR resolve (const TAO_Notify_Object::ID id, CONTAINER& container);
 
 protected:
   ///= TAO_ESF_Worker method
-  void work (TYPE* object ACE_ENV_ARG_DECL);
+  void work (TYPE* object);
 
   /// The id we're looking for.
   TAO_Notify_Object::ID id_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.inl
index 2b9af82e37a..802f0c5e6e5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.inl
@@ -5,7 +5,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class TYPE, class INTERFACE, class INTERFACE_PTR, class EXCEPTION> ACE_INLINE void
-TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::work (TYPE* type ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::work (TYPE* type)
 {
   if (type->id () == this->id_)
     this->result_ = type;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
index 5fbcf580337..1838c5b6dbf 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
@@ -76,8 +76,7 @@ int TAO_Notify_Method_Request_Dispatch::execute_i (void)
       TAO_Notify_Admin& parent = this->proxy_supplier_->consumer_admin ();
       CORBA::Boolean val =  this->proxy_supplier_->check_filters (this->event_,
                                                                   parent.filter_admin (),
-                                                                  parent.filter_operator ()
-                                                                  ACE_ENV_ARG_PARAMETER);
+                                                                  parent.filter_operator ());
 
       if (TAO_debug_level > 1)
         ACE_DEBUG ((LM_DEBUG, "Proxysupplier %x filter eval result = %d",&this->proxy_supplier_ , val));
@@ -87,23 +86,22 @@ int TAO_Notify_Method_Request_Dispatch::execute_i (void)
         return 0;
     }
 
-  ACE_TRY
+  try
     {
       TAO_Notify_Consumer* consumer = this->proxy_supplier_->consumer ();
 
       if (consumer != 0)
         {
-          consumer->deliver (this ACE_ENV_ARG_PARAMETER);
+          consumer->deliver (this);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-        ACE_TEXT ("TAO_Notify_Method_Request_Dispatch::: error sending event.\n ")
-        );
+        ex._tao_print_exception (
+          ACE_TEXT (
+            "TAO_Notify_Method_Request_Dispatch::: error sending event.\n "));
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -113,8 +111,7 @@ TAO_Notify_Method_Request_Dispatch_Queueable *
 TAO_Notify_Method_Request_Dispatch::unmarshal (
     TAO_Notify::Delivery_Request_Ptr & delivery_request,
     TAO_Notify_EventChannelFactory &ecf,
-    TAO_InputCDR & cdr
-    ACE_ENV_ARG_DECL)
+    TAO_InputCDR & cdr)
 {
   bool ok = true;
   TAO_Notify_Method_Request_Dispatch_Queueable * result = 0;
@@ -142,7 +139,7 @@ TAO_Notify_Method_Request_Dispatch::unmarshal (
     if (ok)
     {
       TAO_Notify_ProxySupplier* proxy_supplier = ecf.find_proxy_supplier (id_path,
-        0 ACE_ENV_ARG_PARAMETER);
+        0);
       if (proxy_supplier != 0)
       {
         if (DEBUG_LEVEL > 6) ACE_DEBUG ((LM_DEBUG,
@@ -154,7 +151,7 @@ TAO_Notify_Method_Request_Dispatch::unmarshal (
       }
       else
       {
-        TAO_Notify_ProxyConsumer * proxy_consumer = ecf.find_proxy_consumer (id_path, 0 ACE_ENV_ARG_PARAMETER); //@@todo
+        TAO_Notify_ProxyConsumer * proxy_consumer = ecf.find_proxy_consumer (id_path, 0); //@@todo
         if (proxy_consumer == 0)
         {
           ACE_ERROR ((LM_ERROR,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h
index 7597e9e3a83..484fdaba219 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h
@@ -72,8 +72,7 @@ public:
   static TAO_Notify_Method_Request_Dispatch_Queueable * unmarshal (
     TAO_Notify::Delivery_Request_Ptr & delivery_request,
     TAO_Notify_EventChannelFactory &ecf,
-    TAO_InputCDR & cdr
-    ACE_ENV_ARG_DECL);
+    TAO_InputCDR & cdr);
 
 
 protected:
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
index d9095545817..fd447d57433 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
@@ -37,17 +37,16 @@ TAO_Notify_Method_Request_Lookup::~TAO_Notify_Method_Request_Lookup ()
 
 void
 TAO_Notify_Method_Request_Lookup::work (
-  TAO_Notify_ProxySupplier* proxy_supplier
-  ACE_ENV_ARG_DECL)
+  TAO_Notify_ProxySupplier* proxy_supplier)
 {
   if (delivery_request_.get () == 0)
   {
     TAO_Notify_Method_Request_Dispatch_No_Copy request (*this, proxy_supplier, true);
-    proxy_supplier->deliver (request ACE_ENV_ARG_PARAMETER);
+    proxy_supplier->deliver (request);
   }
   else
   {
-    delivery_request_->dispatch (proxy_supplier, true ACE_ENV_ARG_PARAMETER);
+    delivery_request_->dispatch (proxy_supplier, true);
   }
 }
 
@@ -60,8 +59,7 @@ int TAO_Notify_Method_Request_Lookup::execute_i (void)
 
   CORBA::Boolean val =  this->proxy_consumer_->check_filters (this->event_,
                                                              parent.filter_admin (),
-                                                             parent.filter_operator ()
-                                                             ACE_ENV_ARG_PARAMETER);
+                                                             parent.filter_operator ());
 
   if (TAO_debug_level > 1)
     ACE_DEBUG ((LM_DEBUG, "Proxyconsumer %x filter eval result = %d",&this->proxy_consumer_ , val));
@@ -73,7 +71,7 @@ int TAO_Notify_Method_Request_Lookup::execute_i (void)
   // The map of subscriptions.
   TAO_Notify_Consumer_Map& map = this->proxy_consumer_->event_manager ().consumer_map ();
 
-  TAO_Notify_Consumer_Map::ENTRY* entry = map.find (this->event_->type () ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Consumer_Map::ENTRY* entry = map.find (this->event_->type ());
 
   TAO_Notify_ProxySupplier_Collection* consumers = 0;
 
@@ -83,7 +81,7 @@ int TAO_Notify_Method_Request_Lookup::execute_i (void)
 
     if (consumers != 0)
       {
-        consumers->for_each (this ACE_ENV_ARG_PARAMETER);
+        consumers->for_each (this);
       }
 
     map.release (entry);
@@ -94,7 +92,7 @@ int TAO_Notify_Method_Request_Lookup::execute_i (void)
 
   if (consumers != 0)
     {
-      consumers->for_each (this ACE_ENV_ARG_PARAMETER);
+      consumers->for_each (this);
     }
   this->complete ();
   return 0;
@@ -105,8 +103,7 @@ TAO_Notify_Method_Request_Lookup_Queueable *
 TAO_Notify_Method_Request_Lookup::unmarshal (
   TAO_Notify::Delivery_Request_Ptr & delivery_request,
   TAO_Notify_EventChannelFactory &ecf,
-  TAO_InputCDR & cdr
-  ACE_ENV_ARG_DECL)
+  TAO_InputCDR & cdr)
 {
   bool ok = true;
   TAO_Notify_Method_Request_Lookup_Queueable * result = 0;
@@ -131,7 +128,7 @@ TAO_Notify_Method_Request_Lookup::unmarshal (
     {
       TAO_Notify_ProxyConsumer * proxy_consumer = ecf.find_proxy_consumer (
         id_path,
-        0 ACE_ENV_ARG_PARAMETER);
+        0);
       if (proxy_consumer != 0)
       {
         ACE_NEW_NORETURN (result,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h
index f515e97edcd..72f431b9a2e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h
@@ -53,8 +53,7 @@ public:
   static TAO_Notify_Method_Request_Lookup_Queueable * unmarshal (
     TAO_Notify::Delivery_Request_Ptr & delivery_request,
     TAO_Notify_EventChannelFactory &ecf,
-    TAO_InputCDR & cdr
-    ACE_ENV_ARG_DECL);
+    TAO_InputCDR & cdr);
 
 protected:
   /// Constuctor
@@ -64,7 +63,7 @@ protected:
   int execute_i (void);
 
   ///= TAO_ESF_Worker method
-  virtual void work (TAO_Notify_ProxySupplier* proxy_supplier ACE_ENV_ARG_DECL);
+  virtual void work (TAO_Notify_ProxySupplier* proxy_supplier);
 
 protected:
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl
index a44c8551a93..1bd9f4641ea 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl
@@ -13,21 +13,21 @@ TAO_Notify_Method_Request_Updates_T<SEQ, PROXY, SEQ_PARAM, PROXY_PARAM>::execute
   if (this->proxy_->has_shutdown ())
     return 0; // If we were shutdown while waiting in the queue, return with no action.
 
-  ACE_TRY
+  try
     {
       TAO_Notify_Peer* peer = this->proxy_->peer();
 
       if (peer != 0)
         {
-          peer->dispatch_updates (this->added_, this->removed_ ACE_ENV_ARG_PARAMETER);
+          peer->dispatch_updates (this->added_, this->removed_);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Notify_Method_Request_Updates::execute error sending updates\n ");
+        ex._tao_print_exception (
+          "TAO_Notify_Method_Request_Updates::execute error sending updates\n ");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp
index a4abcb5db21..12ca5cabb5a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp
@@ -19,7 +19,6 @@ TAO_Notify_Constraint_Interpreter::~TAO_Notify_Constraint_Interpreter (void)
 void
 TAO_Notify_Constraint_Interpreter::build_tree (
     const char *constraints
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CosNotifyFilter::InvalidConstraint,
                    CORBA::NO_MEMORY))
@@ -35,7 +34,7 @@ TAO_Notify_Constraint_Interpreter::build_tree (
     {
       // root_ is set in this base class call.
       if (TAO_ETCL_Interpreter::build_tree (constraints) != 0)
-          ACE_THROW (CosNotifyFilter::InvalidConstraint ());
+          throw CosNotifyFilter::InvalidConstraint ();
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h
index acb7c8b9d86..3d2414adbf5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h
@@ -49,8 +49,7 @@ public:
    * Constraint exception if the constraint given has syntax errors or
    * semantic errors, such as mismatched types.
    */
-  void build_tree (const char* constraints
-                   ACE_ENV_ARG_DECL)
+  void build_tree (const char* constraints)
     ACE_THROW_SPEC ((CosNotifyFilter::InvalidConstraint,
                      CORBA::NO_MEMORY));
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
index 3a4f341cb23..4a9d6a27cda 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
@@ -196,8 +196,7 @@ TAO_Notify_Constraint_Visitor::visit_union_pos (
   TAO_ETCL_Union_Pos *union_pos
   )
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
     if (union_pos->union_value ()->accept (this) == 0)
     {
@@ -205,8 +204,7 @@ TAO_Notify_Constraint_Visitor::visit_union_pos (
       this->queue_.dequeue_head (disc_val);
 
       TAO_DynUnion_i dyn_union;
-      dyn_union.init (this->current_value_.in ()
-        ACE_ENV_ARG_PARAMETER);
+      dyn_union.init (this->current_value_.in ());
 
       CORBA::TypeCode_var tc = this->current_value_->type ();
 
@@ -220,8 +218,7 @@ TAO_Notify_Constraint_Visitor::visit_union_pos (
           CORBA::TypeCode_var disc_tc =
             tc->discriminator_type ();
           CORBA::TCKind disc_kind =
-            TAO_DynAnyFactory::unalias (disc_tc.in ()
-            ACE_ENV_ARG_PARAMETER);
+            TAO_DynAnyFactory::unalias (disc_tc.in ());
 
           switch (disc_kind)
           {
@@ -269,10 +266,8 @@ TAO_Notify_Constraint_Visitor::visit_union_pos (
           DynamicAny::DynAny_var dyn_any =
             TAO::MakeDynAnyUtils::make_dyn_any_t<const CORBA::Any &> (
               disc_tc.in (),
-              disc_any
-              ACE_ENV_ARG_PARAMETER);
-          dyn_union.set_discriminator (dyn_any.in ()
-            ACE_ENV_ARG_PARAMETER);
+              disc_any);
+          dyn_union.set_discriminator (dyn_any.in ());
           DynamicAny::DynAny_var u_member =
             dyn_union.member ();
           this->current_value_ =
@@ -291,8 +286,7 @@ TAO_Notify_Constraint_Visitor::visit_union_pos (
 
           for (i = 0; i < count; ++i)
           {
-            member_name = tc->member_name (i
-              ACE_ENV_ARG_PARAMETER);
+            member_name = tc->member_name (i);
 
             if (ACE_OS::strcmp (name, member_name) == 0)
               break;
@@ -301,8 +295,7 @@ TAO_Notify_Constraint_Visitor::visit_union_pos (
           // If there's no match, member_label will throw
           // CORBA::TypeCode::Bounds and the catch block will
           // return -1;
-          this->current_value_ = tc->member_label (i
-            ACE_ENV_ARG_PARAMETER);
+          this->current_value_ = tc->member_label (i);
 
           break;
         }
@@ -330,11 +323,10 @@ TAO_Notify_Constraint_Visitor::visit_union_pos (
     else
       return -1;
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
     return -1;
   }
-  ACE_ENDTRY;
 }
 
 int
@@ -342,14 +334,12 @@ TAO_Notify_Constraint_Visitor::visit_component_pos (
   TAO_ETCL_Component_Pos *pos
   )
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
     // If we are here (from visit_component) the Any containing the
     // component as found in filterable_data_ will be in current_value_.
     CORBA::TypeCode_var tc = this->current_value_->type ();
-    CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
-      ACE_ENV_ARG_PARAMETER);
+    CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ());
 
     DynamicAny::DynAny_var member;
     CORBA::Boolean success = 0;
@@ -360,11 +350,9 @@ TAO_Notify_Constraint_Visitor::visit_component_pos (
     case CORBA::tk_enum:
       {
         TAO_DynEnum_i dyn_enum;
-        dyn_enum.init (this->current_value_.in ()
-          ACE_ENV_ARG_PARAMETER);
+        dyn_enum.init (this->current_value_.in ());
 
-        success = dyn_enum.seek (slot
-          ACE_ENV_ARG_PARAMETER);
+        success = dyn_enum.seek (slot);
 
         if (success == 0)
           return -1;
@@ -377,11 +365,9 @@ TAO_Notify_Constraint_Visitor::visit_component_pos (
     case CORBA::tk_struct:
       {
         TAO_DynStruct_i dyn_struct;
-        dyn_struct.init (this->current_value_.in ()
-          ACE_ENV_ARG_PARAMETER);
+        dyn_struct.init (this->current_value_.in ());
 
-        success = dyn_struct.seek (slot
-          ACE_ENV_ARG_PARAMETER);
+        success = dyn_struct.seek (slot);
 
         if (success == 0)
           return -1;
@@ -414,11 +400,10 @@ TAO_Notify_Constraint_Visitor::visit_component_pos (
       return comp->accept (this);
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
     return -1;
   }
-  ACE_ENDTRY;
 }
 
 int
@@ -480,15 +465,13 @@ TAO_Notify_Constraint_Visitor::visit_component_assoc (
 int
 TAO_Notify_Constraint_Visitor::visit_component_array (TAO_ETCL_Component_Array *array)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
     // If we are here (from visit_component) the Any containing the
     // component as found in filterable_data_ will be in
     // current_value_.
     CORBA::TypeCode_var tc = this->current_value_->type ();
-    CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
-      ACE_ENV_ARG_PARAMETER);
+    CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ());
 
     DynamicAny::DynAny_var member;
     CORBA::Boolean success = 0;
@@ -499,11 +482,9 @@ TAO_Notify_Constraint_Visitor::visit_component_array (TAO_ETCL_Component_Array *
     case CORBA::tk_array:
       {
         TAO_DynEnum_i dyn_array;
-        dyn_array.init (this->current_value_.in ()
-          ACE_ENV_ARG_PARAMETER);
+        dyn_array.init (this->current_value_.in ());
 
-        success = dyn_array.seek (slot
-          ACE_ENV_ARG_PARAMETER);
+        success = dyn_array.seek (slot);
 
         if (success == 0)
           return -1;
@@ -515,11 +496,9 @@ TAO_Notify_Constraint_Visitor::visit_component_array (TAO_ETCL_Component_Array *
     case CORBA::tk_sequence:
       {
         TAO_DynStruct_i dyn_sequence;
-        dyn_sequence.init (this->current_value_.in ()
-          ACE_ENV_ARG_PARAMETER);
+        dyn_sequence.init (this->current_value_.in ());
 
-        success = dyn_sequence.seek (slot
-          ACE_ENV_ARG_PARAMETER);
+        success = dyn_sequence.seek (slot);
 
         if (success == 0)
           return -1;
@@ -551,21 +530,19 @@ TAO_Notify_Constraint_Visitor::visit_component_array (TAO_ETCL_Component_Array *
       return comp->accept (this);
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
     return -1;
   }
-  ACE_ENDTRY;
 }
 
 int
 TAO_Notify_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
     CORBA::TypeCode_var tc = this->current_value_->type ();
-    tc = TAO_DynAnyFactory::strip_alias (tc.in () ACE_ENV_ARG_PARAMETER);
+    tc = TAO_DynAnyFactory::strip_alias (tc.in ());
 
       CORBA::TCKind kind = tc->kind ();
 
@@ -580,8 +557,7 @@ TAO_Notify_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
         case CORBA::tk_sequence:
           {
             TAO_DynSequence_i dyn_seq;
-            dyn_seq.init (current_value_.in()
-              ACE_ENV_ARG_PARAMETER);
+            dyn_seq.init (current_value_.in());
 
             DynamicAny::AnySeq_var any_seq =
               dyn_seq.get_elements ();
@@ -607,8 +583,7 @@ TAO_Notify_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
         // If the TCKind is not a union, the call to init() will
         // raise an exception, and the catch block will return -1;
         TAO_DynUnion_i dyn_union;
-        dyn_union.init (this->current_value_.in ()
-          ACE_ENV_ARG_PARAMETER);
+        dyn_union.init (this->current_value_.in ());
 
         DynamicAny::DynAny_var disc =
           dyn_union.get_discriminator ();
@@ -639,11 +614,10 @@ TAO_Notify_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
       return -1;
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
     return -1;
   }
-  ACE_ENDTRY;
 }
 
 int
@@ -764,8 +738,7 @@ TAO_Notify_Constraint_Visitor::visit_default (TAO_ETCL_Default *def)
   if (comp->accept (this) != 0)
     return -1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
     CORBA::TypeCode_var tc = this->current_value_->type ();
 
@@ -788,11 +761,10 @@ TAO_Notify_Constraint_Visitor::visit_default (TAO_ETCL_Default *def)
     TAO_ETCL_Literal_Constraint default_index_value (default_index);
     return (disc == default_index_value);
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
     return -1;
   }
-  ACE_ENDTRY;
 }
 
 int
@@ -1118,18 +1090,15 @@ TAO_Notify_Constraint_Visitor::visit_in (TAO_ETCL_Binary_Expr *binary)
         const CORBA::Any *component = (const CORBA::Any *) bag;
         CORBA::TCKind kind = CORBA::tk_null;
 
-        ACE_DECLARE_NEW_CORBA_ENV;
-        ACE_TRY
+        try
         {
           CORBA::TypeCode_var tc = component->type ();
-          kind = TAO_DynAnyFactory::unalias (tc.in ()
-            ACE_ENV_ARG_PARAMETER);
+          kind = TAO_DynAnyFactory::unalias (tc.in ());
         }
-        ACE_CATCHANY
+        catch (const CORBA::Exception& ex)
         {
           return return_value;
         }
-        ACE_ENDTRY;
 
         CORBA::Boolean result = 0;
 
@@ -1182,16 +1151,15 @@ CORBA::Boolean
 TAO_Notify_Constraint_Visitor::sequence_does_contain (const CORBA::Any *any,
                                                       TAO_ETCL_Literal_Constraint &item)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
     CORBA::TypeCode_var type = any->type ();
     CORBA::TypeCode_var base_type =
-      TAO_DynAnyFactory::strip_alias (type.in () ACE_ENV_ARG_PARAMETER);
+      TAO_DynAnyFactory::strip_alias (type.in ());
     CORBA::TypeCode_var content_type =
       base_type->content_type ();
     CORBA::TCKind kind =
-      TAO_DynAnyFactory::unalias (content_type.in() ACE_ENV_ARG_PARAMETER);
+      TAO_DynAnyFactory::unalias (content_type.in());
 
     // The literal and the array elements must be
     // of the same simple type.
@@ -1202,8 +1170,7 @@ TAO_Notify_Constraint_Visitor::sequence_does_contain (const CORBA::Any *any,
       return 0;
 
     TAO_DynSequence_i dyn_seq;
-    dyn_seq.init (*any
-      ACE_ENV_ARG_PARAMETER);
+    dyn_seq.init (*any);
 
     DynamicAny::AnySeq_var any_seq =
       dyn_seq.get_elements ();
@@ -1218,11 +1185,10 @@ TAO_Notify_Constraint_Visitor::sequence_does_contain (const CORBA::Any *any,
         return 1;
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
     return 0;
   }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -1231,12 +1197,10 @@ CORBA::Boolean
 TAO_Notify_Constraint_Visitor::array_does_contain (const CORBA::Any *any,
                                                    TAO_ETCL_Literal_Constraint &item)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
     CORBA::TypeCode_var type = any->type ();
-    CORBA::TCKind kind = TAO_DynAnyFactory::unalias (type.in ()
-      ACE_ENV_ARG_PARAMETER);
+    CORBA::TCKind kind = TAO_DynAnyFactory::unalias (type.in ());
 
     // The literal and the array elements must be
     // of the same simple type.
@@ -1247,8 +1211,7 @@ TAO_Notify_Constraint_Visitor::array_does_contain (const CORBA::Any *any,
       return 0;
 
     TAO_DynArray_i dyn_array;
-    dyn_array.init (*any
-      ACE_ENV_ARG_PARAMETER);
+    dyn_array.init (*any);
 
     DynamicAny::AnySeq_var any_seq =
       dyn_array.get_elements ();
@@ -1263,11 +1226,10 @@ TAO_Notify_Constraint_Visitor::array_does_contain (const CORBA::Any *any,
         return 1;
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
     return 0;
   }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -1276,12 +1238,10 @@ CORBA::Boolean
 TAO_Notify_Constraint_Visitor::struct_does_contain (const CORBA::Any *any,
                                                     TAO_ETCL_Literal_Constraint &item)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
     TAO_DynStruct_i dyn_struct;
-    dyn_struct.init (*any
-      ACE_ENV_ARG_PARAMETER);
+    dyn_struct.init (*any);
 
     DynamicAny::NameValuePairSeq_var members =
       dyn_struct.get_members ();
@@ -1293,8 +1253,7 @@ TAO_Notify_Constraint_Visitor::struct_does_contain (const CORBA::Any *any,
     for (CORBA::ULong i = 0; i < length; ++i)
     {
       tc = members[i].value.type ();
-      kind = TAO_DynAnyFactory::unalias (tc.in ()
-        ACE_ENV_ARG_PARAMETER);
+      kind = TAO_DynAnyFactory::unalias (tc.in ());
 
       // The literal and the struct member must be
       // of the same simple type.
@@ -1310,11 +1269,10 @@ TAO_Notify_Constraint_Visitor::struct_does_contain (const CORBA::Any *any,
         return 1;
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
     return 0;
   }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -1323,12 +1281,10 @@ CORBA::Boolean
 TAO_Notify_Constraint_Visitor::union_does_contain (const CORBA::Any *any,
                                                    TAO_ETCL_Literal_Constraint &item)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
     TAO_DynUnion_i dyn_union;
-    dyn_union.init (*any
-      ACE_ENV_ARG_PARAMETER);
+    dyn_union.init (*any);
 
     DynamicAny::DynAny_var cc =
       dyn_union.current_component ();
@@ -1336,8 +1292,7 @@ TAO_Notify_Constraint_Visitor::union_does_contain (const CORBA::Any *any,
     CORBA::Any_var member = cc->to_any ();
 
     CORBA::TypeCode_var tc = member->type ();
-    CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
-      ACE_ENV_ARG_PARAMETER);
+    CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ());
 
     // The literal and the union member must be
     // of the same simple type.
@@ -1351,11 +1306,10 @@ TAO_Notify_Constraint_Visitor::union_does_contain (const CORBA::Any *any,
 
     return (item == element);
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
     return 0;
   }
-  ACE_ENDTRY;
 }
 
 CORBA::Boolean
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
index 531b3686799..c0476c1ee98 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
@@ -10,7 +10,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CosNotifyChannelAdmin::EventChannelFactory_ptr
-TAO_Notify_EventChannelFactory_i::create (PortableServer::POA_ptr default_POA ACE_ENV_ARG_DECL)
+TAO_Notify_EventChannelFactory_i::create (PortableServer::POA_ptr default_POA)
 {
   CosNotifyChannelAdmin::EventChannelFactory_var notify_factory;
 
@@ -29,9 +29,9 @@ TAO_Notify_EventChannelFactory_i::create (PortableServer::POA_ptr default_POA AC
 
   CORBA::ORB_ptr orb = poa->orb_core ().orb () ;
 
-  notify_service->init_service (orb ACE_ENV_ARG_PARAMETER);
+  notify_service->init_service (orb);
 
-  notify_factory = notify_service->create (default_POA ACE_ENV_ARG_PARAMETER);
+  notify_factory = notify_service->create (default_POA);
 
   return notify_factory._retn ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h
index 60ccb0b068d..85405ba3100 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h
@@ -35,7 +35,7 @@ class TAO_Notify_Serv_Export TAO_Notify_EventChannelFactory_i
 public:
   /// Create a factory servant and activates it with the default POA.
   /// Also creates a resource factory and assigns it this default_POA.
-  static CosNotifyChannelAdmin::EventChannelFactory_ptr create (PortableServer::POA_ptr default_POA ACE_ENV_ARG_DECL);
+  static CosNotifyChannelAdmin::EventChannelFactory_ptr create (PortableServer::POA_ptr default_POA);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp
index 3b737e9a761..44de916a2d8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp
@@ -68,40 +68,38 @@ TAO_Notify_Object::set_event_manager( TAO_Notify_Event_Manager* event_manager )
 }
 
 CORBA::Object_ptr
-TAO_Notify_Object::activate (PortableServer::Servant servant ACE_ENV_ARG_DECL)
+TAO_Notify_Object::activate (PortableServer::Servant servant)
 {
-  return this->poa_->activate (servant, this->id_ ACE_ENV_ARG_PARAMETER);
+  return this->poa_->activate (servant, this->id_);
 }
 
 /// Activate with existing id
 CORBA::Object_ptr
 TAO_Notify_Object::activate (
     PortableServer::Servant servant,
-    CORBA::Long id
-    ACE_ENV_ARG_DECL)
+    CORBA::Long id)
 {
   this->id_ = id;
-  return this->poa_->activate_with_id (servant, this->id_ ACE_ENV_ARG_PARAMETER);
+  return this->poa_->activate_with_id (servant, this->id_);
 }
 
 
 void
 TAO_Notify_Object::deactivate (void)
 {
-  ACE_TRY
+  try
   {
-    this->poa_->deactivate (this->id_ ACE_ENV_ARG_PARAMETER);
+    this->poa_->deactivate (this->id_);
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
     // Do not propagate any exceptions
     if (TAO_debug_level > 2)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "(%P|%t)\n");
+      ex._tao_print_exception ("(%P|%t)\n");
       ACE_DEBUG ((LM_DEBUG, "Could not deactivate object %d\n", this->id_));
     }
   }
-  ACE_ENDTRY;
 }
 
 int
@@ -126,7 +124,7 @@ TAO_Notify_Object::shutdown (void)
 CORBA::Object_ptr
 TAO_Notify_Object::ref (void)
 {
-  return this->poa_->id_to_reference (this->id_ ACE_ENV_ARG_PARAMETER);
+  return this->poa_->id_to_reference (this->id_);
 }
 
 void
@@ -149,7 +147,7 @@ TAO_Notify_Object::destroy_proxy_poa (void)
 {
   if (this->proxy_poa_ != 0)
   {
-    ACE_TRY_NEW_ENV
+    try
     {
       if ( this->proxy_poa_ == this->object_poa_ ) this->object_poa_ = 0;
       if ( this->proxy_poa_ == this->poa_ ) this->poa_ = 0;
@@ -162,13 +160,11 @@ TAO_Notify_Object::destroy_proxy_poa (void)
       }
       this->proxy_poa_ = 0;
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
       if (TAO_debug_level > 2)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-        "Proxy shutdown error (%P|%t)\n");
+        ex._tao_print_exception ("Proxy shutdown error (%P|%t)\n");
     }
-    ACE_ENDTRY;
   }
 }
 
@@ -177,7 +173,7 @@ TAO_Notify_Object::destroy_object_poa (void)
 {
   if (this->object_poa_ != 0)
   {
-    ACE_TRY_NEW_ENV
+    try
     {
       if ( this->object_poa_ == this->proxy_poa_ ) this->proxy_poa_ = 0;
       if ( this->object_poa_ == this->poa_ ) this->poa_ = 0;
@@ -190,13 +186,11 @@ TAO_Notify_Object::destroy_object_poa (void)
       }
       this->object_poa_ = 0;
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
       if (TAO_debug_level > 2)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-        "Proxy shutdown error (%P|%t)\n");
+        ex._tao_print_exception ("Proxy shutdown error (%P|%t)\n");
     }
-    ACE_ENDTRY;
   }
 }
 
@@ -248,31 +242,31 @@ TAO_Notify_Object::set_poa (TAO_Notify_POA_Helper* poa)
 }
 
 void
-TAO_Notify_Object::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_ARG_DECL)
+TAO_Notify_Object::set_qos (const CosNotification::QoSProperties & qos)
 {
   CosNotification::PropertyErrorSeq err_seq;
 
   TAO_Notify_QoSProperties new_qos_properties;
 
   if (new_qos_properties.init (qos, err_seq) == -1)
-    ACE_THROW (CORBA::INTERNAL ());
+    throw CORBA::INTERNAL ();
 
   // Apply the appropriate concurrency QoS
   if (new_qos_properties.thread_pool ().is_valid ())
   {
     if (new_qos_properties.thread_pool ().value ().static_threads == 0)
       {
-        TAO_Notify_PROPERTIES::instance()->builder()->apply_reactive_concurrency (*this ACE_ENV_ARG_PARAMETER);
+        TAO_Notify_PROPERTIES::instance()->builder()->apply_reactive_concurrency (*this);
       }
     else
       {
         TAO_Notify_PROPERTIES::instance()->builder()->
-        apply_thread_pool_concurrency (*this, new_qos_properties.thread_pool ().value () ACE_ENV_ARG_PARAMETER);
+        apply_thread_pool_concurrency (*this, new_qos_properties.thread_pool ().value ());
       }
   }
   else if (new_qos_properties.thread_pool_lane ().is_valid ())
     TAO_Notify_PROPERTIES::instance()->builder()->
-    apply_lane_concurrency (*this, new_qos_properties.thread_pool_lane ().value () ACE_ENV_ARG_PARAMETER);
+    apply_lane_concurrency (*this, new_qos_properties.thread_pool_lane ().value ());
 
   // Update the Thread Task's QoS properties..
   this->worker_task_->update_qos_properties (new_qos_properties);
@@ -282,10 +276,10 @@ TAO_Notify_Object::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_A
 
   // Init the the overall QoS on this object.
   if (new_qos_properties.copy (this->qos_properties_) == -1)
-    ACE_THROW (CORBA::INTERNAL ());
+    throw CORBA::INTERNAL ();
 
   if (err_seq.length () > 0) // Unsupported Property
-    ACE_THROW (CosNotification::UnsupportedQoS (err_seq));
+    throw CosNotification::UnsupportedQoS (err_seq);
 }
 
 CosNotification::QoSProperties*
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.h b/TAO/orbsvcs/orbsvcs/Notify/Object.h
index 0731dbb222d..7c610f67385 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Object.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Object.h
@@ -60,13 +60,12 @@ public:
   ID id (void) const;
 
   /// Activate
-  virtual CORBA::Object_ptr activate (PortableServer::Servant servant ACE_ENV_ARG_DECL);
+  virtual CORBA::Object_ptr activate (PortableServer::Servant servant);
 
   /// Activate with existing id
   virtual CORBA::Object_ptr activate (
       PortableServer::Servant servant,
-      CORBA::Long id
-      ACE_ENV_ARG_DECL);
+      CORBA::Long id);
 
   /// Deactivate
   void deactivate (void);
@@ -74,13 +73,13 @@ public:
   /// Have we been shutdown. returns 1 if shutdown.
   int has_shutdown (void);
 
-  void execute_task (TAO_Notify_Method_Request& method_request ACE_ENV_ARG_DECL);
+  void execute_task (TAO_Notify_Method_Request& method_request);
 
   /// Get CORBA Ref.
   CORBA::Object_ptr ref (void);
 
   /// Set the QoS Properties.
-  virtual void set_qos (const CosNotification::QoSProperties & qos ACE_ENV_ARG_DECL);
+  virtual void set_qos (const CosNotification::QoSProperties & qos);
 
   /// Get the QoS Properties.
   CosNotification::QoSProperties* get_qos (void);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.inl b/TAO/orbsvcs/orbsvcs/Notify/Object.inl
index fcc77e8b4d8..baa6c13de0b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Object.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Object.inl
@@ -11,12 +11,12 @@ TAO_Notify_Object::id (void) const
 }
 
 ACE_INLINE void
-TAO_Notify_Object::execute_task (TAO_Notify_Method_Request& method_request ACE_ENV_ARG_DECL)
+TAO_Notify_Object::execute_task (TAO_Notify_Method_Request& method_request)
 {
   TAO_Notify_Worker_Task::Ptr task( this->worker_task_ );
   if ( task.isSet() )
   {
-    task->execute( method_request ACE_ENV_ARG_PARAMETER );
+    task->execute( method_request );
   }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp
index 2b95a550355..8fec9e96b0a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp
@@ -37,40 +37,38 @@ TAO_Notify_POA_Helper::get_unique_id (void)
 }
 
 void
-TAO_Notify_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char* poa_name ACE_ENV_ARG_DECL)
+TAO_Notify_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char* poa_name)
 {
   CORBA::PolicyList policy_list (2);
 
-  this->set_policy (parent_poa, policy_list ACE_ENV_ARG_PARAMETER);
+  this->set_policy (parent_poa, policy_list);
 
-  this->create_i (parent_poa, poa_name, policy_list ACE_ENV_ARG_PARAMETER);
+  this->create_i (parent_poa, poa_name, policy_list);
 }
 
 void
-TAO_Notify_POA_Helper::init (PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL)
+TAO_Notify_POA_Helper::init (PortableServer::POA_ptr parent_poa)
 {
   ACE_CString child_poa_name = this->get_unique_id ();
 
-  this->init (parent_poa, child_poa_name.c_str () ACE_ENV_ARG_PARAMETER);
+  this->init (parent_poa, child_poa_name.c_str ());
 }
 
 void
-TAO_Notify_POA_Helper::set_policy (PortableServer::POA_ptr parent_poa, CORBA::PolicyList &policy_list ACE_ENV_ARG_DECL)
+TAO_Notify_POA_Helper::set_policy (PortableServer::POA_ptr parent_poa, CORBA::PolicyList &policy_list)
 {
   policy_list.length (2);
 
   policy_list[0] =
-    parent_poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID
-                                             ACE_ENV_ARG_PARAMETER);
+    parent_poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID);
 
   policy_list[1] =
-    parent_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                             ACE_ENV_ARG_PARAMETER);
+    parent_poa->create_id_assignment_policy (PortableServer::USER_ID);
 }
 
 
 void
-TAO_Notify_POA_Helper::create_i (PortableServer::POA_ptr parent_poa, const char* poa_name, CORBA::PolicyList &policy_list ACE_ENV_ARG_DECL)
+TAO_Notify_POA_Helper::create_i (PortableServer::POA_ptr parent_poa, const char* poa_name, CORBA::PolicyList &policy_list)
 {
   PortableServer::POAManager_var manager =
     parent_poa->the_POAManager ();
@@ -78,13 +76,11 @@ TAO_Notify_POA_Helper::create_i (PortableServer::POA_ptr parent_poa, const char*
   // Create the child POA.
   this->poa_ = parent_poa->create_POA (poa_name,
                                        manager.in (),
-                                       policy_list
-                                       ACE_ENV_ARG_PARAMETER);
+                                       policy_list);
 
   if (DEBUG_LEVEL > 0)
     {
-      CORBA::String_var the_name = this->poa_->the_name (
-                                           ACE_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::String_var the_name = this->poa_->the_name ();
       ACE_DEBUG ((LM_DEBUG, "Created POA : %s\n", the_name.in ()));
     }
 
@@ -98,7 +94,7 @@ TAO_Notify_POA_Helper::create_i (PortableServer::POA_ptr parent_poa, const char*
 }
 
 PortableServer::ObjectId *
-TAO_Notify_POA_Helper::long_to_ObjectId (CORBA::Long id ACE_ENV_ARG_DECL) const
+TAO_Notify_POA_Helper::long_to_ObjectId (CORBA::Long id) const
 {
   // Modified code from string_to_ObjectId ..
   //
@@ -128,93 +124,86 @@ TAO_Notify_POA_Helper::long_to_ObjectId (CORBA::Long id ACE_ENV_ARG_DECL) const
 }
 
 CORBA::Object_ptr
-TAO_Notify_POA_Helper::activate (PortableServer::Servant servant, CORBA::Long& id ACE_ENV_ARG_DECL)
+TAO_Notify_POA_Helper::activate (PortableServer::Servant servant, CORBA::Long& id)
 {
   // Generate a new ID.
   id = this->id_factory_.id ();
 
   if (DEBUG_LEVEL > 0)
     {
-      CORBA::String_var the_name = this->poa_->the_name (
-                                           ACE_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::String_var the_name = this->poa_->the_name ();
 
       ACE_DEBUG ((LM_DEBUG, "Activating object with id = %d in  POA : %s\n", id, the_name.in ()));
     }
 
   // Convert CORBA::Long to ObjectId
   PortableServer::ObjectId_var oid =
-    this->long_to_ObjectId (id ACE_ENV_ARG_PARAMETER);
+    this->long_to_ObjectId (id);
 
   poa_->activate_object_with_id (oid.in (),
-                                 servant
-                                 ACE_ENV_ARG_PARAMETER);
+                                 servant);
 
-  return poa_->id_to_reference (oid.in ()
-                                ACE_ENV_ARG_PARAMETER);
+  return poa_->id_to_reference (oid.in ());
 }
 
 CORBA::Object_ptr
-TAO_Notify_POA_Helper::activate_with_id (PortableServer::Servant servant, CORBA::Long id ACE_ENV_ARG_DECL)
+TAO_Notify_POA_Helper::activate_with_id (PortableServer::Servant servant, CORBA::Long id)
 {
   if (DEBUG_LEVEL > 0)
     {
-      CORBA::String_var the_name = this->poa_->the_name (
-                                           ACE_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::String_var the_name = this->poa_->the_name ();
       ACE_DEBUG ((LM_DEBUG, "Activating object with existing id = %d in  POA : %s\n", id, the_name.in ()));
     }
   this->id_factory_.set_last_used (id);
 
   // Convert CORBA::Long to ObjectId
   PortableServer::ObjectId_var oid =
-    this->long_to_ObjectId (id ACE_ENV_ARG_PARAMETER);
+    this->long_to_ObjectId (id);
 
   poa_->activate_object_with_id (oid.in (),
-                                 servant
-                                 ACE_ENV_ARG_PARAMETER);
+                                 servant);
 
-  return poa_->id_to_reference (oid.in ()
-                                ACE_ENV_ARG_PARAMETER);
+  return poa_->id_to_reference (oid.in ());
 }
 
 void
-TAO_Notify_POA_Helper::deactivate (CORBA::Long id ACE_ENV_ARG_DECL) const
+TAO_Notify_POA_Helper::deactivate (CORBA::Long id) const
 {
   // Convert CORBA::Long to ObjectId
   PortableServer::ObjectId_var oid =
-    this->long_to_ObjectId (id ACE_ENV_ARG_PARAMETER);
+    this->long_to_ObjectId (id);
 
-  poa_->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
+  poa_->deactivate_object (oid.in ());
 }
 
 CORBA::Object_ptr
-TAO_Notify_POA_Helper::id_to_reference (CORBA::Long id ACE_ENV_ARG_DECL) const
+TAO_Notify_POA_Helper::id_to_reference (CORBA::Long id) const
 {
   // Convert CORBA::Long to ObjectId
   PortableServer::ObjectId_var oid =
-    this->long_to_ObjectId (id ACE_ENV_ARG_PARAMETER);
+    this->long_to_ObjectId (id);
 
-  return poa_->id_to_reference (oid.in ()
-                                ACE_ENV_ARG_PARAMETER);
+  return poa_->id_to_reference (oid.in ());
 }
 
 PortableServer::ServantBase *
-TAO_Notify_POA_Helper::reference_to_servant (CORBA::Object_ptr ptr ACE_ENV_ARG_DECL) const
+TAO_Notify_POA_Helper::reference_to_servant (CORBA::Object_ptr ptr) const
 {
-  return poa_->reference_to_servant (ptr ACE_ENV_ARG_PARAMETER);
+  return poa_->reference_to_servant (ptr);
 }
 
 CORBA::Object_ptr
 TAO_Notify_POA_Helper::servant_to_reference (
-    PortableServer::ServantBase * servant  ACE_ENV_ARG_DECL) const
+    PortableServer::ServantBase * servant) const
 {
-  return poa_->servant_to_reference (servant ACE_ENV_ARG_PARAMETER);
+  return poa_->servant_to_reference (servant);
 }
 
 
 void
 TAO_Notify_POA_Helper::destroy (void)
 {
-  poa_->destroy (1,0 ACE_ENV_ARG_PARAMETER);
+  poa_->destroy (1,0);
  // The <wait_for_completion> flag = 0
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h
index 5a2c9c4a17f..6e361587dbd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h
@@ -41,11 +41,10 @@ public:
 
   /// Create a new PortableServer::POA.
   void init (PortableServer::POA_ptr parent_poa,
-             const char* poa_name
-             ACE_ENV_ARG_DECL);
+             const char* poa_name);
 
   /// Create a new PortableServer::POA. The name is chosen at random.
-  void init (PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL);
+  void init (PortableServer::POA_ptr parent_poa);
 
   /// Destructor
   virtual ~TAO_Notify_POA_Helper ();
@@ -58,43 +57,37 @@ public:
 
   /// Activate Object, the POA will assign an ID and return its value.
   CORBA::Object_ptr activate (PortableServer::Servant servant,
-                              CORBA::Long& id
-                              ACE_ENV_ARG_DECL);
+                              CORBA::Long& id);
 
   /// Activate Object, using existing ID
-  CORBA::Object_ptr activate_with_id (PortableServer::Servant servant, CORBA::Long id ACE_ENV_ARG_DECL);
+  CORBA::Object_ptr activate_with_id (PortableServer::Servant servant, CORBA::Long id);
 
   /// Deactivate Object with ID
-  void deactivate (CORBA::Long id
-                   ACE_ENV_ARG_DECL) const;
+  void deactivate (CORBA::Long id) const;
 
   /// Convert ID to reference.
-  CORBA::Object_ptr id_to_reference (CORBA::Long id
-                                     ACE_ENV_ARG_DECL) const;
+  CORBA::Object_ptr id_to_reference (CORBA::Long id) const;
 
   /// Convert reference to pointer to servant
-  PortableServer::ServantBase * reference_to_servant (CORBA::Object_ptr ptr
-                                                      ACE_ENV_ARG_DECL) const;
+  PortableServer::ServantBase * reference_to_servant (CORBA::Object_ptr ptr) const;
 
-  CORBA::Object_ptr servant_to_reference (PortableServer::ServantBase * servant  ACE_ENV_ARG_DECL) const;
+  CORBA::Object_ptr servant_to_reference (PortableServer::ServantBase * servant) const;
 
 protected:
   /// Set default POA policies.
   virtual void set_policy (PortableServer::POA_ptr parent_poa,
-                           CORBA::PolicyList &policy_list
-                           ACE_ENV_ARG_DECL);
+                           CORBA::PolicyList &policy_list);
 
   /// Apply the polices and create child POA.
   void create_i (PortableServer::POA_ptr parent_poa,
                  const char* poa_name,
-                 CORBA::PolicyList &policy_list ACE_ENV_ARG_DECL);
+                 CORBA::PolicyList &policy_list);
 
   /// Generate a unique id for each POA created.
   ACE_CString get_unique_id (void);
 
   /// Convert id to ObjectID
-  PortableServer::ObjectId* long_to_ObjectId (CORBA::Long id
-                                              ACE_ENV_ARG_DECL) const;
+  PortableServer::ObjectId* long_to_ObjectId (CORBA::Long id) const;
 
 protected:
   /// POA
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp
index 4d38017ea99..3021d98b55a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp
@@ -38,12 +38,12 @@ TAO_Notify_Peer::handle_dispatch_exception (void)
 }
 
 void
-TAO_Notify_Peer::dispatch_updates (const TAO_Notify_EventTypeSeq & added, const TAO_Notify_EventTypeSeq & removed ACE_ENV_ARG_DECL)
+TAO_Notify_Peer::dispatch_updates (const TAO_Notify_EventTypeSeq & added, const TAO_Notify_EventTypeSeq & removed)
 {
   TAO_Notify_EventTypeSeq subscribed_types ;
-  this->proxy ()->subscribed_types (subscribed_types ACE_ENV_ARG_PARAMETER);
+  this->proxy ()->subscribed_types (subscribed_types);
 
-  ACE_TRY
+  try
     {
       CosNotification::EventTypeSeq cos_added;
       CosNotification::EventTypeSeq cos_removed;
@@ -83,27 +83,26 @@ TAO_Notify_Peer::dispatch_updates (const TAO_Notify_EventTypeSeq & added, const
           // Protect this object from being destroyed in this scope.
           TAO_Notify_Proxy::Ptr proxy_guard(this->proxy ());
 
-          this->dispatch_updates_i (cos_added, cos_removed ACE_ENV_ARG_PARAMETER);
+          this->dispatch_updates_i (cos_added, cos_removed);
         }
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_exist)
+  catch (const CORBA::OBJECT_NOT_EXIST& not_exist)
     {
       this->handle_dispatch_exception ();
     }
-  ACE_CATCH (CORBA::NO_IMPLEMENT, no_impl)
+  catch (const CORBA::NO_IMPLEMENT& no_impl)
     {
       // The peer does not implement the offer/subscription_change method
       // Do nothing. Later, perhaps set a flag that helps us decide if we should dispatch_updates_i.
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
       this->handle_dispatch_exception ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Do nothing
     }
-  ACE_ENDTRY;
 }
 
 CORBA::ULong
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Peer.h b/TAO/orbsvcs/orbsvcs/Notify/Peer.h
index 60e66cba1dc..f683993f6fe 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Peer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Peer.h
@@ -56,8 +56,7 @@ public:
 
   // Dispatch updates
   virtual void dispatch_updates (const TAO_Notify_EventTypeSeq & added,
-                                 const TAO_Notify_EventTypeSeq & removed
-                                 ACE_ENV_ARG_DECL);
+                                 const TAO_Notify_EventTypeSeq & removed);
 
   /// QoS changed notification from the Peer.
   virtual void qos_changed (const TAO_Notify_QoSProperties& qos_properties);
@@ -71,8 +70,7 @@ public:
 protected:
   /// Implementation of Peer specific dispatch_updates
   virtual void dispatch_updates_i (const CosNotification::EventTypeSeq& added,
-                                   const CosNotification::EventTypeSeq& removed
-                                   ACE_ENV_ARG_DECL) = 0;
+                                   const CosNotification::EventTypeSeq& removed) = 0;
 
 private:
   /// Release
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp
index 0785bb48dc2..02632dce402 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp
@@ -28,32 +28,31 @@ TAO_Notify_Proxy::~TAO_Notify_Proxy ()
 }
 
 CORBA::Object_ptr
-TAO_Notify_Proxy::activate (PortableServer::Servant servant ACE_ENV_ARG_DECL)
+TAO_Notify_Proxy::activate (PortableServer::Servant servant)
 {
   // Set the POA that we use to return our <ref>
   this->set_primary_as_proxy_poa();
-  return TAO_Notify_Object::activate (servant ACE_ENV_ARG_PARAMETER);
+  return TAO_Notify_Object::activate (servant);
 }
 
 CORBA::Object_ptr
 TAO_Notify_Proxy::activate (PortableServer::Servant servant,
-                            CORBA::Long id
-                            ACE_ENV_ARG_DECL)
+                            CORBA::Long id)
 {
   // Set the POA that we use to return our <ref>
   this->set_primary_as_proxy_poa();
-  return TAO_Notify_Object::activate (servant, id ACE_ENV_ARG_PARAMETER);
+  return TAO_Notify_Object::activate (servant, id);
 }
 
 void
 TAO_Notify_Proxy::deactivate (void)
 {
   ACE_ASSERT (this->proxy_poa() != 0 );
-  this->proxy_poa()->deactivate (this->id() ACE_ENV_ARG_PARAMETER);
+  this->proxy_poa()->deactivate (this->id());
 }
 
 void
-TAO_Notify_Proxy::subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types ACE_ENV_ARG_DECL)
+TAO_Notify_Proxy::subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                         CORBA::INTERNAL ());
@@ -63,7 +62,7 @@ TAO_Notify_Proxy::subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types AC
 }
 
 void
-TAO_Notify_Proxy::types_changed (const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed ACE_ENV_ARG_DECL)
+TAO_Notify_Proxy::types_changed (const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed)
 {
   // return if the updates for this proxy are turned off or
   // if all the updates in the channel are switched off.
@@ -74,7 +73,7 @@ TAO_Notify_Proxy::types_changed (const TAO_Notify_EventTypeSeq& added, const TAO
 
   if (TAO_Notify_PROPERTIES::instance()->asynch_updates () == 1) // if we should send the updates synchronously.
     {
-      this->execute_task (request ACE_ENV_ARG_PARAMETER);
+      this->execute_task (request);
     }
   else // execute in the current thread context.
     {
@@ -83,7 +82,7 @@ TAO_Notify_Proxy::types_changed (const TAO_Notify_EventTypeSeq& added, const TAO
 }
 
 CosNotification::EventTypeSeq*
-TAO_Notify_Proxy::obtain_types (CosNotifyChannelAdmin::ObtainInfoMode mode, const TAO_Notify_EventTypeSeq& types ACE_ENV_ARG_DECL)
+TAO_Notify_Proxy::obtain_types (CosNotifyChannelAdmin::ObtainInfoMode mode, const TAO_Notify_EventTypeSeq& types)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -126,7 +125,7 @@ TAO_Notify_Proxy::qos_changed (const TAO_Notify_QoSProperties& qos_properties)
 }
 
 void
-TAO_Notify_Proxy::save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL)
+TAO_Notify_Proxy::save_persistent (TAO_Notify::Topology_Saver& saver)
 {
   bool changed = this->children_changed_;
   this->children_changed_ = false;
@@ -138,21 +137,21 @@ TAO_Notify_Proxy::save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG
     this->save_attrs(attrs);
 
     const char * type_name = this->get_proxy_type_name ();
-    bool want_all_children = saver.begin_object(this->id(), type_name, attrs, changed ACE_ENV_ARG_PARAMETER);
+    bool want_all_children = saver.begin_object(this->id(), type_name, attrs, changed);
 
     if (want_all_children || this->filter_admin_.is_changed ())
     {
-      this->filter_admin_.save_persistent(saver ACE_ENV_ARG_PARAMETER);
+      this->filter_admin_.save_persistent(saver);
     }
 
     if (want_all_children || this->subscribed_types_.is_changed ())
     {
-      this->subscribed_types_.save_persistent(saver ACE_ENV_ARG_PARAMETER);
+      this->subscribed_types_.save_persistent(saver);
     }
 
     // todo: handle removed children
 
-    saver.end_object(this->id(), type_name ACE_ENV_ARG_PARAMETER);
+    saver.end_object(this->id(), type_name);
   }
 }
 
@@ -169,7 +168,7 @@ TAO_Notify_Proxy::save_attrs (TAO_Notify::NVPList& attrs)
 
 TAO_Notify::Topology_Object*
 TAO_Notify_Proxy::load_child (const ACE_CString &type, CORBA::Long id,
-  const TAO_Notify::NVPList& attrs ACE_ENV_ARG_DECL)
+  const TAO_Notify::NVPList& attrs)
 {
   ACE_UNUSED_ARG (id);
   ACE_UNUSED_ARG (attrs);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h
index d0368573fa6..357c9868ced 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h
@@ -52,34 +52,29 @@ public:
   virtual ~TAO_Notify_Proxy ();
 
   /// Activate
-  virtual CORBA::Object_ptr activate (PortableServer::Servant servant
-                                      ACE_ENV_ARG_DECL);
+  virtual CORBA::Object_ptr activate (PortableServer::Servant servant);
 
   /// Activate with a given ID
   virtual CORBA::Object_ptr activate (
       PortableServer::Servant servant,
-      CORBA::Long id
-      ACE_ENV_ARG_DECL);
+      CORBA::Long id);
 
   /// Deactivate
   void deactivate (void);
 
   /// Obtain the Proxy's subscribed types.
-  void subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types
-                         ACE_ENV_ARG_DECL);
+  void subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types);
 
   /// Check if this event passes the admin and proxy filters.
   CORBA::Boolean check_filters (
       const TAO_Notify_Event* event,
       TAO_Notify_FilterAdmin& parent_filter_admin,
       CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator
-      ACE_ENV_ARG_DECL
     );
 
   /// Inform this proxy that the following types are being advertised.
   void types_changed (const TAO_Notify_EventTypeSeq& added,
-                      const TAO_Notify_EventTypeSeq& removed
-                      ACE_ENV_ARG_DECL);
+                      const TAO_Notify_EventTypeSeq& removed);
 
   /// Have updates been turned off.
   CORBA::Boolean updates_off (void);
@@ -94,14 +89,12 @@ public:
   virtual CosNotification::EventTypeSeq* obtain_types (
       CosNotifyChannelAdmin::ObtainInfoMode mode,
       const TAO_Notify_EventTypeSeq& types
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Notification of subscriptions/offers set at the admin.
   virtual void admin_types_changed (const CosNotification::EventTypeSeq & added,
-                                    const CosNotification::EventTypeSeq & removed
-                                    ACE_ENV_ARG_DECL) = 0;
+                                    const CosNotification::EventTypeSeq & removed) = 0;
 
 
   /// Override, TAO_Notify_Object::qos_changed
@@ -109,12 +102,12 @@ public:
 
   // TAO_Notify::Topology_Object
 
-  virtual void save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL);
+  virtual void save_persistent (TAO_Notify::Topology_Saver& saver);
   virtual void save_attrs(TAO_Notify::NVPList& attrs);
   virtual const char * get_proxy_type_name (void) const = 0;
 
   virtual TAO_Notify::Topology_Object* load_child (const ACE_CString &type, CORBA::Long id,
-    const TAO_Notify::NVPList& attrs ACE_ENV_ARG_DECL);
+    const TAO_Notify::NVPList& attrs);
 
 protected:
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl b/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl
index 43f5d362b18..0f92ffdcb35 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl
@@ -13,22 +13,21 @@ TAO_Notify_Proxy::updates_off (void)
 ACE_INLINE CORBA::Boolean
 TAO_Notify_Proxy::check_filters (const TAO_Notify_Event* event
                              , TAO_Notify_FilterAdmin& parent_filter_admin
-                             , CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator
-                             ACE_ENV_ARG_DECL)
+                             , CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator)
 {
   // check if it passes the parent filter.
   CORBA::Boolean parent_val =
-    parent_filter_admin.match (event ACE_ENV_ARG_PARAMETER);
+    parent_filter_admin.match (event);
 
   CORBA::Boolean val = 0;
 
   if (filter_operator == CosNotifyChannelAdmin::AND_OP)
     {
-      val = parent_val && this->filter_admin_.match (event ACE_ENV_ARG_PARAMETER);
+      val = parent_val && this->filter_admin_.match (event);
     }
   else
     {
-      val = parent_val || this->filter_admin_.match (event ACE_ENV_ARG_PARAMETER);
+      val = parent_val || this->filter_admin_.match (event);
     }
 
   return val;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
index a1ffb1a15ac..614157337c1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
@@ -45,11 +45,11 @@ TAO_Notify_ProxyConsumer::peer (void)
 }
 
 void
-TAO_Notify_ProxyConsumer::init (TAO_Notify::Topology_Parent* topology_parent ACE_ENV_ARG_DECL)
+TAO_Notify_ProxyConsumer::init (TAO_Notify::Topology_Parent* topology_parent)
 {
   ACE_ASSERT( this->supplier_admin_.get() == 0 );
 
-  TAO_Notify_Proxy::initialize (topology_parent ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Proxy::initialize (topology_parent);
 
   this->supplier_admin_.reset (dynamic_cast<TAO_Notify_SupplierAdmin *>(topology_parent));
   ACE_ASSERT (this->supplier_admin_.get() != 0);
@@ -60,12 +60,12 @@ TAO_Notify_ProxyConsumer::init (TAO_Notify::Topology_Parent* topology_parent ACE
   {
     ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                          CORBA::INTERNAL ());
-    this->TAO_Notify_Object::set_qos (default_ps_qos ACE_ENV_ARG_PARAMETER);
+    this->TAO_Notify_Object::set_qos (default_ps_qos);
   }
 }
 
 void
-TAO_Notify_ProxyConsumer::connect (TAO_Notify_Supplier *supplier ACE_ENV_ARG_DECL)
+TAO_Notify_ProxyConsumer::connect (TAO_Notify_Supplier *supplier)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventChannelAdmin::AlreadyConnected
@@ -79,7 +79,8 @@ TAO_Notify_ProxyConsumer::connect (TAO_Notify_Supplier *supplier ACE_ENV_ARG_DEC
 
   if (max_suppliers != 0 && supplier_count >= max_suppliers.value ())
   {
-    ACE_THROW (CORBA::IMP_LIMIT ()); // we've reached the limit of suppliers connected.
+    throw CORBA::IMP_LIMIT (
+      ); // we've reached the limit of suppliers connected.
   }
 
   {
@@ -89,13 +90,13 @@ TAO_Notify_ProxyConsumer::connect (TAO_Notify_Supplier *supplier ACE_ENV_ARG_DEC
     // if supplier is set and reconnect not allowed we get out.
     if (this->is_connected () && TAO_Notify_PROPERTIES::instance()->allow_reconnect() == false)
       {
-        ACE_THROW (CosEventChannelAdmin::AlreadyConnected ());
+        throw CosEventChannelAdmin::AlreadyConnected ();
       }
 
     // Adopt the supplier
     this->supplier_ = auto_supplier;
 
-    this->supplier_admin_->subscribed_types (this->subscribed_types_ ACE_ENV_ARG_PARAMETER); // get the parents subscribed types.
+    this->supplier_admin_->subscribed_types (this->subscribed_types_); // get the parents subscribed types.
   }
 
   // Inform QoS values.
@@ -104,30 +105,30 @@ TAO_Notify_ProxyConsumer::connect (TAO_Notify_Supplier *supplier ACE_ENV_ARG_DEC
 
   TAO_Notify_EventTypeSeq removed;
 
-  this->event_manager().offer_change (this, this->subscribed_types_, removed ACE_ENV_ARG_PARAMETER);
+  this->event_manager().offer_change (this, this->subscribed_types_, removed);
 
-  this->event_manager().connect (this ACE_ENV_ARG_PARAMETER);
+  this->event_manager().connect (this);
 
   // Increment the global supplier count
   ++supplier_count;
 }
 void
-TAO_Notify_ProxyConsumer::push_i (TAO_Notify_Event * event ACE_ENV_ARG_DECL)
+TAO_Notify_ProxyConsumer::push_i (TAO_Notify_Event * event)
 {
   if (this->supports_reliable_events ())
     {
       TAO_Notify_Event::Ptr pevent(event->queueable_copy());
       TAO_Notify::Routing_Slip_Ptr routing_slip =
-        TAO_Notify::Routing_Slip::create (pevent ACE_ENV_ARG_PARAMETER);
+        TAO_Notify::Routing_Slip::create (pevent);
       if (DEBUG_LEVEL > 0)
         ACE_DEBUG((LM_DEBUG, ACE_TEXT ("ProxyConsumer routing event.\n")));
-      routing_slip->route (this, true ACE_ENV_ARG_PARAMETER);
+      routing_slip->route (this, true);
       routing_slip->wait_persist ();
     }
   else
     {
       TAO_Notify_Method_Request_Lookup_No_Copy request (event, this);
-      this->execute_task (request ACE_ENV_ARG_PARAMETER);
+      this->execute_task (request);
     }
 }
 
@@ -152,9 +153,9 @@ TAO_Notify_ProxyConsumer::disconnect (void)
 {
   TAO_Notify_EventTypeSeq added;
 
-  event_manager().offer_change (this, added, this->subscribed_types_ ACE_ENV_ARG_PARAMETER);
+  event_manager().offer_change (this, added, this->subscribed_types_);
 
-  this->event_manager().disconnect (this ACE_ENV_ARG_PARAMETER);
+  this->event_manager().disconnect (this);
 
   // Decrement the global supplier count
   this->admin_properties().suppliers ()--;
@@ -183,7 +184,7 @@ TAO_Notify_ProxyConsumer::destroy (void)
   if ( result == 1)
     return;
 
-  this->supplier_admin_->remove (this ACE_ENV_ARG_PARAMETER);
+  this->supplier_admin_->remove (this);
 
   // Do not reset this->supplier_.
   // It is not safe to delete the non-refcounted supplier here.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
index 5e56ae10676..7e2f2e4564f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
@@ -48,10 +48,10 @@ public:
   virtual ~TAO_Notify_ProxyConsumer ();
 
   /// init: overrides Topology_Object method
-  virtual void init (TAO_Notify::Topology_Parent * topology_parent ACE_ENV_ARG_DECL);
+  virtual void init (TAO_Notify::Topology_Parent * topology_parent);
 
   /// Connect
-  void connect (TAO_Notify_Supplier* supplier ACE_ENV_ARG_DECL)
+  void connect (TAO_Notify_Supplier* supplier)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      , CosEventChannelAdmin::AlreadyConnected
@@ -78,7 +78,7 @@ protected:
   TAO_Notify_Supplier* supplier (void);
 
   /// Accept an event from the Supplier
-  void push_i (TAO_Notify_Event * event ACE_ENV_ARG_DECL);
+  void push_i (TAO_Notify_Event * event);
 
 private:
   /// Is this part of a reliable channel
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp
index e89976a1c6e..bd274580332 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp
@@ -22,10 +22,9 @@ TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::~TAO_Notify_ProxyConsumer_T ()
 
 template <class SERVANT_TYPE> void
 TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::admin_types_changed (const CosNotification::EventTypeSeq & added,
-                                                           const CosNotification::EventTypeSeq & removed
-                                                           ACE_ENV_ARG_DECL)
+                                                           const CosNotification::EventTypeSeq & removed)
 {
-  this->offer_change (added, removed ACE_ENV_ARG_PARAMETER);
+  this->offer_change (added, removed);
 }
 
 template <class SERVANT_TYPE> CosNotifyChannelAdmin::SupplierAdmin_ptr
@@ -38,13 +37,13 @@ TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::MyAdmin (void)
 
   CORBA::Object_var object = this->supplier_admin().ref ();
 
-  ret = CosNotifyChannelAdmin::SupplierAdmin::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+  ret = CosNotifyChannelAdmin::SupplierAdmin::_narrow (object.in ());
 
   return ret._retn ();
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::offer_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ACE_ENV_ARG_DECL)
+TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::offer_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyComm::InvalidEventType
@@ -62,19 +61,16 @@ TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::offer_change (const CosNotification::E
 
   this->event_manager().offer_change (this,
                                       seq_added,
-                                      seq_removed
-                                      ACE_ENV_ARG_PARAMETER);
+                                      seq_removed);
 }
 
 template <class SERVANT_TYPE> CosNotification::EventTypeSeq*
 TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::obtain_subscription_types (
-    CosNotifyChannelAdmin::ObtainInfoMode mode
-    ACE_ENV_ARG_DECL)
+    CosNotifyChannelAdmin::ObtainInfoMode mode)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
-    this->obtain_types (mode, this->event_manager().subscription_types ()
-                        ACE_ENV_ARG_PARAMETER);
+    this->obtain_types (mode, this->event_manager().subscription_types ());
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h
index 9f10ecf26e4..0d38ba6b19b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h
@@ -44,8 +44,7 @@ public:
 
   /// Notification of subscriptions set at the admin.
   virtual void admin_types_changed (const CosNotification::EventTypeSeq & added,
-                                    const CosNotification::EventTypeSeq & removed
-                                    ACE_ENV_ARG_DECL);
+                                    const CosNotification::EventTypeSeq & removed);
 
   virtual CosNotifyChannelAdmin::SupplierAdmin_ptr MyAdmin (void)
     ACE_THROW_SPEC ((
@@ -54,7 +53,6 @@ public:
 
   virtual CosNotification::EventTypeSeq * obtain_subscription_types (
     CosNotifyChannelAdmin::ObtainInfoMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -63,7 +61,6 @@ public:
   virtual void offer_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
index 5d1c2469408..f65d85abe56 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
@@ -29,11 +29,11 @@ TAO_Notify_ProxySupplier::~TAO_Notify_ProxySupplier ()
 }
 
 void
-TAO_Notify_ProxySupplier::init (TAO_Notify_ConsumerAdmin* consumer_admin ACE_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier::init (TAO_Notify_ConsumerAdmin* consumer_admin)
 {
   ACE_ASSERT (consumer_admin != 0 && this->consumer_admin_.get() == 0);
 
-  TAO_Notify_Proxy::initialize (consumer_admin ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Proxy::initialize (consumer_admin);
 
   this->consumer_admin_.reset (consumer_admin);
 
@@ -43,7 +43,7 @@ TAO_Notify_ProxySupplier::init (TAO_Notify_ConsumerAdmin* consumer_admin ACE_ENV
   {
     ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                           CORBA::INTERNAL ());
-    this->TAO_Notify_Object::set_qos (default_ps_qos ACE_ENV_ARG_PARAMETER);
+    this->TAO_Notify_Object::set_qos (default_ps_qos);
   }
 }
 
@@ -54,7 +54,7 @@ TAO_Notify_ProxySupplier:: peer (void)
 }
 
 void
-TAO_Notify_ProxySupplier::connect (TAO_Notify_Consumer *consumer ACE_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier::connect (TAO_Notify_Consumer *consumer)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventChannelAdmin::AlreadyConnected
@@ -68,7 +68,8 @@ TAO_Notify_ProxySupplier::connect (TAO_Notify_Consumer *consumer ACE_ENV_ARG_DEC
 
   if (max_consumers != 0 && consumer_count >= max_consumers.value ())
   {
-    ACE_THROW (CORBA::IMP_LIMIT ()); // we've reached the limit of consumers connected.
+    throw CORBA::IMP_LIMIT (
+      ); // we've reached the limit of consumers connected.
   }
 
   {
@@ -78,13 +79,13 @@ TAO_Notify_ProxySupplier::connect (TAO_Notify_Consumer *consumer ACE_ENV_ARG_DEC
     // if consumer is set and reconnect not allowed we get out.
     if (this->is_connected () && TAO_Notify_PROPERTIES::instance()->allow_reconnect() == false)
       {
-          ACE_THROW (CosEventChannelAdmin::AlreadyConnected ());
+          throw CosEventChannelAdmin::AlreadyConnected ();
       }
 
     // Adopt the consumer
     this->consumer_ = auto_consumer;
 
-    this->consumer_admin_->subscribed_types (this->subscribed_types_ ACE_ENV_ARG_PARAMETER); // get the parents subscribed types.
+    this->consumer_admin_->subscribed_types (this->subscribed_types_); // get the parents subscribed types.
   }
 
   // Inform QoS values.
@@ -93,9 +94,9 @@ TAO_Notify_ProxySupplier::connect (TAO_Notify_Consumer *consumer ACE_ENV_ARG_DEC
 
   TAO_Notify_EventTypeSeq removed;
 
-  this->event_manager().subscription_change (this, this->subscribed_types_, removed ACE_ENV_ARG_PARAMETER);
+  this->event_manager().subscription_change (this, this->subscribed_types_, removed);
 
-  this->event_manager().connect (this ACE_ENV_ARG_PARAMETER);
+  this->event_manager().connect (this);
 
   // Increment the global consumer count
   ++consumer_count;
@@ -106,9 +107,9 @@ TAO_Notify_ProxySupplier::disconnect (void)
 {
   TAO_Notify_EventTypeSeq added;
 
-  this->event_manager().subscription_change (this, added, this->subscribed_types_ ACE_ENV_ARG_PARAMETER);
+  this->event_manager().subscription_change (this, added, this->subscribed_types_);
 
-  this->event_manager().disconnect (this ACE_ENV_ARG_PARAMETER);
+  this->event_manager().disconnect (this);
 
   // Decrement the global consumer count
   this->admin_properties().consumers ()--;
@@ -137,16 +138,16 @@ TAO_Notify_ProxySupplier::destroy (void)
   if ( result == 1)
     return;
 
-  this->consumer_admin_->remove (this ACE_ENV_ARG_PARAMETER);
+  this->consumer_admin_->remove (this);
 
   // Do not reset this->consumer_.
   // It is not safe to delete the non-refcounted consumer here.
 }
 
 void
-TAO_Notify_ProxySupplier::deliver (TAO_Notify_Method_Request_Dispatch_No_Copy & request ACE_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier::deliver (TAO_Notify_Method_Request_Dispatch_No_Copy & request)
 {
-  this->execute_task (request ACE_ENV_ARG_PARAMETER);
+  this->execute_task (request);
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
index 723de83294d..f038e2c2c66 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
@@ -47,10 +47,10 @@ public:
   virtual ~TAO_Notify_ProxySupplier ();
 
   /// Init
-  virtual void init (TAO_Notify_ConsumerAdmin* consumer_admin ACE_ENV_ARG_DECL);
+  virtual void init (TAO_Notify_ConsumerAdmin* consumer_admin);
 
   /// Connect
-  void connect (TAO_Notify_Consumer* consumer ACE_ENV_ARG_DECL)
+  void connect (TAO_Notify_Consumer* consumer)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      , CosEventChannelAdmin::AlreadyConnected
@@ -59,7 +59,7 @@ public:
   void disconnect (void);
 
   /// Dispatch Event to consumer
-  virtual void deliver (TAO_Notify_Method_Request_Dispatch_No_Copy & request ACE_ENV_ARG_DECL);
+  virtual void deliver (TAO_Notify_Method_Request_Dispatch_No_Copy & request);
 
   /// Override TAO_Notify_Container_T::shutdown  method
   virtual int shutdown (void);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
index b3568409e86..f47602374e1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
@@ -29,14 +29,13 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::~TAO_Notify_ProxySupplier_T ()
 
 template <class SERVANT_TYPE> void
 TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::admin_types_changed (const CosNotification::EventTypeSeq & added,
-                                                           const CosNotification::EventTypeSeq & removed
-                                                           ACE_ENV_ARG_DECL)
+                                                           const CosNotification::EventTypeSeq & removed)
 {
-  this->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
+  this->subscription_change (added, removed);
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_structured (const CosNotification::StructuredEvent& notification ACE_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_structured (const CosNotification::StructuredEvent& notification)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -45,11 +44,11 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_structured (const CosNotificat
 
   TAO_Notify_Method_Request_Dispatch_No_Copy request (&event, this, 1);
 
-  this->execute_task (request ACE_ENV_ARG_PARAMETER);
+  this->execute_task (request);
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_structured_no_filtering (const CosNotification::StructuredEvent& notification ACE_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_structured_no_filtering (const CosNotification::StructuredEvent& notification)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -58,11 +57,11 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_structured_no_filtering (const
 
   TAO_Notify_Method_Request_Dispatch_No_Copy request (&event, this, 0);
 
-  this->execute_task (request ACE_ENV_ARG_PARAMETER);
+  this->execute_task (request);
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_any (const CORBA::Any & any ACE_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_any (const CORBA::Any & any)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -71,11 +70,11 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_any (const CORBA::Any & any AC
 
   TAO_Notify_Method_Request_Dispatch_No_Copy request (&event, this, 1);
 
-  this->execute_task (request ACE_ENV_ARG_PARAMETER);
+  this->execute_task (request);
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_any_no_filtering (const CORBA::Any& any ACE_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_any_no_filtering (const CORBA::Any& any)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ))
@@ -84,22 +83,21 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_any_no_filtering (const CORBA:
 
   TAO_Notify_Method_Request_Dispatch_No_Copy request (&event, this, 0);
 
-  this->execute_task (request ACE_ENV_ARG_PARAMETER);
+  this->execute_task (request);
 }
 
 template <class SERVANT_TYPE> CosNotification::EventTypeSeq*
-TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::obtain_offered_types (CosNotifyChannelAdmin::ObtainInfoMode mode ACE_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::obtain_offered_types (CosNotifyChannelAdmin::ObtainInfoMode mode)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->obtain_types (mode, this->event_manager().offered_types () ACE_ENV_ARG_PARAMETER);
+  return this->obtain_types (mode, this->event_manager().offered_types ());
 }
 
 template <class SERVANT_TYPE> void
 TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::subscription_change (const CosNotification::EventTypeSeq & added,
-                                                           const CosNotification::EventTypeSeq & removed
-                                                           ACE_ENV_ARG_DECL)
+                                                           const CosNotification::EventTypeSeq & removed)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNotifyComm::InvalidEventType))
 {
@@ -113,7 +111,7 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::subscription_change (const CosNotifica
     this->subscribed_types_.add_and_remove (seq_added, seq_removed);
   }
 
-  this->event_manager().subscription_change (this, seq_added, seq_removed ACE_ENV_ARG_PARAMETER);
+  this->event_manager().subscription_change (this, seq_added, seq_removed);
 }
 
 template <class SERVANT_TYPE> void
@@ -128,10 +126,10 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::suspend_connection (void)
     ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ());
 
     if (this->is_connected () == 0)
-      ACE_THROW (CosNotifyChannelAdmin::NotConnected ());
+      throw CosNotifyChannelAdmin::NotConnected ();
 
     if (this->consumer()->is_suspended () == 1)
-      ACE_THROW (CosNotifyChannelAdmin::ConnectionAlreadyInactive ());
+      throw CosNotifyChannelAdmin::ConnectionAlreadyInactive ();
   }
 
   this->consumer()->suspend ();
@@ -150,10 +148,10 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::resume_connection (void)
     ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ());
 
     if (this->is_connected () == 0)
-      ACE_THROW (CosNotifyChannelAdmin::NotConnected ());
+      throw CosNotifyChannelAdmin::NotConnected ();
 
     if (this->consumer()->is_suspended () == 0)
-      ACE_THROW (CosNotifyChannelAdmin::ConnectionAlreadyActive ());
+      throw CosNotifyChannelAdmin::ConnectionAlreadyActive ();
   }
 
   this->consumer()->resume ();
@@ -169,7 +167,7 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::MyAdmin (void)
 
   CORBA::Object_var object = this->consumer_admin().ref ();
 
-  ret = CosNotifyChannelAdmin::ConsumerAdmin::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+  ret = CosNotifyChannelAdmin::ConsumerAdmin::_narrow (object.in ());
 
   return ret._retn ();
 }
@@ -189,12 +187,12 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::priority_filter (void)
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/ ACE_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 template <class SERVANT_TYPE> CosNotifyFilter::MappingFilter_ptr
@@ -210,12 +208,12 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::lifetime_filter (void)
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/ ACE_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h
index f31cba76ee9..75b800ede14 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h
@@ -41,30 +41,29 @@ public:
 
   /// Notification of subscriptions set at the admin.
   virtual void admin_types_changed (const CosNotification::EventTypeSeq & added,
-                                    const CosNotification::EventTypeSeq & removed
-                                    ACE_ENV_ARG_DECL);
+                                    const CosNotification::EventTypeSeq & removed);
 
   ///= POA_Notify_Internal methods
   /// POA_Notify_Internal::Event_Forwarder method
-  virtual void forward_structured (const CosNotification::StructuredEvent & event ACE_ENV_ARG_DECL)
+  virtual void forward_structured (const CosNotification::StructuredEvent & event)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
   /// POA_Notify_Internal::Event_Forwarder method
-  virtual void forward_structured_no_filtering (const CosNotification::StructuredEvent & event ACE_ENV_ARG_DECL)
+  virtual void forward_structured_no_filtering (const CosNotification::StructuredEvent & event)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
   /// POA_Notify_Internal::Event_Forwarder method
-  virtual void forward_any (const CORBA::Any & event ACE_ENV_ARG_DECL)
+  virtual void forward_any (const CORBA::Any & event)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
   /// POA_Notify_Internal::Event_Forwarder method
-  virtual void forward_any_no_filtering (const CORBA::Any & event ACE_ENV_ARG_DECL)
+  virtual void forward_any_no_filtering (const CORBA::Any & event)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
@@ -74,14 +73,12 @@ protected:
 
   // = Interface methods
   virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr MyAdmin (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
   virtual void suspend_connection (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -90,7 +87,6 @@ protected:
   ));
 
   virtual void resume_connection (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -99,7 +95,6 @@ protected:
   ));
 
   virtual CosNotifyFilter::MappingFilter_ptr priority_filter (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -107,14 +102,12 @@ protected:
 
   virtual void priority_filter (
     CosNotifyFilter::MappingFilter_ptr priority_filter
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
   virtual CosNotifyFilter::MappingFilter_ptr lifetime_filter (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -122,7 +115,6 @@ protected:
 
   virtual void lifetime_filter (
     CosNotifyFilter::MappingFilter_ptr lifetime_filter
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -130,7 +122,6 @@ protected:
 
   virtual CosNotification::EventTypeSeq * obtain_offered_types (
     CosNotifyChannelAdmin::ObtainInfoMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -139,7 +130,6 @@ protected:
   virtual void subscription_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp
index 740c2cdd848..009a4a9b70a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp
@@ -38,13 +38,13 @@ TAO_Notify_Proxy_T<SERVANT_TYPE>::_remove_ref (void)
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_Proxy_T<SERVANT_TYPE>::validate_event_qos (const CosNotification::QoSProperties & /*required_qos*/, CosNotification::NamedPropertyRangeSeq_out /*available_qos*/ ACE_ENV_ARG_DECL)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::validate_event_qos (const CosNotification::QoSProperties & /*required_qos*/, CosNotification::NamedPropertyRangeSeq_out /*available_qos*/)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotification::UnsupportedQoS
                    ))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 template <class SERVANT_TYPE> CosNotification::QoSProperties*
@@ -60,7 +60,7 @@ TAO_Notify_Proxy_T<SERVANT_TYPE>::get_qos (void)
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_Proxy_T<SERVANT_TYPE>::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_ARG_DECL)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::set_qos (const CosNotification::QoSProperties & qos)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotification::UnsupportedQoS
@@ -69,25 +69,24 @@ TAO_Notify_Proxy_T<SERVANT_TYPE>::set_qos (const CosNotification::QoSProperties
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
 
-  this->TAO_Notify_Object::set_qos (qos ACE_ENV_ARG_PARAMETER);
+  this->TAO_Notify_Object::set_qos (qos);
 }
 
 template <class SERVANT_TYPE> void
 TAO_Notify_Proxy_T<SERVANT_TYPE>::validate_qos (
                                             const CosNotification::QoSProperties & /*required_qos*/,
                                             CosNotification::NamedPropertyRangeSeq_out /*available_qos*/
-    ACE_ENV_ARG_DECL
     )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotification::UnsupportedQoS
                    ))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 template <class SERVANT_TYPE> CosNotifyFilter::FilterID
-TAO_Notify_Proxy_T<SERVANT_TYPE>::add_filter (CosNotifyFilter::Filter_ptr new_filter ACE_ENV_ARG_DECL)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::add_filter (CosNotifyFilter::Filter_ptr new_filter)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -96,7 +95,7 @@ TAO_Notify_Proxy_T<SERVANT_TYPE>::add_filter (CosNotifyFilter::Filter_ptr new_fi
                       CORBA::INTERNAL ());
 
   CosNotifyFilter::FilterID fid =
-    this->filter_admin_.add_filter (new_filter ACE_ENV_ARG_PARAMETER);
+    this->filter_admin_.add_filter (new_filter);
   this->self_change ();
   return fid;
 }
@@ -104,7 +103,6 @@ TAO_Notify_Proxy_T<SERVANT_TYPE>::add_filter (CosNotifyFilter::Filter_ptr new_fi
 template <class SERVANT_TYPE> void
 TAO_Notify_Proxy_T<SERVANT_TYPE>::remove_filter (
     CosNotifyFilter::FilterID filter
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
@@ -114,11 +112,11 @@ TAO_Notify_Proxy_T<SERVANT_TYPE>::remove_filter (
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
 
-  this->filter_admin_.remove_filter (filter ACE_ENV_ARG_PARAMETER);
+  this->filter_admin_.remove_filter (filter);
 }
 
 template <class SERVANT_TYPE> CosNotifyFilter::Filter_ptr
-TAO_Notify_Proxy_T<SERVANT_TYPE>::get_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::get_filter (CosNotifyFilter::FilterID filter)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyFilter::FilterNotFound
@@ -127,7 +125,7 @@ TAO_Notify_Proxy_T<SERVANT_TYPE>::get_filter (CosNotifyFilter::FilterID filter A
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
 
-  return this->filter_admin_.get_filter (filter ACE_ENV_ARG_PARAMETER);
+  return this->filter_admin_.get_filter (filter);
 }
 
 template <class SERVANT_TYPE> CosNotifyFilter::FilterIDSeq*
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h
index f31b6e350ed..7e24ca1b8ff 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h
@@ -54,7 +54,6 @@ public:
   virtual void validate_event_qos (
     const CosNotification::QoSProperties & required_qos,
     CosNotification::NamedPropertyRangeSeq_out available_qos
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -62,7 +61,6 @@ public:
   ));
 
  virtual CosNotification::QoSProperties * get_qos (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -70,7 +68,6 @@ public:
 
   virtual void set_qos (
     const CosNotification::QoSProperties & qos
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -80,7 +77,6 @@ public:
   virtual void validate_qos (
     const CosNotification::QoSProperties & required_qos,
     CosNotification::NamedPropertyRangeSeq_out available_qos
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -89,7 +85,6 @@ public:
 
   virtual CosNotifyFilter::FilterID add_filter (
     CosNotifyFilter::Filter_ptr new_filter
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -97,7 +92,6 @@ public:
 
   virtual void remove_filter (
     CosNotifyFilter::FilterID filter
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -106,7 +100,6 @@ public:
 
   virtual CosNotifyFilter::Filter_ptr get_filter (
     CosNotifyFilter::FilterID filter
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -114,14 +107,12 @@ public:
   ));
 
   virtual CosNotifyFilter::FilterIDSeq * get_all_filters (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
   virtual void remove_all_filters (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
index 8f70f048db0..8fe73daef1c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
@@ -26,7 +26,7 @@ TAO_Notify_RT_Builder::~TAO_Notify_RT_Builder ()
 
 void
 TAO_Notify_RT_Builder::apply_thread_pool_concurrency (TAO_Notify_Object& object
-                                                       , const NotifyExt::ThreadPoolParams& tp_params ACE_ENV_ARG_DECL)
+                                                       , const NotifyExt::ThreadPoolParams& tp_params)
 {
   TAO_Notify_RT_POA_Helper* proxy_poa = 0;
 
@@ -39,7 +39,7 @@ TAO_Notify_RT_Builder::apply_thread_pool_concurrency (TAO_Notify_Object& object
 
   PortableServer::POA_var default_poa = TAO_Notify_PROPERTIES::instance ()->default_poa ();
 
-  proxy_poa->init (default_poa.in (), tp_params ACE_ENV_ARG_PARAMETER);
+  proxy_poa->init (default_poa.in (), tp_params);
 
   // Give ownership of proxy_poa
   object.set_proxy_poa (auto_proxy_poa.release ());
@@ -47,7 +47,7 @@ TAO_Notify_RT_Builder::apply_thread_pool_concurrency (TAO_Notify_Object& object
 
 void
 TAO_Notify_RT_Builder::apply_lane_concurrency (TAO_Notify_Object& object
-                                                , const NotifyExt::ThreadPoolLanesParams& tpl_params ACE_ENV_ARG_DECL)
+                                                , const NotifyExt::ThreadPoolLanesParams& tpl_params)
 {
   TAO_Notify_RT_POA_Helper* proxy_poa = 0;
 
@@ -60,7 +60,7 @@ TAO_Notify_RT_Builder::apply_lane_concurrency (TAO_Notify_Object& object
 
   PortableServer::POA_var default_poa = TAO_Notify_PROPERTIES::instance ()->default_poa ();
 
-  proxy_poa->init (default_poa.in (), tpl_params ACE_ENV_ARG_PARAMETER);
+  proxy_poa->init (default_poa.in (), tpl_params);
 
   // Give ownership of proxy_poa
   object.set_proxy_poa (auto_proxy_poa.release ());
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h
index 6e0b2bba087..24ed28e86a2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h
@@ -38,10 +38,10 @@ public:
   virtual ~TAO_Notify_RT_Builder ();
 
   /// Apply Thread Pools.
-  virtual void apply_thread_pool_concurrency (TAO_Notify_Object& object, const NotifyExt::ThreadPoolParams& tp_params ACE_ENV_ARG_DECL);
+  virtual void apply_thread_pool_concurrency (TAO_Notify_Object& object, const NotifyExt::ThreadPoolParams& tp_params);
 
   /// Apply Thread Pools with Lanes.
-  virtual void apply_lane_concurrency (TAO_Notify_Object& object, const NotifyExt::ThreadPoolLanesParams& tpl_params ACE_ENV_ARG_DECL);
+  virtual void apply_lane_concurrency (TAO_Notify_Object& object, const NotifyExt::ThreadPoolLanesParams& tpl_params);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp
index af5484fed61..5e712190c46 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp
@@ -17,7 +17,7 @@ TAO_Notify_RT_Factory::~TAO_Notify_RT_Factory ()
 }
 
 void
-TAO_Notify_RT_Factory::create (TAO_Notify_StructuredProxyPushSupplier*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory::create (TAO_Notify_StructuredProxyPushSupplier*& proxy)
 {
   ACE_NEW_THROW_EX (proxy,
                     TAO_Notify_RT_StructuredProxyPushSupplier (),
@@ -25,105 +25,105 @@ TAO_Notify_RT_Factory::create (TAO_Notify_StructuredProxyPushSupplier*& proxy AC
 }
 
 void
-TAO_Notify_RT_Factory:: create (TAO_Notify_ProxySupplier_Collection*& collection ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_ProxySupplier_Collection*& collection)
 {
-  TAO_Notify_Default_Factory::create (collection ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (collection);
 }
 
 void
-TAO_Notify_RT_Factory:: create (TAO_Notify_ProxyConsumer_Collection*& collection ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_ProxyConsumer_Collection*& collection)
 {
-  TAO_Notify_Default_Factory::create (collection ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (collection);
 }
 
 void
-TAO_Notify_RT_Factory:: create (TAO_Notify_EventChannel_Collection*& collection ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_EventChannel_Collection*& collection)
 {
-  TAO_Notify_Default_Factory::create (collection ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (collection);
 }
 
 void
-TAO_Notify_RT_Factory:: create (TAO_Notify_ConsumerAdmin_Collection*& collection ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_ConsumerAdmin_Collection*& collection)
 {
-  TAO_Notify_Default_Factory::create (collection ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (collection);
 }
 
 void
-TAO_Notify_RT_Factory:: create (TAO_Notify_SupplierAdmin_Collection*& collection ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_SupplierAdmin_Collection*& collection)
 {
-  TAO_Notify_Default_Factory::create (collection ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (collection);
 }
 
 void
-TAO_Notify_RT_Factory:: create (TAO_Notify_Proxy_Collection*& collection ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_Proxy_Collection*& collection)
 {
-  TAO_Notify_Default_Factory::create (collection ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (collection);
 }
 
 void
-TAO_Notify_RT_Factory:: create (TAO_Notify_EventChannelFactory*& channel_factory ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_EventChannelFactory*& channel_factory)
 {
-  TAO_Notify_Default_Factory::create (channel_factory ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (channel_factory);
 }
 
 void
-TAO_Notify_RT_Factory:: create (TAO_Notify_EventChannel*& channel ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_EventChannel*& channel)
 {
-  TAO_Notify_Default_Factory::create (channel ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (channel);
 }
 
 void
-TAO_Notify_RT_Factory:: create (TAO_Notify_SupplierAdmin*& admin ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_SupplierAdmin*& admin)
 {
-  TAO_Notify_Default_Factory::create (admin ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (admin);
 }
 
 void
-TAO_Notify_RT_Factory:: create (TAO_Notify_ConsumerAdmin*& admin ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_ConsumerAdmin*& admin)
 {
-  TAO_Notify_Default_Factory::create (admin ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (admin);
 }
 
 void
-TAO_Notify_RT_Factory:: create (TAO_Notify_ProxyPushConsumer*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_ProxyPushConsumer*& proxy)
 {
-  TAO_Notify_Default_Factory::create (proxy ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (proxy);
 }
 
 void
-TAO_Notify_RT_Factory:: create (TAO_Notify_ProxyPushSupplier*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_ProxyPushSupplier*& proxy)
 {
-  TAO_Notify_Default_Factory::create (proxy ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (proxy);
 }
 
 void
-TAO_Notify_RT_Factory:: create (TAO_Notify_CosEC_ProxyPushConsumer*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_CosEC_ProxyPushConsumer*& proxy)
 {
-  TAO_Notify_Default_Factory::create (proxy ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (proxy);
 }
 
 void
-TAO_Notify_RT_Factory:: create (TAO_Notify_CosEC_ProxyPushSupplier*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_CosEC_ProxyPushSupplier*& proxy)
 {
-  TAO_Notify_Default_Factory::create (proxy ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (proxy);
 }
 
 void
-TAO_Notify_RT_Factory:: create (TAO_Notify_StructuredProxyPushConsumer*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_StructuredProxyPushConsumer*& proxy)
 {
-  TAO_Notify_Default_Factory::create (proxy ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (proxy);
 }
 
 void
-TAO_Notify_RT_Factory:: create (TAO_Notify_SequenceProxyPushConsumer*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_SequenceProxyPushConsumer*& proxy)
 {
-  TAO_Notify_Default_Factory::create (proxy ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (proxy);
 }
 
 void
-TAO_Notify_RT_Factory:: create (TAO_Notify_SequenceProxyPushSupplier*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_SequenceProxyPushSupplier*& proxy)
 {
-  TAO_Notify_Default_Factory::create (proxy ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (proxy);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h
index 38bf46c4662..2f89e49d159 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h
@@ -38,58 +38,58 @@ public:
   virtual ~TAO_Notify_RT_Factory ();
 
   /// Create ProxySupplier Collection
-  virtual void create (TAO_Notify_ProxySupplier_Collection*& collection ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_ProxySupplier_Collection*& collection);
 
   /// Create ProxyConsumer Collection
-  virtual void create (TAO_Notify_ProxyConsumer_Collection*& collection ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_ProxyConsumer_Collection*& collection);
 
   /// Create EventChannel Collection
-  virtual void create (TAO_Notify_EventChannel_Collection*& collection ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_EventChannel_Collection*& collection);
 
   /// Create ConsumerAdmin Collection
-  virtual void create (TAO_Notify_ConsumerAdmin_Collection*& collection ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_ConsumerAdmin_Collection*& collection);
 
   /// Create SupplierAdmin Collection
-  virtual void create (TAO_Notify_SupplierAdmin_Collection*& collection ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_SupplierAdmin_Collection*& collection);
 
   /// Create Proxy Collection
-  virtual void create (TAO_Notify_Proxy_Collection*& collection ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_Proxy_Collection*& collection);
 
   /// Create EventChannelDefault_Factory
-  virtual void create (TAO_Notify_EventChannelFactory*& channel_factory ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_EventChannelFactory*& channel_factory);
 
   /// Create EventChannel
-  virtual void create (TAO_Notify_EventChannel*& channel ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_EventChannel*& channel);
 
   /// Create SupplierAdmin
-  virtual void create (TAO_Notify_SupplierAdmin*& admin ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_SupplierAdmin*& admin);
 
   /// Create ConsumerAdmin
-  virtual void create (TAO_Notify_ConsumerAdmin*& admin ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_ConsumerAdmin*& admin);
 
   /// Create ProxyPushConsumer
-  virtual void create (TAO_Notify_ProxyPushConsumer*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_ProxyPushConsumer*& proxy);
 
   /// Create ProxyPushSupplier
-  virtual void create (TAO_Notify_ProxyPushSupplier*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_ProxyPushSupplier*& proxy);
 
   /// Create CosEC_ProxyPushConsumer
-  virtual void create (TAO_Notify_CosEC_ProxyPushConsumer*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_CosEC_ProxyPushConsumer*& proxy);
 
   /// Create CosEC_ProxyPushSupplier
-  virtual void create (TAO_Notify_CosEC_ProxyPushSupplier*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_CosEC_ProxyPushSupplier*& proxy);
 
   /// Create StructuredProxyPushConsumer
-  virtual void create (TAO_Notify_StructuredProxyPushConsumer*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_StructuredProxyPushConsumer*& proxy);
 
   /// Create StructuredProxyPushSupplier
-  virtual void create (TAO_Notify_StructuredProxyPushSupplier*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_StructuredProxyPushSupplier*& proxy);
 
   /// Create SequenceProxyPushConsumer
-  virtual void create (TAO_Notify_SequenceProxyPushConsumer*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_SequenceProxyPushConsumer*& proxy);
 
   /// Create SequenceProxyPushSupplier
-  virtual void create (TAO_Notify_SequenceProxyPushSupplier*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_SequenceProxyPushSupplier*& proxy);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp
index fe0f0af4dc4..55b8f625fb4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp
@@ -21,38 +21,34 @@ TAO_RT_Notify_Service::~TAO_RT_Notify_Service ()
 }
 
 void
-TAO_RT_Notify_Service::init_service (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+TAO_RT_Notify_Service::init_service (CORBA::ORB_ptr orb)
 {
   ACE_DEBUG ((LM_DEBUG, "Loading the Real-Time Notification Service...\n"));
 
-  this->init_i (orb ACE_ENV_ARG_PARAMETER);
+  this->init_i (orb);
 }
 
 void
-TAO_RT_Notify_Service::init_i (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+TAO_RT_Notify_Service::init_i (CORBA::ORB_ptr orb)
 {
   //Init the base class.
-  TAO_CosNotify_Service::init_i (orb ACE_ENV_ARG_PARAMETER);
+  TAO_CosNotify_Service::init_i (orb);
 
   TAO_Notify_RT_Properties* properties = TAO_Notify_RT_PROPERTIES::instance();
 
   // Resolve RTORB
   CORBA::Object_var object =
-    orb->resolve_initial_references ("RTORB"
-                                      ACE_ENV_ARG_PARAMETER);
+    orb->resolve_initial_references ("RTORB");
 
   RTCORBA::RTORB_var rt_orb =
-    RTCORBA::RTORB::_narrow (object.in ()
-                             ACE_ENV_ARG_PARAMETER);
+    RTCORBA::RTORB::_narrow (object.in ());
 
   // Resolve RTCurrent
   object =
-    orb->resolve_initial_references ("RTCurrent"
-                                     ACE_ENV_ARG_PARAMETER);
+    orb->resolve_initial_references ("RTCurrent");
 
   RTCORBA::Current_var current =
-    RTCORBA::Current::_narrow (object.in ()
-                               ACE_ENV_ARG_PARAMETER);
+    RTCORBA::Current::_narrow (object.in ());
 
  /// Set the properties
   properties->rt_orb (rt_orb.in ());
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h
index 594a4d8c01e..c07d87818c0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h
@@ -40,11 +40,11 @@ public:
   ~TAO_RT_Notify_Service ();
 
   /// Init the service.
-  virtual void init_service (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL);
+  virtual void init_service (CORBA::ORB_ptr orb);
 
 protected:
   /// Init the data members
-  virtual void init_i (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL);
+  virtual void init_i (CORBA::ORB_ptr orb);
 
   /// Create the Factory for RT Notify objects.
   virtual TAO_Notify_Factory* create_factory (void);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
index 9d142db5b71..6b63aba2149 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
@@ -18,20 +18,20 @@ TAO_Notify_RT_POA_Helper::~TAO_Notify_RT_POA_Helper ()
 }
 
 void
-TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const NotifyExt::ThreadPoolParams& tp_params ACE_ENV_ARG_DECL)
+TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const NotifyExt::ThreadPoolParams& tp_params)
 {
   ACE_CString child_poa_name = this->get_unique_id ();
 
-  this->init (parent_poa, child_poa_name.c_str (), tp_params ACE_ENV_ARG_PARAMETER);
+  this->init (parent_poa, child_poa_name.c_str (), tp_params);
 }
 
 void
 TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char* poa_name
-                                 , const NotifyExt::ThreadPoolParams& tp_params ACE_ENV_ARG_DECL)
+                                 , const NotifyExt::ThreadPoolParams& tp_params)
 {
   CORBA::PolicyList policy_list (4);
 
-  this->set_policy (parent_poa, policy_list ACE_ENV_ARG_PARAMETER);
+  this->set_policy (parent_poa, policy_list);
 
   RTCORBA::RTORB_var rt_orb = TAO_Notify_RT_PROPERTIES::instance ()->rt_orb ();
 
@@ -46,8 +46,7 @@ TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char*
   policy_list.length (3);
   policy_list[2] =
     rt_orb->create_priority_model_policy (priority_model,
-                                          tp_params.server_priority
-                                          ACE_ENV_ARG_PARAMETER);
+                                          tp_params.server_priority);
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Creating threadpool: static threads = %d, def. prio = %d\n"
@@ -61,32 +60,30 @@ TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char*
                                tp_params.default_priority,
                                tp_params.allow_request_buffering,
                                tp_params.max_buffered_requests,
-                               tp_params.max_request_buffer_size
-                               ACE_ENV_ARG_PARAMETER);
+                               tp_params.max_request_buffer_size);
 
   policy_list.length (4);
   policy_list[3] =
-    rt_orb->create_threadpool_policy (threadpool_id
-                                      ACE_ENV_ARG_PARAMETER);
+    rt_orb->create_threadpool_policy (threadpool_id);
 
-  this->create_i (parent_poa, poa_name, policy_list ACE_ENV_ARG_PARAMETER);
+  this->create_i (parent_poa, poa_name, policy_list);
 }
 
 void
-TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const NotifyExt::ThreadPoolLanesParams& tpl_params ACE_ENV_ARG_DECL)
+TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const NotifyExt::ThreadPoolLanesParams& tpl_params)
 {
   ACE_CString child_poa_name = this->get_unique_id ();
 
-  this->init (parent_poa, child_poa_name.c_str (), tpl_params ACE_ENV_ARG_PARAMETER);
+  this->init (parent_poa, child_poa_name.c_str (), tpl_params);
 }
 
 void
 TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char* poa_name
-                                 , const NotifyExt::ThreadPoolLanesParams& tpl_params ACE_ENV_ARG_DECL)
+                                 , const NotifyExt::ThreadPoolLanesParams& tpl_params)
 {
   CORBA::PolicyList policy_list (4);
 
-  this->set_policy (parent_poa, policy_list ACE_ENV_ARG_PARAMETER);
+  this->set_policy (parent_poa, policy_list);
 
   RTCORBA::RTORB_var rt_orb = TAO_Notify_RT_PROPERTIES::instance ()->rt_orb ();
 
@@ -97,8 +94,7 @@ TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char*
   policy_list.length (3);
   policy_list[2] =
     rt_orb->create_priority_model_policy (priority_model,
-                                          tpl_params.server_priority
-                                          ACE_ENV_ARG_PARAMETER);
+                                          tpl_params.server_priority);
 
   // Populate RTCORBA Lanes.
   RTCORBA::ThreadpoolLanes lanes (tpl_params.lanes.length ());
@@ -124,19 +120,17 @@ TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char*
                                           tpl_params.allow_borrowing,
                                           tpl_params.allow_request_buffering,
                                           tpl_params.max_buffered_requests,
-                                          tpl_params.max_request_buffer_size
-                                          ACE_ENV_ARG_PARAMETER);
+                                          tpl_params.max_request_buffer_size);
 
   policy_list.length (4);
   policy_list[3] =
-    rt_orb->create_threadpool_policy (threadpool_id
-                                      ACE_ENV_ARG_PARAMETER);
+    rt_orb->create_threadpool_policy (threadpool_id);
 
-  this->create_i (parent_poa, poa_name, policy_list ACE_ENV_ARG_PARAMETER);
+  this->create_i (parent_poa, poa_name, policy_list);
 }
 
 void
-TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL)
+TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa)
 {
   CORBA::PolicyList policy_list (1);
 
@@ -146,12 +140,11 @@ TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa ACE_ENV_ARG_D
 
   policy_list[0] =
     rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
-                                          0
-                                          ACE_ENV_ARG_PARAMETER);
+                                          0);
 
   ACE_CString child_poa_name = this->get_unique_id ();
 
-  this->create_i (parent_poa, child_poa_name.c_str (), policy_list ACE_ENV_ARG_PARAMETER);
+  this->create_i (parent_poa, child_poa_name.c_str (), policy_list);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h
index d272420ef98..aad3f8534a0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h
@@ -37,24 +37,24 @@ public:
 
   /// Create a new PortableServer::POA.
   /// The UNIQUE_ID, USER_ID , CLIENT_PROPAGATED and thread pool policy is applied to the new POA.
-  void init (PortableServer::POA_ptr parent_poa, const char* poa_name, const NotifyExt::ThreadPoolParams& tp_params ACE_ENV_ARG_DECL);
+  void init (PortableServer::POA_ptr parent_poa, const char* poa_name, const NotifyExt::ThreadPoolParams& tp_params);
 
   /// Create a new PortableServer::POA. The name is chosen at random.
   /// The UNIQUE_ID, USER_ID , CLIENT_PROPAGATED and thread pool policy is applied to the new POA.
-  void init (PortableServer::POA_ptr parent_poa, const NotifyExt::ThreadPoolParams& tp_params ACE_ENV_ARG_DECL);
+  void init (PortableServer::POA_ptr parent_poa, const NotifyExt::ThreadPoolParams& tp_params);
 
   /// Create a new PortableServer::POA.
   /// The UNIQUE_ID, USER_ID , CLIENT_PROPAGATED and thread lane policy is applied to the new POA.
   void init (PortableServer::POA_ptr parent_poa, const char* poa_name,
-             const NotifyExt::ThreadPoolLanesParams& tpl_params ACE_ENV_ARG_DECL);
+             const NotifyExt::ThreadPoolLanesParams& tpl_params);
 
   /// Create a new PortableServer::POA. The name is chosen at random.
   /// The UNIQUE_ID, USER_ID , CLIENT_PROPAGATED and thread lane policy is applied to the new POA.
-  void init (PortableServer::POA_ptr parent_poa, const NotifyExt::ThreadPoolLanesParams& tpl_params ACE_ENV_ARG_DECL);
+  void init (PortableServer::POA_ptr parent_poa, const NotifyExt::ThreadPoolLanesParams& tpl_params);
 
   /// Create a new PortableServer::POA. The name is chosen at random.
   /// The CLIENT_PROPAGATED policy is applied to the new POA.
-  void init (PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL);
+  void init (PortableServer::POA_ptr parent_poa);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp
index 8ecd21f6d40..519d55d2b0b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp
@@ -45,7 +45,7 @@ TAO_Notify_Reactive_Task::shutdown (void)
 }
 
 void
-TAO_Notify_Reactive_Task::execute (TAO_Notify_Method_Request& method_request ACE_ENV_ARG_DECL)
+TAO_Notify_Reactive_Task::execute (TAO_Notify_Method_Request& method_request)
 {
   method_request.execute ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h
index 7d3dcec5f3e..df91c7ce28d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h
@@ -49,7 +49,7 @@ public:
   virtual void shutdown (void);
 
   /// Exec the request.
-  virtual void execute (TAO_Notify_Method_Request& method_request ACE_ENV_ARG_DECL);
+  virtual void execute (TAO_Notify_Method_Request& method_request);
 
   /// The object used by clients to register timers. This method returns a Reactor based Timer.
   virtual TAO_Notify_Timer* timer (void);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.cpp
index 06fa3a8c3f5..b5fa036f8d0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.cpp
@@ -28,7 +28,7 @@ namespace TAO_Notify
 
   template<class TOPOOBJ>
   void
-  Reconnect_Worker<TOPOOBJ>::work (TOPOOBJ* o ACE_ENV_ARG_DECL)
+  Reconnect_Worker<TOPOOBJ>::work (TOPOOBJ* o)
   {
     ACE_ASSERT(o != 0);
     o->reconnect ();
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h
index a4c71244ec2..d7c2407fce8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h
@@ -35,7 +35,7 @@ namespace TAO_Notify
     Reconnect_Worker();
 
     // override virtual ESF_Worker method
-    virtual void work (TOPOOBJ* o ACE_ENV_ARG_DECL);
+    virtual void work (TOPOOBJ* o);
   };
 } // namespace TAO_Notify
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp
index 8360fa282e7..59687cd8108 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp
@@ -44,8 +44,7 @@ namespace TAO_Notify
 
   NotifyExt::ReconnectionRegistry::ReconnectionID
   Reconnection_Registry::register_callback (
-    NotifyExt::ReconnectionCallback_ptr callback
-    ACE_ENV_ARG_DECL)
+    NotifyExt::ReconnectionCallback_ptr callback)
   {
     //@@todo DO WE NEED THREAD SAFENESS?
     NotifyExt::ReconnectionRegistry::ReconnectionID next_id = ++highest_id_;
@@ -60,7 +59,7 @@ namespace TAO_Notify
     TAO_Notify_Properties* properties = TAO_Notify_PROPERTIES::instance();
     CORBA::ORB_var orb = properties->orb ();
 
-    CORBA::String_var cior = orb->object_to_string (callback ACE_ENV_ARG_PARAMETER);
+    CORBA::String_var cior = orb->object_to_string (callback);
     ACE_CString ior(cior.in ());
     if ( 0 != reconnection_registry_.bind (next_id, ior))
     {
@@ -72,8 +71,7 @@ namespace TAO_Notify
   }
 
   void
-  Reconnection_Registry::unregister_callback (NotifyExt::ReconnectionRegistry::ReconnectionID id
-    ACE_ENV_ARG_DECL)
+  Reconnection_Registry::unregister_callback (NotifyExt::ReconnectionRegistry::ReconnectionID id)
   {
     if (DEBUG_LEVEL > 0)
     {
@@ -99,7 +97,7 @@ namespace TAO_Notify
   // During topology save
 
   void
-  Reconnection_Registry::save_persistent (Topology_Saver& saver ACE_ENV_ARG_DECL)
+  Reconnection_Registry::save_persistent (Topology_Saver& saver)
   {
     bool change = this->self_changed_;
     this->self_changed_ = false;
@@ -107,7 +105,7 @@ namespace TAO_Notify
 
     NVPList attrs;
     //@@todo: bool want_all_children =
-      saver.begin_object (0, REGISTRY_TYPE, attrs, change ACE_ENV_ARG_PARAMETER);
+      saver.begin_object (0, REGISTRY_TYPE, attrs, change);
 
     Reconnection_Registry_Type::ENTRY *entry;
     for (Reconnection_Registry_Type::ITERATOR iter (this->reconnection_registry_);
@@ -124,15 +122,15 @@ namespace TAO_Notify
       }
       cattrs.push_back(NVP(RECONNECT_ID, entry->ext_id_));
       cattrs.push_back(NVP(RECONNECT_IOR, entry->int_id_));
-      saver.begin_object (entry->ext_id_, REGISTRY_CALLBACK_TYPE, cattrs, true ACE_ENV_ARG_PARAMETER);
-      saver.end_object (entry->ext_id_, REGISTRY_CALLBACK_TYPE ACE_ENV_ARG_PARAMETER);
+      saver.begin_object (entry->ext_id_, REGISTRY_CALLBACK_TYPE, cattrs, true);
+      saver.end_object (entry->ext_id_, REGISTRY_CALLBACK_TYPE);
     }
 // todo:
 //    for all deleted children
 //    {
 //      saver.delete_child(child_type, child_id);
 //    }
-    saver.end_object (0, REGISTRY_TYPE ACE_ENV_ARG_PARAMETER);
+    saver.end_object (0, REGISTRY_TYPE);
   }
 
   ///////////////////////////////////////
@@ -141,8 +139,7 @@ namespace TAO_Notify
   Topology_Object*
   Reconnection_Registry::load_child (const ACE_CString & type,
         CORBA::Long,
-        const NVPList& attrs
-        ACE_ENV_ARG_DECL_NOT_USED)
+        const NVPList& attrs)
   {
     if (type == REGISTRY_CALLBACK_TYPE)
     {
@@ -178,8 +175,7 @@ namespace TAO_Notify
   }
 
   void
-  Reconnection_Registry::send_reconnect (CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory
-    ACE_ENV_ARG_DECL_NOT_USED)
+  Reconnection_Registry::send_reconnect (CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory)
   {
     TAO_Notify_Properties* properties = TAO_Notify_PROPERTIES::instance();
     CORBA::ORB_var orb = properties->orb ();
@@ -190,8 +186,7 @@ namespace TAO_Notify
       iter.next (entry);
       iter.advance ())
     {
-      ACE_DECLARE_NEW_ENV;
-      ACE_TRY
+      try
       {
         if (DEBUG_LEVEL > 0)
         {
@@ -201,12 +196,12 @@ namespace TAO_Notify
             ));
         }
         ACE_CString & ior = entry->int_id_;
-        CORBA::Object_var obj = orb->string_to_object (ior.c_str () ACE_ENV_ARG_PARAMETER);
+        CORBA::Object_var obj = orb->string_to_object (ior.c_str ());
         NotifyExt::ReconnectionCallback_var callback =
           NotifyExt::ReconnectionCallback::_narrow (obj.in ());
         if (!CORBA::is_nil (callback.in ()))
         {
-          callback->reconnect (dest_factory ACE_ENV_ARG_PARAMETER);
+          callback->reconnect (dest_factory);
         }
         else
         {
@@ -219,7 +214,7 @@ namespace TAO_Notify
           bad_ids.push_back (entry->ext_id_);
         }
       }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
       {
         ACE_DEBUG ((LM_DEBUG,
           ACE_TEXT ("(%P|%t) Reconnection Registry: Exception sending reconnection to client -- discarding registry entry\n")
@@ -228,7 +223,6 @@ namespace TAO_Notify
         bad_ids.push_back (entry->ext_id_);
         //@@todo : we might want to check for retryable exceptions, but for now...
       }
-      ACE_ENDTRY;
     }
     size_t bad_count = bad_ids.size ();
     for (size_t nbad = 0; nbad < bad_count; ++nbad)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h
index b2c4a52c4a2..78d10a5733e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h
@@ -62,29 +62,25 @@ namespace TAO_Notify
 
     /// add a new callback to the registry
     ::NotifyExt::ReconnectionRegistry::ReconnectionID register_callback (
-      ::NotifyExt::ReconnectionCallback_ptr callback
-      ACE_ENV_ARG_DECL);
+      ::NotifyExt::ReconnectionCallback_ptr callback);
 
     ///
-    void unregister_callback (::NotifyExt::ReconnectionRegistry::ReconnectionID id
-      ACE_ENV_ARG_DECL);
+    void unregister_callback (::NotifyExt::ReconnectionRegistry::ReconnectionID id);
 
     CORBA::Boolean is_alive (void);
 
     //////////////////////
     // During topology save
-    virtual void save_persistent (Topology_Saver& saver ACE_ENV_ARG_DECL);
+    virtual void save_persistent (Topology_Saver& saver);
 
     ///////////////////////////////////////
     // During reload of persistent topology
 
     virtual Topology_Object* load_child (const ACE_CString & type,
       CORBA::Long id,
-      const NVPList& attrs
-      ACE_ENV_ARG_DECL);
+      const NVPList& attrs);
 
-    void send_reconnect (CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory
-      ACE_ENV_ARG_DECL);
+    void send_reconnect (CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory);
 
   private:
     void release (void);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp
index 2b9c0893896..6621a57a627 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp
@@ -53,7 +53,7 @@ size_t Routing_Slip::count_enter_deleting_ = 0;
 size_t Routing_Slip::count_enter_terminal_ = 0;
 
 Routing_Slip_Ptr
-Routing_Slip::create (const TAO_Notify_Event::Ptr& event ACE_ENV_ARG_DECL)
+Routing_Slip::create (const TAO_Notify_Event::Ptr& event)
 {
   Routing_Slip * prs;
   ACE_NEW_THROW_EX (prs, Routing_Slip (event), CORBA::NO_MEMORY ());
@@ -111,8 +111,7 @@ Routing_Slip::create (
   Routing_Slip_Ptr result;
   ACE_Message_Block * event_mb = 0;
   ACE_Message_Block * rs_mb = 0;
-  ACE_DECLARE_NEW_ENV;
-  ACE_TRY
+  try
     {
       if (rspm->reload (event_mb, rs_mb))
       {
@@ -120,7 +119,7 @@ Routing_Slip::create (
         TAO_Notify_Event::Ptr event (TAO_Notify_Event::unmarshal (cdr_event));
         if (event.isSet())
         {
-          result = create (event ACE_ENV_ARG_PARAMETER);
+          result = create (event);
           TAO_InputCDR cdr_rs (rs_mb);
           if ( result->unmarshal (ecf, cdr_rs))
           {
@@ -142,13 +141,12 @@ Routing_Slip::create (
         }
       }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_ERROR ((LM_ERROR,
         ACE_TEXT ("(%P|%t) Routing_Slip::create: Exception reloading event.\n")
         ));
     }
-  ACE_ENDTRY;
   delete event_mb;
   delete rs_mb;
 
@@ -227,7 +225,7 @@ Routing_Slip::wait_persist ()
 }
 
 void
-Routing_Slip::route (TAO_Notify_ProxyConsumer* pc, bool reliable_channel ACE_ENV_ARG_DECL)
+Routing_Slip::route (TAO_Notify_ProxyConsumer* pc, bool reliable_channel)
 {
   ACE_ASSERT(pc != 0);
 
@@ -273,7 +271,7 @@ Routing_Slip::route (TAO_Notify_ProxyConsumer* pc, bool reliable_channel ACE_ENV
     }
   }
   guard.release ();
-  pc->execute_task (method ACE_ENV_ARG_PARAMETER);
+  pc->execute_task (method);
 }
 #if 0 // forward
 void
@@ -329,8 +327,7 @@ Routing_Slip::forward (TAO_Notify_ProxySupplier* ps, bool filter)
 void
 Routing_Slip::dispatch (
   TAO_Notify_ProxySupplier* ps,
-  bool filter
-  ACE_ENV_ARG_DECL)
+  bool filter)
 {
   // cannot be the first action
   ACE_ASSERT (this->state_ != rssCREATING);
@@ -362,7 +359,7 @@ Routing_Slip::dispatch (
                     this->sequence_,
                     static_cast<int> (request_id),
                     ps->id()));
-      ps->execute_task (method ACE_ENV_ARG_PARAMETER);
+      ps->execute_task (method);
     }
   else
     {
@@ -842,8 +839,7 @@ Routing_Slip::unmarshal (TAO_Notify_EventChannelFactory &ecf, TAO_InputCDR & cdr
     ACE_CDR::Octet code = 0;
     while (cdr.read_octet(code))
     {
-      ACE_DECLARE_NEW_ENV;
-      ACE_TRY
+      try
       {
         if (code == TAO_Notify_Method_Request_Dispatch::persistence_code)
         {
@@ -857,8 +853,7 @@ Routing_Slip::unmarshal (TAO_Notify_EventChannelFactory &ecf, TAO_InputCDR & cdr
             TAO_Notify_Method_Request_Dispatch::unmarshal (
               request,
               ecf,
-              cdr
-              ACE_ENV_ARG_PARAMETER);
+              cdr);
           if (method != 0)
           {
             this->delivery_requests_.push_back (request);
@@ -872,9 +867,7 @@ Routing_Slip::unmarshal (TAO_Notify_EventChannelFactory &ecf, TAO_InputCDR & cdr
               TAO_Notify_Method_Request_Lookup::unmarshal (
                 request,
                 ecf,
-                cdr
-                ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK
+                cdr);
           if (method != 0)
           {
             this->delivery_requests_.push_back (request);
@@ -882,12 +875,11 @@ Routing_Slip::unmarshal (TAO_Notify_EventChannelFactory &ecf, TAO_InputCDR & cdr
           }
         }
       }
-      ACE_CATCHANY;
+      catch (const CORBA::Exception&)
       {
         // @@todo should we log this?
         // just ignore failures
       }
-      ACE_ENDTRY;
     }
   }
   return this->delivery_requests_.size () > 0;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h
index 84714fe29eb..da894894c01 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h
@@ -68,8 +68,7 @@ class TAO_Notify_Serv_Export Routing_Slip : public Persistent_Callback
   typedef ACE_Guard< TAO_SYNCH_MUTEX > Routing_Slip_Guard;
 public:
   /// "Factory" method for normal use.
-  static Routing_Slip_Ptr create (const TAO_Notify_Event::Ptr& event
-    ACE_ENV_ARG_DECL);
+  static Routing_Slip_Ptr create (const TAO_Notify_Event::Ptr& event);
 
   /// "Factory" method for use during reload from persistent storage.
   static Routing_Slip_Ptr create (
@@ -89,12 +88,12 @@ public:
   /// Route this event to destinations
   /// must be the Action request after
   /// the routing slip is created.
-  void route (TAO_Notify_ProxyConsumer* pc, bool reliable_channel ACE_ENV_ARG_DECL);
+  void route (TAO_Notify_ProxyConsumer* pc, bool reliable_channel);
 
   /// \brief Schedule delivery to a consumer via a proxy supplier
   /// \param proxy_supplier the proxy supplier that will deliver the event
   /// \param filter should consumer-based filtering be applied?
-  void dispatch (TAO_Notify_ProxySupplier * proxy_supplier, bool filter ACE_ENV_ARG_DECL);
+  void dispatch (TAO_Notify_ProxySupplier * proxy_supplier, bool filter);
 
 
   /////////////////////////////////////////
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.cpp
index da11e708026..941d3ae1872 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.cpp
@@ -31,12 +31,12 @@ namespace TAO_Notify
 
   template<class TOPOOBJ>
   void
-  Save_Persist_Worker<TOPOOBJ>::work (TOPOOBJ* o ACE_ENV_ARG_DECL)
+  Save_Persist_Worker<TOPOOBJ>::work (TOPOOBJ* o)
   {
     ACE_ASSERT(o != 0);
     if (this->want_all_children_ || o->is_changed ())
     {
-      o->save_persistent (saver_ ACE_ENV_ARG_PARAMETER);
+      o->save_persistent (saver_);
     }
   }
 } // namespace TAO_Notify
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h
index a9d425891f0..4218b4b627a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h
@@ -40,7 +40,7 @@ namespace TAO_Notify
     Save_Persist_Worker(Topology_Saver& saver, bool want_all_children);
 
     // override virtual ESF_Worker method
-    virtual void work (TOPOOBJ* o ACE_ENV_ARG_DECL);
+    virtual void work (TOPOOBJ* o);
 
   private:
     Topology_Saver& saver_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp
index 7e10edfb171..614f9b63004 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp
@@ -17,7 +17,7 @@ TAO_Notify_Seq_Worker_T<T>::TAO_Notify_Seq_Worker_T (void)
 }
 
 template<class TYPE> ACE_TYPENAME TAO_Notify_Seq_Worker_T<TYPE>::SEQ*
-TAO_Notify_Seq_Worker_T<TYPE>::create (CONTAINER &container ACE_ENV_ARG_DECL)
+TAO_Notify_Seq_Worker_T<TYPE>::create (CONTAINER &container)
 {
   SEQ* tmp;
   ACE_NEW_THROW_EX (tmp, //this->seq_,
@@ -26,7 +26,7 @@ TAO_Notify_Seq_Worker_T<TYPE>::create (CONTAINER &container ACE_ENV_ARG_DECL)
 
   this->seq_ = tmp;
 
-  container.collection ()->for_each (this ACE_ENV_ARG_PARAMETER);
+  container.collection ()->for_each (this);
 
   return this->seq_._retn ();
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h
index 5e89210356e..265481e5a8f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h
@@ -44,11 +44,11 @@ public:
   TAO_Notify_Seq_Worker_T (void);
 
   /// create a SEQ
-  SEQ* create (CONTAINER& container ACE_ENV_ARG_DECL);
+  SEQ* create (CONTAINER& container);
 
 protected:
   ///= TAO_ESF_Worker method
-  void work (TYPE* object ACE_ENV_ARG_DECL);
+  void work (TYPE* object);
 
   /// The result
   SEQ_VAR seq_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.inl
index 43dc3487646..a3e0ab45685 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.inl
@@ -5,7 +5,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class TYPE> ACE_INLINE void
-TAO_Notify_Seq_Worker_T<TYPE>::work (TYPE* type ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_Seq_Worker_T<TYPE>::work (TYPE* type)
 {
   this->seq_->length (this->seq_->length () + 1);
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp
index 94ab584710b..9372b97576f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp
@@ -38,7 +38,7 @@ TAO_Notify_SequenceProxyPushConsumer::MyType (void)
 }
 
 void
-TAO_Notify_SequenceProxyPushConsumer::connect_sequence_push_supplier (CosNotifyComm::SequencePushSupplier_ptr push_supplier ACE_ENV_ARG_DECL)
+TAO_Notify_SequenceProxyPushConsumer::connect_sequence_push_supplier (CosNotifyComm::SequencePushSupplier_ptr push_supplier)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventChannelAdmin::AlreadyConnected
@@ -50,14 +50,14 @@ TAO_Notify_SequenceProxyPushConsumer::connect_sequence_push_supplier (CosNotifyC
                     TAO_Notify_SequencePushSupplier (this),
                     CORBA::NO_MEMORY ());
 
-  supplier->init (push_supplier ACE_ENV_ARG_PARAMETER);
+  supplier->init (push_supplier);
 
-  this->connect (supplier ACE_ENV_ARG_PARAMETER);
+  this->connect (supplier);
   this->self_change ();
 }
 
 void
-TAO_Notify_SequenceProxyPushConsumer::push_structured_events (const CosNotification::EventBatch& event_batch ACE_ENV_ARG_DECL)
+TAO_Notify_SequenceProxyPushConsumer::push_structured_events (const CosNotification::EventBatch& event_batch)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventComm::Disconnected
@@ -65,11 +65,11 @@ TAO_Notify_SequenceProxyPushConsumer::push_structured_events (const CosNotificat
 {
   // Check if we should proceed at all.
   if (this->admin_properties().reject_new_events () == 1 && this->admin_properties().queue_full ())
-    ACE_THROW (CORBA::IMP_LIMIT ());
+    throw CORBA::IMP_LIMIT ();
 
   if (this->is_connected () == 0)
     {
-      ACE_THROW (CosEventComm::Disconnected ());
+      throw CosEventComm::Disconnected ();
     }
 
   for (CORBA::ULong i = 0; i < event_batch.length (); ++i)
@@ -77,7 +77,7 @@ TAO_Notify_SequenceProxyPushConsumer::push_structured_events (const CosNotificat
       const CosNotification::StructuredEvent& notification = event_batch[i];
 
       TAO_Notify_StructuredEvent_No_Copy event (notification);
-      this->push_i (&event ACE_ENV_ARG_PARAMETER);
+      this->push_i (&event);
     }
 }
 
@@ -106,26 +106,24 @@ TAO_Notify_SequenceProxyPushConsumer::load_attrs (const TAO_Notify::NVPList& att
   if (attrs.load("PeerIOR", ior))
   {
     CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
-    ACE_DECLARE_NEW_CORBA_ENV;
-    ACE_TRY
+    try
     {
       CosNotifyComm::SequencePushSupplier_var ps = CosNotifyComm::SequencePushSupplier::_nil();
       if ( ior.length() > 0 )
       {
-        CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
-        ps = CosNotifyComm::SequencePushSupplier::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+        CORBA::Object_var obj = orb->string_to_object(ior.c_str());
+        ps = CosNotifyComm::SequencePushSupplier::_unchecked_narrow(obj.in());
       }
       // minor hack: suppress generating subscription updates during reload.
       bool save_updates = this->updates_off_;
       this->updates_off_ = true;
-      this->connect_sequence_push_supplier(ps.in() ACE_ENV_ARG_PARAMETER);
+      this->connect_sequence_push_supplier(ps.in());
       this->updates_off_ = save_updates;
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
       ACE_ASSERT(0);
     }
-    ACE_ENDTRY;
   }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h
index f91abbd0962..373a3389297 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h
@@ -66,7 +66,6 @@ protected:
                      ));
 
   virtual void connect_sequence_push_supplier (CosNotifyComm::SequencePushSupplier_ptr push_supplier
-                                               ACE_ENV_ARG_DECL
                                                )
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
@@ -74,7 +73,6 @@ protected:
                      ));
 
   virtual void push_structured_events (const CosNotification::EventBatch & notifications
-                                      ACE_ENV_ARG_DECL
                                       )
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp
index 5c1140577f7..6ca9c897786 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp
@@ -26,7 +26,7 @@ TAO_Notify_SequenceProxyPushSupplier::release (void)
 }
 
 void
-TAO_Notify_SequenceProxyPushSupplier::connect_sequence_push_consumer (CosNotifyComm::SequencePushConsumer_ptr push_consumer ACE_ENV_ARG_DECL)
+TAO_Notify_SequenceProxyPushSupplier::connect_sequence_push_consumer (CosNotifyComm::SequencePushConsumer_ptr push_consumer)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventChannelAdmin::AlreadyConnected
@@ -39,9 +39,9 @@ TAO_Notify_SequenceProxyPushSupplier::connect_sequence_push_consumer (CosNotifyC
                     TAO_Notify_SequencePushConsumer (this),
                     CORBA::NO_MEMORY ());
 
-  consumer->init (push_consumer ACE_ENV_ARG_PARAMETER);
+  consumer->init (push_consumer);
 
-  this->connect (consumer ACE_ENV_ARG_PARAMETER);
+  this->connect (consumer);
   this->self_change ();
 }
 
@@ -80,22 +80,20 @@ TAO_Notify_SequenceProxyPushSupplier::load_attrs (const TAO_Notify::NVPList& att
   if (attrs.load("PeerIOR", ior))
   {
     CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
-    ACE_DECLARE_NEW_CORBA_ENV;
-    ACE_TRY
+    try
     {
       CosNotifyComm::SequencePushConsumer_var pc = CosNotifyComm::SequencePushConsumer::_nil();
       if (ior.length() > 0)
       {
-        CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
-        pc = CosNotifyComm::SequencePushConsumer::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+        CORBA::Object_var obj = orb->string_to_object(ior.c_str());
+        pc = CosNotifyComm::SequencePushConsumer::_unchecked_narrow(obj.in());
       }
-      this->connect_sequence_push_consumer(pc.in() ACE_ENV_ARG_PARAMETER);
+      this->connect_sequence_push_consumer(pc.in());
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
       // if we can't reconnect, tough
     }
-    ACE_ENDTRY;
   }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h
index cc35f740442..3b5e76b8cde 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h
@@ -69,7 +69,6 @@ public:
 
   virtual void connect_sequence_push_consumer (
     CosNotifyComm::SequencePushConsumer_ptr push_consumer
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -78,7 +77,6 @@ public:
   ));
 
   virtual void disconnect_sequence_push_supplier (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
index 95ddb3a892c..58fa06443d6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
@@ -34,14 +34,14 @@ TAO_Notify_SequencePushConsumer::~TAO_Notify_SequencePushConsumer ()
 }
 
 void
-TAO_Notify_SequencePushConsumer::init (CosNotifyComm::SequencePushConsumer_ptr push_consumer ACE_ENV_ARG_DECL)
+TAO_Notify_SequencePushConsumer::init (CosNotifyComm::SequencePushConsumer_ptr push_consumer)
 {
   // Initialize only once
   ACE_ASSERT( CORBA::is_nil (this->push_consumer_.in()) );
 
   if (CORBA::is_nil (push_consumer))
   {
-    ACE_THROW (CORBA::BAD_PARAM());
+    throw CORBA::BAD_PARAM();
   }
 
   if (!TAO_Notify_PROPERTIES::instance()->separate_dispatching_orb ())
@@ -58,7 +58,7 @@ TAO_Notify_SequencePushConsumer::init (CosNotifyComm::SequencePushConsumer_ptr p
       CORBA::Object_var obj =
         TAO_Notify_PROPERTIES::instance()->dispatching_orb()->string_to_object(temp.in());
 
-      ACE_TRY
+      try
         {
           CosNotifyComm::SequencePushConsumer_var new_push_consumer =
             CosNotifyComm::SequencePushConsumer::_unchecked_narrow(obj.in());
@@ -75,16 +75,16 @@ TAO_Notify_SequencePushConsumer::init (CosNotifyComm::SequencePushConsumer_ptr p
             }
           //--cj end
         }
-      ACE_CATCH (CORBA::TRANSIENT, ex)
+      catch (const CORBA::TRANSIENT& ex)
         {
-          ACE_PRINT_EXCEPTION (ex, "Got a TRANSIENT in NS_SequencePushConsumer::init");
+          ex._tao_print_exception (
+            "Got a TRANSIENT in NS_SequencePushConsumer::init");
           ACE_DEBUG ((LM_DEBUG, "(%P|%t) got it for NS_SequencePushConsumer %@\n", this));
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           // _narrow failed
         }
-      ACE_ENDTRY;
     }
 }
 
@@ -208,17 +208,15 @@ TAO_Notify_SequencePushConsumer::dispatch_from_queue (Request_Queue& requests, A
           }
         }
         ace_mon.release();
-        ACE_DECLARE_NEW_ENV;
-        ACE_TRY
+        try
         {
           this->proxy_supplier ()->destroy ();
         }
-        ACE_CATCHANY
+        catch (const CORBA::Exception& ex)
         {
           // todo is there something meaningful we can do here?
           ;
         }
-        ACE_ENDTRY;
         ace_mon.acquire();
         break;
       }
@@ -261,12 +259,11 @@ TAO_Notify_SequencePushConsumer::dispatch_from_queue (Request_Queue& requests, A
 
 bool
 TAO_Notify_SequencePushConsumer::enqueue_if_necessary (
-  TAO_Notify_Method_Request_Event * request
-  ACE_ENV_ARG_DECL)
+  TAO_Notify_Method_Request_Event * request)
 {
   if (DEBUG_LEVEL > 0)
     ACE_DEBUG ( (LM_DEBUG, "SequencePushConsumer enqueing event.\n"));
-  this->enqueue_request (request ACE_ENV_ARG_PARAMETER);
+  this->enqueue_request (request);
 
   size_t mbs = static_cast<size_t>(this->max_batch_size_.value());
 
@@ -283,20 +280,20 @@ TAO_Notify_SequencePushConsumer::enqueue_if_necessary (
 
 
 void
-TAO_Notify_SequencePushConsumer::push (const CORBA::Any& /*event*/ ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_SequencePushConsumer::push (const CORBA::Any& /*event*/)
 {
   //NOP
 }
 
 void
-TAO_Notify_SequencePushConsumer::push (const CosNotification::StructuredEvent& /*notification*/ ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_SequencePushConsumer::push (const CosNotification::StructuredEvent& /*notification*/)
 {
   //NOP
 }
 
 
 void
-TAO_Notify_SequencePushConsumer::push (const CosNotification::EventBatch& event_batch ACE_ENV_ARG_DECL)
+TAO_Notify_SequencePushConsumer::push (const CosNotification::EventBatch& event_batch)
 {
   //--cj verify dispatching ORB
   if (TAO_debug_level >= 10) {
@@ -305,7 +302,7 @@ TAO_Notify_SequencePushConsumer::push (const CosNotification::EventBatch& event_
   }
   //--cj end
 
-  this->push_consumer_->push_structured_events (event_batch ACE_ENV_ARG_PARAMETER);
+  this->push_consumer_->push_structured_events (event_batch);
 }
 
 ACE_CString
@@ -313,27 +310,24 @@ TAO_Notify_SequencePushConsumer::get_ior (void) const
 {
   ACE_CString result;
   CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance ()->orb ();
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
-    CORBA::String_var ior = orb->object_to_string (this->push_consumer_.in () ACE_ENV_ARG_PARAMETER);
+    CORBA::String_var ior = orb->object_to_string (this->push_consumer_.in ());
     result = static_cast<const char*> (ior.in ());
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
     result.fast_clear();
   }
-  ACE_ENDTRY;
   return result;
 }
 
 void
-TAO_Notify_SequencePushConsumer::reconnect_from_consumer (TAO_Notify_Consumer* old_consumer
-                                                          ACE_ENV_ARG_DECL)
+TAO_Notify_SequencePushConsumer::reconnect_from_consumer (TAO_Notify_Consumer* old_consumer)
 {
   TAO_Notify_SequencePushConsumer* tmp = dynamic_cast<TAO_Notify_SequencePushConsumer *> (old_consumer);
   ACE_ASSERT(tmp != 0);
-  this->init(tmp->push_consumer_.in() ACE_ENV_ARG_PARAMETER);
+  this->init(tmp->push_consumer_.in());
   this->schedule_timer(false);
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h
index ac5661e674f..362cd39b425 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h
@@ -48,13 +48,12 @@ public:
   virtual ~TAO_Notify_SequencePushConsumer ();
 
   /// Init the Consumer
-  void init (CosNotifyComm::SequencePushConsumer_ptr push_consumer ACE_ENV_ARG_DECL);
+  void init (CosNotifyComm::SequencePushConsumer_ptr push_consumer);
 
   /// Add request to a queue if necessary.
   /// for Sequence it's always necessary.
   virtual bool enqueue_if_necessary(
-    TAO_Notify_Method_Request_Event * request
-    ACE_ENV_ARG_DECL);
+    TAO_Notify_Method_Request_Event * request);
 
   virtual bool dispatch_from_queue (
     Request_Queue & requests,
@@ -62,21 +61,20 @@ public:
 
 
   /// Push <event> to this consumer.
-  virtual void push (const CORBA::Any& event ACE_ENV_ARG_DECL);
+  virtual void push (const CORBA::Any& event);
 
   // Push event.
-  virtual void push (const CosNotification::StructuredEvent & event ACE_ENV_ARG_DECL);
+  virtual void push (const CosNotification::StructuredEvent & event);
 
   /// Push a batch of events to this consumer.
-  virtual void push (const CosNotification::EventBatch& event ACE_ENV_ARG_DECL);
+  virtual void push (const CosNotification::EventBatch& event);
 
   /// Retrieve the ior of this peer
   virtual ACE_CString get_ior (void) const;
 
   /// on reconnect we need to move events from the old consumer
   /// to the new one
-  virtual void reconnect_from_consumer (TAO_Notify_Consumer* old_consumer
-    ACE_ENV_ARG_DECL);
+  virtual void reconnect_from_consumer (TAO_Notify_Consumer* old_consumer);
 
 protected:
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp
index 20000a62737..025fd468294 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp
@@ -18,7 +18,7 @@ TAO_Notify_SequencePushSupplier::~TAO_Notify_SequencePushSupplier ()
 }
 
 void
-TAO_Notify_SequencePushSupplier::init (CosNotifyComm::SequencePushSupplier_ptr push_supplier ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_SequencePushSupplier::init (CosNotifyComm::SequencePushSupplier_ptr push_supplier)
 {
   // TODO: verify single init call
   // push_supplier is optional
@@ -38,17 +38,15 @@ TAO_Notify_SequencePushSupplier::get_ior (void) const
 {
   ACE_CString result;
   CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
-    CORBA::String_var ior = orb->object_to_string(this->push_supplier_.in() ACE_ENV_ARG_PARAMETER);
+    CORBA::String_var ior = orb->object_to_string(this->push_supplier_.in());
     result = static_cast<const char*> (ior.in ());
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
     result.fast_clear();
   }
-  ACE_ENDTRY;
   return result;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h
index 2b2af2efc08..2db6e078ec3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h
@@ -42,7 +42,7 @@ public:
   virtual ~TAO_Notify_SequencePushSupplier ();
 
   /// Init
-  void init (CosNotifyComm::SequencePushSupplier_ptr push_supplier ACE_ENV_ARG_DECL);
+  void init (CosNotifyComm::SequencePushSupplier_ptr push_supplier);
 
   /// TAO_Notify_Destroy_Callback methods
   virtual void release (void);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Service.h b/TAO/orbsvcs/orbsvcs/Notify/Service.h
index 2876d6b16d9..8219b3adc88 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Service.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Service.h
@@ -62,14 +62,14 @@ public:
   virtual int init (int argc, ACE_TCHAR *argv[]) = 0;
 
   /// Init the service.
-  virtual void init_service (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) = 0;
+  virtual void init_service (CORBA::ORB_ptr orb) = 0;
 
   /// Init the service with separate dispatching orb.
-  virtual void init_service2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_orb ACE_ENV_ARG_DECL) = 0;
+  virtual void init_service2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_orb) = 0;
 
   /// Create the Channel Factory.
   virtual CosNotifyChannelAdmin::EventChannelFactory_ptr create (
-      PortableServer::POA_ptr default_POA ACE_ENV_ARG_DECL
+      PortableServer::POA_ptr default_POA
     ) = 0;
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
index fb514502662..68c829d0191 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
@@ -19,59 +19,59 @@ TAO_Notify_RT_StructuredProxyPushSupplier::~TAO_Notify_RT_StructuredProxyPushSup
 }
 
 CORBA::Object_ptr
-TAO_Notify_RT_StructuredProxyPushSupplier::activate (PortableServer::Servant servant ACE_ENV_ARG_DECL)
+TAO_Notify_RT_StructuredProxyPushSupplier::activate (PortableServer::Servant servant)
 {
-  CORBA::Object_var object = TAO_Notify_Proxy::activate (servant ACE_ENV_ARG_PARAMETER);
+  CORBA::Object_var object = TAO_Notify_Proxy::activate (servant);
 
   // Obtain our ref.
   CORBA::Object_var obj = this->ref ();
 
-  this->event_forwarder_ = Event_Forwarder::StructuredProxyPushSupplier::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+  this->event_forwarder_ = Event_Forwarder::StructuredProxyPushSupplier::_narrow (obj.in ());
 
   return object._retn ();
 }
 
 CORBA::Object_ptr
 TAO_Notify_RT_StructuredProxyPushSupplier::activate (PortableServer::Servant ,
-                                                     CORBA::Long ACE_ENV_ARG_DECL_NOT_USED)
+                                                     CORBA::Long)
 {
    return CORBA::Object::_nil ();
 }
 
 void
-TAO_Notify_RT_StructuredProxyPushSupplier::deliver (TAO_Notify_Method_Request_Dispatch_No_Copy & request ACE_ENV_ARG_DECL)
+TAO_Notify_RT_StructuredProxyPushSupplier::deliver (TAO_Notify_Method_Request_Dispatch_No_Copy & request)
 {
-  ACE_TRY
+  try
     {
-      request.event()->push (this->event_forwarder_.in () ACE_ENV_ARG_PARAMETER);
+      request.event()->push (this->event_forwarder_.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       if (TAO_debug_level > 2)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "(%P|%t) TAO_Notify_RT_StructuredProxyPushSupplier::push failed\n");
+          ex._tao_print_exception (
+            "(%P|%t) TAO_Notify_RT_StructuredProxyPushSupplier::push failed\n");
         }
 
     }
-  ACE_ENDTRY;
 }
 
 void
-TAO_Notify_RT_StructuredProxyPushSupplier::push_no_filtering (const TAO_Notify_Event* event ACE_ENV_ARG_DECL)
+TAO_Notify_RT_StructuredProxyPushSupplier::push_no_filtering (const TAO_Notify_Event* event)
 {
-  ACE_TRY
+  try
     {
-      event->push_no_filtering (this->event_forwarder_.in () ACE_ENV_ARG_PARAMETER);
+      event->push_no_filtering (this->event_forwarder_.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       if (TAO_debug_level > 2)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "(%P|%t) TAO_Notify_RT_StructuredProxyPushSupplier::push failed\n");
+          ex._tao_print_exception (
+            "(%P|%t) TAO_Notify_RT_StructuredProxyPushSupplier::push failed\n");
         }
 
     }
-  ACE_ENDTRY;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h
index 995a4ceeb31..2b743fa4cf7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h
@@ -40,17 +40,17 @@ public:
   ~TAO_Notify_RT_StructuredProxyPushSupplier ();
 
   /// Activate this object and obtain the Event_Forwarder interface.
-  virtual CORBA::Object_ptr activate (PortableServer::Servant servant ACE_ENV_ARG_DECL);
+  virtual CORBA::Object_ptr activate (PortableServer::Servant servant);
 
   /// Dummy method to prevent hidden TAO_Notify_Proxy::activate warning.
   virtual CORBA::Object_ptr activate (PortableServer::Servant servant,
-                                      CORBA::Long id ACE_ENV_ARG_DECL);
+                                      CORBA::Long id);
 
   /// Dispatch Event to consumer
-  void deliver (TAO_Notify_Method_Request_Dispatch_No_Copy & request ACE_ENV_ARG_DECL);
+  void deliver (TAO_Notify_Method_Request_Dispatch_No_Copy & request);
 
   /// Dispatch Event to consumer, no filtering
-  virtual void push_no_filtering (const TAO_Notify_Event* event ACE_ENV_ARG_DECL);
+  virtual void push_no_filtering (const TAO_Notify_Event* event);
 
 private:
   /// Our ref.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
index 2a744e362ba..d99bb2d71c0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
@@ -67,13 +67,13 @@ TAO_Notify_StructuredEvent_No_Copy::copy (void) const
 }
 
 CORBA::Boolean
-TAO_Notify_StructuredEvent_No_Copy::do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL) const
+TAO_Notify_StructuredEvent_No_Copy::do_match (CosNotifyFilter::Filter_ptr filter) const
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - "
                 "TAO_Notify_StructuredEvent::do_match ()\n"));
 
-  return filter->match_structured (*this->notification_ ACE_ENV_ARG_PARAMETER);
+  return filter->match_structured (*this->notification_);
 }
 
 void
@@ -83,46 +83,46 @@ TAO_Notify_StructuredEvent_No_Copy::convert (CosNotification::StructuredEvent& n
 }
 
 void
-TAO_Notify_StructuredEvent_No_Copy::push (TAO_Notify_Consumer* consumer ACE_ENV_ARG_DECL) const
+TAO_Notify_StructuredEvent_No_Copy::push (TAO_Notify_Consumer* consumer) const
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - "
                           "TAO_Notify_StructuredEvent::do_push ("
                           "CosNotifyComm::StructuredPushConsumer_ptr)\n"));
 
-  consumer->push (*this->notification_ ACE_ENV_ARG_PARAMETER);
+  consumer->push (*this->notification_);
 }
 
 void
-TAO_Notify_StructuredEvent_No_Copy::push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
+TAO_Notify_StructuredEvent_No_Copy::push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder) const
 {
-  forwarder->forward_structured (*this->notification_ ACE_ENV_ARG_PARAMETER);
+  forwarder->forward_structured (*this->notification_);
 }
 
 void
-TAO_Notify_StructuredEvent_No_Copy::push_no_filtering (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
+TAO_Notify_StructuredEvent_No_Copy::push_no_filtering (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder) const
 {
-  forwarder->forward_structured_no_filtering (*this->notification_ ACE_ENV_ARG_PARAMETER);
+  forwarder->forward_structured_no_filtering (*this->notification_);
 }
 
 void
-TAO_Notify_StructuredEvent_No_Copy::push (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
+TAO_Notify_StructuredEvent_No_Copy::push (Event_Forwarder::ProxyPushSupplier_ptr forwarder) const
 {
   CORBA::Any any;
 
   TAO_Notify_Event::translate (*this->notification_, any);
 
-  forwarder->forward_any (any ACE_ENV_ARG_PARAMETER);
+  forwarder->forward_any (any);
 }
 
 void
-TAO_Notify_StructuredEvent_No_Copy::push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
+TAO_Notify_StructuredEvent_No_Copy::push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder) const
 {
   CORBA::Any any;
 
   TAO_Notify_Event::translate (*this->notification_, any);
 
-  forwarder->forward_any_no_filtering (any ACE_ENV_ARG_PARAMETER);
+  forwarder->forward_any_no_filtering (any);
 }
 
 /*****************************************************************************************************/
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h
index 54755fdb0a3..ccacb524046 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h
@@ -45,7 +45,7 @@ public:
   /// marshal this event into a CDR buffer (for persistence)
   virtual void marshal (TAO_OutputCDR & cdr) const;
 
-  CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL) const;
+  CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter) const;
 
   /// Convert to CosNotification::Structured type
   virtual void convert (CosNotification::StructuredEvent& notification) const;
@@ -54,19 +54,19 @@ public:
   virtual const TAO_Notify_EventType& type (void) const;
 
   /// Push event to consumer
-  virtual void push (TAO_Notify_Consumer* consumer ACE_ENV_ARG_DECL) const;
+  virtual void push (TAO_Notify_Consumer* consumer) const;
 
   /// Push event to the Event_Forwarder interface
-  virtual void push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const;
+  virtual void push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder) const;
 
   /// Push event to the Event_Forwarder interface
-  virtual void push_no_filtering (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const;
+  virtual void push_no_filtering (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder) const;
 
   /// Push event to the Event_Forwarder interface
-  virtual void push (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const;
+  virtual void push (Event_Forwarder::ProxyPushSupplier_ptr forwarder) const;
 
   /// Push event to the Event_Forwarder interface
-  virtual void push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const;
+  virtual void push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder) const;
 
   /// unmarshal this event from a CDR buffer (for persistence)
   /// \return the new event, or NULL if this is the wrong type of event.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
index ca29e011545..49b96f8cd8f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
@@ -39,7 +39,7 @@ TAO_Notify_StructuredProxyPushConsumer::MyType (void)
 }
 
 void
-TAO_Notify_StructuredProxyPushConsumer::connect_structured_push_supplier (CosNotifyComm::StructuredPushSupplier_ptr push_supplier ACE_ENV_ARG_DECL)
+TAO_Notify_StructuredProxyPushConsumer::connect_structured_push_supplier (CosNotifyComm::StructuredPushSupplier_ptr push_supplier)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventChannelAdmin::AlreadyConnected
@@ -51,13 +51,13 @@ TAO_Notify_StructuredProxyPushConsumer::connect_structured_push_supplier (CosNot
                     TAO_Notify_StructuredPushSupplier (this),
                     CORBA::NO_MEMORY ());
 
-  supplier->init (push_supplier ACE_ENV_ARG_PARAMETER);
-  this->connect (supplier ACE_ENV_ARG_PARAMETER);
+  supplier->init (push_supplier);
+  this->connect (supplier);
   this->self_change ();
 }
 
 void
-TAO_Notify_StructuredProxyPushConsumer::push_structured_event (const CosNotification::StructuredEvent & notification ACE_ENV_ARG_DECL)
+TAO_Notify_StructuredProxyPushConsumer::push_structured_event (const CosNotification::StructuredEvent & notification)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventComm::Disconnected
@@ -66,15 +66,15 @@ TAO_Notify_StructuredProxyPushConsumer::push_structured_event (const CosNotifica
   // Check if we should proceed at all.
   if (this->admin_properties().reject_new_events () == 1
       && this->admin_properties().queue_full ())
-    ACE_THROW (CORBA::IMP_LIMIT ());
+    throw CORBA::IMP_LIMIT ();
 
   if (this->is_connected () == 0)
     {
-      ACE_THROW (CosEventComm::Disconnected ());
+      throw CosEventComm::Disconnected ();
     }
 
   TAO_Notify_StructuredEvent_No_Copy event (notification);
-  this->push_i (&event ACE_ENV_ARG_PARAMETER);
+  this->push_i (&event);
 }
 
 void
@@ -102,26 +102,24 @@ TAO_Notify_StructuredProxyPushConsumer::load_attrs (const TAO_Notify::NVPList& a
   if (attrs.load("PeerIOR", ior))
   {
     CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
-    ACE_DECLARE_NEW_CORBA_ENV;
-    ACE_TRY
+    try
     {
       CosNotifyComm::StructuredPushSupplier_var ps = CosNotifyComm::StructuredPushSupplier::_nil();
       if ( ior.length() > 0 )
       {
-        CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
-        ps = CosNotifyComm::StructuredPushSupplier::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+        CORBA::Object_var obj = orb->string_to_object(ior.c_str());
+        ps = CosNotifyComm::StructuredPushSupplier::_unchecked_narrow(obj.in());
       }
       // minor hack: suppress generating subscription updates during reload.
       bool save_updates = this->updates_off_;
       this->updates_off_ = true;
-      this->connect_structured_push_supplier(ps.in() ACE_ENV_ARG_PARAMETER);
+      this->connect_structured_push_supplier(ps.in());
       this->updates_off_ = save_updates;
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
       // if we can't reconnect to peer, tough...
     }
-    ACE_ENDTRY;
   }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h
index 177c16bed68..24c6a667cf1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h
@@ -63,7 +63,6 @@ protected:
 
   virtual void connect_structured_push_supplier (
     CosNotifyComm::StructuredPushSupplier_ptr push_supplier
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -72,7 +71,6 @@ protected:
 
   virtual void push_structured_event (
       const CosNotification::StructuredEvent & notification
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -80,7 +78,6 @@ protected:
     ));
 
   virtual void disconnect_structured_push_consumer (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
index 6d71dcb8fbb..81c43a8ff53 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
@@ -38,7 +38,7 @@ TAO_Notify_StructuredProxyPushSupplier::MyType (void)
 }
 
 void
-TAO_Notify_StructuredProxyPushSupplier::connect_structured_push_consumer (CosNotifyComm::StructuredPushConsumer_ptr push_consumer ACE_ENV_ARG_DECL)
+TAO_Notify_StructuredProxyPushSupplier::connect_structured_push_consumer (CosNotifyComm::StructuredPushConsumer_ptr push_consumer)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventChannelAdmin::AlreadyConnected
@@ -51,9 +51,9 @@ TAO_Notify_StructuredProxyPushSupplier::connect_structured_push_consumer (CosNot
                     TAO_Notify_StructuredPushConsumer (this),
                     CORBA::NO_MEMORY ());
 
-  consumer->init (push_consumer ACE_ENV_ARG_PARAMETER);
+  consumer->init (push_consumer);
 
-  this->connect (consumer ACE_ENV_ARG_PARAMETER);
+  this->connect (consumer);
   this->self_change ();
 }
 
@@ -83,22 +83,20 @@ TAO_Notify_StructuredProxyPushSupplier::load_attrs (const TAO_Notify::NVPList& a
   if (attrs.load("PeerIOR", ior))
   {
     CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
-    ACE_DECLARE_NEW_CORBA_ENV;
-    ACE_TRY
+    try
     {
       CosNotifyComm::StructuredPushConsumer_var pc = CosNotifyComm::StructuredPushConsumer::_nil();
       if (ior.length() > 0)
       {
-        CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
-        pc = CosNotifyComm::StructuredPushConsumer::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+        CORBA::Object_var obj = orb->string_to_object(ior.c_str());
+        pc = CosNotifyComm::StructuredPushConsumer::_unchecked_narrow(obj.in());
       }
-      this->connect_structured_push_consumer(pc.in() ACE_ENV_ARG_PARAMETER);
+      this->connect_structured_push_consumer(pc.in());
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
       // if we can't connect... tough
     }
-    ACE_ENDTRY;
   }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h
index 0d6ef16902c..068e3e5a09e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h
@@ -69,7 +69,6 @@ public:
 
   virtual void connect_structured_push_consumer (
     CosNotifyComm::StructuredPushConsumer_ptr push_consumer
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -78,7 +77,6 @@ public:
   ));
 
   virtual void disconnect_structured_push_supplier (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
index 48daf1a676e..a80bfdea1b5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
@@ -21,14 +21,14 @@ TAO_Notify_StructuredPushConsumer::~TAO_Notify_StructuredPushConsumer ()
 }
 
 void
-TAO_Notify_StructuredPushConsumer::init (CosNotifyComm::StructuredPushConsumer_ptr push_consumer ACE_ENV_ARG_DECL)
+TAO_Notify_StructuredPushConsumer::init (CosNotifyComm::StructuredPushConsumer_ptr push_consumer)
 {
   // Initialize only once
   ACE_ASSERT( CORBA::is_nil (this->push_consumer_.in()) );
 
   if (CORBA::is_nil (push_consumer))
   {
-    ACE_THROW (CORBA::BAD_PARAM());
+    throw CORBA::BAD_PARAM();
   }
 
   if (!TAO_Notify_PROPERTIES::instance()->separate_dispatching_orb ())
@@ -45,10 +45,10 @@ TAO_Notify_StructuredPushConsumer::init (CosNotifyComm::StructuredPushConsumer_p
       CORBA::Object_var obj =
         TAO_Notify_PROPERTIES::instance()->dispatching_orb()->string_to_object(temp.in());
 
-      ACE_TRY
+      try
         {
           CosNotifyComm::StructuredPushConsumer_var new_push_consumer =
-            CosNotifyComm::StructuredPushConsumer::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+            CosNotifyComm::StructuredPushConsumer::_unchecked_narrow(obj.in());
 
           this->push_consumer_ = CosNotifyComm::StructuredPushConsumer::_duplicate (new_push_consumer.in());
           this->publish_ = CosNotifyComm::NotifyPublish::_duplicate (new_push_consumer.in());
@@ -61,16 +61,16 @@ TAO_Notify_StructuredPushConsumer::init (CosNotifyComm::StructuredPushConsumer_p
           }
           //--cj end
         }
-      ACE_CATCH (CORBA::TRANSIENT, ex)
+      catch (const CORBA::TRANSIENT& ex)
         {
-          ACE_PRINT_EXCEPTION (ex, "Got a TRANSIENT in NS_StructuredPushConsumer::init");
+          ex._tao_print_exception (
+            "Got a TRANSIENT in NS_StructuredPushConsumer::init");
           ACE_DEBUG ((LM_DEBUG, "(%P|%t) got it for NS_StructuredPushConsumer %@\n", this));
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           // _narrow failed
         }
-      ACE_ENDTRY;
     }
 }
 
@@ -82,17 +82,17 @@ TAO_Notify_StructuredPushConsumer::release (void)
 }
 
 void
-TAO_Notify_StructuredPushConsumer::push (const CORBA::Any& event ACE_ENV_ARG_DECL)
+TAO_Notify_StructuredPushConsumer::push (const CORBA::Any& event)
 {
   CosNotification::StructuredEvent notification;
 
   TAO_Notify_Event::translate (event, notification);
 
-  this->push_consumer_->push_structured_event (notification ACE_ENV_ARG_PARAMETER);
+  this->push_consumer_->push_structured_event (notification);
 }
 
 void
-TAO_Notify_StructuredPushConsumer::push (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL)
+TAO_Notify_StructuredPushConsumer::push (const CosNotification::StructuredEvent& event)
 {
   //--cj verify dispatching ORB
   if (TAO_debug_level >= 10) {
@@ -101,12 +101,12 @@ TAO_Notify_StructuredPushConsumer::push (const CosNotification::StructuredEvent&
   }
   //--cj end
 
-  this->push_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER);
+  this->push_consumer_->push_structured_event (event);
 }
 
 /// Push a batch of events to this consumer.
 void
-TAO_Notify_StructuredPushConsumer::push (const CosNotification::EventBatch& event ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_StructuredPushConsumer::push (const CosNotification::EventBatch& event)
 {
   ACE_ASSERT(false);
   ACE_UNUSED_ARG (event);
@@ -114,12 +114,11 @@ TAO_Notify_StructuredPushConsumer::push (const CosNotification::EventBatch& even
 }
 
 void
-TAO_Notify_StructuredPushConsumer::reconnect_from_consumer (TAO_Notify_Consumer* old_consumer
-    ACE_ENV_ARG_DECL)
+TAO_Notify_StructuredPushConsumer::reconnect_from_consumer (TAO_Notify_Consumer* old_consumer)
 {
   TAO_Notify_StructuredPushConsumer* tmp = dynamic_cast<TAO_Notify_StructuredPushConsumer *> (old_consumer);
   ACE_ASSERT(tmp != 0);
-  this->init(tmp->push_consumer_.in() ACE_ENV_ARG_PARAMETER);
+  this->init(tmp->push_consumer_.in());
   this->schedule_timer(false);
 }
 
@@ -128,17 +127,15 @@ TAO_Notify_StructuredPushConsumer::get_ior (void) const
 {
   ACE_CString result;
   CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
-    CORBA::String_var ior = orb->object_to_string(this->push_consumer_.in() ACE_ENV_ARG_PARAMETER);
+    CORBA::String_var ior = orb->object_to_string(this->push_consumer_.in());
     result = static_cast<const char*> (ior.in ());
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
     result.fast_clear();
   }
-  ACE_ENDTRY;
   return result;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h
index 9b9d603d383..057c2364763 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h
@@ -39,22 +39,22 @@ public:
   TAO_Notify_StructuredPushConsumer (TAO_Notify_ProxySupplier* proxy);
 
   /// Init the Consumer
-  void init (CosNotifyComm::StructuredPushConsumer_ptr push_consumer ACE_ENV_ARG_DECL);
+  void init (CosNotifyComm::StructuredPushConsumer_ptr push_consumer);
 
   /// Destructor
   virtual ~TAO_Notify_StructuredPushConsumer ();
 
   /// Push <event> to this consumer.
-//  virtual void push_i (const TAO_Notify_Event* event ACE_ENV_ARG_DECL);
+//  virtual void push_i (const TAO_Notify_Event* event);
 
   /// Push <event> to this consumer.
-  virtual void push (const CORBA::Any& event ACE_ENV_ARG_DECL);
+  virtual void push (const CORBA::Any& event);
 
   /// Push <event> to this consumer.
-  virtual void push (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL);
+  virtual void push (const CosNotification::StructuredEvent& event);
 
   /// Push a batch of events to this consumer.
-  virtual void push (const CosNotification::EventBatch& event ACE_ENV_ARG_DECL);
+  virtual void push (const CosNotification::EventBatch& event);
 
   /// Retrieve the ior of this peer
   virtual ACE_CString get_ior (void) const;
@@ -62,8 +62,7 @@ public:
   /// on reconnect we need to move events from the old consumer
   /// to the new one
   virtual void reconnect_from_consumer (
-    TAO_Notify_Consumer* old_consumer
-    ACE_ENV_ARG_DECL);
+    TAO_Notify_Consumer* old_consumer);
 
 
 protected:
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp
index 981911bb89f..752de21c980 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp
@@ -17,7 +17,7 @@ TAO_Notify_StructuredPushSupplier::~TAO_Notify_StructuredPushSupplier ()
 }
 
 void
-TAO_Notify_StructuredPushSupplier::init (CosNotifyComm::StructuredPushSupplier_ptr push_supplier ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_StructuredPushSupplier::init (CosNotifyComm::StructuredPushSupplier_ptr push_supplier)
 {
   // TODO: verify single init call
   // push_supplier is optional
@@ -37,17 +37,15 @@ TAO_Notify_StructuredPushSupplier::get_ior (void) const
 {
   ACE_CString result;
   CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
-    CORBA::String_var ior = orb->object_to_string(this->push_supplier_.in() ACE_ENV_ARG_PARAMETER);
+    CORBA::String_var ior = orb->object_to_string(this->push_supplier_.in());
     result = static_cast<const char*> (ior.in ());
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
     result.fast_clear();
   }
-  ACE_ENDTRY;
   return result;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h
index b123bdb35d7..5d8e5a74278 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h
@@ -42,7 +42,7 @@ public:
   virtual ~TAO_Notify_StructuredPushSupplier ();
 
   /// Init
-  void init (CosNotifyComm::StructuredPushSupplier_ptr push_supplier ACE_ENV_ARG_DECL);
+  void init (CosNotifyComm::StructuredPushSupplier_ptr push_supplier);
 
   /// Retrieve the ior of this peer
   virtual ACE_CString get_ior (void) const;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp
index 70e0e846b04..1249bb447f7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp
@@ -21,9 +21,9 @@ TAO_Notify_Subscription_Change_Worker::~TAO_Notify_Subscription_Change_Worker ()
 }
 
 void
-TAO_Notify_Subscription_Change_Worker::work (TAO_Notify_Proxy* proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Subscription_Change_Worker::work (TAO_Notify_Proxy* proxy)
 {
-  proxy->admin_types_changed (this->added_, this->removed_ ACE_ENV_ARG_PARAMETER);
+  proxy->admin_types_changed (this->added_, this->removed_);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h
index dc17f2a64b6..deea9ca7ce9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h
@@ -41,7 +41,7 @@ public:
   virtual ~TAO_Notify_Subscription_Change_Worker ();
 
   ///= TAO_ESF_Worker method
-  void work (TAO_Notify_Proxy* proxy ACE_ENV_ARG_DECL);
+  void work (TAO_Notify_Proxy* proxy);
 
 protected:
   const CosNotification::EventTypeSeq & added_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp
index bf1d0eae7ee..d760d336730 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp
@@ -31,11 +31,10 @@ TAO_Notify_Supplier::proxy (void)
 void
 TAO_Notify_Supplier::dispatch_updates_i (
   const CosNotification::EventTypeSeq& added,
-  const CosNotification::EventTypeSeq& removed
-  ACE_ENV_ARG_DECL)
+  const CosNotification::EventTypeSeq& removed)
 {
   if (!CORBA::is_nil (this->subscribe_.in ()))
-    this->subscribe_->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
+    this->subscribe_->subscription_change (added, removed);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.h b/TAO/orbsvcs/orbsvcs/Notify/Supplier.h
index f8032aae3d7..1f0c9d78fb8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.h
@@ -50,8 +50,7 @@ public:
 protected:
   /// Dispatch updates implementation.
   virtual void dispatch_updates_i (const CosNotification::EventTypeSeq& added,
-                                   const CosNotification::EventTypeSeq& removed
-                                   ACE_ENV_ARG_DECL);
+                                   const CosNotification::EventTypeSeq& removed);
 
   /// The proxy that we associate with.
   TAO_Notify_ProxyConsumer* proxy_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
index 8e38720abe0..344c0294e64 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
@@ -49,14 +49,14 @@ TAO_Notify_SupplierAdmin::~TAO_Notify_SupplierAdmin ()
 }
 
 void
-TAO_Notify_SupplierAdmin::init (TAO_Notify_EventChannel *ec ACE_ENV_ARG_DECL)
+TAO_Notify_SupplierAdmin::init (TAO_Notify_EventChannel *ec)
 {
-  TAO_Notify_Admin::init (ec ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Admin::init (ec);
 
   const CosNotification::QoSProperties &default_sa_qos =
     TAO_Notify_PROPERTIES::instance ()->default_supplier_admin_qos_properties ();
 
-  this->set_qos (default_sa_qos ACE_ENV_ARG_PARAMETER);
+  this->set_qos (default_sa_qos);
 }
 
 void
@@ -88,12 +88,12 @@ TAO_Notify_SupplierAdmin::destroy (void)
   if ( result == 1)
     return;
 
-  this->ec_->remove (this ACE_ENV_ARG_PARAMETER);
+  this->ec_->remove (this);
 }
 
 TAO_Notify::Topology_Object*
 TAO_Notify_SupplierAdmin::load_child (const ACE_CString &type,
-  CORBA::Long id, const TAO_Notify::NVPList& attrs ACE_ENV_ARG_DECL)
+  CORBA::Long id, const TAO_Notify::NVPList& attrs)
 {
   TAO_Notify::Topology_Object* result = this;
   if (type == "proxy_push_consumer")
@@ -102,7 +102,7 @@ TAO_Notify_SupplierAdmin::load_child (const ACE_CString &type,
       ACE_TEXT ("(%P|%t) Admin reload proxy %d\n")
       , static_cast<int> (id)
       ));
-    result = this->load_proxy(id, CosNotifyChannelAdmin::ANY_EVENT, attrs ACE_ENV_ARG_PARAMETER);
+    result = this->load_proxy(id, CosNotifyChannelAdmin::ANY_EVENT, attrs);
   }
   else if (type == "structured_proxy_push_consumer")
   {
@@ -110,7 +110,7 @@ TAO_Notify_SupplierAdmin::load_child (const ACE_CString &type,
       ACE_TEXT ("(%P|%t) Admin reload proxy %d\n")
       , static_cast<int> (id)
       ));
-    result = this->load_proxy(id, CosNotifyChannelAdmin::STRUCTURED_EVENT, attrs ACE_ENV_ARG_PARAMETER);
+    result = this->load_proxy(id, CosNotifyChannelAdmin::STRUCTURED_EVENT, attrs);
   }
   else if (type == "sequence_proxy_push_consumer")
   {
@@ -118,11 +118,11 @@ TAO_Notify_SupplierAdmin::load_child (const ACE_CString &type,
       ACE_TEXT ("(%P|%t) Admin reload proxy %d\n")
       , static_cast<int> (id)
       ));
-    result = this->load_proxy(id, CosNotifyChannelAdmin::SEQUENCE_EVENT, attrs ACE_ENV_ARG_PARAMETER);
+    result = this->load_proxy(id, CosNotifyChannelAdmin::SEQUENCE_EVENT, attrs);
   }
   else
   {
-    result = TAO_Notify_Admin::load_child (type, id, attrs ACE_ENV_ARG_PARAMETER);
+    result = TAO_Notify_Admin::load_child (type, id, attrs);
   }
   return result;
 }
@@ -131,14 +131,13 @@ TAO_Notify::Topology_Object*
 TAO_Notify_SupplierAdmin::load_proxy (
   CORBA::Long id,
   CosNotifyChannelAdmin::ClientType ctype,
-  const TAO_Notify::NVPList& attrs ACE_ENV_ARG_DECL)
+  const TAO_Notify::NVPList& attrs)
 {
   TAO_Notify_Builder* bld = TAO_Notify_PROPERTIES::instance()->builder();
   TAO_Notify_ProxyConsumer * proxy =
     bld->build_proxy (this
                , ctype
-               , id
-               ACE_ENV_ARG_PARAMETER);
+               , id);
   ACE_ASSERT(proxy != 0);
   proxy->load_attrs (attrs);
   return proxy;
@@ -146,13 +145,13 @@ TAO_Notify_SupplierAdmin::load_proxy (
 
 
 void
-TAO_Notify_SupplierAdmin::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_ARG_DECL)
+TAO_Notify_SupplierAdmin::set_qos (const CosNotification::QoSProperties & qos)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotification::UnsupportedQoS
                    ))
 {
-  this->TAO_Notify_Object::set_qos (qos ACE_ENV_ARG_PARAMETER);
+  this->TAO_Notify_Object::set_qos (qos);
 }
 
 CosNotification::QoSProperties*
@@ -166,8 +165,7 @@ TAO_Notify_SupplierAdmin::get_qos (void)
 
 CosNotifyChannelAdmin::ProxyConsumer_ptr
 TAO_Notify_SupplierAdmin::obtain_notification_push_consumer (CosNotifyChannelAdmin::ClientType ctype
-                                                         , CosNotifyChannelAdmin::ProxyID_out proxy_id
-                                                         ACE_ENV_ARG_DECL)
+                                                         , CosNotifyChannelAdmin::ProxyID_out proxy_id)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotifyChannelAdmin::AdminLimitExceeded
@@ -180,8 +178,7 @@ TAO_Notify_SupplierAdmin::obtain_notification_push_consumer (CosNotifyChannelAdm
     TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this
                                                                 , ctype
                                                                 , proxy_id
-                                                                , initial_qos
-                                                                ACE_ENV_ARG_PARAMETER);
+                                                                , initial_qos);
   this->self_change ();
   return proxy._retn ();
 }
@@ -190,7 +187,6 @@ CosNotifyChannelAdmin::ProxyConsumer_ptr
 TAO_Notify_SupplierAdmin::obtain_notification_push_consumer_with_qos (CosNotifyChannelAdmin::ClientType ctype,
                                                                   CosNotifyChannelAdmin::ProxyID_out proxy_id,
                                                                   const CosNotification::QoSProperties & initial_qos
-                                                                  ACE_ENV_ARG_DECL
                                                                   )
   ACE_THROW_SPEC ((
                    CORBA::SystemException
@@ -202,8 +198,7 @@ TAO_Notify_SupplierAdmin::obtain_notification_push_consumer_with_qos (CosNotifyC
     TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this
                                                                 , ctype
                                                                 , proxy_id,
-                                                                initial_qos
-                                                                ACE_ENV_ARG_PARAMETER);
+                                                                initial_qos);
   this->self_change ();
   return proxy._retn ();
 }
@@ -216,7 +211,7 @@ TAO_Notify_SupplierAdmin::obtain_push_consumer (void)
                    ))
 {
   CosEventChannelAdmin::ProxyPushConsumer_var proxy =
-    TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this ACE_ENV_ARG_PARAMETER);
+    TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this);
   this->self_change ();
   return proxy._retn ();
 }
@@ -256,11 +251,11 @@ TAO_Notify_SupplierAdmin::push_consumers (void)
 {
   TAO_Notify_Proxy_Seq_Worker seq_worker;
 
-  return seq_worker.create (this->proxy_container() ACE_ENV_ARG_PARAMETER);
+  return seq_worker.create (this->proxy_container());
 }
 
 CosNotifyChannelAdmin::ProxyConsumer_ptr
-TAO_Notify_SupplierAdmin::get_proxy_consumer (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL)
+TAO_Notify_SupplierAdmin::get_proxy_consumer (CosNotifyChannelAdmin::ProxyID proxy_id)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotifyChannelAdmin::ProxyNotFound
@@ -268,13 +263,12 @@ TAO_Notify_SupplierAdmin::get_proxy_consumer (CosNotifyChannelAdmin::ProxyID pro
 {
   TAO_Notify_ProxyConsumer_Find_Worker find_worker;
 
-  return find_worker.resolve (proxy_id, this->proxy_container() ACE_ENV_ARG_PARAMETER);
+  return find_worker.resolve (proxy_id, this->proxy_container());
 }
 
 void
 TAO_Notify_SupplierAdmin::offer_change (const CosNotification::EventTypeSeq & added,
                                     const CosNotification::EventTypeSeq & removed
-                                    ACE_ENV_ARG_DECL
                                     )
   ACE_THROW_SPEC ((
                    CORBA::SystemException
@@ -293,40 +287,40 @@ TAO_Notify_SupplierAdmin::offer_change (const CosNotification::EventTypeSeq & ad
 
     TAO_Notify_Subscription_Change_Worker worker (added, removed);
 
-    this->proxy_container().collection ()->for_each (&worker ACE_ENV_ARG_PARAMETER);
+    this->proxy_container().collection ()->for_each (&worker);
   }
 }
 
 CosNotifyFilter::FilterID
-TAO_Notify_SupplierAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter ACE_ENV_ARG_DECL)
+TAO_Notify_SupplierAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   CosNotifyFilter::FilterID fid =
-    this->filter_admin_.add_filter (new_filter ACE_ENV_ARG_PARAMETER);
+    this->filter_admin_.add_filter (new_filter);
   this->self_change ();
   return fid;
 }
 
 void
-TAO_Notify_SupplierAdmin::remove_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL)
+TAO_Notify_SupplierAdmin::remove_filter (CosNotifyFilter::FilterID filter)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotifyFilter::FilterNotFound
                    ))
 {
-  this->filter_admin_.remove_filter (filter ACE_ENV_ARG_PARAMETER);
+  this->filter_admin_.remove_filter (filter);
 }
 
 ::CosNotifyFilter::Filter_ptr
-TAO_Notify_SupplierAdmin::get_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL)
+TAO_Notify_SupplierAdmin::get_filter (CosNotifyFilter::FilterID filter)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotifyFilter::FilterNotFound
                    ))
 {
-  return this->filter_admin_.get_filter (filter ACE_ENV_ARG_PARAMETER);
+  return this->filter_admin_.get_filter (filter);
 }
 
 ::CosNotifyFilter::FilterIDSeq*
@@ -370,20 +364,18 @@ TAO_Notify_SupplierAdmin::pull_consumers (void)
 
 void
 TAO_Notify_SupplierAdmin::validate_qos (const CosNotification::QoSProperties & /*required_qos*/,
-                                    CosNotification::NamedPropertyRangeSeq_out /*available_qos*/
-                                    ACE_ENV_ARG_DECL)
+                                    CosNotification::NamedPropertyRangeSeq_out /*available_qos*/)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotification::UnsupportedQoS
                    ))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 CosNotifyChannelAdmin::ProxyConsumer_ptr
 TAO_Notify_SupplierAdmin::obtain_notification_pull_consumer (CosNotifyChannelAdmin::ClientType /*ctype*/,
-                                                         CosNotifyChannelAdmin::ProxyID_out /*proxy_id*/
-                                                         ACE_ENV_ARG_DECL)
+                                                         CosNotifyChannelAdmin::ProxyID_out /*proxy_id*/)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotifyChannelAdmin::AdminLimitExceeded
@@ -395,15 +387,14 @@ TAO_Notify_SupplierAdmin::obtain_notification_pull_consumer (CosNotifyChannelAdm
 TAO_Notify_ProxyConsumer *
 TAO_Notify_SupplierAdmin::find_proxy_consumer (
     TAO_Notify::IdVec & id_path,
-    size_t position
-    ACE_ENV_ARG_DECL)
+    size_t position)
 {
   TAO_Notify_ProxyConsumer * result = 0;
   size_t path_size = id_path.size ();
   if (position < path_size)
   {
     TAO_Notify_ProxyConsumer_Find_Worker find_worker;
-    TAO_Notify_Proxy * proxy = find_worker.find (id_path[position], this->proxy_container() ACE_ENV_ARG_PARAMETER);
+    TAO_Notify_Proxy * proxy = find_worker.find (id_path[position], this->proxy_container());
     result = dynamic_cast <TAO_Notify_ProxyConsumer *> (proxy);
   }
   return result;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h
index 3dcffc953a7..e8495c124e8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h
@@ -51,7 +51,7 @@ public:
   virtual ~TAO_Notify_SupplierAdmin ();
 
   /// Init
-  void init (TAO_Notify_EventChannel *ec ACE_ENV_ARG_DECL);
+  void init (TAO_Notify_EventChannel *ec);
 
   /// ServantBase refcount methods.
   virtual void _add_ref (void);
@@ -63,21 +63,18 @@ public:
   virtual TAO_Notify::Topology_Object* load_child (
     const ACE_CString &type,
     CORBA::Long id,
-    const TAO_Notify::NVPList& attrs
-    ACE_ENV_ARG_DECL);
+    const TAO_Notify::NVPList& attrs);
 
   TAO_Notify_ProxyConsumer * find_proxy_consumer (
       TAO_Notify::IdVec & id_path,
-      size_t position
-      ACE_ENV_ARG_DECL);
+      size_t position);
 
 protected:
 
     TAO_Notify::Topology_Object *load_proxy (
     CORBA::Long id,
     CosNotifyChannelAdmin::ClientType ctype,
-    const TAO_Notify::NVPList& attrs
-    ACE_ENV_ARG_DECL);
+    const TAO_Notify::NVPList& attrs);
 
   /// = NotifyExt::SupplierAdmin methods
   CosNotifyChannelAdmin::ProxyConsumer_ptr
@@ -85,7 +82,6 @@ protected:
       CosNotifyChannelAdmin::ClientType ctype,
       CosNotifyChannelAdmin::ProxyID_out proxy_id,
       const CosNotification::QoSProperties & initial_qos
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNotifyChannelAdmin::AdminLimitExceeded,
@@ -96,28 +92,23 @@ protected:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual ::CosNotifyChannelAdmin::EventChannel_ptr MyChannel (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual ::CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual ::CosNotifyChannelAdmin::ProxyIDSeq * pull_consumers (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual ::CosNotifyChannelAdmin::ProxyIDSeq * push_consumers (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual ::CosNotifyChannelAdmin::ProxyConsumer_ptr get_proxy_consumer (
       CosNotifyChannelAdmin::ProxyID proxy_id
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNotifyChannelAdmin::ProxyNotFound));
@@ -126,7 +117,6 @@ protected:
   obtain_notification_pull_consumer (
       CosNotifyChannelAdmin::ClientType ctype,
       CosNotifyChannelAdmin::ProxyID_out proxy_id
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNotifyChannelAdmin::AdminLimitExceeded));
@@ -135,7 +125,6 @@ protected:
   obtain_notification_push_consumer (
       CosNotifyChannelAdmin::ClientType ctype,
       CosNotifyChannelAdmin::ProxyID_out proxy_id
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNotifyChannelAdmin::AdminLimitExceeded));
@@ -146,47 +135,42 @@ protected:
   virtual ::CosNotification::QoSProperties* get_qos (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void set_qos (const CosNotification::QoSProperties& qos
-                        ACE_ENV_ARG_DECL)
+  virtual void set_qos (const CosNotification::QoSProperties& qos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNotification::UnsupportedQoS));
 
   virtual void validate_qos (
       const CosNotification::QoSProperties & required_qos,
       CosNotification::NamedPropertyRangeSeq_out available_qos
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNotification::UnsupportedQoS));
 
   virtual void offer_change (const CosNotification::EventTypeSeq & added,
-                             const CosNotification::EventTypeSeq & removed
-                             ACE_ENV_ARG_DECL)
+                             const CosNotification::EventTypeSeq & removed)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      , CosNotifyComm::InvalidEventType
                      ));
 
   virtual CosNotifyFilter::FilterID add_filter (
-      CosNotifyFilter::Filter_ptr new_filter ACE_ENV_ARG_DECL
+      CosNotifyFilter::Filter_ptr new_filter
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void remove_filter (
-      CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL
+      CosNotifyFilter::FilterID filter
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNotifyFilter::FilterNotFound));
 
   virtual ::CosNotifyFilter::Filter_ptr get_filter (
       CosNotifyFilter::FilterID filter
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNotifyFilter::FilterNotFound));
 
   virtual ::CosNotifyFilter::FilterIDSeq * get_all_filters (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -194,12 +178,10 @@ protected:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual ::CosEventChannelAdmin::ProxyPushConsumer_ptr obtain_push_consumer (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual ::CosEventChannelAdmin::ProxyPullConsumer_ptr obtain_pull_consumer (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
index 0192a72f5e9..df5b3989df0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
@@ -38,7 +38,7 @@ TAO_Notify_ThreadPool_Task::timer (void)
 
 void
 TAO_Notify_ThreadPool_Task::init (const NotifyExt::ThreadPoolParams& tp_params,
-                                  const TAO_Notify_AdminProperties::Ptr& admin_properties  ACE_ENV_ARG_DECL)
+                                  const TAO_Notify_AdminProperties::Ptr& admin_properties)
 {
   ACE_ASSERT (this->timer_.get() == 0);
 
@@ -92,12 +92,12 @@ TAO_Notify_ThreadPool_Task::init (const NotifyExt::ThreadPoolParams& tp_params,
         ACE_TEXT ("exiting!\n%a"),
         tp_params.default_priority));
     }
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
   }
 }
 
 void
-TAO_Notify_ThreadPool_Task::execute (TAO_Notify_Method_Request& method_request ACE_ENV_ARG_DECL)
+TAO_Notify_ThreadPool_Task::execute (TAO_Notify_Method_Request& method_request)
 {
   if (!shutdown_)
   {
@@ -119,7 +119,7 @@ TAO_Notify_ThreadPool_Task::svc (void)
 
   while (!shutdown_)
   {
-    ACE_TRY_NEW_ENV
+    try
     {
       ACE_Time_Value* dequeue_blocking_time = 0;
       ACE_Time_Value earliest_time;
@@ -149,12 +149,11 @@ TAO_Notify_ThreadPool_Task::svc (void)
           ACE_DEBUG ((LM_DEBUG, "ThreadPool_Task dequeue failed\n"));
       }
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ex._tao_print_exception (
         "ThreadPool_Task (%P|%t) exception in method request\n");
     }
-    ACE_ENDTRY;
   } /* while */
 
   return 0;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h
index ffff9d3a1a6..ff55d455179 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h
@@ -58,10 +58,10 @@ public:
   virtual int close (u_long flags);
 
   /// Activate the threadpool
-  void init (const NotifyExt::ThreadPoolParams& tp_params, const TAO_Notify_AdminProperties::Ptr& admin_properties ACE_ENV_ARG_DECL);
+  void init (const NotifyExt::ThreadPoolParams& tp_params, const TAO_Notify_AdminProperties::Ptr& admin_properties);
 
   /// Queue the request
-  virtual void execute (TAO_Notify_Method_Request& method_request ACE_ENV_ARG_DECL);
+  virtual void execute (TAO_Notify_Method_Request& method_request);
 
   /// Shutdown task
   virtual void shutdown ();
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h
index a30c9c21208..9adc45910c8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h
@@ -60,7 +60,7 @@ public:
    * call the load_child method of the object passed in, then do the same
    * loading process on the returned object.
    */
-  virtual void load (Topology_Object *root ACE_ENV_ARG_DECL) = 0;
+  virtual void load (Topology_Object *root) = 0;
 
   /**
    * \brief Close the loader after loading is complete.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp
index 87d61638478..882d42ec693 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp
@@ -40,7 +40,7 @@ namespace TAO_Notify
   }
 
   void
-  Topology_Object::initialize (Topology_Parent* topology_parent ACE_ENV_ARG_DECL_NOT_USED)
+  Topology_Object::initialize (Topology_Parent* topology_parent)
   {
     ACE_ASSERT (topology_parent != 0 && this->topology_parent_ == 0);
     this->topology_parent_ = topology_parent;
@@ -57,8 +57,7 @@ namespace TAO_Notify
   Topology_Object *
   Topology_Object::load_child (const ACE_CString & /*type*/,
     CORBA::Long /* id */,
-    const NVPList& /* attrs */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    const NVPList& /* attrs */)
   {
     return 0;
   }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
index 20f40b680fa..5704f73a84e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
@@ -72,21 +72,21 @@ namespace TAO_Notify
     ///   if (is_persistent ())
     ///   {
     ///     bool want_all_children = saver.begin_object(
-    ///       this->id(), type, attrs, change ACE_ENV_ARG_PARAMETER);
+    ///       this->id(), type, attrs, change);
     ///     for all children
     ///     {
     ///       if (want_all_children || child.is_changed())
     ///       {
-    ///         child.save_persistent(saver ACE_ENV_ARG_PARAMETER);
+    ///         child.save_persistent(saver);
     ///       }
     ///     }
     ///     for all deleted children
     ///     {
     ///       saver.delete_child(child_type, child_id);
     ///     }
-    ///     saver.end_object(this->id(), type ACE_ENV_ARG_PARAMETER);
+    ///     saver.end_object(this->id(), type);
     ///   )
-    virtual void save_persistent (Topology_Saver& saver ACE_ENV_ARG_DECL) = 0;
+    virtual void save_persistent (Topology_Saver& saver) = 0;
 
     /// Re-establish connections that we had before a shutdown.
     ///
@@ -116,7 +116,7 @@ namespace TAO_Notify
     virtual ~Topology_Object ();
 
     /// Init this object with data from <rhs>.
-    virtual void initialize (Topology_Parent* topology_parent ACE_ENV_ARG_DECL);
+    virtual void initialize (Topology_Parent* topology_parent);
 
     /// \brief Create a child of the appropriate type and return it.
     ///
@@ -125,8 +125,7 @@ namespace TAO_Notify
     /// its new ID.
     virtual Topology_Object* load_child (const ACE_CString & /*type*/,
       CORBA::Long /* id */,
-      const NVPList& /* attrs */
-      ACE_ENV_ARG_DECL_NOT_USED);
+      const NVPList& /* attrs */);
 
     /// \brief Find the id associated with topology object.
     ///
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h
index 4159beb2c19..2ccc88017aa 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h
@@ -64,8 +64,7 @@ namespace TAO_Notify
     virtual bool begin_object (CORBA::Long id,
       const ACE_CString &type,
       const NVPList& attrs,
-      bool changed
-      ACE_ENV_ARG_DECL) = 0;
+      bool changed) = 0;
 
     /** \brief Report deleted children to the saver.
     *
@@ -78,8 +77,7 @@ namespace TAO_Notify
     */
     virtual void delete_child (
       CORBA::Long id,
-      const ACE_CString & type
-      ACE_ENV_ARG_DECL_NOT_USED)
+      const ACE_CString & type)
     {
       ACE_UNUSED_ARG (id);
       ACE_UNUSED_ARG (type);
@@ -91,8 +89,7 @@ namespace TAO_Notify
     * and commit it to the persistent store.
     */
     virtual void end_object (CORBA::Long id,
-      const ACE_CString &type
-      ACE_ENV_ARG_DECL) = 0;
+      const ACE_CString &type) = 0;
 
     /**
      * \brief Close the saver.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h
index b1e529c56bd..577248919b6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h
@@ -51,7 +51,7 @@ public:
 
   ///= Public method to be implemented by subclasses.
   /// Exec the request.
-  virtual void execute (TAO_Notify_Method_Request& method_request ACE_ENV_ARG_DECL) = 0;
+  virtual void execute (TAO_Notify_Method_Request& method_request) = 0;
 
   /// Shutdown task
   virtual void shutdown (void) = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
index 2fde3ff524a..336b06d11da 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
@@ -124,7 +124,7 @@ namespace TAO_Notify
 
   //virtual
   void
-  XML_Loader::load (Topology_Object *root ACE_ENV_ARG_DECL)
+  XML_Loader::load (Topology_Object *root)
   {
     ACE_ASSERT (root != 0);
     this->live_ = true;
@@ -157,14 +157,14 @@ namespace TAO_Notify
         // The only way to find out what it is, it to let it print itself, so...
         ACE_ERROR ((LM_ERROR, "Unable to load \"%s\".\n", this->file_name_.c_str ()));
         ex.print ();
-        ACE_THROW(CORBA::INTERNAL());
+        throw CORBA::INTERNAL();
       }
       ACEXML_ENDTRY;
     }
     else
     {
       ACE_DEBUG((LM_DEBUG, ACE_TEXT("Unable to open the XML input file: %s.\n"), file_name_.c_str()));
-      ACE_THROW(CORBA::INTERNAL());
+      throw CORBA::INTERNAL();
     }
   }
 
@@ -183,8 +183,7 @@ namespace TAO_Notify
       Topology_Object* cur = 0;
       if (object_stack_.top (cur) == 0)
       {
-        ACE_DECLARE_NEW_ENV;
-        ACE_TRY
+        try
         {
           NVPList attrs;
           CORBA::Long id = makeNVPList (attrs, xml_attrs);
@@ -196,15 +195,14 @@ namespace TAO_Notify
 
           ACE_CString cname (name);
           Topology_Object* next = cur->load_child (
-            cname, id, attrs ACE_ENV_ARG_PARAMETER);
+            cname, id, attrs);
           ACE_ASSERT(next != 0);
           object_stack_.push (next);
         }
-        ACE_CATCHANY
+        catch (const CORBA::Exception& ex)
         {
-          ACEXML_THROW (ACEXML_SAXException (ACE_ANY_EXCEPTION._info ().c_str ()));
+          ACEXML_THROW (ACEXML_SAXException (ex._info ().c_str ()));
         }
-        ACE_ENDTRY;
       }
     }
   }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h
index 7069179d9bd..b90799d8f20 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h
@@ -49,7 +49,7 @@ public:
   ///////////////////////////////////
   // Override Topology_Loader methods
   // see Topology_Loader.h for documentation
-  virtual void load (Topology_Object *root ACE_ENV_ARG_DECL);
+  virtual void load (Topology_Object *root);
 
 
   /////////////////////////////////////////
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp
index 46264d44035..44639fd2c98 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp
@@ -45,7 +45,7 @@ namespace TAO_Notify
   {
     if (this->close_out_ && this->output_ != 0)
     {
-      this->end_object(0, "notification_service" ACE_ENV_ARG_PARAMETER);
+      this->end_object(0, "notification_service");
 
       ACE_OS::fclose(this->output_);
       this->output_ = 0;
@@ -113,8 +113,7 @@ namespace TAO_Notify
 
       ACE_OS::fprintf (out, "<?xml version=\"1.0\"?>\n");
 
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
+      try
       {
         bool changed = true;
         NVPList attrs;
@@ -138,16 +137,16 @@ namespace TAO_Notify
         {
           attrs.push_back(NVP("timestamp", nowusstr));
         }
-        this->begin_object(0, "notification_service", attrs, changed ACE_ENV_ARG_PARAMETER);
+        this->begin_object(0, "notification_service", attrs, changed);
       }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
       {
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-          ACE_TEXT ("(%P|%t) XML_Saver Unknown exception\n"));
+        ex._tao_print_exception (
+          ACE_TEXT (
+            "(%P|%t) XML_Saver Unknown exception\n"));
         delete this->output_;
         this->output_ = 0;
       }
-      ACE_ENDTRY;
     }
     return this->output_ != 0;
   }
@@ -155,8 +154,7 @@ namespace TAO_Notify
   bool XML_Saver::begin_object(CORBA::Long id,
     const ACE_CString& type,
     const NVPList& attrs,
-    bool /* changed */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    bool /* changed */)
   {
     ACE_ASSERT(this->output_ != 0);
 
@@ -184,8 +182,7 @@ namespace TAO_Notify
   }
 
   void XML_Saver::end_object (CORBA::Long /* id */,
-                              const ACE_CString& type
-                              ACE_ENV_ARG_DECL_NOT_USED)
+                              const ACE_CString& type)
   {
     ACE_ASSERT(this->output_ != 0);
     FILE *out = this->output_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h
index 873ceaf1a45..418d974d86a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h
@@ -50,12 +50,10 @@ public:
   virtual bool begin_object (CORBA::Long id,
     const ACE_CString& type,
     const NVPList& attrs,
-    bool changed
-    ACE_ENV_ARG_DECL);
+    bool changed);
 
   virtual void end_object (CORBA::Long id,
-    const ACE_CString& type
-    ACE_ENV_ARG_DECL);
+    const ACE_CString& type);
 
   virtual void close (void);
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
index 193fba4e773..2705c6ae78e 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
@@ -19,8 +19,7 @@ ACE_RCSID (PortableGroup,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 PortableServer::ObjectId *
-TAO_GOA::create_id_for_reference (CORBA::Object_ptr the_ref
-                                  ACE_ENV_ARG_DECL)
+TAO_GOA::create_id_for_reference (CORBA::Object_ptr the_ref)
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       PortableGroup::NotAGroupObject
@@ -32,23 +31,20 @@ TAO_GOA::create_id_for_reference (CORBA::Object_ptr the_ref
 
   // Create a temporary object reference and then get the
   // ObjectId out of it.
-  CORBA::Object_var obj_ref = this->create_reference (repository_id
-                                                      ACE_ENV_ARG_PARAMETER);
+  CORBA::Object_var obj_ref = this->create_reference (repository_id);
 
   PortableServer::ObjectId_var obj_id =
-    this->reference_to_id (obj_ref.in () ACE_ENV_ARG_PARAMETER);
+    this->reference_to_id (obj_ref.in ());
 
   // Associate the object reference with the group reference.
   this->associate_group_with_ref (the_ref,
-                                  obj_ref.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+                                  obj_ref.in ());
 
   return obj_id._retn ();
 }
 
 PortableGroup::IDs *
-TAO_GOA::reference_to_ids (CORBA::Object_ptr the_ref
-                           ACE_ENV_ARG_DECL_NOT_USED)
+TAO_GOA::reference_to_ids (CORBA::Object_ptr the_ref)
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       PortableGroup::NotAGroupObject
@@ -61,8 +57,7 @@ TAO_GOA::reference_to_ids (CORBA::Object_ptr the_ref
 
 void
 TAO_GOA::associate_reference_with_id (CORBA::Object_ptr ref,
-                                      const PortableServer::ObjectId & oid
-                                      ACE_ENV_ARG_DECL)
+                                      const PortableServer::ObjectId & oid)
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       PortableGroup::NotAGroupObject
@@ -71,19 +66,16 @@ TAO_GOA::associate_reference_with_id (CORBA::Object_ptr ref,
   // Create a reference for the specified ObjectId, since
   // it is much easier to extract the object key from the
   // reference.
-  CORBA::Object_var obj_ref = this->id_to_reference (oid
-                                                     ACE_ENV_ARG_PARAMETER);
+  CORBA::Object_var obj_ref = this->id_to_reference (oid);
 
   // Associate the object reference with the group reference.
   this->associate_group_with_ref (ref,
-                                  obj_ref.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+                                  obj_ref.in ());
 }
 
 void
 TAO_GOA::disassociate_reference_with_id (CORBA::Object_ptr ref,
-                                         const PortableServer::ObjectId & oid
-                                         ACE_ENV_ARG_DECL_NOT_USED)
+                                         const PortableServer::ObjectId & oid)
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       PortableGroup::NotAGroupObject
@@ -101,8 +93,7 @@ TAO_GOA::TAO_GOA (const TAO_Root_POA::String &name,
                   ACE_Lock &lock,
                   TAO_SYNCH_MUTEX &thread_lock,
                   TAO_ORB_Core &orb_core,
-                  TAO_Object_Adapter *object_adapter
-                  ACE_ENV_ARG_DECL)
+                  TAO_Object_Adapter *object_adapter)
   : TAO_Regular_POA (name,
                      poa_manager,
                      policies,
@@ -110,8 +101,7 @@ TAO_GOA::TAO_GOA (const TAO_Root_POA::String &name,
                      lock,
                      thread_lock,
                      orb_core,
-                     object_adapter
-                     ACE_ENV_ARG_PARAMETER)
+                     object_adapter)
 {
 }
 
@@ -127,8 +117,7 @@ TAO_GOA::new_POA (const String &name,
                   ACE_Lock &lock,
                   TAO_SYNCH_MUTEX &thread_lock,
                   TAO_ORB_Core &orb_core,
-                  TAO_Object_Adapter *object_adapter
-                  ACE_ENV_ARG_DECL)
+                  TAO_Object_Adapter *object_adapter)
 {
   TAO_GOA *poa = 0;
 
@@ -140,8 +129,7 @@ TAO_GOA::new_POA (const String &name,
                              lock,
                              thread_lock,
                              orb_core,
-                             object_adapter
-                             ACE_ENV_ARG_PARAMETER),
+                             object_adapter),
                     CORBA::NO_MEMORY ());
 
   return poa;
@@ -151,90 +139,76 @@ TAO_GOA::new_POA (const String &name,
 PortableServer::POA_ptr
 TAO_GOA::create_POA (const char *adapter_name,
                         PortableServer::POAManager_ptr poa_manager,
-                        const CORBA::PolicyList &policies
-                        ACE_ENV_ARG_DECL)
+                        const CORBA::PolicyList &policies)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::AdapterAlreadyExists,
                    PortableServer::POA::InvalidPolicy))
 {
   PortableServer::POA_ptr poa = this->TAO_Regular_POA::create_POA (adapter_name,
                                                            poa_manager,
-                                                           policies
-                                                           ACE_ENV_ARG_PARAMETER);
+                                                           policies);
   return poa;
 }
 
 PortableServer::POA_ptr
 TAO_GOA::find_POA (const char *adapter_name,
-                      CORBA::Boolean activate_it
-                      ACE_ENV_ARG_DECL)
+                      CORBA::Boolean activate_it)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::AdapterNonExistent))
 {
   PortableServer::POA_ptr poa = this->TAO_Regular_POA::find_POA (adapter_name,
-                                                         activate_it
-                                                         ACE_ENV_ARG_PARAMETER);
+                                                         activate_it);
   return poa;
 }
 
 void
 TAO_GOA::destroy (CORBA::Boolean etherealize_objects,
-                     CORBA::Boolean wait_for_completion
-                     ACE_ENV_ARG_DECL)
+                     CORBA::Boolean wait_for_completion)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->TAO_Regular_POA::destroy (etherealize_objects,
-                          wait_for_completion
-                          ACE_ENV_ARG_PARAMETER);
+                          wait_for_completion);
 }
 
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
 PortableServer::ThreadPolicy_ptr
-TAO_GOA::create_thread_policy (PortableServer::ThreadPolicyValue value
-                                  ACE_ENV_ARG_DECL)
+TAO_GOA::create_thread_policy (PortableServer::ThreadPolicyValue value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ThreadPolicy_ptr policy =
-    this->TAO_Regular_POA::create_thread_policy (value
-                                         ACE_ENV_ARG_PARAMETER);
+    this->TAO_Regular_POA::create_thread_policy (value);
   return policy;
 }
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 PortableServer::LifespanPolicy_ptr
-TAO_GOA::create_lifespan_policy (PortableServer::LifespanPolicyValue value
-                                    ACE_ENV_ARG_DECL)
+TAO_GOA::create_lifespan_policy (PortableServer::LifespanPolicyValue value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::LifespanPolicy_ptr policy =
-    this->TAO_Regular_POA::create_lifespan_policy (value
-                                           ACE_ENV_ARG_PARAMETER);
+    this->TAO_Regular_POA::create_lifespan_policy (value);
   return policy;
 }
 
 PortableServer::IdUniquenessPolicy_ptr
-TAO_GOA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value
-                                         ACE_ENV_ARG_DECL)
+TAO_GOA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::IdUniquenessPolicy_ptr policy =
-    this->TAO_Regular_POA::create_id_uniqueness_policy (value
-                                                ACE_ENV_ARG_PARAMETER);
+    this->TAO_Regular_POA::create_id_uniqueness_policy (value);
   return policy;
 }
 
 
 PortableServer::IdAssignmentPolicy_ptr
-TAO_GOA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value
-                                         ACE_ENV_ARG_DECL)
+TAO_GOA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::IdAssignmentPolicy_ptr policy =
-    this->TAO_Regular_POA::create_id_assignment_policy (value
-                                                ACE_ENV_ARG_PARAMETER);
+    this->TAO_Regular_POA::create_id_assignment_policy (value);
   return policy;
 }
 
@@ -242,36 +216,30 @@ TAO_GOA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue va
 #if (TAO_HAS_MINIMUM_POA == 0)
 
 PortableServer::ImplicitActivationPolicy_ptr
-TAO_GOA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value
-                                               ACE_ENV_ARG_DECL)
+TAO_GOA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ImplicitActivationPolicy_ptr policy =
-    this->TAO_Regular_POA::create_implicit_activation_policy (value
-                                                      ACE_ENV_ARG_PARAMETER);
+    this->TAO_Regular_POA::create_implicit_activation_policy (value);
   return policy;
 }
 
 PortableServer::ServantRetentionPolicy_ptr
-TAO_GOA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value
-                                             ACE_ENV_ARG_DECL)
+TAO_GOA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ServantRetentionPolicy_ptr policy =
-    this->TAO_Regular_POA::create_servant_retention_policy (value
-                                                    ACE_ENV_ARG_PARAMETER);
+    this->TAO_Regular_POA::create_servant_retention_policy (value);
   return policy;
 }
 
 
 PortableServer::RequestProcessingPolicy_ptr
-TAO_GOA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value
-                                              ACE_ENV_ARG_DECL)
+TAO_GOA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::RequestProcessingPolicy_ptr policy =
-    this->TAO_Regular_POA::create_request_processing_policy (value
-                                                     ACE_ENV_ARG_PARAMETER);
+    this->TAO_Regular_POA::create_request_processing_policy (value);
   return policy;
 }
 
@@ -327,12 +295,10 @@ TAO_GOA::the_activator (void)
 }
 
 void
-TAO_GOA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator
-                           ACE_ENV_ARG_DECL)
+TAO_GOA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->TAO_Regular_POA::the_activator (adapter_activator
-                                ACE_ENV_ARG_PARAMETER);
+  this->TAO_Regular_POA::the_activator (adapter_activator);
 }
 
 PortableServer::ServantManager_ptr
@@ -346,13 +312,11 @@ TAO_GOA::get_servant_manager (void)
 }
 
 void
-TAO_GOA::set_servant_manager (PortableServer::ServantManager_ptr imgr
-                                 ACE_ENV_ARG_DECL)
+TAO_GOA::set_servant_manager (PortableServer::ServantManager_ptr imgr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
-  this->TAO_Regular_POA::set_servant_manager (imgr
-                                      ACE_ENV_ARG_PARAMETER);
+  this->TAO_Regular_POA::set_servant_manager (imgr);
 }
 
 PortableServer::Servant
@@ -367,157 +331,133 @@ TAO_GOA::get_servant (void)
 }
 
 void
-TAO_GOA::set_servant (PortableServer::Servant servant
-                         ACE_ENV_ARG_DECL)
+TAO_GOA::set_servant (PortableServer::Servant servant)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
-  this->TAO_Regular_POA::set_servant (servant
-                              ACE_ENV_ARG_PARAMETER);
+  this->TAO_Regular_POA::set_servant (servant);
 }
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 PortableServer::ObjectId *
-TAO_GOA::activate_object (PortableServer::Servant p_servant
-                             ACE_ENV_ARG_DECL)
+TAO_GOA::activate_object (PortableServer::Servant p_servant)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantAlreadyActive,
                    PortableServer::POA::WrongPolicy))
 {
   PortableServer::ObjectId *object_id =
-    this->TAO_Regular_POA::activate_object (p_servant
-                                    ACE_ENV_ARG_PARAMETER);
+    this->TAO_Regular_POA::activate_object (p_servant);
   return object_id;
 }
 
 void
 TAO_GOA::activate_object_with_id (const PortableServer::ObjectId &id,
-                                     PortableServer::Servant p_servant
-                                     ACE_ENV_ARG_DECL)
+                                     PortableServer::Servant p_servant)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantAlreadyActive,
                    PortableServer::POA::ObjectAlreadyActive,
                    PortableServer::POA::WrongPolicy))
 {
   this->TAO_Regular_POA::activate_object_with_id (id,
-                                          p_servant
-                                          ACE_ENV_ARG_PARAMETER);
+                                          p_servant);
 }
 
 void
-TAO_GOA::deactivate_object (const PortableServer::ObjectId &oid
-                               ACE_ENV_ARG_DECL)
+TAO_GOA::deactivate_object (const PortableServer::ObjectId &oid)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy))
 {
-  this->TAO_Regular_POA::deactivate_object (oid
-                                    ACE_ENV_ARG_PARAMETER);
+  this->TAO_Regular_POA::deactivate_object (oid);
 }
 
 CORBA::Object_ptr
-TAO_GOA::create_reference (const char *intf
-                              ACE_ENV_ARG_DECL)
+TAO_GOA::create_reference (const char *intf)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
   CORBA::Object_ptr obj =
-    this->TAO_Regular_POA::create_reference (intf
-                                     ACE_ENV_ARG_PARAMETER);
+    this->TAO_Regular_POA::create_reference (intf);
   return obj;
 }
 
 CORBA::Object_ptr
 TAO_GOA::create_reference_with_id (const PortableServer::ObjectId &oid,
-                                   const char *intf
-                                   ACE_ENV_ARG_DECL)
+                                   const char *intf)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_ptr obj =
     this->TAO_Regular_POA::create_reference_with_id (oid,
-                                             intf
-                                             ACE_ENV_ARG_PARAMETER);
+                                             intf);
   return obj;
 }
 
 PortableServer::ObjectId *
-TAO_GOA::servant_to_id (PortableServer::Servant p_servant
-                           ACE_ENV_ARG_DECL)
+TAO_GOA::servant_to_id (PortableServer::Servant p_servant)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantNotActive,
                    PortableServer::POA::WrongPolicy))
 {
   PortableServer::ObjectId *object_id =
-    this->TAO_Regular_POA::servant_to_id (p_servant
-                                  ACE_ENV_ARG_PARAMETER);
+    this->TAO_Regular_POA::servant_to_id (p_servant);
   return object_id;
 }
 
 CORBA::Object_ptr
-TAO_GOA::servant_to_reference (PortableServer::Servant p_servant
-                                  ACE_ENV_ARG_DECL)
+TAO_GOA::servant_to_reference (PortableServer::Servant p_servant)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantNotActive,
                    PortableServer::POA::WrongPolicy))
 {
   CORBA::Object_ptr obj =
-    this->TAO_Regular_POA::servant_to_reference (p_servant
-                                         ACE_ENV_ARG_PARAMETER);
+    this->TAO_Regular_POA::servant_to_reference (p_servant);
   return obj;
 }
 
 
 PortableServer::Servant
-TAO_GOA::reference_to_servant (CORBA::Object_ptr reference
-                                  ACE_ENV_ARG_DECL)
+TAO_GOA::reference_to_servant (CORBA::Object_ptr reference)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongAdapter,
                    PortableServer::POA::WrongPolicy))
 {
   PortableServer::Servant servant =
-    this->TAO_Regular_POA::reference_to_servant (reference
-                                         ACE_ENV_ARG_PARAMETER);
+    this->TAO_Regular_POA::reference_to_servant (reference);
   return servant;
 }
 
 PortableServer::ObjectId *
-TAO_GOA::reference_to_id (CORBA::Object_ptr reference
-                             ACE_ENV_ARG_DECL)
+TAO_GOA::reference_to_id (CORBA::Object_ptr reference)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongAdapter,
                    PortableServer::POA::WrongPolicy))
 {
   PortableServer::ObjectId *object_id =
-    this->TAO_Regular_POA::reference_to_id (reference
-                                    ACE_ENV_ARG_PARAMETER);
+    this->TAO_Regular_POA::reference_to_id (reference);
   return object_id;
 }
 
 PortableServer::Servant
-TAO_GOA::id_to_servant (const PortableServer::ObjectId &oid
-                           ACE_ENV_ARG_DECL)
+TAO_GOA::id_to_servant (const PortableServer::ObjectId &oid)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy))
 {
   PortableServer::Servant servant =
-    this->TAO_Regular_POA::id_to_servant (oid
-                                  ACE_ENV_ARG_PARAMETER);
+    this->TAO_Regular_POA::id_to_servant (oid);
   return servant;
 }
 
 CORBA::Object_ptr
-TAO_GOA::id_to_reference (const PortableServer::ObjectId &oid
-                             ACE_ENV_ARG_DECL)
+TAO_GOA::id_to_reference (const PortableServer::ObjectId &oid)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy))
 {
   CORBA::Object_ptr obj =
-    this->TAO_Regular_POA::id_to_reference (oid
-                                    ACE_ENV_ARG_PARAMETER);
+    this->TAO_Regular_POA::id_to_reference (oid);
   return obj;
 }
 
@@ -588,8 +528,7 @@ TAO_GOA::find_group_component_in_profile (const TAO_Profile* profile,
 int
 TAO_GOA::create_group_acceptors (CORBA::Object_ptr the_ref,
                                  TAO_PortableGroup_Acceptor_Registry &acceptor_registry,
-                                 TAO_ORB_Core &orb_core
-                                 ACE_ENV_ARG_DECL)
+                                 TAO_ORB_Core &orb_core)
 {
   const TAO_MProfile& profiles = the_ref->_stubobj ()->base_profiles ();
   const TAO_Profile* profile;
@@ -604,8 +543,7 @@ TAO_GOA::create_group_acceptors (CORBA::Object_ptr the_ref,
       if (profile->supports_multicast ())
         {
           acceptor_registry.open (profile,
-                                  orb_core
-                                  ACE_ENV_ARG_PARAMETER);
+                                  orb_core);
           ++num;
         }
 
@@ -619,8 +557,7 @@ TAO_GOA::create_group_acceptors (CORBA::Object_ptr the_ref,
 void
 TAO_GOA::associate_group_with_ref (
       CORBA::Object_ptr group_ref,
-      CORBA::Object_ptr obj_ref
-      ACE_ENV_ARG_DECL)
+      CORBA::Object_ptr obj_ref)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::NotAGroupObject))
 {
@@ -640,7 +577,7 @@ TAO_GOA::associate_group_with_ref (
     {
       // Group component wasn't found.  The group reference
       // that was passed in must be bogus.
-      ACE_THROW (PortableGroup::NotAGroupObject ());
+      throw PortableGroup::NotAGroupObject ();
     }
 
   PortableGroup_Request_Dispatcher *rd =
@@ -651,8 +588,7 @@ TAO_GOA::associate_group_with_ref (
   // specified group reference.
   this->create_group_acceptors (group_ref,
                                 rd->acceptor_registry_,
-                                this->orb_core_
-                                ACE_ENV_ARG_PARAMETER);
+                                this->orb_core_);
 
 
 
@@ -660,8 +596,7 @@ TAO_GOA::associate_group_with_ref (
   const TAO::ObjectKey &key =
     obj_ref->_stubobj ()->profile_in_use ()->object_key ();
   rd->group_map_.add_groupid_objectkey_pair (group_id._retn (),
-                                             key
-                                             ACE_ENV_ARG_PARAMETER);
+                                             key);
 
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h
index 03a10db2536..42a20bdbd8f 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h
@@ -55,7 +55,6 @@ public:
   //@{
   virtual PortableServer::ObjectId * create_id_for_reference (
       CORBA::Object_ptr the_ref
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -65,7 +64,6 @@ public:
 
   virtual PortableGroup::IDs * reference_to_ids (
       CORBA::Object_ptr the_ref
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -75,7 +73,6 @@ public:
   virtual void associate_reference_with_id (
       CORBA::Object_ptr ref,
       const PortableServer::ObjectId & oid
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -85,7 +82,6 @@ public:
   virtual void disassociate_reference_with_id (
       CORBA::Object_ptr ref,
       const PortableServer::ObjectId & oid
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -96,55 +92,45 @@ public:
   // Standard POA interface methods
   PortableServer::POA_ptr create_POA (const char *adapter_name,
                                       PortableServer::POAManager_ptr poa_manager,
-                                      const CORBA::PolicyList &policies
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                      const CORBA::PolicyList &policies)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::AdapterAlreadyExists,
                      PortableServer::POA::InvalidPolicy));
 
   PortableServer::POA_ptr find_POA (const char *adapter_name,
-                                    CORBA::Boolean activate_it
-                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                    CORBA::Boolean activate_it)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::AdapterNonExistent));
 
   void destroy (CORBA::Boolean etherealize_objects,
-                CORBA::Boolean wait_for_completion
-                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                CORBA::Boolean wait_for_completion)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-  PortableServer::ThreadPolicy_ptr create_thread_policy (PortableServer::ThreadPolicyValue value
-                                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::ThreadPolicy_ptr create_thread_policy (PortableServer::ThreadPolicyValue value)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-  PortableServer::LifespanPolicy_ptr create_lifespan_policy (PortableServer::LifespanPolicyValue value
-                                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::LifespanPolicy_ptr create_lifespan_policy (PortableServer::LifespanPolicyValue value)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value
-                                                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value
-                                                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-  PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value
-                                                                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value
-                                                                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value
-                                                                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
@@ -166,16 +152,14 @@ public:
   PortableServer::AdapterActivator_ptr the_activator (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void the_activator (PortableServer::AdapterActivator_ptr adapter_activator
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void the_activator (PortableServer::AdapterActivator_ptr adapter_activator)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   PortableServer::ServantManager_ptr get_servant_manager (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
-  void set_servant_manager (PortableServer::ServantManager_ptr imgr
-                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void set_servant_manager (PortableServer::ServantManager_ptr imgr)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
@@ -184,76 +168,64 @@ public:
                      PortableServer::POA::NoServant,
                      PortableServer::POA::WrongPolicy));
 
-  void set_servant (PortableServer::Servant servant
-                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void set_servant (PortableServer::Servant servant)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-  PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant
-                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantAlreadyActive,
                      PortableServer::POA::WrongPolicy));
 
   void activate_object_with_id (const PortableServer::ObjectId &id,
-                                PortableServer::Servant p_servant
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                PortableServer::Servant p_servant)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantAlreadyActive,
                      PortableServer::POA::ObjectAlreadyActive,
                      PortableServer::POA::WrongPolicy));
 
-  void deactivate_object (const PortableServer::ObjectId &oid
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void deactivate_object (const PortableServer::ObjectId &oid)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
                      PortableServer::POA::WrongPolicy));
 
-  CORBA::Object_ptr create_reference (const char *intf
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Object_ptr create_reference (const char *intf)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
   CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid,
-                                              const char *intf
-                                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                              const char *intf)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant
-                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantNotActive,
                      PortableServer::POA::WrongPolicy));
 
-  CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant
-                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantNotActive,
                      PortableServer::POA::WrongPolicy));
 
-  PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference
-                                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
                      PortableServer::POA::WrongAdapter,
                      PortableServer::POA::WrongPolicy));
 
-  PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference
-                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongAdapter,
                      PortableServer::POA::WrongPolicy));
 
-  PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid
-                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
                      PortableServer::POA::WrongPolicy));
 
-  CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
                      PortableServer::POA::WrongPolicy));
@@ -270,8 +242,7 @@ public:
            ACE_Lock &lock,
            TAO_SYNCH_MUTEX &thread_lock,
            TAO_ORB_Core &orb_core,
-           TAO_Object_Adapter *object_adapter
-           ACE_ENV_ARG_DECL);
+           TAO_Object_Adapter *object_adapter);
 
   virtual ~TAO_GOA (void);
 
@@ -288,8 +259,7 @@ protected:
                             ACE_Lock &lock,
                             TAO_SYNCH_MUTEX &thread_lock,
                             TAO_ORB_Core &orb_core,
-                            TAO_Object_Adapter *object_adapter
-                            ACE_ENV_ARG_DECL);
+                            TAO_Object_Adapter *object_adapter);
 
   int find_group_component (const CORBA::Object_ptr the_ref,
                             PortableGroup::TagGroupTaggedComponent &group);
@@ -303,15 +273,13 @@ protected:
       CORBA::Object_ptr the_ref,
       TAO_PortableGroup_Acceptor_Registry &acceptor_registry,
       TAO_ORB_Core &orb_core
-      ACE_ENV_ARG_DECL
     );
 
   /// Helper function to associate group references with
   /// object references.
   void associate_group_with_ref (
         CORBA::Object_ptr group_ref,
-        CORBA::Object_ptr obj_ref
-        ACE_ENV_ARG_DECL)
+        CORBA::Object_ptr obj_ref)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableGroup::NotAGroupObject));
 };
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp
index fe3650caa71..3ed2d1869a0 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp
@@ -26,8 +26,7 @@ TAO_PG_Default_Property_Validator::~TAO_PG_Default_Property_Validator (void)
 
 void
 TAO_PG_Default_Property_Validator::validate_property (
-    const PortableGroup::Properties & props
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Properties & props)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::InvalidProperty,
                    PortableGroup::UnsupportedProperty))
@@ -44,22 +43,21 @@ TAO_PG_Default_Property_Validator::validate_property (
           if (!(property.val >>= membership)
               || (membership != PortableGroup::MEMB_APP_CTRL
                   && membership != PortableGroup::MEMB_INF_CTRL))
-            ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                       property.val));
+            throw PortableGroup::InvalidProperty (property.nam, property.val);
         }
       else if (property.nam == this->factories_)
         {
           const PortableGroup::FactoriesValue * factories;
           if (!(property.val >>= factories))
-            ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                       property.val));
+            throw PortableGroup::InvalidProperty (property.nam, property.val);
           else
             {
               const CORBA::ULong flen = factories->length ();
 
               if (flen == 0)
-                ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                           property.val));
+                throw PortableGroup::InvalidProperty (
+                  property.nam,
+                  property.val);
 
               for (CORBA::ULong j = 0; j < flen; ++j)
                 {
@@ -68,8 +66,9 @@ TAO_PG_Default_Property_Validator::validate_property (
 
                   if (CORBA::is_nil (factory_info.the_factory.in ())
                       || factory_info.the_location.length () == 0)
-                    ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                               property.val));
+                    throw PortableGroup::InvalidProperty (
+                      property.nam,
+                      property.val);
                 }
             }
         }
@@ -78,8 +77,7 @@ TAO_PG_Default_Property_Validator::validate_property (
 
 void
 TAO_PG_Default_Property_Validator::validate_criteria (
-    const PortableGroup::Properties & props
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Properties & props)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::InvalidCriteria,
                    PortableGroup::CannotMeetCriteria))
@@ -144,7 +142,7 @@ TAO_PG_Default_Property_Validator::validate_criteria (
       // deallocations should occur.
       invalid_criteria.length (p);
 
-      ACE_THROW (PortableGroup::InvalidCriteria (invalid_criteria));
+      throw PortableGroup::InvalidCriteria (invalid_criteria);
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h
index 9f9ced075d9..15cf9257f0f 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h
@@ -46,8 +46,7 @@ public:
   /// Validate the given properties.  Throw an exception when the
   /// first invalid property is encountered.  The remaining properties
   /// will not be validated.
-  virtual void validate_property (const PortableGroup::Properties & props
-                          ACE_ENV_ARG_DECL)
+  virtual void validate_property (const PortableGroup::Properties & props)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::InvalidProperty,
                      PortableGroup::UnsupportedProperty));
@@ -55,8 +54,7 @@ public:
   /// Validate the given properties/criteria.  All criteria
   /// will be validated regardless of whether or not an invalid
   /// property was encountered.
-  virtual void validate_criteria (const PortableGroup::Properties & criteria
-                          ACE_ENV_ARG_DECL)
+  virtual void validate_criteria (const PortableGroup::Properties & criteria)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::InvalidCriteria,
                      PortableGroup::CannotMeetCriteria));
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
index 16f718b8f6c..eaba8c3012d 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
@@ -117,7 +117,7 @@ void TAO::PG_FactoryRegistry::_remove_ref (void)
   this->quit_state_ = GONE;
 }
 
-int TAO::PG_FactoryRegistry::idle (int & result ACE_ENV_ARG_DECL_NOT_USED)
+int TAO::PG_FactoryRegistry::idle (int & result)
 {
   result = 0;
   int quit = 0;
@@ -145,15 +145,14 @@ int TAO::PG_FactoryRegistry::fini (void)
   }
   if (this->ns_name_ != 0)
   {
-    this->naming_context_->unbind (this_name_
-                            ACE_ENV_ARG_PARAMETER);
+    this->naming_context_->unbind (this_name_);
     this->ns_name_ = 0;
   }
   return 0;
 }
 
 
-void TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa ACE_ENV_ARG_DECL)
+void TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa)
 {
   ACE_ASSERT (CORBA::is_nil (this->orb_.in ()));
   ACE_ASSERT (CORBA::is_nil (this->poa_.in ()));
@@ -163,21 +162,18 @@ void TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb, PortableServer::POA_ptr
   ACE_ASSERT ( ! CORBA::is_nil (this->poa_.in ()));
 
   // Register with the POA.
-  this->object_id_ = this->poa_->activate_object (this ACE_ENV_ARG_PARAMETER);
+  this->object_id_ = this->poa_->activate_object (this);
 
   // find my identity as a corba object
   this->this_obj_ =
-    this->poa_->id_to_reference (object_id_.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+    this->poa_->id_to_reference (object_id_.in ());
 
   // and create a ior string
-  this->ior_ = this->orb_->object_to_string (this->this_obj_.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+  this->ior_ = this->orb_->object_to_string (this->this_obj_.in ());
 
 }
 
-int TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb
-                                   ACE_ENV_ARG_DECL)
+int TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb)
 {
   int result = 0;
 
@@ -185,8 +181,7 @@ int TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb
 
   // Use the ROOT POA for now
   CORBA::Object_var poa_object =
-    this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA
-                                            ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA);
 
   if (CORBA::is_nil (poa_object.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -195,8 +190,7 @@ int TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb
 
   // Get the POA object.
   this->poa_ =
-    PortableServer::POA::_narrow (poa_object.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (poa_object.in ());
 
 
   if (CORBA::is_nil (this->poa_.in()))
@@ -212,17 +206,15 @@ int TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb
   poa_manager->activate ();
 
   // Register with the POA.
-  this->object_id_ = this->poa_->activate_object (this ACE_ENV_ARG_PARAMETER);
+  this->object_id_ = this->poa_->activate_object (this);
 
   // find my identity as a corba object
   this->this_obj_ =
-    this->poa_->id_to_reference (object_id_.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+    this->poa_->id_to_reference (object_id_.in ());
 
 
   // and create a ior string
-  this->ior_ = this->orb_->object_to_string (this->this_obj_.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+  this->ior_ = this->orb_->object_to_string (this->this_obj_.in ());
 
 
   if (this->ior_output_file_ != 0)
@@ -239,7 +231,7 @@ int TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb
     this->identity_ += this->ns_name_;
 
     CORBA::Object_var naming_obj =
-      this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
+      this->orb_->resolve_initial_references ("NameService");
 
     if (CORBA::is_nil(naming_obj.in ())){
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -248,13 +240,13 @@ int TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb
     }
 
     this->naming_context_ =
-      CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
+      CosNaming::NamingContext::_narrow (naming_obj.in ());
 
     this->this_name_.length (1);
     this->this_name_[0].id = CORBA::string_dup (this->ns_name_);
 
     this->naming_context_->rebind (this->this_name_, this->this_obj_.in()  //CORBA::Object::_duplicate(this_obj)
-                            ACE_ENV_ARG_PARAMETER);
+                            );
   }
 
   return result;
@@ -292,7 +284,6 @@ void TAO::PG_FactoryRegistry::register_factory (
     const char * role,
     const char * type_id,
     const PortableGroup::FactoryInfo & factory_info
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -323,7 +314,7 @@ void TAO::PG_FactoryRegistry::register_factory (
     {
       if (role_info->type_id_ != type_id)
         {
-          ACE_THROW ( PortableGroup::TypeConflict() );
+          throw PortableGroup::TypeConflict();
         }
     }
 
@@ -339,7 +330,7 @@ void TAO::PG_FactoryRegistry::register_factory (
                       this->identity_.c_str(),
                       static_cast<const char *> (info.the_location[0].id),
           role));
-      ACE_THROW (PortableGroup::MemberAlreadyPresent() );
+      throw PortableGroup::MemberAlreadyPresent();
     }
   }
 
@@ -365,7 +356,6 @@ void TAO::PG_FactoryRegistry::register_factory (
 void TAO::PG_FactoryRegistry::unregister_factory (
     const char * role,
     const PortableGroup::Location & location
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException, PortableGroup::MemberNotFound))
 {
@@ -431,7 +421,7 @@ void TAO::PG_FactoryRegistry::unregister_factory (
       this->identity_.c_str(),
       role
       ));
-    ACE_THROW ( PortableGroup::MemberNotFound() );
+    throw PortableGroup::MemberNotFound();
   }
 
   //////////////////////
@@ -445,8 +435,7 @@ void TAO::PG_FactoryRegistry::unregister_factory (
       ));
     if (quit_on_idle_)
     {
-        this->poa_->deactivate_object (this->object_id_.in ()
-               ACE_ENV_ARG_PARAMETER);
+        this->poa_->deactivate_object (this->object_id_.in ());
         quit_state_ = DEACTIVATED;
     }
   }
@@ -456,7 +445,6 @@ void TAO::PG_FactoryRegistry::unregister_factory (
 
 void TAO::PG_FactoryRegistry::unregister_factory_by_role (
     const char * role
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -493,8 +481,7 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_role (
       ));
     if (quit_on_idle_)
     {
-        this->poa_->deactivate_object (this->object_id_.in ()
-               ACE_ENV_ARG_PARAMETER);
+        this->poa_->deactivate_object (this->object_id_.in ());
         quit_state_ = DEACTIVATED;
     }
   }
@@ -504,7 +491,6 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_role (
 
 void TAO::PG_FactoryRegistry::unregister_factory_by_location (
     const PortableGroup::Location & location
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -608,8 +594,7 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_location (
       ));
     if (quit_on_idle_)
     {
-        this->poa_->deactivate_object (this->object_id_.in ()
-               ACE_ENV_ARG_PARAMETER);
+        this->poa_->deactivate_object (this->object_id_.in ());
         quit_state_ = DEACTIVATED;
     }
   }
@@ -620,7 +605,6 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_location (
 ::PortableGroup::FactoryInfos * TAO::PG_FactoryRegistry::list_factories_by_role (
     const char * role,
     CORBA::String_out type_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -652,7 +636,6 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_location (
 
 ::PortableGroup::FactoryInfos * TAO::PG_FactoryRegistry::list_factories_by_location (
     const PortableGroup::Location & location
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
index cb917663981..dbc93df64f7 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
@@ -88,12 +88,12 @@ namespace TAO
      * @param orbManager our ORB -- we keep var to it.
      * @return zero for success; nonzero is process return code for failure.
      */
-    int init (CORBA::ORB_ptr orb  ACE_ENV_ARG_DECL);
+    int init (CORBA::ORB_ptr orb);
 
     /**
      * alternative init using designated poa
      */
-    void init (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa ACE_ENV_ARG_DECL);
+    void init (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa);
 
     /**
      * Prepare to exit.
@@ -106,7 +106,7 @@ namespace TAO
      * @param result is a place to return status to be returned by the process
      * @returns 0 to continue.  1 to quit.
      */
-    int idle(int & result ACE_ENV_ARG_DECL);
+    int idle(int & result);
 
     /**
      * Identify this object.
@@ -132,7 +132,6 @@ namespace TAO
         const char * role,
         const char * type_id,
         const PortableGroup::FactoryInfo & factory_info
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -142,33 +141,28 @@ namespace TAO
     virtual void unregister_factory (
         const char * role,
         const PortableGroup::Location & location
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException, PortableGroup::MemberNotFound));
 
     virtual void unregister_factory_by_role (
         const char * role
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 
     virtual void unregister_factory_by_location (
       const PortableGroup::Location & location
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual ::PortableGroup::FactoryInfos * list_factories_by_role (
         const char * role,
         CORBA::String_out type_id
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual ::PortableGroup::FactoryInfos * list_factories_by_location (
       const PortableGroup::Location & location
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
index 3115752ee52..e8ed26daa88 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
@@ -31,7 +31,6 @@ TAO_PG_GenericFactory::TAO_PG_GenericFactory (
 
 TAO_PG_GenericFactory::~TAO_PG_GenericFactory (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   TAO_PG_Factory_Map::iterator end = this->factory_map_.end ();
   for (TAO_PG_Factory_Map::iterator i = this->factory_map_.begin ();
@@ -40,17 +39,15 @@ TAO_PG_GenericFactory::~TAO_PG_GenericFactory (void)
     {
       TAO_PG_Factory_Set & factory_set = (*i).int_id_;
 
-      ACE_TRY
+      try
         {
           this->delete_object_i (factory_set,
-                                 1 /* Ignore exceptions */
-                                 ACE_ENV_ARG_PARAMETER);
+                                 1 /* Ignore exceptions */);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           // Ignore all exceptions.
         }
-      ACE_ENDTRY;
     }
 
   (void) this->factory_map_.close ();
@@ -60,8 +57,7 @@ CORBA::Object_ptr
 TAO_PG_GenericFactory::create_object (
     const char * type_id,
     const PortableGroup::Criteria & the_criteria,
-    PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id
-    ACE_ENV_ARG_DECL)
+    PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::NoFactory,
                    PortableGroup::ObjectNotCreated,
@@ -70,8 +66,7 @@ TAO_PG_GenericFactory::create_object (
                    PortableGroup::CannotMeetCriteria))
 {
   PortableGroup::Properties_var properties =
-    this->property_manager_.get_type_properties (type_id
-                                                 ACE_ENV_ARG_PARAMETER);
+    this->property_manager_.get_type_properties (type_id);
 
   PortableGroup::MembershipStyleValue membership_style =
     TAO_PG_MEMBERSHIP_STYLE;
@@ -89,8 +84,7 @@ TAO_PG_GenericFactory::create_object (
                           membership_style,
                           factory_infos,
                           initial_number_members,
-                          minimum_number_members
-                          ACE_ENV_ARG_PARAMETER);
+                          minimum_number_members);
 
   CORBA::ULong fcid = 0;
 
@@ -133,14 +127,13 @@ TAO_PG_GenericFactory::create_object (
     this->object_group_manager_.create_object_group (fcid,
                                                      oid.in (),
                                                      type_id,
-                                                     the_criteria
-                                                     ACE_ENV_ARG_PARAMETER);
+                                                     the_criteria);
 
   TAO_PG_Factory_Set factory_set;
 
   const CORBA::ULong factory_infos_count = factory_infos.length ();
 
-  ACE_TRY
+  try
     {
       if (factory_infos_count > 0
           && membership_style == PortableGroup::MEMB_INF_CTRL)
@@ -149,11 +142,10 @@ TAO_PG_GenericFactory::create_object (
                                        type_id,
                                        factory_infos,
                                        initial_number_members,
-                                       factory_set
-                                       ACE_ENV_ARG_PARAMETER);
+                                       factory_set);
 
           if (this->factory_map_.bind (fcid, factory_set) != 0)
-            ACE_TRY_THROW (PortableGroup::ObjectNotCreated ());
+            throw PortableGroup::ObjectNotCreated ();
 
         }
 
@@ -171,18 +163,15 @@ TAO_PG_GenericFactory::create_object (
 
       *tmp <<= fcid;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       this->delete_object_i (factory_set,
-                             1 /* Ignore exceptions */
-                             ACE_ENV_ARG_PARAMETER);
+                             1 /* Ignore exceptions */);
 
-      this->object_group_manager_.destroy_object_group (oid.in ()
-                                                        ACE_ENV_ARG_PARAMETER);
+      this->object_group_manager_.destroy_object_group (oid.in ());
 
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
 
   {
     ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
@@ -201,8 +190,7 @@ TAO_PG_GenericFactory::create_object (
 void
 TAO_PG_GenericFactory::delete_object (
     const PortableGroup::GenericFactory::FactoryCreationId &
-      factory_creation_id
-    ACE_ENV_ARG_DECL)
+      factory_creation_id)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectNotFound))
 {
@@ -223,15 +211,14 @@ TAO_PG_GenericFactory::delete_object (
           TAO_PG_Factory_Set & factory_set = entry->int_id_;
 
           this->delete_object_i (factory_set,
-                                 0  /* Do not ignore exceptions */
-                                 ACE_ENV_ARG_PARAMETER);
+                                 0  /* Do not ignore exceptions */);
 
           if (this->factory_map_.unbind (fcid) != 0)
-            ACE_THROW (CORBA::INTERNAL ());
+            throw CORBA::INTERNAL ();
         }
     }
   else
-    ACE_THROW (PortableGroup::ObjectNotFound ());  // @@
+    throw PortableGroup::ObjectNotFound ();  // @@
                                                    //    CORBA::BAD_PARAM
                                                    //    instead?
 
@@ -242,14 +229,12 @@ TAO_PG_GenericFactory::delete_object (
 
   // Destroy the object group entry.
   this->object_group_manager_.destroy_object_group (
-    oid.in ()
-    ACE_ENV_ARG_PARAMETER);
+    oid.in ());
 }
 
 void
 TAO_PG_GenericFactory::delete_object_i (TAO_PG_Factory_Set & factory_set,
-                                        CORBA::Boolean ignore_exceptions
-                                        ACE_ENV_ARG_DECL)
+                                        CORBA::Boolean ignore_exceptions)
 {
   const size_t len = factory_set.size ();
 
@@ -268,12 +253,11 @@ TAO_PG_GenericFactory::delete_object_i (TAO_PG_Factory_Set & factory_set,
       const PortableGroup::GenericFactory::FactoryCreationId & member_fcid =
         factory_node.factory_creation_id.in ();
 
-      ACE_TRY
+      try
         {
-          factory->delete_object (member_fcid
-                                  ACE_ENV_ARG_PARAMETER);
+          factory->delete_object (member_fcid);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           // Exceptions are generally only ignored when this
           // GenericFactory (not the one being invoked above) is
@@ -282,9 +266,8 @@ TAO_PG_GenericFactory::delete_object_i (TAO_PG_Factory_Set & factory_set,
           // members have been destroyed, and minimize the number of
           // object group members that have not been destroyed.
           if (!ignore_exceptions)
-            ACE_RE_THROW;
+            throw;
         }
-      ACE_ENDTRY;
 
       // Since GenericFactory::delete_object() can throw an exception,
       // decrease the size of the factory array incrementally since
@@ -298,8 +281,7 @@ TAO_PG_GenericFactory::delete_object_i (TAO_PG_Factory_Set & factory_set,
 void
 TAO_PG_GenericFactory::delete_member (
   CORBA::ULong group_id,
-  const PortableGroup::Location & location
-  ACE_ENV_ARG_DECL)
+  const PortableGroup::Location & location)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_);
 
@@ -328,8 +310,7 @@ TAO_PG_GenericFactory::delete_member (
 
           if (info.the_location == location)
             {
-              info.the_factory->delete_object (node.factory_creation_id.in ()
-                                               ACE_ENV_ARG_PARAMETER);
+              info.the_factory->delete_object (node.factory_creation_id.in ());
 
               // The member has been successfully deleted.  Reduce the
               // size of the factory_set accordingly.
@@ -370,8 +351,7 @@ TAO_PG_GenericFactory::populate_object_group (
   const char * type_id,
   const PortableGroup::FactoryInfos & factory_infos,
   PortableGroup::InitialNumberMembersValue initial_number_members,
-  TAO_PG_Factory_Set & factory_set
-  ACE_ENV_ARG_DECL)
+  TAO_PG_Factory_Set & factory_set)
 {
   CORBA::ULong factory_infos_count = factory_infos.length ();
   factory_set.size (factory_infos_count);
@@ -390,8 +370,9 @@ TAO_PG_GenericFactory::populate_object_group (
           if (CORBA::is_nil (factory))
             {
               // @@ instead InvalidProperty?
-              ACE_THROW (PortableGroup::NoFactory (factory_info.the_location,
-                                                   type_id));
+              throw PortableGroup::NoFactory (
+                factory_info.the_location,
+                type_id);
             }
 
           // Do not allow the PortableGroup::MemberAlreadyPresent
@@ -402,8 +383,7 @@ TAO_PG_GenericFactory::populate_object_group (
             this->create_member (object_group,
                                  factory_info,
                                  type_id,
-                                 propagate_member_already_present
-                                 ACE_ENV_ARG_PARAMETER);
+                                 propagate_member_already_present);
         }
 
       factory_node.factory_info = factory_info;  // Memberwise copy
@@ -452,13 +432,11 @@ TAO_PG_GenericFactory::process_criteria (
   PortableGroup::MembershipStyleValue & membership_style,
   PortableGroup::FactoriesValue & factory_infos,
   PortableGroup::InitialNumberMembersValue & initial_number_members,
-  PortableGroup::MinimumNumberMembersValue & minimum_number_members
-  ACE_ENV_ARG_DECL)
+  PortableGroup::MinimumNumberMembersValue & minimum_number_members)
 {
   // Get type-specific properties.
   PortableGroup::Properties_var props =
-    this->property_manager_.get_type_properties (type_id
-                                                 ACE_ENV_ARG_PARAMETER);
+    this->property_manager_.get_type_properties (type_id);
 
   // Merge the given criteria with the type-specific criteria.
   TAO_PG::override_properties (criteria, props.inout ());
@@ -487,7 +465,7 @@ TAO_PG_GenericFactory::process_criteria (
     {
       // This only occurs if extraction of the actual value from the
       // Any fails.
-      ACE_THROW (PortableGroup::InvalidProperty (name, value));
+      throw PortableGroup::InvalidProperty (name, value);
     }
 
   // Factories
@@ -498,7 +476,7 @@ TAO_PG_GenericFactory::process_criteria (
     {
       // This only occurs if extraction of the actual value from the
       // Any fails.
-      ACE_THROW (PortableGroup::InvalidProperty (name, value1));
+      throw PortableGroup::InvalidProperty (name, value1);
     }
 
   const CORBA::ULong factory_infos_count =
@@ -512,7 +490,7 @@ TAO_PG_GenericFactory::process_criteria (
     {
       // This only occurs if extraction of the actual value from the
       // Any fails.
-      ACE_THROW (PortableGroup::InvalidProperty (name, value2));
+      throw PortableGroup::InvalidProperty (name, value2);
     }
 
   if (membership_style == PortableGroup::MEMB_INF_CTRL)
@@ -536,7 +514,7 @@ TAO_PG_GenericFactory::process_criteria (
     {
       // This only occurs if extraction of the actual value from the
       // Any fails.
-      ACE_THROW (PortableGroup::InvalidProperty (name, value3));
+      throw PortableGroup::InvalidProperty (name, value3);
     }
 
   // If the minimum number of members is less than the initial number
@@ -569,7 +547,7 @@ TAO_PG_GenericFactory::process_criteria (
       // deallocations should occur.
       unmet_criteria.length (uc);
 
-      ACE_THROW (PortableGroup::CannotMeetCriteria (unmet_criteria));
+      throw PortableGroup::CannotMeetCriteria (unmet_criteria);
     }
 }
 
@@ -577,8 +555,7 @@ void
 TAO_PG_GenericFactory::check_minimum_number_members (
   PortableGroup::ObjectGroup_ptr object_group,
   CORBA::ULong group_id,
-  const char * type_id
-  ACE_ENV_ARG_DECL)
+  const char * type_id)
 {
   // Check if we've dropped below the MinimumNumberMembers threshold.
   // If so, attempt to create enough new members to fill the gap.
@@ -593,8 +570,7 @@ TAO_PG_GenericFactory::check_minimum_number_members (
   TAO_PG_Factory_Set & factory_set = entry->int_id_;
 
   PortableGroup::Properties_var props =
-    this->property_manager_.get_properties (object_group
-                                            ACE_ENV_ARG_PARAMETER);
+    this->property_manager_.get_properties (object_group);
 
   PortableGroup::Name name (1);
   name.length (1);
@@ -613,12 +589,11 @@ TAO_PG_GenericFactory::check_minimum_number_members (
         {
           // This only occurs if extraction of the actual value from
           // the Any fails.  It shouldn't fail at this point.
-          ACE_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
 
       const CORBA::ULong count =
-        this->object_group_manager_.member_count (object_group
-                                                  ACE_ENV_ARG_PARAMETER);
+        this->object_group_manager_.member_count (object_group);
 
       if (count >= static_cast<CORBA::ULong> (minimum_number_members))
         return;
@@ -645,7 +620,7 @@ TAO_PG_GenericFactory::check_minimum_number_members (
           if (tmp_fcid != nil_fcid)
             continue;
 
-          ACE_TRY
+          try
             {
               const CORBA::Boolean propagate_member_already_present = 1;
 
@@ -653,8 +628,7 @@ TAO_PG_GenericFactory::check_minimum_number_members (
                 this->create_member (object_group,
                                      node.factory_info,
                                      type_id,
-                                     propagate_member_already_present
-                                     ACE_ENV_ARG_PARAMETER);
+                                     propagate_member_already_present);
 
               ++creation_count;
 
@@ -663,11 +637,10 @@ TAO_PG_GenericFactory::check_minimum_number_members (
               if (gap == creation_count)
                 return;
             }
-          ACE_CATCH (PortableGroup::MemberAlreadyPresent, ex)
+          catch (const PortableGroup::MemberAlreadyPresent& ex)
             {
               // Ignore this exception and continue.
             }
-          ACE_ENDTRY;
         }
 
       // @todo If we get this far, and the MinimumNumberMembers
@@ -681,8 +654,7 @@ TAO_PG_GenericFactory::create_member (
     PortableGroup::ObjectGroup_ptr object_group,
     const PortableGroup::FactoryInfo & factory_info,
     const char * type_id,
-    const CORBA::Boolean propagate_member_already_present
-    ACE_ENV_ARG_DECL)
+    const CORBA::Boolean propagate_member_already_present)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::NoFactory,
                    PortableGroup::ObjectNotCreated,
@@ -696,10 +668,9 @@ TAO_PG_GenericFactory::create_member (
   CORBA::Object_var member =
     factory_info.the_factory->create_object (type_id,
                                              factory_info.the_criteria,
-                                             fcid.out ()
-                                             ACE_ENV_ARG_PARAMETER);
+                                             fcid.out ());
 
-  ACE_TRY
+  try
     {
       // @@ Should an "_is_a()" be performed here?  While it
       //    appears to be the right thing to do, it can be
@@ -710,19 +681,16 @@ TAO_PG_GenericFactory::create_member (
       // created if the type_id parameter does not match the
       // type of object the GenericFactory creates.
       CORBA::Boolean right_type_id =
-        member->_is_a (type_id
-                       ACE_ENV_ARG_PARAMETER);
+        member->_is_a (type_id);
 
       // @todo Strategize this -- e.g. strict type checking.
       if (!right_type_id)
         {
           // An Object of incorrect type was created.  Delete
           // it, and throw a NoFactory exception.
-          factory_info.the_factory->delete_object (fcid.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
+          factory_info.the_factory->delete_object (fcid.in ());
 
-          ACE_TRY_THROW (PortableGroup::NoFactory (factory_info.the_location,
-                                                   type_id));
+          throw PortableGroup::NoFactory (factory_info.the_location, type_id);
         }
 
       this->object_group_manager_._tao_add_member (
@@ -730,23 +698,20 @@ TAO_PG_GenericFactory::create_member (
         factory_info.the_location,
         member.in (),
         type_id,
-        propagate_member_already_present
-        ACE_ENV_ARG_PARAMETER);
+        propagate_member_already_present);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // If the member reference is not nil, then the factory
       // was successfully invoked.  Since an exception was
       // thrown, clean up the up created member.
       if (!CORBA::is_nil (member.in ()))
         {
-          factory_info.the_factory->delete_object (fcid.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
+          factory_info.the_factory->delete_object (fcid.in ());
         }
 
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
 
   return fcid._retn ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h
index 96b725c941a..9d01a0cfc25 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h
@@ -74,8 +74,7 @@ public:
       const char * type_id,
       const PortableGroup::Criteria & the_criteria,
       PortableGroup::GenericFactory::FactoryCreationId_out
-        factory_creation_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        factory_creation_id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::NoFactory,
                      PortableGroup::ObjectNotCreated,
@@ -91,8 +90,7 @@ public:
    */
   virtual void delete_object (
       const PortableGroup::GenericFactory::FactoryCreationId &
-        factory_creation_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        factory_creation_id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectNotFound));
 
@@ -110,8 +108,7 @@ public:
    * factories.
    */
   void delete_object_i (TAO_PG_Factory_Set & factory_set,
-                        CORBA::Boolean ignore_exceptions
-                        ACE_ENV_ARG_DECL);
+                        CORBA::Boolean ignore_exceptions);
 
   /// If the member corresponding to the given group ID and location
   /// was created by the infrastructure, call delete_object() on the
@@ -121,8 +118,7 @@ public:
    * when ObjectGroupManager::remove_member() is explicitly called.
    */
   void delete_member (CORBA::ULong group_id,
-                      const PortableGroup::Location & location
-                      ACE_ENV_ARG_DECL);
+                      const PortableGroup::Location & location);
 
   /// Verify that the MinimumNumberMembers criterion is satisfied.
   /**
@@ -135,8 +131,7 @@ public:
   void check_minimum_number_members (
     PortableGroup::ObjectGroup_ptr object_group,
     CORBA::ULong group_id,
-    const char * type_id
-    ACE_ENV_ARG_DECL);
+    const char * type_id);
 
   /// Create a new object group member using the supplied FactoryInfo
   /// and RepositoryId and add it to the given object group.
@@ -147,8 +142,7 @@ public:
       PortableGroup::ObjectGroup_ptr object_group,
       const PortableGroup::FactoryInfo & factory_info,
       const char * type_id,
-      const CORBA::Boolean propagate_member_already_present
-      ACE_ENV_ARG_DECL)
+      const CORBA::Boolean propagate_member_already_present)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::NoFactory,
                      PortableGroup::ObjectNotCreated,
@@ -167,8 +161,7 @@ private:
          const char * type_id,
          const PortableGroup::FactoryInfos &factory_infos,
          PortableGroup::InitialNumberMembersValue initial_number_members,
-         TAO_PG_Factory_Set & factory_set
-         ACE_ENV_ARG_DECL);
+         TAO_PG_Factory_Set & factory_set);
 
   /// Get a new ObjectId to be used when creating a new ObjectGroup.
   /**
@@ -197,8 +190,7 @@ private:
     PortableGroup::MembershipStyleValue & membership_style,
     PortableGroup::FactoriesValue & factory_infos,
     PortableGroup::InitialNumberMembersValue & initial_number_members,
-    PortableGroup::MinimumNumberMembersValue & minimum_number_members
-    ACE_ENV_ARG_DECL);
+    PortableGroup::MinimumNumberMembersValue & minimum_number_members);
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
index 3c911ac6674..2b6abd2903b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
@@ -49,8 +49,7 @@ TAO::PG_Group_Factory::~PG_Group_Factory (void)
 void TAO::PG_Group_Factory::init (
   CORBA::ORB_ptr orb,
   PortableServer::POA_ptr poa,
-  PortableGroup::FactoryRegistry_ptr factory_registry
-  ACE_ENV_ARG_DECL)
+  PortableGroup::FactoryRegistry_ptr factory_registry)
 {
   ACE_ASSERT (CORBA::is_nil (this->orb_.in ()));
   ACE_ASSERT (CORBA::is_nil (this->poa_.in ()));
@@ -65,15 +64,14 @@ void TAO::PG_Group_Factory::init (
   ACE_ASSERT (!CORBA::is_nil (this->poa_.in ()));
   ACE_ASSERT (!CORBA::is_nil (this->factory_registry_.in ()));
 
-  this->manipulator_.init (orb, poa ACE_ENV_ARG_PARAMETER);
+  this->manipulator_.init (orb, poa);
 }
 
 
 TAO::PG_Object_Group * TAO::PG_Group_Factory::create_group (
     const char * type_id,
     const PortableGroup::Criteria & the_criteria,
-    TAO::PG_Property_Set * typeid_properties
-    ACE_ENV_ARG_DECL)
+    TAO::PG_Property_Set * typeid_properties)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::NoFactory,
                    PortableGroup::ObjectNotCreated,
@@ -89,8 +87,7 @@ TAO::PG_Object_Group * TAO::PG_Group_Factory::create_group (
     this->manipulator_.create_object_group (
       type_id,
       this->domain_id_,
-      group_id
-      ACE_ENV_ARG_PARAMETER);
+      group_id);
 
   // pick up the object group information as assigned by
   // ObjectGroupManager
@@ -125,26 +122,24 @@ TAO::PG_Object_Group * TAO::PG_Group_Factory::create_group (
   return objectGroup;
 }
 
-void TAO::PG_Group_Factory::delete_group (PortableGroup::ObjectGroup_ptr object_group
-    ACE_ENV_ARG_DECL)
+void TAO::PG_Group_Factory::delete_group (PortableGroup::ObjectGroup_ptr object_group)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectNotFound))
 {
   if (! destroy_group (object_group))
   {
-    ACE_THROW (PortableGroup::ObjectNotFound ());
+    throw PortableGroup::ObjectNotFound ();
   }
 }
 
 
-void TAO::PG_Group_Factory::delete_group (PortableGroup::ObjectGroupId group_id
-    ACE_ENV_ARG_DECL)
+void TAO::PG_Group_Factory::delete_group (PortableGroup::ObjectGroupId group_id)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectNotFound))
 {
   if (! destroy_group (group_id))
   {
-    ACE_THROW (PortableGroup::ObjectNotFound ());
+    throw PortableGroup::ObjectNotFound ();
   }
 }
 
@@ -197,8 +192,7 @@ int TAO::PG_Group_Factory::destroy_group (PortableGroup::ObjectGroup_ptr object_
 
 PortableGroup::ObjectGroups *
 TAO::PG_Group_Factory::groups_at_location (
-    const PortableGroup::Location & the_location
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ( (CORBA::SystemException))
 {
   size_t upper_limit = this->group_map_.current_size ();
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
index b9bd1309492..a42ba34d67a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
@@ -80,15 +80,13 @@ namespace TAO
     void init (
       CORBA::ORB_ptr orb,
       PortableServer::POA_ptr poa,
-      PortableGroup::FactoryRegistry_ptr factory_registry
-      ACE_ENV_ARG_DECL);
+      PortableGroup::FactoryRegistry_ptr factory_registry);
 
 
     TAO::PG_Object_Group * create_group (
         const char * type_id,
         const PortableGroup::Criteria & the_criteria,
-        TAO::PG_Property_Set * typeid_properties
-        ACE_ENV_ARG_DECL)
+        TAO::PG_Property_Set * typeid_properties)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableGroup::NoFactory,
                        PortableGroup::ObjectNotCreated,
@@ -97,21 +95,18 @@ namespace TAO
                        PortableGroup::CannotMeetCriteria));
 
 
-    void delete_group (PortableGroup::ObjectGroup_ptr object_group
-        ACE_ENV_ARG_DECL)
+    void delete_group (PortableGroup::ObjectGroup_ptr object_group)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableGroup::ObjectNotFound));
 
 
-    void delete_group (PortableGroup::ObjectGroupId group_id
-        ACE_ENV_ARG_DECL)
+    void delete_group (PortableGroup::ObjectGroupId group_id)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableGroup::ObjectNotFound));
 
     PortableGroup::ObjectGroups *
     groups_at_location (
-        const PortableGroup::Location & the_location
-        ACE_ENV_ARG_DECL)
+        const PortableGroup::Location & the_location)
       ACE_THROW_SPEC ( (CORBA::SystemException));
 
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp
index 55832aabccc..cb1c9f14f42 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp
@@ -28,23 +28,20 @@ TAO_PG_Group_Guard::~TAO_PG_Group_Guard (void)
 {
   if (!this->released_)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
+      try
         {
           this->generic_factory_.delete_object_i (this->factory_set_,
                                                   1  // Ignore exceptions
-                                                  ACE_ENV_ARG_PARAMETER);
+                                                  );
 
           // This should never throw an exception if this Guard is
           // used properly.
-          this->group_manager_.destroy_object_group (this->oid_
-                                                     ACE_ENV_ARG_PARAMETER);
+          this->group_manager_.destroy_object_group (this->oid_);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           // Ignore all exceptions.
         }
-      ACE_ENDTRY;
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp
index 5251b3d7931..4fd9fac28f1 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp
@@ -9,8 +9,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 TAO_PG_Null_Property_Validator::validate_property (
-    const PortableGroup::Properties &
-    ACE_ENV_ARG_DECL_NOT_USED)
+    const PortableGroup::Properties &)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::InvalidProperty,
                    PortableGroup::UnsupportedProperty))
@@ -19,8 +18,7 @@ TAO_PG_Null_Property_Validator::validate_property (
 
 void
 TAO_PG_Null_Property_Validator::validate_criteria (
-    const PortableGroup::Properties &
-    ACE_ENV_ARG_DECL_NOT_USED)
+    const PortableGroup::Properties &)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::InvalidCriteria,
                    PortableGroup::CannotMeetCriteria))
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h
index 41047a90c99..b9f6dc18f15 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h
@@ -41,8 +41,7 @@ public:
    * This particular implementation performs no validation
    * whatsoever.
    */
-  void validate_property (const PortableGroup::Properties & props
-                          ACE_ENV_ARG_DECL)
+  void validate_property (const PortableGroup::Properties & props)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::InvalidProperty,
                      PortableGroup::UnsupportedProperty));
@@ -52,8 +51,7 @@ public:
    * This particular implementation performs no validation
    * whatsoever.
    */
-  void validate_criteria (const PortableGroup::Properties & criteria
-                          ACE_ENV_ARG_DECL)
+  void validate_criteria (const PortableGroup::Properties & criteria)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::InvalidCriteria,
                      PortableGroup::CannotMeetCriteria));
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
index c6cb7bab513..cc8f022947a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
@@ -51,8 +51,7 @@ TAO_PG_ObjectGroupManager::create_member (
     PortableGroup::ObjectGroup_ptr /* object_group */,
     const PortableGroup::Location & /* the_location */,
     const char * /* type_id */,
-    const PortableGroup::Criteria & /* the_criteria */
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Criteria & /* the_criteria */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::MemberAlreadyPresent,
@@ -69,8 +68,7 @@ PortableGroup::ObjectGroup_ptr
 TAO_PG_ObjectGroupManager::add_member (
     PortableGroup::ObjectGroup_ptr object_group,
     const PortableGroup::Location & the_location,
-    CORBA::Object_ptr member
-    ACE_ENV_ARG_DECL)
+    CORBA::Object_ptr member)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::MemberAlreadyPresent,
@@ -92,8 +90,7 @@ TAO_PG_ObjectGroupManager::add_member (
   return this->add_member_i (object_group,
                              the_location,
                              member,
-                             check_type_id
-                             ACE_ENV_ARG_PARAMETER);
+                             check_type_id);
 
 }
 
@@ -104,8 +101,7 @@ TAO_PG_ObjectGroupManager::_tao_add_member (
     const PortableGroup::Location & the_location,
     CORBA::Object_ptr member,
     const char * type_id,
-    const CORBA::Boolean propagate_member_already_present
-    ACE_ENV_ARG_DECL)
+    const CORBA::Boolean propagate_member_already_present)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::MemberAlreadyPresent,
                    PortableGroup::NoFactory))
@@ -121,7 +117,7 @@ TAO_PG_ObjectGroupManager::_tao_add_member (
 
   PortableGroup::ObjectGroup_var new_group;
 
-  ACE_TRY
+  try
     {
       // TypeId already checked by GenericFactory.
       const CORBA::Boolean check_type_id = 0;
@@ -129,26 +125,23 @@ TAO_PG_ObjectGroupManager::_tao_add_member (
       new_group = this->add_member_i (object_group,
                                       the_location,
                                       member,
-                                      check_type_id
-                                      ACE_ENV_ARG_PARAMETER);
+                                      check_type_id);
     }
-  ACE_CATCH (PortableGroup::ObjectGroupNotFound, ex)
+  catch (const PortableGroup::ObjectGroupNotFound& ex)
     {
-      ACE_TRY_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
-  ACE_CATCH (PortableGroup::MemberAlreadyPresent, ex)
+  catch (const PortableGroup::MemberAlreadyPresent& ex)
     {
       if (propagate_member_already_present)
-        ACE_RE_THROW;
+        throw;
       else
-        ACE_TRY_THROW (CORBA::INTERNAL ());
+        throw CORBA::INTERNAL ();
     }
-  ACE_CATCH (PortableGroup::ObjectNotAdded, ex)
+  catch (const PortableGroup::ObjectNotAdded& ex)
     {
-      ACE_TRY_THROW (PortableGroup::NoFactory (the_location,
-                                               type_id));
+      throw PortableGroup::NoFactory (the_location, type_id);
     }
-  ACE_ENDTRY;
 
   return new_group._retn ();
 }
@@ -158,24 +151,21 @@ TAO_PG_ObjectGroupManager::add_member_i (
     PortableGroup::ObjectGroup_ptr object_group,
     const PortableGroup::Location & the_location,
     CORBA::Object_ptr member,
-    const CORBA::Boolean check_type_id
-    ACE_ENV_ARG_DECL)
+    const CORBA::Boolean check_type_id)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::MemberAlreadyPresent,
                    PortableGroup::ObjectNotAdded))
 {
   TAO_PG_ObjectGroup_Map_Entry * group_entry =
-    this->get_group_entry (object_group
-                           ACE_ENV_ARG_PARAMETER);
+    this->get_group_entry (object_group);
 
   if (check_type_id)
     {
       CORBA::Boolean right_type_id =
         this->valid_type_id (object_group,
                              group_entry,
-                             member
-                             ACE_ENV_ARG_PARAMETER);
+                             member);
 
       if (!right_type_id)
         {
@@ -237,8 +227,7 @@ TAO_PG_ObjectGroupManager::add_member_i (
 PortableGroup::ObjectGroup_ptr
 TAO_PG_ObjectGroupManager::remove_member (
     PortableGroup::ObjectGroup_ptr object_group,
-    const PortableGroup::Location & the_location
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::MemberNotFound))
@@ -246,8 +235,7 @@ TAO_PG_ObjectGroupManager::remove_member (
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0);
 
   TAO_PG_ObjectGroup_Map_Entry * group_entry =
-    this->get_group_entry (object_group
-                           ACE_ENV_ARG_PARAMETER);
+    this->get_group_entry (object_group);
 
   TAO_PG_ObjectGroup_Array * groups = 0;
   if (this->location_map_.find (the_location, groups) != 0)
@@ -290,8 +278,7 @@ TAO_PG_ObjectGroupManager::remove_member (
           if (this->generic_factory_)
             {
               this->generic_factory_->delete_member (group_entry->group_id,
-                                                     the_location
-                                                     ACE_ENV_ARG_PARAMETER);
+                                                     the_location);
             }
 
           if (member_infos.remove (info) == 0)
@@ -301,8 +288,7 @@ TAO_PG_ObjectGroupManager::remove_member (
                   this->generic_factory_->check_minimum_number_members (
                     object_group,
                     group_entry->group_id,
-                    group_entry->type_id.in ()
-                    ACE_ENV_ARG_PARAMETER);
+                    group_entry->type_id.in ());
                 }
 
               return PortableGroup::ObjectGroup::_duplicate (object_group);
@@ -318,16 +304,14 @@ TAO_PG_ObjectGroupManager::remove_member (
 
 PortableGroup::Locations *
 TAO_PG_ObjectGroupManager::locations_of_members (
-    PortableGroup::ObjectGroup_ptr object_group
-    ACE_ENV_ARG_DECL)
+    PortableGroup::ObjectGroup_ptr object_group)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound))
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0);
 
   TAO_PG_ObjectGroup_Map_Entry * group_entry =
-    this->get_group_entry (object_group
-                           ACE_ENV_ARG_PARAMETER);
+    this->get_group_entry (object_group);
 
   PortableGroup::Locations *temp = 0;
   ACE_NEW_THROW_EX (temp,
@@ -357,8 +341,7 @@ TAO_PG_ObjectGroupManager::locations_of_members (
 
 PortableGroup::ObjectGroups *
 TAO_PG_ObjectGroupManager::groups_at_location (
-    const PortableGroup::Location & the_location
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableGroup::ObjectGroups * ogs;
@@ -390,8 +373,7 @@ TAO_PG_ObjectGroupManager::groups_at_location (
 
 PortableGroup::ObjectGroupId
 TAO_PG_ObjectGroupManager::get_object_group_id (
-    PortableGroup::ObjectGroup_ptr object_group
-    ACE_ENV_ARG_DECL)
+    PortableGroup::ObjectGroup_ptr object_group)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound))
 {
@@ -401,8 +383,7 @@ TAO_PG_ObjectGroupManager::get_object_group_id (
                     0);
 
   TAO_PG_ObjectGroup_Map_Entry * entry =
-    this->get_group_entry (object_group
-                           ACE_ENV_ARG_PARAMETER);
+    this->get_group_entry (object_group);
 
   if (entry == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
@@ -414,8 +395,7 @@ TAO_PG_ObjectGroupManager::get_object_group_id (
 
 PortableGroup::ObjectGroup_ptr
 TAO_PG_ObjectGroupManager::get_object_group_ref (
-    PortableGroup::ObjectGroup_ptr object_group
-    ACE_ENV_ARG_DECL)
+    PortableGroup::ObjectGroup_ptr object_group)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound))
 {
@@ -428,8 +408,7 @@ TAO_PG_ObjectGroupManager::get_object_group_ref (
                       PortableGroup::ObjectGroup::_nil ());
 
 
-    entry = this->get_group_entry (object_group
-                                   ACE_ENV_ARG_PARAMETER);
+    entry = this->get_group_entry (object_group);
   }
 
   if (entry == 0)
@@ -443,8 +422,7 @@ TAO_PG_ObjectGroupManager::get_object_group_ref (
 CORBA::Object_ptr
 TAO_PG_ObjectGroupManager::get_member_ref (
     PortableGroup::ObjectGroup_ptr object_group,
-    const PortableGroup::Location & loc
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Location & loc)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::MemberNotFound))
@@ -455,8 +433,7 @@ TAO_PG_ObjectGroupManager::get_member_ref (
                     CORBA::Object::_nil ());
 
   TAO_PG_ObjectGroup_Map_Entry * group_entry =
-    this->get_group_entry (object_group
-                           ACE_ENV_ARG_PARAMETER);
+    this->get_group_entry (object_group);
 
   // This method assumes that it is faster to check for non-existence
   // of an object group (and hence the member) at a given location,
@@ -490,7 +467,6 @@ TAO_PG_ObjectGroupManager::get_member_ref (
 PortableGroup::ObjectGroup_ptr
 TAO_PG_ObjectGroupManager::get_object_group_ref_from_id (
         PortableGroup::ObjectGroupId group_id
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -532,8 +508,7 @@ TAO_PG_ObjectGroupManager::create_object_group (
   CORBA::ULong group_id,
   const PortableServer::ObjectId &oid,
   const char * type_id,
-  const PortableGroup::Criteria & the_criteria
-  ACE_ENV_ARG_DECL)
+  const PortableGroup::Criteria & the_criteria)
 {
   if (CORBA::is_nil (this->poa_.in ()))
     ACE_THROW_RETURN (CORBA::INTERNAL (), CORBA::Object::_nil ());
@@ -542,8 +517,7 @@ TAO_PG_ObjectGroupManager::create_object_group (
   // RepositoryId of the object being created.
   CORBA::Object_var object_group =
     this->poa_->create_reference_with_id (oid,
-                                          type_id
-                                          ACE_ENV_ARG_PARAMETER);
+                                          type_id);
 
   TAO_PG_ObjectGroup_Map_Entry * group_entry = 0;
   ACE_NEW_THROW_EX (group_entry,
@@ -587,22 +561,20 @@ TAO_PG_ObjectGroupManager::create_object_group (
 
 void
 TAO_PG_ObjectGroupManager::destroy_object_group (
-  const PortableServer::ObjectId & oid
-  ACE_ENV_ARG_DECL)
+  const PortableServer::ObjectId & oid)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_);
 
   TAO_PG_ObjectGroup_Map_Entry * group_entry = 0;
   if (this->object_group_map_.unbind (oid, group_entry) != 0)
-    ACE_THROW (PortableGroup::ObjectNotFound ());
+    throw PortableGroup::ObjectNotFound ();
 
   delete group_entry;
 }
 
 char *
 TAO_PG_ObjectGroupManager::type_id (
-  PortableGroup::ObjectGroup_ptr object_group
-  ACE_ENV_ARG_DECL)
+  PortableGroup::ObjectGroup_ptr object_group)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     guard,
@@ -610,8 +582,7 @@ TAO_PG_ObjectGroupManager::type_id (
                     0);
 
   TAO_PG_ObjectGroup_Map_Entry * group_entry =
-    this->get_group_entry (object_group
-                           ACE_ENV_ARG_PARAMETER);
+    this->get_group_entry (object_group);
 
   return CORBA::string_dup (group_entry->type_id.in ());
 }
@@ -634,8 +605,7 @@ TAO_PG_ObjectGroupManager::object_group (const PortableServer::ObjectId & oid)
 
 CORBA::ULong
 TAO_PG_ObjectGroupManager::member_count (
-    PortableGroup::ObjectGroup_ptr group
-    ACE_ENV_ARG_DECL)
+    PortableGroup::ObjectGroup_ptr group)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound))
 {
@@ -645,8 +615,7 @@ TAO_PG_ObjectGroupManager::member_count (
 //                     0);
 
   TAO_PG_ObjectGroup_Map_Entry * group_entry =
-    this->get_group_entry (group
-                           ACE_ENV_ARG_PARAMETER);
+    this->get_group_entry (group);
 
   return static_cast<CORBA::ULong> (group_entry->member_infos.size ());
 }
@@ -660,8 +629,7 @@ TAO_PG_ObjectGroupManager::poa (PortableServer::POA_ptr p)
 
 PortableGroup::Properties *
 TAO_PG_ObjectGroupManager::get_properties (
-    PortableGroup::ObjectGroup_ptr object_group
-    ACE_ENV_ARG_DECL)
+    PortableGroup::ObjectGroup_ptr object_group)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound))
 {
@@ -683,8 +651,7 @@ TAO_PG_ObjectGroupManager::get_properties (
                       0);
 
     TAO_PG_ObjectGroup_Map_Entry * group_entry =
-      this->get_group_entry (object_group
-                             ACE_ENV_ARG_PARAMETER);
+      this->get_group_entry (object_group);
 
     *properties = group_entry->properties;
   }
@@ -694,8 +661,7 @@ TAO_PG_ObjectGroupManager::get_properties (
 
 TAO_PG_ObjectGroup_Map_Entry *
 TAO_PG_ObjectGroupManager::get_group_entry (
-    CORBA::Object_ptr object_group
-    ACE_ENV_ARG_DECL)
+    CORBA::Object_ptr object_group)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound))
 {
@@ -703,26 +669,24 @@ TAO_PG_ObjectGroupManager::get_group_entry (
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
   PortableServer::ObjectId_var oid;
-  ACE_TRY
+  try
     {
-      oid = this->poa_->reference_to_id (object_group
-                                         ACE_ENV_ARG_PARAMETER);
+      oid = this->poa_->reference_to_id (object_group);
     }
-  ACE_CATCH (PortableServer::POA::WrongAdapter, ex)
+  catch (const PortableServer::POA::WrongAdapter& ex)
     {
       if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ex, "TAO_PG (%P|%t) Unexpected exception\n");
+        ex._tao_print_exception ("TAO_PG (%P|%t) Unexpected exception\n");
 
-      ACE_TRY_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
-  ACE_CATCH (PortableServer::POA::WrongPolicy, ex)
+  catch (const PortableServer::POA::WrongPolicy& ex)
     {
       if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ex, "TAO_PG (%P|%t) Unexpected exception\n");
+        ex._tao_print_exception ("TAO_PG (%P|%t) Unexpected exception\n");
 
-      ACE_TRY_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
-  ACE_ENDTRY;
 
   TAO_PG_ObjectGroup_Map_Entry * group_entry = 0;
   if (this->object_group_map_.find (oid.in (), group_entry) != 0)
@@ -788,8 +752,7 @@ CORBA::Boolean
 TAO_PG_ObjectGroupManager::valid_type_id (
   PortableGroup::ObjectGroup_ptr object_group,
   TAO_PG_ObjectGroup_Map_Entry * group_entry,
-  CORBA::Object_ptr member
-  ACE_ENV_ARG_DECL)
+  CORBA::Object_ptr member)
 {
   // @todo Strategize this -- e.g. strict type checking.
 
@@ -825,14 +788,12 @@ TAO_PG_ObjectGroupManager::valid_type_id (
     // type_id parameter does not match the type of object the
     // GenericFactory creates.
     right_type_id =
-      member->_is_a (type_id.in ()
-                     ACE_ENV_ARG_PARAMETER);
+      member->_is_a (type_id.in ());
   }
 
   // Make sure the group entry still exists.  It may have been
   // destroyed by another thread.
-  group_entry = this->get_group_entry (object_group
-                                       ACE_ENV_ARG_PARAMETER);
+  group_entry = this->get_group_entry (object_group);
 
   return right_type_id;
 }
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h
index b78cc4028f3..2b0505f50cc 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h
@@ -68,8 +68,7 @@ public:
       PortableGroup::ObjectGroup_ptr object_group,
       const PortableGroup::Location & the_location,
       const char * type_id,
-      const PortableGroup::Criteria & the_criteria
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Criteria & the_criteria)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound,
                      PortableGroup::MemberAlreadyPresent,
@@ -82,8 +81,7 @@ public:
   virtual PortableGroup::ObjectGroup_ptr add_member (
       PortableGroup::ObjectGroup_ptr object_group,
       const PortableGroup::Location & the_location,
-      CORBA::Object_ptr member
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::Object_ptr member)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound,
                      PortableGroup::MemberAlreadyPresent,
@@ -98,37 +96,32 @@ public:
    */
   virtual PortableGroup::ObjectGroup_ptr remove_member (
       PortableGroup::ObjectGroup_ptr object_group,
-      const PortableGroup::Location & the_location
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Location & the_location)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound,
                      PortableGroup::MemberNotFound));
 
   /// Return the locations of the members in the given ObjectGroup.
   virtual PortableGroup::Locations * locations_of_members (
-      PortableGroup::ObjectGroup_ptr object_group
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableGroup::ObjectGroup_ptr object_group)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound));
 
   /// Return the locations of the members in the given ObjectGroup.
   virtual PortableGroup::ObjectGroups * groups_at_location (
-      const PortableGroup::Location & the_location
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Location & the_location)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the ObjectGroupId for the given ObjectGroup.
   /// @note Does this method make sense for load balanced objects?
   virtual PortableGroup::ObjectGroupId get_object_group_id (
-      PortableGroup::ObjectGroup_ptr object_group
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableGroup::ObjectGroup_ptr object_group)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound));
 
   /// @note Does this method make sense for load balanced objects?
   virtual PortableGroup::ObjectGroup_ptr get_object_group_ref (
-      PortableGroup::ObjectGroup_ptr object_group
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableGroup::ObjectGroup_ptr object_group)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound));
 
@@ -136,8 +129,7 @@ public:
   /// ObjectGroup at the given location.
   virtual CORBA::Object_ptr get_member_ref (
       PortableGroup::ObjectGroup_ptr object_group,
-      const PortableGroup::Location & loc
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Location & loc)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound,
                      PortableGroup::MemberNotFound));
@@ -147,7 +139,6 @@ public:
    */
    virtual PortableGroup::ObjectGroup_ptr get_object_group_ref_from_id (
         PortableGroup::ObjectGroupId group_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -168,8 +159,7 @@ public:
       const PortableGroup::Location & the_location,
       CORBA::Object_ptr member,
       const char * type_id,
-      const CORBA::Boolean propagate_member_already_present
-      ACE_ENV_ARG_DECL)
+      const CORBA::Boolean propagate_member_already_present)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::MemberAlreadyPresent,
                      PortableGroup::NoFactory));
@@ -184,28 +174,24 @@ public:
     CORBA::ULong group_id,
     const PortableServer::ObjectId &oid,
     const char * type_id,
-    const PortableGroup::Criteria & the_criteria
-    ACE_ENV_ARG_DECL);
+    const PortableGroup::Criteria & the_criteria);
 
   /// Destroy the object group corresponding to the given ObjectId.
   /**
    * @note This method is used mainly by the
    *       GenericFactory::delete_object() method.
    */
-  void destroy_object_group (const PortableServer::ObjectId & oid
-                             ACE_ENV_ARG_DECL);
+  void destroy_object_group (const PortableServer::ObjectId & oid);
 
   /// Return the properties set when the object group was created, and
   /// the dynamic properties that may have overridden them.
   PortableGroup::Properties * get_properties (
-      PortableGroup::ObjectGroup_ptr object_group
-      ACE_ENV_ARG_DECL)
+      PortableGroup::ObjectGroup_ptr object_group)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound));
 
   /// Return the type_id for the given object group.
-  char * type_id (PortableGroup::ObjectGroup_ptr object_group
-                  ACE_ENV_ARG_DECL);
+  char * type_id (PortableGroup::ObjectGroup_ptr object_group);
 
   /// Return the object group associated with the given ObjectId.
   /**
@@ -216,8 +202,7 @@ public:
     const PortableServer::ObjectId & oid);
 
   /// Return the number of members in the given object group.
-  CORBA::ULong member_count (PortableGroup::ObjectGroup_ptr group
-                             ACE_ENV_ARG_DECL)
+  CORBA::ULong member_count (PortableGroup::ObjectGroup_ptr group)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound));
 
@@ -243,8 +228,7 @@ protected:
     PortableGroup::ObjectGroup_ptr object_group,
     const PortableGroup::Location & the_location,
     CORBA::Object_ptr member,
-    const CORBA::Boolean check_type_id
-    ACE_ENV_ARG_DECL)
+    const CORBA::Boolean check_type_id)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::MemberAlreadyPresent,
@@ -253,8 +237,7 @@ protected:
   /// Obtain the ObjectGroup hash map entry corresponding to the given
   /// ObjectGroup reference.
   TAO_PG_ObjectGroup_Map_Entry * get_group_entry (
-      PortableGroup::ObjectGroup_ptr object_group
-      ACE_ENV_ARG_DECL)
+      PortableGroup::ObjectGroup_ptr object_group)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound));
 
@@ -282,8 +265,7 @@ protected:
   CORBA::Boolean valid_type_id (
     PortableGroup::ObjectGroup_ptr object_group,
     TAO_PG_ObjectGroup_Map_Entry * group_entry,
-    CORBA::Object_ptr member
-    ACE_ENV_ARG_DECL);
+    CORBA::Object_ptr member);
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
index 7fc3d2ff98b..ac3cf69da93 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
@@ -150,8 +150,7 @@ TAO::PG_Object_Group::get_primary_location (void) const
 
 
 PortableGroup::ObjectGroup_ptr
-TAO::PG_Object_Group::add_member_to_iogr (CORBA::Object_ptr member
-                                          ACE_ENV_ARG_DECL)
+TAO::PG_Object_Group::add_member_to_iogr (CORBA::Object_ptr member)
 {
   // assume internals is locked
 
@@ -175,8 +174,7 @@ TAO::PG_Object_Group::add_member_to_iogr (CORBA::Object_ptr member
       // create_object.
       cleaned =
         this->manipulator_.remove_profiles (cleaned.in (),
-                                            this->reference_.in ()
-                                            ACE_ENV_ARG_PARAMETER);
+                                            this->reference_.in ());
       this->empty_ = 0;
     }
 
@@ -188,14 +186,13 @@ TAO::PG_Object_Group::add_member_to_iogr (CORBA::Object_ptr member
 
   // Now merge the list into one new IOGR
   result =
-    this->manipulator_.merge_iors (iors ACE_ENV_ARG_PARAMETER);
+    this->manipulator_.merge_iors (iors);
   return result._retn ();
 }
 
 void
 TAO::PG_Object_Group::add_member (const PortableGroup::Location & the_location,
-                                  CORBA::Object_ptr member
-                                  ACE_ENV_ARG_DECL)
+                                  CORBA::Object_ptr member)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectNotAdded))
 
@@ -210,17 +207,14 @@ TAO::PG_Object_Group::add_member (const PortableGroup::Location & the_location,
   // to replicas.
 
   CORBA::String_var member_ior_string =
-    orb_->object_to_string (member
-                            ACE_ENV_ARG_PARAMETER);
+    orb_->object_to_string (member);
 
   PortableGroup::ObjectGroup_var new_reference =
-    add_member_to_iogr (member
-                        ACE_ENV_ARG_PARAMETER);
+    add_member_to_iogr (member);
 
   // Convert new member back to a (non group) ior.
   CORBA::Object_var member_ior =
-    this->orb_->string_to_object (member_ior_string.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+    this->orb_->string_to_object (member_ior_string.in ());
 
   MemberInfo * info = 0;
   ACE_NEW_THROW_EX (info,
@@ -231,7 +225,7 @@ TAO::PG_Object_Group::add_member (const PortableGroup::Location & the_location,
   if (this->members_.bind (the_location, info) != 0)
     {
       // @@ Dale why this is a NO MEMORY exception?
-      ACE_THROW(CORBA::NO_MEMORY());
+      throw CORBA::NO_MEMORY();
     }
 
   this->reference_ = new_reference; // note var-to-var assignment does
@@ -242,7 +236,7 @@ TAO::PG_Object_Group::add_member (const PortableGroup::Location & the_location,
     }
   else
     {
-      ACE_THROW (PortableGroup::ObjectNotAdded ());
+      throw PortableGroup::ObjectNotAdded ();
     }
 
   if (TAO_debug_level > 6)
@@ -255,8 +249,7 @@ TAO::PG_Object_Group::add_member (const PortableGroup::Location & the_location,
 int
 TAO::PG_Object_Group::set_primary_member (
     TAO_IOP::TAO_IOR_Property * prop,
-    const PortableGroup::Location & the_location
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::MemberNotFound))
 {
@@ -282,8 +275,7 @@ TAO::PG_Object_Group::set_primary_member (
       int set_ok =
         this->manipulator_.set_primary (prop,
                                         this->reference_.in (),
-                                        info->member_.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+                                        info->member_.in ());
       if (!set_ok)
         {
           if (TAO_debug_level > 3)
@@ -333,8 +325,7 @@ TAO::PG_Object_Group::set_primary_member (
 
 void
 TAO::PG_Object_Group::remove_member (
-    const PortableGroup::Location & the_location
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ( (CORBA::SystemException,
                    PortableGroup::MemberNotFound))
 {
@@ -346,8 +337,7 @@ TAO::PG_Object_Group::remove_member (
         {
           this->reference_ =
             this->manipulator_.remove_profiles (this->reference_.in (),
-                                                info->member_.in ()
-                                                ACE_ENV_ARG_PARAMETER);
+                                                info->member_.in ());
         }
       else
         {
@@ -376,7 +366,7 @@ TAO::PG_Object_Group::remove_member (
                       "remove_member throwing MemberNotFound.\n"
                       ));
         }
-      ACE_THROW (PortableGroup::MemberNotFound() );
+      throw PortableGroup::MemberNotFound();
     }
 }
 
@@ -393,15 +383,14 @@ TAO::PG_Object_Group::get_object_group_id (void) const
 
 void
 TAO::PG_Object_Group::set_properties_dynamically (
-    const PortableGroup::Properties & overrides
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Properties & overrides)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::InvalidProperty,
                    PortableGroup::UnsupportedProperty))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_);
 
-  this->properties_.decode (overrides ACE_ENV_ARG_PARAMETER);
+  this->properties_.decode (overrides);
 
   //@@ int todo_override_rather_than_replace?
 }
@@ -461,8 +450,7 @@ TAO::PG_Object_Group::distribute_iogr (void)
 {
   // assume internals is locked
   CORBA::String_var iogr =
-    this->orb_->object_to_string (this->reference_.in()
-                                  ACE_ENV_ARG_PARAMETER);
+    this->orb_->object_to_string (this->reference_.in());
 
 //  size_t n_rep = 0; // for dump_ior below
   for (MemberMap_Iterator it = this->members_.begin();
@@ -481,7 +469,7 @@ TAO::PG_Object_Group::distribute_iogr (void)
         PortableGroup::TAO_UpdateObjectGroup::_narrow ( info->member_.in ());
       if (!CORBA::is_nil (uog.in ()))
         {
-          ACE_TRY_NEW_ENV
+          try
             {
               if (TAO_debug_level > 3)
                 {
@@ -494,19 +482,17 @@ TAO::PG_Object_Group::distribute_iogr (void)
                               ));
                 }
               //        dump_ior ("group", "iogr", this->tagged_component_.object_group_ref_version, iogr);
-              //        CORBA::String_var replica_ior = this->orb_->object_to_string(uog.in() ACE_ENV_ARG_PARAMETER);
+              //        CORBA::String_var replica_ior = this->orb_->object_to_string(uog.in());
               //        dump_ior (info->location_[0].id, "ior", (this->tagged_component_.object_group_ref_version * 100) + n_rep++, replica_ior);
               uog->tao_update_object_group (iogr.in (),
                                             this->tagged_component_.object_group_ref_version,
-                                            info->is_primary_
-                                            ACE_ENV_ARG_PARAMETER);
+                                            info->is_primary_);
             }
-          ACE_CATCHANY
+          catch (const CORBA::Exception& ex)
             {
               // we expect an exception
               // tao_update_object_group is not a real method
             }
-          ACE_ENDTRY;
         }
       else
         {
@@ -553,8 +539,7 @@ TAO::PG_Object_Group::locations_of_members (void)
 
 CORBA::Object_ptr
 TAO::PG_Object_Group::get_member_reference (
-    const PortableGroup::Location & the_location
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ((
     CORBA::SystemException,
     PortableGroup::MemberNotFound))
@@ -623,8 +608,7 @@ void
 TAO::PG_Object_Group::create_member (
     const PortableGroup::Location & the_location,
     const char * type_id,
-    const PortableGroup::Criteria & the_criteria
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Criteria & the_criteria)
   ACE_THROW_SPEC ( (CORBA::SystemException,
     PortableGroup::MemberAlreadyPresent,
     PortableGroup::NoFactory,
@@ -643,8 +627,7 @@ TAO::PG_Object_Group::create_member (
       PortableGroup::FactoryInfos_var factories =
         this->factory_registry_->list_factories_by_role (
           role_.c_str(),
-          factory_type.out ()
-          ACE_ENV_ARG_PARAMETER);
+          factory_type.out ());
 
       // @@ what if factory_type != type_id != this->type_id_
 
@@ -666,23 +649,19 @@ TAO::PG_Object_Group::create_member (
                 factory_info.the_factory->create_object (
                   type_id,
                   the_criteria,
-                  fcid. out()
-                  ACE_ENV_ARG_PARAMETER);
+                  fcid. out());
 
               // convert the new member to a stringified IOR to avoid
               // contamination with group info
               CORBA::String_var member_ior_string =
-                orb_->object_to_string (member.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+                orb_->object_to_string (member.in ());
 
               PortableGroup::ObjectGroup_var new_reference =
-                this->add_member_to_iogr (member.in ()
-                                          ACE_ENV_ARG_PARAMETER);
+                this->add_member_to_iogr (member.in ());
 
               // Convert new member back to a (non group) ior.
               CORBA::Object_var member_ior =
-                this->orb_->string_to_object (member_ior_string.in ()
-                                              ACE_ENV_ARG_PARAMETER);
+                this->orb_->string_to_object (member_ior_string.in ());
 
               MemberInfo * info = 0;
               ACE_NEW_THROW_EX (info, MemberInfo(
@@ -694,7 +673,7 @@ TAO::PG_Object_Group::create_member (
 
               if (this->members_.bind (the_location, info) != 0)
                 {
-                  ACE_THROW(CORBA::NO_MEMORY());
+                  throw CORBA::NO_MEMORY();
                 }
 
               this->reference_ = new_reference; // note var-to-var
@@ -709,17 +688,17 @@ TAO::PG_Object_Group::create_member (
         }
       if (! created)
         {
-          ACE_THROW (PortableGroup::NoFactory ());
+          throw PortableGroup::NoFactory ();
         }
     }
   else
     {
-      ACE_THROW (PortableGroup::MemberAlreadyPresent ());
+      throw PortableGroup::MemberAlreadyPresent ();
     }
 }
 
 void
-TAO::PG_Object_Group::create_members (size_t count ACE_ENV_ARG_DECL)
+TAO::PG_Object_Group::create_members (size_t count)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::NoFactory))
 {
@@ -730,8 +709,7 @@ TAO::PG_Object_Group::create_members (size_t count ACE_ENV_ARG_DECL)
   PortableGroup::FactoryInfos_var factories =
   this->factory_registry_->list_factories_by_role (
         role_.c_str(),
-        factory_type.out ()
-        ACE_ENV_ARG_PARAMETER);
+        factory_type.out ());
 
   CORBA::ULong factory_count = factories->length ();
   if (factory_count > 0)
@@ -748,30 +726,26 @@ TAO::PG_Object_Group::create_members (size_t count ACE_ENV_ARG_DECL)
               ///////////////////////////////////////////
               // If a factory refuses to create a replica
               // it's not fatal.
-              ACE_TRY_NEW_ENV
+              try
                 {
                   PortableGroup::GenericFactory::FactoryCreationId_var fcid;
                   CORBA::Object_var member =
                     factory_info.the_factory->create_object (
                       this->type_id_.in (),
                       factory_info.the_criteria,
-                      fcid. out()
-                      ACE_ENV_ARG_PARAMETER);
+                      fcid. out());
 
                   // convert the new member to a stringified IOR to avoid
                   // contamination with group info
                   CORBA::String_var member_ior_string =
-                    orb_->object_to_string (member.in ()
-                                            ACE_ENV_ARG_PARAMETER);
+                    orb_->object_to_string (member.in ());
 
                   PortableGroup::ObjectGroup_var new_reference =
-                    this->add_member_to_iogr (member.in ()
-                                              ACE_ENV_ARG_PARAMETER);
+                    this->add_member_to_iogr (member.in ());
 
                   // Convert new member back to a (non group) ior.
                   CORBA::Object_var member_ior =
-                    this->orb_->string_to_object (member_ior_string.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
+                    this->orb_->string_to_object (member_ior_string.in ());
 
                   MemberInfo * info = 0;
                   ACE_NEW_THROW_EX (info, MemberInfo(
@@ -783,13 +757,13 @@ TAO::PG_Object_Group::create_members (size_t count ACE_ENV_ARG_DECL)
 
                   if (this->members_.bind (factory_location, info) != 0)
                     {
-                      ACE_TRY_THROW(CORBA::NO_MEMORY());
+                      throw CORBA::NO_MEMORY();
                     }
                   this->reference_ =
                     new_reference; // note var-to-var assignment does
                                    // a duplicate
                 }
-              ACE_CATCHANY
+              catch (const CORBA::Exception& ex)
                 {
                   // log, but otherwise ignore the errorf
                   if (TAO_debug_level > 0)
@@ -803,7 +777,6 @@ TAO::PG_Object_Group::create_members (size_t count ACE_ENV_ARG_DECL)
                                   ));
                     }
                 }
-              ACE_ENDTRY;
             }
         }
 
@@ -814,7 +787,7 @@ TAO::PG_Object_Group::create_members (size_t count ACE_ENV_ARG_DECL)
     }
   else
     {
-      ACE_THROW (PortableGroup::NoFactory());
+      throw PortableGroup::NoFactory();
     }
 }
 
@@ -830,8 +803,7 @@ TAO::PG_Object_Group::initial_populate (void)
 
       if (this->members_.current_size () < initial_number_members)
         {
-          this->create_members (initial_number_members
-                                ACE_ENV_ARG_PARAMETER);
+          this->create_members (initial_number_members);
         }
     }
 }
@@ -847,7 +819,7 @@ TAO::PG_Object_Group::minimum_populate (void)
         this->get_minimum_number_members ();
       if (members_.current_size () < minimum_number_members)
         {
-          this->create_members (minimum_number_members ACE_ENV_ARG_PARAMETER);
+          this->create_members (minimum_number_members);
         }
     }
 }
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
index b466da4d3d2..18c687e2012 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
@@ -176,8 +176,7 @@ namespace TAO
      * @@TODO DOC
      */
     void set_properties_dynamically (
-        const PortableGroup::Properties & overrides
-        ACE_ENV_ARG_DECL)
+        const PortableGroup::Properties & overrides)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableGroup::InvalidProperty,
                        PortableGroup::UnsupportedProperty));
@@ -200,8 +199,7 @@ namespace TAO
      */
     void add_member (
         const PortableGroup::Location & the_location,
-        CORBA::Object_ptr member
-        ACE_ENV_ARG_DECL)
+        CORBA::Object_ptr member)
       ACE_THROW_SPEC ( (CORBA::SystemException,
                        PortableGroup::ObjectNotAdded));
 
@@ -214,8 +212,7 @@ namespace TAO
      */
     int set_primary_member (
       TAO_IOP::TAO_IOR_Property * prop,
-      const PortableGroup::Location & the_location
-      ACE_ENV_ARG_DECL)
+      const PortableGroup::Location & the_location)
       ACE_THROW_SPEC ((
         CORBA::SystemException
         , PortableGroup::MemberNotFound
@@ -225,8 +222,7 @@ namespace TAO
      * @@TODO DOC
      */
     void remove_member (
-        const PortableGroup::Location & the_location
-        ACE_ENV_ARG_DECL)
+        const PortableGroup::Location & the_location)
       ACE_THROW_SPEC ( (CORBA::SystemException,
                        PortableGroup::MemberNotFound));
 
@@ -237,8 +233,7 @@ namespace TAO
     void create_member (
         const PortableGroup::Location & the_location,
         const char * type_id,
-        const PortableGroup::Criteria & the_criteria
-        ACE_ENV_ARG_DECL)
+        const PortableGroup::Criteria & the_criteria)
       ACE_THROW_SPEC ( (CORBA::SystemException,
         PortableGroup::MemberAlreadyPresent,
         PortableGroup::NoFactory,
@@ -256,8 +251,7 @@ namespace TAO
      * @@TODO DOC
      */
     CORBA::Object_ptr get_member_reference (
-        const PortableGroup::Location & the_location
-        ACE_ENV_ARG_DECL)
+        const PortableGroup::Location & the_location)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableGroup::MemberNotFound));
@@ -287,10 +281,10 @@ namespace TAO
 
     void distribute_iogr (void);
 
-    PortableGroup::ObjectGroup_ptr add_member_to_iogr(CORBA::Object_ptr member ACE_ENV_ARG_DECL);
+    PortableGroup::ObjectGroup_ptr add_member_to_iogr(CORBA::Object_ptr member);
 
 
-    void create_members (size_t count ACE_ENV_ARG_DECL)
+    void create_members (size_t count)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableGroup::NoFactory
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp
index 65fbaf99762..6436536b524 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp
@@ -63,8 +63,7 @@ PortableGroup::ObjectGroup_ptr
 TAO::PG_Object_Group_Manipulator::create_object_group (
   const char * type_id,
   const char * domain_id,
-  PortableGroup::ObjectGroupId & group_id
-  ACE_ENV_ARG_DECL)
+  PortableGroup::ObjectGroupId & group_id)
 {
    allocate_ogid(group_id);
    PortableServer::ObjectId_var oid = convert_ogid_to_oid (group_id);
@@ -72,8 +71,7 @@ TAO::PG_Object_Group_Manipulator::create_object_group (
   // Create a reference for the ObjectGroup
   CORBA::Object_var object_group =
     this->poa_->create_reference_with_id (oid.in(),
-                                          type_id
-                                          ACE_ENV_ARG_PARAMETER);
+                                          type_id);
 
   PortableGroup::TagGroupTaggedComponent tag_component;
 
@@ -92,8 +90,7 @@ TAO::PG_Object_Group_Manipulator::create_object_group (
 
 void
 TAO::PG_Object_Group_Manipulator::init (CORBA::ORB_ptr orb,
-                                        PortableServer::POA_ptr poa
-                                        ACE_ENV_ARG_DECL)
+                                        PortableServer::POA_ptr poa)
 {
   ACE_ASSERT (CORBA::is_nil (this->orb_.in ()) && !CORBA::is_nil (orb));
   this->orb_ = CORBA::ORB::_duplicate (orb);
@@ -103,39 +100,37 @@ TAO::PG_Object_Group_Manipulator::init (CORBA::ORB_ptr orb,
 
   // Get an object reference for the ORBs IORManipulation object!
   CORBA::Object_var IORM = this->orb_->resolve_initial_references (
-    TAO_OBJID_IORMANIPULATION, 0 ACE_ENV_ARG_PARAMETER);
+    TAO_OBJID_IORMANIPULATION, 0);
 
   this->iorm_ = TAO_IOP::TAO_IOR_Manipulation::_narrow (
-    IORM.in () ACE_ENV_ARG_PARAMETER);
+    IORM.in ());
 }
 
 int TAO::PG_Object_Group_Manipulator::set_primary (
       TAO_IOP::TAO_IOR_Property * prop,
       PortableGroup::ObjectGroup_ptr group,
-      CORBA::Object_ptr new_primary
-      ACE_ENV_ARG_DECL) const
+      CORBA::Object_ptr new_primary) const
 {
-  int sts = this->iorm_->is_primary_set (prop, group ACE_ENV_ARG_PARAMETER);
+  int sts = this->iorm_->is_primary_set (prop, group);
   if (sts)
   {
-    (void)this->iorm_->remove_primary_tag (prop, group ACE_ENV_ARG_PARAMETER);
+    (void)this->iorm_->remove_primary_tag (prop, group);
   }
   /////note: iorm takes it's parameters in the "wrong" order for this call
-  return this->iorm_->set_primary (prop, new_primary, group ACE_ENV_ARG_PARAMETER);
+  return this->iorm_->set_primary (prop, new_primary, group);
 }
 
 PortableGroup::ObjectGroup_ptr TAO::PG_Object_Group_Manipulator::merge_iors(
-  TAO_IOP::TAO_IOR_Manipulation::IORList & list ACE_ENV_ARG_DECL) const
+  TAO_IOP::TAO_IOR_Manipulation::IORList & list) const
 {
-  return this->iorm_->merge_iors (list ACE_ENV_ARG_PARAMETER);
+  return this->iorm_->merge_iors (list);
 }
 
 PortableGroup::ObjectGroup_ptr TAO::PG_Object_Group_Manipulator::remove_profiles(
       PortableGroup::ObjectGroup_ptr group,
-      PortableGroup::ObjectGroup_ptr profile
-      ACE_ENV_ARG_DECL) const
+      PortableGroup::ObjectGroup_ptr profile) const
 {
-  return this->iorm_->remove_profiles(group, profile ACE_ENV_ARG_PARAMETER);
+  return this->iorm_->remove_profiles(group, profile);
 }
 
 void dump_membership (const char * label, PortableGroup::ObjectGroup_ptr member)
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h
index 4397cbfe8e0..91c37045d1f 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h
@@ -53,8 +53,7 @@ namespace TAO
      * Initializes the group creator.
      */
     void init (CORBA::ORB_ptr orb,
-               PortableServer::POA_ptr poa
-               ACE_ENV_ARG_DECL);
+               PortableServer::POA_ptr poa);
 
     /**
      * Create an empty object group.
@@ -62,23 +61,19 @@ namespace TAO
     PortableGroup::ObjectGroup_ptr create_object_group (
       const char * type_id,
       const char * domain_id,
-      PortableGroup::ObjectGroupId & group_id
-      ACE_ENV_ARG_DECL);
+      PortableGroup::ObjectGroupId & group_id);
 
     PortableGroup::ObjectGroup_ptr remove_profiles (
       PortableGroup::ObjectGroup_ptr group,
-      PortableGroup::ObjectGroup_ptr profile
-      ACE_ENV_ARG_DECL) const;
+      PortableGroup::ObjectGroup_ptr profile) const;
 
     PortableGroup::ObjectGroup_ptr merge_iors (
-      TAO_IOP::TAO_IOR_Manipulation::IORList & iors
-      ACE_ENV_ARG_DECL) const;
+      TAO_IOP::TAO_IOR_Manipulation::IORList & iors) const;
 
     int set_primary (
       TAO_IOP::TAO_IOR_Property * prop,
       PortableGroup::ObjectGroup_ptr reference,
-      CORBA::Object_ptr new_primary
-      ACE_ENV_ARG_DECL) const;
+      CORBA::Object_ptr new_primary) const;
 
   void dump_membership (const char * label,
                         PortableGroup::ObjectGroup_ptr member) const;
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp
index 6cb93acdff3..71c22906cae 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp
@@ -26,23 +26,20 @@ TAO::PG_Properties_Support::~PG_Properties_Support ()
 }
 
 void TAO::PG_Properties_Support::set_default_property (const char * name,
-      const PortableGroup::Value & value
-      ACE_ENV_ARG_DECL)
+      const PortableGroup::Value & value)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->default_properties_.set_property(name, value ACE_ENV_ARG_PARAMETER);
+  this->default_properties_.set_property(name, value);
 }
 
-void TAO::PG_Properties_Support::set_default_properties (const PortableGroup::Properties & props
-    ACE_ENV_ARG_DECL)
+void TAO::PG_Properties_Support::set_default_properties (const PortableGroup::Properties & props)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->default_properties_.decode (props ACE_ENV_ARG_PARAMETER);
+  this->default_properties_.decode (props);
 }
 
 PortableGroup::Properties *
-TAO::PG_Properties_Support::get_default_properties (
-      ACE_ENV_SINGLE_ARG_DECL)
+TAO::PG_Properties_Support::get_default_properties ()
   ACE_THROW_SPEC ((
     CORBA::SystemException,
     PortableGroup::InvalidProperty,
@@ -55,8 +52,7 @@ TAO::PG_Properties_Support::get_default_properties (
 }
 
 void TAO::PG_Properties_Support::remove_default_properties (
-    const PortableGroup::Properties & props
-    ACE_ENV_ARG_DECL_NOT_USED)
+    const PortableGroup::Properties & props)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->default_properties_.remove (props);
@@ -65,8 +61,7 @@ void TAO::PG_Properties_Support::remove_default_properties (
 void
 TAO::PG_Properties_Support::set_type_properties (
     const char *type_id,
-    const PortableGroup::Properties & overrides
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Properties & overrides)
   ACE_THROW_SPEC ( (CORBA::SystemException,
                    PortableGroup::InvalidProperty,
                    PortableGroup::UnsupportedProperty))
@@ -83,13 +78,12 @@ TAO::PG_Properties_Support::set_type_properties (
     this->properties_map_.bind (type_id, typeid_properties);
   }
   typeid_properties->clear ();
-  typeid_properties->decode (overrides ACE_ENV_ARG_PARAMETER);
+  typeid_properties->decode (overrides);
 }
 
 PortableGroup::Properties *
 TAO::PG_Properties_Support::get_type_properties (
-    const char *type_id
-    ACE_ENV_ARG_DECL)
+    const char *type_id)
   ACE_THROW_SPEC ( (CORBA::SystemException))
 {
   PortableGroup::Properties_var result;
@@ -108,8 +102,7 @@ TAO::PG_Properties_Support::get_type_properties (
 void
 TAO::PG_Properties_Support::remove_type_properties (
     const char *type_id,
-    const PortableGroup::Properties & props
-    ACE_ENV_ARG_DECL_NOT_USED)
+    const PortableGroup::Properties & props)
   ACE_THROW_SPEC ( (CORBA::SystemException))
 {
   // NOTE: do not actually delete the properties for this type.
@@ -129,8 +122,7 @@ TAO::PG_Properties_Support::remove_type_properties (
 
 TAO::PG_Property_Set *
 TAO::PG_Properties_Support::find_typeid_properties (
-    const char *type_id
-    ACE_ENV_ARG_DECL)
+    const char *type_id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->internals_, 0);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h
index 89233d0f012..f3e6729c6f8 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h
@@ -73,8 +73,7 @@ namespace TAO
      * @value an Any containing the value.
      */
     void set_default_property (const char * name,
-          const PortableGroup::Value & value
-          ACE_ENV_ARG_DECL)
+          const PortableGroup::Value & value)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
     /**
@@ -85,8 +84,7 @@ namespace TAO
      *
      * @param props the set of properties to update the defaults.
      */
-    void set_default_properties (const PortableGroup::Properties & props
-         ACE_ENV_ARG_DECL)
+    void set_default_properties (const PortableGroup::Properties & props)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
     /**
@@ -113,8 +111,7 @@ namespace TAO
      * @param props a set of propertys to be removed by name.
      */
     void remove_default_properties (
-        const PortableGroup::Properties & props
-        ACE_ENV_ARG_DECL)
+        const PortableGroup::Properties & props)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /**
@@ -131,8 +128,7 @@ namespace TAO
      */
     void set_type_properties (
         const char *type_id,
-        const PortableGroup::Properties & overrides
-        ACE_ENV_ARG_DECL)
+        const PortableGroup::Properties & overrides)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableGroup::InvalidProperty,
@@ -156,8 +152,7 @@ namespace TAO
      * @returns a newly allocated PortableGroup::Properties that must be released by the caller.
      */
     PortableGroup::Properties * get_type_properties (
-        const char *type_id
-        ACE_ENV_ARG_DECL)
+        const char *type_id)
       ACE_THROW_SPEC ( (CORBA::SystemException));
 
     /**
@@ -174,8 +169,7 @@ namespace TAO
      * @returns a pointer to a Property_Set owned by this Properties_Support object.
      */
     TAO::PG_Property_Set *  find_typeid_properties (
-        const char *type_id
-        ACE_ENV_ARG_DECL)
+        const char *type_id)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /**
@@ -189,8 +183,7 @@ namespace TAO
      */
     void remove_type_properties (
         const char *type_id,
-        const PortableGroup::Properties & props
-        ACE_ENV_ARG_DECL)
+        const PortableGroup::Properties & props)
       ACE_THROW_SPEC ( (CORBA::SystemException));
 
     ///////////////
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
index 0cde16c21b8..0ced0341ca0 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
@@ -27,8 +27,7 @@ TAO_PG_PropertyManager::TAO_PG_PropertyManager (
 
 void
 TAO_PG_PropertyManager::set_default_properties (
-    const PortableGroup::Properties & props
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Properties & props)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::InvalidProperty,
                    PortableGroup::UnsupportedProperty))
@@ -46,12 +45,10 @@ TAO_PG_PropertyManager::set_default_properties (
       PortableGroup::Property property = props[i];
 
       if (property.nam == factories)
-        ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                   property.val));
+        throw PortableGroup::InvalidProperty (property.nam, property.val);
     }
 
-  this->property_validator_.validate_property (props
-                                               ACE_ENV_ARG_PARAMETER);
+  this->property_validator_.validate_property (props);
 
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_);
 
@@ -60,8 +57,7 @@ TAO_PG_PropertyManager::set_default_properties (
 
 
 PortableGroup::Properties *
-TAO_PG_PropertyManager::get_default_properties (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO_PG_PropertyManager::get_default_properties ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0);
@@ -81,8 +77,7 @@ TAO_PG_PropertyManager::get_default_properties (
 
 void
 TAO_PG_PropertyManager::remove_default_properties (
-    const PortableGroup::Properties &props
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Properties &props)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::InvalidProperty,
                    PortableGroup::UnsupportedProperty))
@@ -93,22 +88,19 @@ TAO_PG_PropertyManager::remove_default_properties (
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_);
 
   this->remove_properties (props,
-                           this->default_properties_
-                           ACE_ENV_ARG_PARAMETER);
+                           this->default_properties_);
 }
 
 
 void
 TAO_PG_PropertyManager::set_type_properties (
     const char * type_id,
-    const PortableGroup::Properties & overrides
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Properties & overrides)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::InvalidProperty,
                    PortableGroup::UnsupportedProperty))
 {
-  this->property_validator_.validate_property (overrides
-                                               ACE_ENV_ARG_PARAMETER);
+  this->property_validator_.validate_property (overrides);
 
   CORBA::ULong num_overrides = overrides.length ();
 
@@ -119,7 +111,7 @@ TAO_PG_PropertyManager::set_type_properties (
 
   Type_Prop_Table::ENTRY * entry = 0;
   if (this->type_properties_.find (type_id, entry) != 0)
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   PortableGroup::Properties & props = entry->int_id_;
   props = overrides;
@@ -128,8 +120,7 @@ TAO_PG_PropertyManager::set_type_properties (
 
 PortableGroup::Properties *
 TAO_PG_PropertyManager::get_type_properties (
-    const char * type_id
-    ACE_ENV_ARG_DECL)
+    const char * type_id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0);
@@ -176,8 +167,7 @@ TAO_PG_PropertyManager::get_type_properties (
 void
 TAO_PG_PropertyManager::remove_type_properties (
     const char * type_id,
-    const PortableGroup::Properties & props
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Properties & props)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::InvalidProperty,
                    PortableGroup::UnsupportedProperty))
@@ -189,21 +179,19 @@ TAO_PG_PropertyManager::remove_type_properties (
 
   Type_Prop_Table::ENTRY * entry = 0;
   if (this->type_properties_.find (type_id, entry) != 0)
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   PortableGroup::Properties & type_properties = entry->int_id_;
 
   this->remove_properties (props,
-                           type_properties
-                           ACE_ENV_ARG_PARAMETER);
+                           type_properties);
 }
 
 
 void
 TAO_PG_PropertyManager::set_properties_dynamically (
     PortableGroup::ObjectGroup_ptr /* object_group */,
-    const PortableGroup::Properties & /* overrides */
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Properties & /* overrides */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::InvalidProperty,
@@ -224,24 +212,21 @@ TAO_PG_PropertyManager::set_properties_dynamically (
       PortableGroup::Property property = props[i];
 
       if (property.nam == factories)
-        ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                   property.val));
+        throw PortableGroup::InvalidProperty (property.nam, property.val);
     }
 
-  this->property_validator_.validate_property (overrides
-                                               ACE_ENV_ARG_PARAMETER);
+  this->property_validator_.validate_property (overrides);
 
   // @todo Set the properties in the object group map entry.
 #endif  /* 0 */
 
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 
 PortableGroup::Properties *
 TAO_PG_PropertyManager::get_properties (
-    PortableGroup::ObjectGroup_ptr object_group
-    ACE_ENV_ARG_DECL)
+    PortableGroup::ObjectGroup_ptr object_group)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound))
 {
@@ -251,16 +236,14 @@ TAO_PG_PropertyManager::get_properties (
 
   // @@ Race condition here!
   PortableGroup::Properties_var dynamic_properties =
-    this->object_group_manager_.get_properties (object_group
-                                                ACE_ENV_ARG_PARAMETER);
+    this->object_group_manager_.get_properties (object_group);
 
   CORBA::ULong dyn_props_len = dynamic_properties->length ();
   if (dyn_props_len > properties_len)
     properties_len = dyn_props_len;
 
   CORBA::String_var type_id =
-    this->object_group_manager_.type_id (object_group
-                                         ACE_ENV_ARG_PARAMETER);
+    this->object_group_manager_.type_id (object_group);
 
   CORBA::ULong type_props_len = 0;
   PortableGroup::Properties * type_properties = 0;
@@ -312,8 +295,7 @@ TAO_PG_PropertyManager::get_properties (
 void
 TAO_PG_PropertyManager::remove_properties (
     const PortableGroup::Properties & to_be_removed,
-    PortableGroup::Properties &properties
-    ACE_ENV_ARG_DECL)
+    PortableGroup::Properties &properties)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::InvalidProperty,
                    PortableGroup::UnsupportedProperty))
@@ -345,8 +327,7 @@ TAO_PG_PropertyManager::remove_properties (
       // The property to be removed doesn't exist in the current list
       // of default properties.
       if (n == old_n)
-        ACE_THROW (PortableGroup::InvalidProperty (remove.nam,
-                                                   remove.val));
+        throw PortableGroup::InvalidProperty (remove.nam, remove.val);
     }
 
   // All properties were successfully removed, and the remaining ones
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h
index 5d6c40fa063..21b5837e4c7 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h
@@ -65,21 +65,18 @@ public:
 
   /// Set the default properties to be used by all object groups.
   virtual void set_default_properties (
-      const PortableGroup::Properties & props
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Properties & props)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::InvalidProperty,
                      PortableGroup::UnsupportedProperty));
 
   /// Get the default properties used by all object groups.
-  virtual PortableGroup::Properties * get_default_properties (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual PortableGroup::Properties * get_default_properties ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Remove default properties.
   virtual void remove_default_properties (
-      const PortableGroup::Properties & props
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Properties & props)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::InvalidProperty,
                      PortableGroup::UnsupportedProperty));
@@ -88,8 +85,7 @@ public:
   /// properties override the default properties.
   virtual void set_type_properties (
       const char * type_id,
-      const PortableGroup::Properties & overrides
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Properties & overrides)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::InvalidProperty,
                      PortableGroup::UnsupportedProperty));
@@ -100,15 +96,13 @@ public:
    * addition to the default properties that were not overridden.
    */
   virtual PortableGroup::Properties * get_type_properties (
-      const char * type_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const char * type_id)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Remove the given properties associated with the Replica type ID.
   virtual void remove_type_properties (
       const char * type_id,
-      const PortableGroup::Properties & props
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Properties & props)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::InvalidProperty,
                      PortableGroup::UnsupportedProperty));
@@ -121,8 +115,7 @@ public:
    */
   virtual void set_properties_dynamically (
       PortableGroup::ObjectGroup_ptr object_group,
-      const PortableGroup::Properties & overrides
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Properties & overrides)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound,
                      PortableGroup::InvalidProperty,
@@ -136,8 +129,7 @@ public:
    * that weren't overridden.
    */
   virtual PortableGroup::Properties * get_properties (
-      PortableGroup::ObjectGroup_ptr object_group
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableGroup::ObjectGroup_ptr object_group)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound));
 
@@ -156,8 +148,7 @@ private:
   /// Remove properties "to_be_removed" from the given list of
   /// properties.
   void remove_properties (const PortableGroup::Properties & to_be_removed,
-                          PortableGroup::Properties &properties
-                          ACE_ENV_ARG_DECL)
+                          PortableGroup::Properties &properties)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::InvalidProperty,
                      PortableGroup::UnsupportedProperty));
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp
index 196f92dd8e5..90d594d80d5 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp
@@ -27,22 +27,20 @@ TAO::PG_Property_Set::PG_Property_Set()
 }
 
 TAO::PG_Property_Set::PG_Property_Set (
-  const PortableGroup::Properties & property_set
-    ACE_ENV_ARG_DECL)
+  const PortableGroup::Properties & property_set)
   ACE_THROW_SPEC ((CORBA::SystemException))
   : defaults_ (0)
 {
-  this->decode (property_set ACE_ENV_ARG_PARAMETER);
+  this->decode (property_set);
 }
 
 TAO::PG_Property_Set::PG_Property_Set (
     const PortableGroup::Properties & property_set,
-    PG_Property_Set * defaults
-    ACE_ENV_ARG_DECL)
+    PG_Property_Set * defaults)
   ACE_THROW_SPEC ((CORBA::SystemException))
   : defaults_ (defaults)
 {
-  this->decode (property_set ACE_ENV_ARG_PARAMETER);
+  this->decode (property_set);
 }
 
 
@@ -58,8 +56,7 @@ TAO::PG_Property_Set::~PG_Property_Set ()
 }
 
 void
-TAO::PG_Property_Set::decode (const PortableGroup::Properties & property_set
-                              ACE_ENV_ARG_DECL)
+TAO::PG_Property_Set::decode (const PortableGroup::Properties & property_set)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_);
@@ -74,8 +71,7 @@ TAO::PG_Property_Set::decode (const PortableGroup::Properties & property_set
     const CosNaming::NameComponent & nc = nsName[0];
 
     this->set_property (static_cast<const char *> (nc.id),
-                        property.val
-                        ACE_ENV_ARG_PARAMETER);
+                        property.val);
 
 #if 0
     ACE_CString name = static_cast<const char *> (nc.id);
@@ -102,7 +98,7 @@ TAO::PG_Property_Set::decode (const PortableGroup::Properties & property_set
           ));
       }
       // @@ should throw something here
-      ACE_THROW (CORBA::NO_MEMORY ());
+      throw CORBA::NO_MEMORY ();
     }
 #endif
   }
@@ -148,8 +144,7 @@ void TAO::PG_Property_Set::remove (const PortableGroup::Properties & property_se
 
 void TAO::PG_Property_Set::set_property (
   const char * name,
-  const PortableGroup::Value & value
-  ACE_ENV_ARG_DECL)
+  const PortableGroup::Value & value)
 {
   ACE_CString key (name);
   PortableGroup::Value * value_copy;
@@ -174,7 +169,7 @@ void TAO::PG_Property_Set::set_property (
         ));
     }
     // @@ should throw something here
-    ACE_THROW (CORBA::NO_MEMORY ());
+    throw CORBA::NO_MEMORY ();
   }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h
index 44aae869da7..50a5515baac 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h
@@ -70,8 +70,7 @@ namespace TAO
      * constructor
      * @param property_set the properties to be decoded
      */
-    PG_Property_Set (const PortableGroup::Properties & property_set
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    PG_Property_Set (const PortableGroup::Properties & property_set)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /**
@@ -80,8 +79,7 @@ namespace TAO
      * @param defaults a propert set decoder that supplies default values.
      */
     PG_Property_Set (const PortableGroup::Properties & property_set,
-                     PG_Property_Set * defaults
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                     PG_Property_Set * defaults)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /**
@@ -112,7 +110,7 @@ namespace TAO
      * Duplicate values replace previous values.
      * @param property_set the properties to be decoded
      */
-    void decode (const PortableGroup::Properties & property_set ACE_ENV_ARG_DECL)
+    void decode (const PortableGroup::Properties & property_set)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /**
@@ -129,8 +127,7 @@ namespace TAO
      */
     void set_property (
       const char * name,
-      const PortableGroup::Value & value
-      ACE_ENV_ARG_DECL);
+      const PortableGroup::Value & value);
 
 
     /**
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp
index 44dc85aaf3d..1eb65a2faf7 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp
@@ -20,8 +20,7 @@ TAO_PG_Servant_Dispatcher::create_Root_POA (const ACE_CString &name,
                                             ACE_Lock &lock,
                                             TAO_SYNCH_MUTEX &thread_lock,
                                             TAO_ORB_Core &orb_core,
-                                            TAO_Object_Adapter *object_adapter
-                                            ACE_ENV_ARG_DECL)
+                                            TAO_Object_Adapter *object_adapter)
 {
   TAO_Root_POA *poa = 0;
 
@@ -33,8 +32,7 @@ TAO_PG_Servant_Dispatcher::create_Root_POA (const ACE_CString &name,
                              lock,
                              thread_lock,
                              orb_core,
-                             object_adapter
-                             ACE_ENV_ARG_PARAMETER),
+                             object_adapter),
                     CORBA::NO_MEMORY ());
 
   return poa;
@@ -45,8 +43,7 @@ TAO_PG_Servant_Dispatcher::pre_invoke_remote_request (
   TAO_Root_POA &,
   CORBA::Short,
   TAO_ServerRequest &,
-  TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &
-  ACE_ENV_ARG_DECL_NOT_USED)
+  TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &)
 {
 }
 
@@ -54,8 +51,7 @@ void
 TAO_PG_Servant_Dispatcher::pre_invoke_collocated_request (
   TAO_Root_POA &,
   CORBA::Short,
-  TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &
-  ACE_ENV_ARG_DECL_NOT_USED)
+  TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &)
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h
index a5718c240cc..9d7f33e9ce6 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h
@@ -42,14 +42,12 @@ public:
   void pre_invoke_remote_request (TAO_Root_POA &poa,
                                   CORBA::Short servant_priority,
                                   TAO_ServerRequest &req,
-                                  TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
-                                  ACE_ENV_ARG_DECL);
+                                  TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state);
 
   /// Pre_invoke collocated request.
   void pre_invoke_collocated_request (TAO_Root_POA &poa,
                                       CORBA::Short servant_priority,
-                                      TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
-                                      ACE_ENV_ARG_DECL);
+                                      TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state);
 
   /// Post_invoke request.
   void post_invoke (TAO_Root_POA &poa,
@@ -62,8 +60,7 @@ public:
                                  ACE_Lock &lock,
                                  TAO_SYNCH_MUTEX &thread_lock,
                                  TAO_ORB_Core &orb_core,
-                                 TAO_Object_Adapter *object_adapter
-                                 ACE_ENV_ARG_DECL);
+                                 TAO_Object_Adapter *object_adapter);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
index 2962b4a5270..ce55617b726 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
@@ -37,8 +37,7 @@ TAO_PortableGroup_Acceptor_Registry::~TAO_PortableGroup_Acceptor_Registry (void)
 
 void
 TAO_PortableGroup_Acceptor_Registry::open (const TAO_Profile* profile,
-                                           TAO_ORB_Core &orb_core
-                                           ACE_ENV_ARG_DECL)
+                                           TAO_ORB_Core &orb_core)
 {
   Entry *entry;
 
@@ -68,8 +67,7 @@ TAO_PortableGroup_Acceptor_Registry::open (const TAO_Profile* profile,
             {
               this->open_i (profile,
                             orb_core,
-                            factory
-                            ACE_ENV_ARG_PARAMETER);
+                            factory);
 
               // found = 1;  // A usable protocol was found.
             }
@@ -84,8 +82,7 @@ TAO_PortableGroup_Acceptor_Registry::open (const TAO_Profile* profile,
 void
 TAO_PortableGroup_Acceptor_Registry::open_i (const TAO_Profile* profile,
                                              TAO_ORB_Core &orb_core,
-                                             TAO_ProtocolFactorySetItor &factory
-                                             ACE_ENV_ARG_DECL)
+                                             TAO_ProtocolFactorySetItor &factory)
 {
   TAO_Acceptor *acceptor = (*factory)->factory ()->make_acceptor ();
 
@@ -118,11 +115,11 @@ TAO_PortableGroup_Acceptor_Registry::open_i (const TAO_Profile* profile,
                         buffer,
                         ""));
 
-          ACE_THROW (CORBA::BAD_PARAM (
-              CORBA::SystemException::_tao_minor_code (
-                TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
-                EINVAL),
-              CORBA::COMPLETED_NO));
+          throw CORBA::BAD_PARAM (
+            CORBA::SystemException::_tao_minor_code (
+              TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
+              EINVAL),
+            CORBA::COMPLETED_NO);
         }
 
       // Add acceptor to list.
@@ -143,11 +140,11 @@ TAO_PortableGroup_Acceptor_Registry::open_i (const TAO_Profile* profile,
                         buffer,
                         ""));
 
-          ACE_THROW (CORBA::BAD_PARAM (
-              CORBA::SystemException::_tao_minor_code (
-                TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
-                EINVAL),
-              CORBA::COMPLETED_NO));
+          throw CORBA::BAD_PARAM (
+            CORBA::SystemException::_tao_minor_code (
+              TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
+              EINVAL),
+            CORBA::COMPLETED_NO);
         }
     }
   else
@@ -158,11 +155,11 @@ TAO_PortableGroup_Acceptor_Registry::open_i (const TAO_Profile* profile,
                     ACE_TEXT ("unable to create acceptor ")
                     ));
 
-      ACE_THROW (CORBA::BAD_PARAM (
-          CORBA::SystemException::_tao_minor_code (
-            TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
-            EINVAL),
-          CORBA::COMPLETED_NO));
+      throw CORBA::BAD_PARAM (
+        CORBA::SystemException::_tao_minor_code (
+          TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
+          EINVAL),
+        CORBA::COMPLETED_NO);
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h
index 1ecc90efa4d..c95ca388c73 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h
@@ -77,8 +77,7 @@ public:
 
   /// Open an acceptor based on a tagged profile.
   void open (const TAO_Profile* profile,
-             TAO_ORB_Core &orb_core
-             ACE_ENV_ARG_DECL);
+             TAO_ORB_Core &orb_core);
 
   /// Close all open acceptors.
   int close_all (void);
@@ -91,8 +90,7 @@ protected:
   /// Helper function to open a group acceptor.
   void open_i (const TAO_Profile* profile,
                TAO_ORB_Core &orb_core,
-               TAO_ProtocolFactorySetItor &factory
-               ACE_ENV_ARG_DECL);
+               TAO_ProtocolFactorySetItor &factory);
 
   /// Find an acceptor by using a profile.
   int find (const TAO_Profile* profile,
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
index aba18845954..439dea22c4e 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
@@ -24,7 +24,7 @@ TAO_PortableGroup_Loader::init (int /*argc*/,
 {
   ACE_TRACE ("TAO_PortableGroup_Loader::init");
   // Register the ORB initializer.
-  ACE_TRY_NEW_ENV
+  try
     {
       PortableInterceptor::ORBInitializer_ptr temp_orb_initializer =
         PortableInterceptor::ORBInitializer::_nil ();
@@ -40,16 +40,14 @@ TAO_PortableGroup_Loader::init (int /*argc*/,
                           CORBA::COMPLETED_NO));
       orb_initializer = temp_orb_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            "Unexpected exception caught while initializing the PortableGroup:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
index 94c07aba6e4..9ac5f584dd0 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
@@ -20,14 +20,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 TAO_PortableGroup_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Narrow to a TAO_ORBInitInfo object to get access to the
   // orb_core() TAO extension.
-  TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info
-                                                           ACE_ENV_ARG_PARAMETER);
+  TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info);
 
   if (CORBA::is_nil (tao_info.in ()))
     {
@@ -38,7 +36,7 @@ TAO_PortableGroup_ORBInitializer::pre_init (
                     "\"PortableInterceptor::ORBInitInfo_ptr\" to\n"
                     "(%P|%t)   \"TAO_ORBInitInfo_ptr.\"\n"));
 
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   // Set a new request dispatcher in the ORB.
@@ -60,8 +58,7 @@ TAO_PortableGroup_ORBInitializer::pre_init (
 
 void
 TAO_PortableGroup_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h
index 56f730edd59..0729f32766c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h
@@ -40,12 +40,10 @@ class TAO_PortableGroup_Export TAO_PortableGroup_ORBInitializer :
   public virtual TAO_Local_RefCounted_Object
 {
 public:
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 };
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp
index 90746bf0dc8..35ca472f796 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp
@@ -20,8 +20,7 @@ PortableGroup_Request_Dispatcher::~PortableGroup_Request_Dispatcher (void)
 void
 PortableGroup_Request_Dispatcher::dispatch (TAO_ORB_Core *orb_core,
                                             TAO_ServerRequest &request,
-                                            CORBA::Object_out forward_to
-                                            ACE_ENV_ARG_DECL)
+                                            CORBA::Object_out forward_to)
 {
   // Check if the request contains a tagged profile
   if (request.profile ().discriminator () == GIOP::ProfileAddr)
@@ -40,8 +39,7 @@ PortableGroup_Request_Dispatcher::dispatch (TAO_ORB_Core *orb_core,
           this->group_map_.dispatch (&group,
                                      orb_core,
                                      request,
-                                     forward_to
-                                     ACE_ENV_ARG_PARAMETER);
+                                     forward_to);
 
           return;
         }
@@ -52,8 +50,7 @@ PortableGroup_Request_Dispatcher::dispatch (TAO_ORB_Core *orb_core,
   // Dispatch based on object key.
   orb_core->adapter_registry ()->dispatch (request.object_key (),
                                            request,
-                                           forward_to
-                                           ACE_ENV_ARG_PARAMETER);
+                                           forward_to);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h
index fb6ae13e934..ea140f7a4a1 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h
@@ -50,8 +50,7 @@ public:
    */
   virtual void dispatch (TAO_ORB_Core *orb_core,
                          TAO_ServerRequest &request,
-                         CORBA::Object_out forward_to
-                         ACE_ENV_ARG_DECL);
+                         CORBA::Object_out forward_to);
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
index 87d925d5435..edc4b8d93b4 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
@@ -45,7 +45,6 @@ void
 TAO_Portable_Group_Map::add_groupid_objectkey_pair (
     PortableGroup::TagGroupTaggedComponent *group_id,
     const TAO::ObjectKey &key
-    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX,
@@ -90,7 +89,7 @@ TAO_Portable_Group_Map::add_groupid_objectkey_pair (
       if (result != 0)
         {
           delete new_entry;
-          ACE_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
 
       // Transfer ownership of group_id to the map.
@@ -100,8 +99,7 @@ TAO_Portable_Group_Map::add_groupid_objectkey_pair (
 
 void
 TAO_Portable_Group_Map::remove_groupid_objectkey_pair (const PortableGroup::TagGroupTaggedComponent* /*group_id*/,
-                                                       const TAO::ObjectKey &/*key*/
-                                                       ACE_ENV_ARG_DECL_NOT_USED)
+                                                       const TAO::ObjectKey &/*key*/)
 {
 
 }
@@ -111,8 +109,7 @@ void
 TAO_Portable_Group_Map::dispatch (PortableGroup::TagGroupTaggedComponent* group_id,
                                   TAO_ORB_Core *orb_core,
                                   TAO_ServerRequest &request,
-                                  CORBA::Object_out forward_to
-                                  ACE_ENV_ARG_DECL)
+                                  CORBA::Object_out forward_to)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX,
              guard,
@@ -137,8 +134,7 @@ TAO_Portable_Group_Map::dispatch (PortableGroup::TagGroupTaggedComponent* group_
         {
           orb_core->adapter_registry ()->dispatch (entry->key,
                                                    request,
-                                                   forward_to
-                                                   ACE_ENV_ARG_PARAMETER);
+                                                   forward_to);
 
           // Reset the read pointer in the message block.
           msgblk->rd_ptr (read_ptr);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h
index c6c69ae9e11..d4c8ecd01b6 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h
@@ -95,22 +95,19 @@ public:
   /// Add a GroupId->ObjectKey mapping to the map.
   /// This function takes ownership of the memory pointed to be group_id
   void add_groupid_objectkey_pair (PortableGroup::TagGroupTaggedComponent *group_id,
-                                   const TAO::ObjectKey &key
-                                   ACE_ENV_ARG_DECL);
+                                   const TAO::ObjectKey &key);
 
 
   /// Remove a GroupId->ObjectKey mapping from the map.
   void remove_groupid_objectkey_pair (const PortableGroup::TagGroupTaggedComponent* group_id,
-                                      const TAO::ObjectKey &key
-                                      ACE_ENV_ARG_DECL);
+                                      const TAO::ObjectKey &key);
 
   /// Dispatch a request to all of the ObjectIds that belong to
   /// the specified group.
   void dispatch (PortableGroup::TagGroupTaggedComponent* group_id,
                                     TAO_ORB_Core *orb_core,
                                     TAO_ServerRequest &request,
-                                    CORBA::Object_out forward_to
-                                    ACE_ENV_ARG_DECL);
+                                    CORBA::Object_out forward_to);
 
   /// Id hash map.
   typedef ACE_Hash_Map_Manager_Ex<
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
index 7e69bc96aa7..31ce6b54f00 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
@@ -73,8 +73,7 @@ TAO_UIPMC_Profile::TAO_UIPMC_Profile (const CORBA::Octet class_d_address[4],
 /*
 
 TAO_UIPMC_Profile::TAO_UIPMC_Profile (const char *string,
-                                      TAO_ORB_Core *orb_core
-                                      ACE_ENV_ARG_DECL)
+                                      TAO_ORB_Core *orb_core)
   : TAO_Profile (TAO_TAG_UIPMC_PROFILE,
                  orb_core,
                  TAO_GIOP_Message_Version (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR)),
@@ -83,7 +82,7 @@ TAO_UIPMC_Profile::TAO_UIPMC_Profile (const char *string,
     tagged_profile_ ()
 {
   this->add_group_component ();
-  this->parse_string (string ACE_ENV_ARG_PARAMETER);
+  this->parse_string (string);
   addressing_mode_ = default_addressing_mode_;
 }
 
@@ -190,16 +189,13 @@ TAO_UIPMC_Profile::decode_profile (TAO_InputCDR& cdr)
 }
 
 void
-TAO_UIPMC_Profile::parse_string (const char *string
-                                 ACE_ENV_ARG_DECL)
+TAO_UIPMC_Profile::parse_string (const char *string)
 {
-  this->parse_string_i (string
-                        ACE_ENV_ARG_PARAMETER);
+  this->parse_string_i (string);
 }
 
 void
-TAO_UIPMC_Profile::parse_string_i (const char *string
-                                   ACE_ENV_ARG_DECL)
+TAO_UIPMC_Profile::parse_string_i (const char *string)
 {
   // Remove the "N.n@" version prefix, if it exists, and verify the
   // version is one that we accept.
@@ -213,11 +209,11 @@ TAO_UIPMC_Profile::parse_string_i (const char *string
       if (string[0] != '1' ||
           string[2] != '0')
         {
-          ACE_THROW (CORBA::INV_OBJREF (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO::VMCID,
-                            EINVAL),
-                          CORBA::COMPLETED_NO));
+          throw CORBA::INV_OBJREF (
+            CORBA::SystemException::_tao_minor_code (
+              TAO::VMCID,
+              EINVAL),
+            CORBA::COMPLETED_NO);
         }
 
       string += 4;
@@ -247,11 +243,11 @@ TAO_UIPMC_Profile::parse_string_i (const char *string
       if (major != TAO_DEF_MIOP_MAJOR ||
           minor >  TAO_DEF_MIOP_MINOR)
         {
-          ACE_THROW (CORBA::INV_OBJREF (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO::VMCID,
-                            EINVAL),
-                          CORBA::COMPLETED_NO));
+          throw CORBA::INV_OBJREF (
+            CORBA::SystemException::_tao_minor_code (
+              TAO::VMCID,
+              EINVAL),
+            CORBA::COMPLETED_NO);
         }
 
       // Skip over "N.n-"
@@ -260,11 +256,11 @@ TAO_UIPMC_Profile::parse_string_i (const char *string
   else
     {
       // The group component version is mandatory.
-      ACE_THROW (CORBA::INV_OBJREF (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO::VMCID,
-                        EINVAL),
-                      CORBA::COMPLETED_NO));
+      throw CORBA::INV_OBJREF (
+        CORBA::SystemException::_tao_minor_code (
+          TAO::VMCID,
+          EINVAL),
+        CORBA::COMPLETED_NO);
     }
 
   // Parse the group_domain_id.
@@ -280,11 +276,11 @@ TAO_UIPMC_Profile::parse_string_i (const char *string
     {
       // The group_domain_id is mandatory, so throw an
       // exception if it isn't found.
-      ACE_THROW (CORBA::INV_OBJREF (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO::VMCID,
-                        EINVAL),
-                      CORBA::COMPLETED_NO));
+      throw CORBA::INV_OBJREF (
+        CORBA::SystemException::_tao_minor_code (
+          TAO::VMCID,
+          EINVAL),
+        CORBA::COMPLETED_NO);
     }
 
   // Save the group_domain_id.
@@ -313,11 +309,11 @@ TAO_UIPMC_Profile::parse_string_i (const char *string
       if (end_pos == ACE_CString::npos)
         {
           // The Group ID is mandatory, so throw an exception.
-          ACE_THROW (CORBA::INV_OBJREF (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO::VMCID,
-                            EINVAL),
-                          CORBA::COMPLETED_NO));
+          throw CORBA::INV_OBJREF (
+            CORBA::SystemException::_tao_minor_code (
+              TAO::VMCID,
+              EINVAL),
+            CORBA::COMPLETED_NO);
         }
     }
 
@@ -340,11 +336,11 @@ TAO_UIPMC_Profile::parse_string_i (const char *string
         {
           // The group version was expected but not found,
           // so throw an exception.
-          ACE_THROW (CORBA::INV_OBJREF (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO::VMCID,
-                            EINVAL),
-                          CORBA::COMPLETED_NO));
+          throw CORBA::INV_OBJREF (
+            CORBA::SystemException::_tao_minor_code (
+              TAO::VMCID,
+              EINVAL),
+            CORBA::COMPLETED_NO);
         }
 
       ACE_CString str_group_ref_ver = ace_str.substring (pos, end_pos - pos);
@@ -362,11 +358,11 @@ TAO_UIPMC_Profile::parse_string_i (const char *string
     {
       // The multicast address is mandatory, so throw an exception,
       // since it wasn't found.
-      ACE_THROW (CORBA::INV_OBJREF (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO::VMCID,
-                        EINVAL),
-                      CORBA::COMPLETED_NO));
+      throw CORBA::INV_OBJREF (
+        CORBA::SystemException::_tao_minor_code (
+          TAO::VMCID,
+          EINVAL),
+        CORBA::COMPLETED_NO);
     }
 
   ACE_CString mcast_addr = ace_str.substring (pos, end_pos - pos);
@@ -379,11 +375,11 @@ TAO_UIPMC_Profile::parse_string_i (const char *string
     {
       // The multicast port is mandatory, so throw an exception,
       // since it wasn't found.
-      ACE_THROW (CORBA::INV_OBJREF (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO::VMCID,
-                        EINVAL),
-                      CORBA::COMPLETED_NO));
+      throw CORBA::INV_OBJREF (
+        CORBA::SystemException::_tao_minor_code (
+          TAO::VMCID,
+          EINVAL),
+        CORBA::COMPLETED_NO);
     }
 
   CORBA::UShort mcast_port =
@@ -415,8 +411,7 @@ TAO_UIPMC_Profile::do_is_equivalent (const TAO_Profile *other_profile)
 }
 
 CORBA::ULong
-TAO_UIPMC_Profile::hash (CORBA::ULong max
-                         ACE_ENV_ARG_DECL_NOT_USED)
+TAO_UIPMC_Profile::hash (CORBA::ULong max)
 {
   // Get the hashvalue for all endpoints.
   CORBA::ULong hashval = this->endpoint_.hash ();
@@ -662,8 +657,7 @@ TAO_UIPMC_Profile::update_cached_group_component (void)
 void
 TAO_UIPMC_Profile::request_target_specifier (
                       TAO_Target_Specification &target_spec,
-                      TAO_Target_Specification::TAO_Target_Address required_type
-                      ACE_ENV_ARG_DECL)
+                      TAO_Target_Specification::TAO_Target_Address required_type)
 {
   // Fill out the target specifier based on the required type.
   switch (required_type)
@@ -681,7 +675,7 @@ TAO_UIPMC_Profile::request_target_specifier (
     case TAO_Target_Specification::Reference_Addr:
     default:
       // Unsupported or unknown required type.  Throw an exception.
-      ACE_THROW (CORBA::MARSHAL ());
+      throw CORBA::MARSHAL ();
     }
 }
 
@@ -693,8 +687,7 @@ TAO_UIPMC_Profile::supports_multicast (void) const
 }
 
 void
-TAO_UIPMC_Profile::addressing_mode (CORBA::Short addr_mode
-                                    ACE_ENV_ARG_DECL)
+TAO_UIPMC_Profile::addressing_mode (CORBA::Short addr_mode)
 {
   // ** See race condition note about addressing mode in Profile.h **
   switch (addr_mode)
@@ -708,11 +701,11 @@ TAO_UIPMC_Profile::addressing_mode (CORBA::Short addr_mode
       // There is no object key, so it is not supported.
 
     default:
-      ACE_THROW (CORBA::BAD_PARAM (
-             CORBA::SystemException::_tao_minor_code (
-               TAO::VMCID,
-               EINVAL),
-             CORBA::COMPLETED_NO));
+      throw CORBA::BAD_PARAM (
+        CORBA::SystemException::_tao_minor_code (
+          TAO::VMCID,
+          EINVAL),
+        CORBA::COMPLETED_NO);
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
index bd7074695bf..3642aa0c600 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
@@ -74,8 +74,7 @@ public:
 
   /// Create object using a string ior.
   TAO_UIPMC_Profile (const char *string,
-                     TAO_ORB_Core *orb_core
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                     TAO_ORB_Core *orb_core);
 
   /// Destructor is to be called only through <_decr_refcnt>.
   ~TAO_UIPMC_Profile (void);
@@ -86,22 +85,18 @@ public:
   /// in UIPMC there is no object key marshalled and we do not implement
   /// a useable ::decode_endpoints
   virtual int decode (TAO_InputCDR& cdr);
-  virtual void parse_string (const char *string
-                             ACE_ENV_ARG_DECL);
+  virtual void parse_string (const char *string);
   virtual char * to_string (void);
   virtual int encode_endpoints (void);
   virtual TAO_Endpoint *endpoint (void);
   virtual CORBA::ULong endpoint_count (void) const;
-  virtual CORBA::ULong hash (CORBA::ULong max
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  virtual CORBA::ULong hash (CORBA::ULong max);
   virtual IOP::TaggedProfile &create_tagged_profile (void);
   virtual void request_target_specifier (
                       TAO_Target_Specification &target_spec,
-                      TAO_Target_Specification::TAO_Target_Address r
-                      ACE_ENV_ARG_DECL);
+                      TAO_Target_Specification::TAO_Target_Address r);
   virtual int supports_multicast (void) const;
-  virtual void addressing_mode (CORBA::Short addr_mode
-                                ACE_ENV_ARG_DECL);
+  virtual void addressing_mode (CORBA::Short addr_mode);
   static int extract_group_component (const IOP::TaggedProfile &profile,
                                       PortableGroup::TagGroupTaggedComponent &group);
 
@@ -115,8 +110,7 @@ protected:
   /// Template methods, please see documentation in tao/Profile.h
   virtual int decode_profile (TAO_InputCDR& cdr);
   virtual int decode_endpoints (void);
-  virtual void parse_string_i (const char *
-                               ACE_ENV_ARG_DECL);
+  virtual void parse_string_i (const char *);
   virtual void create_profile_body (TAO_OutputCDR &cdr) const;
   virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
   virtual void update_cached_group_component (void);
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
index da43bc14b8f..f1f4953377f 100644
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
@@ -121,21 +121,19 @@ TAO_PropertySetFactory::create_propertyset (void)
 
 CosPropertyService::PropertySet_ptr
 TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService::PropertyTypes &allowed_property_types,
-                                                        const CosPropertyService::Properties &allowed_properties
-                                                        ACE_ENV_ARG_DECL)
+                                                        const CosPropertyService::Properties &allowed_properties)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::ConstraintNotSupported))
 {
   TAO_PropertySet *new_set = 0;
   CosPropertyService::PropertySet_ptr propset_ptr = 0;
 
-  ACE_TRY
+  try
     {
       // New a TAO_PropertySet using these constraints.
       ACE_NEW_RETURN (new_set,
                       TAO_PropertySet (allowed_property_types,
-                                       allowed_properties
-                                       ACE_ENV_ARG_PARAMETER), 0);
+                                       allowed_properties), 0);
 
       // Successful, store this in the products sequence.
       CORBA::ULong products_len = this->propertyset_products_.length ();
@@ -145,23 +143,22 @@ TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService
       // All done.
       propset_ptr = new_set->_this ();
     }
-  ACE_CATCH (CORBA::UserException, ex)
+  catch (const CORBA::UserException& )
     {
       // Release the memory.
       delete new_set;
 
       // Throw the exception.
-      ACE_TRY_THROW (CosPropertyService::ConstraintNotSupported());
+      throw CosPropertyService::ConstraintNotSupported();
     }
-  ACE_CATCH (CORBA::SystemException, ex)
+  catch (const CORBA::SystemException& )
     {
       // Release memory.
       delete new_set;
 
       // Throw the exception.
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
 
   return propset_ptr;
 }
@@ -170,20 +167,18 @@ TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService
 // constraints. "All the properties will have *fixed-normal* modes".
 
 CosPropertyService::PropertySet_ptr
-TAO_PropertySetFactory::create_initial_propertyset (const CosPropertyService::Properties &initial_properties
-                                                    ACE_ENV_ARG_DECL)
+TAO_PropertySetFactory::create_initial_propertyset (const CosPropertyService::Properties &initial_properties)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::MultipleExceptions))
 {
   TAO_PropertySet *new_set = 0;
   CosPropertyService::PropertySet_ptr propset_ptr = 0;
 
-  ACE_TRY
+  try
     {
       // New a TAO_PropertySet.
       ACE_NEW_RETURN (new_set,
-                      TAO_PropertySet (initial_properties
-                                       ACE_ENV_ARG_PARAMETER), 0);
+                      TAO_PropertySet (initial_properties), 0);
 
       // Successful, store this in the products sequence.
       CORBA::ULong products_len = this->propertyset_products_.length ();
@@ -193,23 +188,22 @@ TAO_PropertySetFactory::create_initial_propertyset (const CosPropertyService::Pr
       // All done.
       propset_ptr = new_set->_this ();
     }
-  ACE_CATCH (CosPropertyService::MultipleExceptions, ex)
+  catch (const CosPropertyService::MultipleExceptions& )
     {
       // Release memory.
       delete new_set;
 
       // Throw the exception.
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_CATCH (CORBA::SystemException, ex)
+  catch (const CORBA::SystemException& )
     {
       // Release the memory.
       delete new_set;
 
       // Throw the exception.
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
 
   return propset_ptr;
 }
@@ -257,21 +251,19 @@ TAO_PropertySetDefFactory::create_propertysetdef (void)
 
 CosPropertyService::PropertySetDef_ptr
 TAO_PropertySetDefFactory::create_constrained_propertysetdef (const CosPropertyService::PropertyTypes &allowed_property_types,
-                                                              const CosPropertyService::PropertyDefs &allowed_property_defs
-                                                              ACE_ENV_ARG_DECL)
+                                                              const CosPropertyService::PropertyDefs &allowed_property_defs)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::ConstraintNotSupported))
 {
   TAO_PropertySetDef *new_set = 0;
   CosPropertyService::PropertySetDef_ptr propsetdef_ptr = 0;
 
-  ACE_TRY
+  try
     {
       // New a TAO_PropertySetDef using these constraints.
       ACE_NEW_RETURN (new_set,
                       TAO_PropertySetDef (allowed_property_types,
-                                          allowed_property_defs
-                                          ACE_ENV_ARG_PARAMETER), 0);
+                                          allowed_property_defs), 0);
 
       // Successful, store this in the products sequence.
       CORBA::ULong products_len = this->propertysetdef_products_.length ();
@@ -281,23 +273,22 @@ TAO_PropertySetDefFactory::create_constrained_propertysetdef (const CosPropertyS
       // All done. Return the pointer.
       propsetdef_ptr = new_set->_this ();
     }
-  ACE_CATCH (CORBA::UserException, ex)
+  catch (const CORBA::UserException& )
     {
       // Release the memory.
       delete new_set;
 
       // Throw the exception.
-      ACE_TRY_THROW (CosPropertyService::ConstraintNotSupported());
+      throw CosPropertyService::ConstraintNotSupported();
     }
-  ACE_CATCH (CORBA::SystemException, ex)
+  catch (const CORBA::SystemException& )
     {
       // Release memory.
       delete new_set;
 
       // Throw the exception.
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
 
   return propsetdef_ptr;
 }
@@ -306,20 +297,18 @@ TAO_PropertySetDefFactory::create_constrained_propertysetdef (const CosPropertyS
 // initital constraints.
 
 CosPropertyService::PropertySetDef_ptr
-TAO_PropertySetDefFactory::create_initial_propertysetdef (const CosPropertyService::PropertyDefs &initial_property_defs
-                                                          ACE_ENV_ARG_DECL)
+TAO_PropertySetDefFactory::create_initial_propertysetdef (const CosPropertyService::PropertyDefs &initial_property_defs)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::MultipleExceptions))
 {
   TAO_PropertySetDef *new_set = 0;
   CosPropertyService::PropertySetDef_ptr propsetdef_ptr = 0;
 
-  ACE_TRY
+  try
     {
       // New a TAO_PropertySet using these lengths.
       ACE_NEW_RETURN (new_set,
-                      TAO_PropertySetDef (initial_property_defs
-                                          ACE_ENV_ARG_PARAMETER), 0);
+                      TAO_PropertySetDef (initial_property_defs), 0);
 
       // Successful, store this in the products sequence.
       CORBA::ULong products_len = this->propertysetdef_products_.length ();
@@ -329,23 +318,22 @@ TAO_PropertySetDefFactory::create_initial_propertysetdef (const CosPropertyServi
       // All done.
       propsetdef_ptr = new_set->_this ();
     }
-  ACE_CATCH (CosPropertyService::MultipleExceptions, ex)
+  catch (const CosPropertyService::MultipleExceptions& )
     {
       // Release memory.
       delete new_set;
 
       // Throw the exception.
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_CATCH (CORBA::SystemException, ex)
+  catch (const CORBA::SystemException& )
     {
       // Release the memory.
       delete new_set;
 
       // Throw the exception.
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
 
   return propsetdef_ptr;
 }
@@ -365,8 +353,7 @@ TAO_PropertySet::TAO_PropertySet (void)
 
 
 TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowed_property_types,
-                                      const CosPropertyService::Properties allowed_properties
-                                      ACE_ENV_ARG_DECL)
+                                      const CosPropertyService::Properties allowed_properties)
   : allowed_property_types_ (allowed_property_types),
     allowed_property_names_ (allowed_properties.length ())
 {
@@ -381,25 +368,22 @@ TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowe
       allowed_properties[ni].property_name;
 
   // Define the allowed properties in the hash table.
-  ACE_TRY
+  try
     {
-      this->define_properties (allowed_properties
-                               ACE_ENV_ARG_PARAMETER);
+      this->define_properties (allowed_properties);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_PropertySet-Constructor");
-      ACE_RE_THROW;
+      ex._tao_print_exception ("TAO_PropertySet-Constructor");
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 // TAO_PropertySetDef's constructor needs this, for initializing the
 // allowed properties' sequence withe just the maximum length.
 
 TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowed_property_types,
-                                      const CORBA::ULong number_of_allowed_properties
-                                      ACE_ENV_ARG_DECL_NOT_USED)
+                                      const CORBA::ULong number_of_allowed_properties)
   : allowed_property_types_ (allowed_property_types),
     allowed_property_names_ (number_of_allowed_properties)
 {
@@ -409,22 +393,19 @@ TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowe
 // properies with *normal* modes.
 
 
-TAO_PropertySet::TAO_PropertySet (const CosPropertyService::Properties initial_properties
-                                  ACE_ENV_ARG_DECL)
+TAO_PropertySet::TAO_PropertySet (const CosPropertyService::Properties initial_properties)
 {
   // Define all the initial properties in the Property Set. All take
   // *normal* modes.
-  ACE_TRY
+  try
     {
-      this->define_properties (initial_properties
-                               ACE_ENV_ARG_PARAMETER);
+      this->define_properties (initial_properties);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_PropertySet-Constructor");
-      ACE_RE_THROW;
+      ex._tao_print_exception ("TAO_PropertySet-Constructor");
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 // Destructor. All sequences will be deleted.
@@ -443,8 +424,7 @@ TAO_PropertySet::~TAO_PropertySet (void)
 
 void
 TAO_PropertySet::define_property (const char *property_name,
-                                  const CORBA::Any &property_value
-                                  ACE_ENV_ARG_DECL)
+                                  const CORBA::Any &property_value)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::InvalidPropertyName,
                    CosPropertyService::ConflictingProperty,
@@ -454,17 +434,17 @@ TAO_PropertySet::define_property (const char *property_name,
 {
   // Check the name's validity.
   if (property_name == 0)
-    ACE_THROW (CosPropertyService::InvalidPropertyName());
+    throw CosPropertyService::InvalidPropertyName();
 
   CORBA::TypeCode_var arg_tc = property_value.type ();
 
   // Is this type allowed?
   if (is_type_allowed (arg_tc.in ()) != 1)
-    ACE_THROW (CosPropertyService::UnsupportedTypeCode());
+    throw CosPropertyService::UnsupportedTypeCode();
 
   // Is this property allowed?
   if (is_property_allowed (property_name) != 1)
-    ACE_THROW (CosPropertyService::UnsupportedProperty());
+    throw CosPropertyService::UnsupportedProperty();
 
   // Try to bind the property. Use normal mode.
   CosProperty_Hash_Key hash_key (property_name);
@@ -489,24 +469,23 @@ TAO_PropertySet::define_property (const char *property_name,
 
       // Is the pointer valid?
       if (entry_ptr == 0)
-        ACE_THROW (CORBA::UNKNOWN ());
+        throw CORBA::UNKNOWN ();
 
       mapped_tc = entry_ptr->int_id_.pvalue_.type ();
 
       {
         CORBA::Boolean const equal_tc =
-          mapped_tc.in ()->equal (arg_tc.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+          mapped_tc.in ()->equal (arg_tc.in ());
 
         // If type is not the same, raise exception.
         if (!equal_tc)
-          ACE_THROW (CosPropertyService::ConflictingProperty());
+          throw CosPropertyService::ConflictingProperty();
       }
 
       // If mode is read only, raise exception.
       if ((entry_ptr->int_id_.pmode_ == CosPropertyService::read_only) ||
           (entry_ptr->int_id_.pmode_ == CosPropertyService::fixed_readonly))
-        ACE_THROW (CosPropertyService::ReadOnlyProperty());
+        throw CosPropertyService::ReadOnlyProperty();
 
       // Use the mode that is already there.
       hash_value.pmode_ = entry_ptr->int_id_.pmode_;
@@ -517,12 +496,12 @@ TAO_PropertySet::define_property (const char *property_name,
         {
           ACE_DEBUG ((LM_DEBUG,
                       "TAO_PropertySet::Define Property failed\n"));
-          ACE_THROW (CORBA::UNKNOWN ());
+          throw CORBA::UNKNOWN ();
         }
       break;
     default:
       // Error. ret is -1.
-      ACE_THROW (CORBA::UNKNOWN ());
+      throw CORBA::UNKNOWN ();
     }
 
   return;
@@ -533,7 +512,6 @@ TAO_PropertySet::define_property (const char *property_name,
 CORBA::Boolean
 TAO_PropertySet::is_type_allowed (CORBA::TypeCode_ptr type)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   // If the sequence is empty, no constraints.
   if (this->allowed_property_types_.length () == 0)
@@ -545,21 +523,19 @@ TAO_PropertySet::is_type_allowed (CORBA::TypeCode_ptr type)
        ti < this->allowed_property_types_.length ();
        ti++)
     {
-      ACE_TRY
+      try
         {
-          ret_val = this->allowed_property_types_[ti]->equal (type
-                                                              ACE_ENV_ARG_PARAMETER);
+          ret_val = this->allowed_property_types_[ti]->equal (type);
 
           if (ret_val == 1)
             return 1;
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+          ACE_PRINT_EXCEPTION (ex,
                                "TAO_PropertySet::is_type_allowed failed");
           return ret_val;
         }
-      ACE_ENDTRY;
     }
 
   // Type not found.
@@ -594,8 +570,7 @@ TAO_PropertySet::is_property_allowed (const char* property_name)
 
 
 void
-TAO_PropertySet::define_properties (const CosPropertyService::Properties &nproperties
-                                    ACE_ENV_ARG_DECL)
+TAO_PropertySet::define_properties (const CosPropertyService::Properties &nproperties)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::MultipleExceptions))
 {
@@ -607,14 +582,13 @@ TAO_PropertySet::define_properties (const CosPropertyService::Properties &nprope
 
   for (CORBA::ULong pi = 0; pi < sequence_length; pi++)
     {
-      ACE_TRY
+      try
         {
           // Define this property.
           this->define_property (nproperties [pi].property_name.in (),
-                                 nproperties [pi].property_value
-                                 ACE_ENV_ARG_PARAMETER);
+                                 nproperties [pi].property_value);
         }
-      ACE_CATCH (CosPropertyService::InvalidPropertyName, ex)
+      catch (const CosPropertyService::InvalidPropertyName& )
         {
           CORBA::ULong len = multi_ex.exceptions.length ();
           multi_ex.exceptions.length (len + 1);
@@ -623,7 +597,7 @@ TAO_PropertySet::define_properties (const CosPropertyService::Properties &nprope
           multi_ex.exceptions[len].failing_property_name =
             nproperties[pi].property_name;
         }
-      ACE_CATCH (CosPropertyService::ConflictingProperty, ex)
+      catch (const CosPropertyService::ConflictingProperty& )
         {
           CORBA::ULong len = multi_ex.exceptions.length ();
           multi_ex.exceptions.length (len + 1);
@@ -632,7 +606,7 @@ TAO_PropertySet::define_properties (const CosPropertyService::Properties &nprope
           multi_ex.exceptions[len].failing_property_name =
             nproperties[pi].property_name;
         }
-      ACE_CATCH (CosPropertyService::ReadOnlyProperty, ex)
+      catch (const CosPropertyService::ReadOnlyProperty& )
         {
           CORBA::ULong len = multi_ex.exceptions.length ();
           multi_ex.exceptions.length (len + 1);
@@ -641,7 +615,7 @@ TAO_PropertySet::define_properties (const CosPropertyService::Properties &nprope
           multi_ex.exceptions[len].failing_property_name =
             nproperties[pi].property_name;
         }
-      ACE_CATCH (CosPropertyService::UnsupportedTypeCode, ex)
+      catch (const CosPropertyService::UnsupportedTypeCode& )
         {
           CORBA::ULong len = multi_ex.exceptions.length ();
           multi_ex.exceptions.length (len + 1);
@@ -650,7 +624,7 @@ TAO_PropertySet::define_properties (const CosPropertyService::Properties &nprope
           multi_ex.exceptions[len].failing_property_name =
             nproperties[pi].property_name;
         }
-      ACE_CATCH (CosPropertyService::UnsupportedProperty, ex)
+      catch (const CosPropertyService::UnsupportedProperty& )
          {
            CORBA::ULong len = multi_ex.exceptions.length ();
            multi_ex.exceptions.length (len + 1);
@@ -659,16 +633,15 @@ TAO_PropertySet::define_properties (const CosPropertyService::Properties &nprope
            multi_ex.exceptions[len].failing_property_name =
              nproperties[pi].property_name;
          }
-       ACE_CATCH (CORBA::SystemException, sysex)
+       catch (const CORBA::SystemException& )
          {
-           ACE_RE_THROW;
+           throw;
          }
-       ACE_ENDTRY;
     }
 
   // Raise the multi exception if needed.
   if (multi_ex.exceptions.length () > 0)
-    ACE_THROW (CosPropertyService::MultipleExceptions (multi_ex));
+    throw CosPropertyService::MultipleExceptions (multi_ex);
 }
 
 // Returns the current number of properties associated with this
@@ -691,8 +664,7 @@ TAO_PropertySet::get_number_of_properties (void)
 void
 TAO_PropertySet::get_all_property_names (CORBA::ULong how_many,
                                              CosPropertyService::PropertyNames_out property_names,
-                                             CosPropertyService::PropertyNamesIterator_out rest
-                                             ACE_ENV_ARG_DECL)
+                                             CosPropertyService::PropertyNamesIterator_out rest)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocating storage is a must.
@@ -773,8 +745,7 @@ TAO_PropertySet::get_all_property_names (CORBA::ULong how_many,
 
 
 CORBA::Any *
-TAO_PropertySet::get_property_value (const char *property_name
-                                     ACE_ENV_ARG_DECL)
+TAO_PropertySet::get_property_value (const char *property_name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::PropertyNotFound,
                    CosPropertyService::InvalidPropertyName))
@@ -810,8 +781,7 @@ TAO_PropertySet::get_property_value (const char *property_name
 
 CORBA::Boolean
 TAO_PropertySet::get_properties (const CosPropertyService::PropertyNames &property_names,
-                                 CosPropertyService::Properties_out nproperties
-                                 ACE_ENV_ARG_DECL)
+                                 CosPropertyService::Properties_out nproperties)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocate memory for the out parameter.
@@ -834,8 +804,7 @@ TAO_PropertySet::get_properties (const CosPropertyService::PropertyNames &proper
 
   for (CORBA::ULong i = 0; i < n; i++)
     {
-      any_ptr = get_property_value (property_names [i]
-                                    ACE_ENV_ARG_PARAMETER);
+      any_ptr = get_property_value (property_names [i]);
 
       if (any_ptr != 0)
         {
@@ -866,8 +835,7 @@ TAO_PropertySet::get_properties (const CosPropertyService::PropertyNames &proper
 void
 TAO_PropertySet::get_all_properties (CORBA::ULong how_many,
                                      CosPropertyService::Properties_out nproperties,
-                                     CosPropertyService::PropertiesIterator_out rest
-                                     ACE_ENV_ARG_DECL)
+                                     CosPropertyService::PropertiesIterator_out rest)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocate memory for the out parameter.
@@ -958,8 +926,7 @@ TAO_PropertySet::get_all_properties (CORBA::ULong how_many,
 
 
 void
-TAO_PropertySet::delete_property (const char *property_name
-                                  ACE_ENV_ARG_DECL)
+TAO_PropertySet::delete_property (const char *property_name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::PropertyNotFound,
                    CosPropertyService::InvalidPropertyName,
@@ -967,7 +934,7 @@ TAO_PropertySet::delete_property (const char *property_name
 {
   // Check the name's validity.
   if (property_name == 0)
-    ACE_THROW (CosPropertyService::InvalidPropertyName());
+    throw CosPropertyService::InvalidPropertyName();
 
   // Get the entry from the Hash Table.
 
@@ -976,17 +943,17 @@ TAO_PropertySet::delete_property (const char *property_name
 
   if (this->hash_table_.find (hash_key,
                               entry_ptr) == -1)
-    ACE_THROW (CosPropertyService::PropertyNotFound());
+    throw CosPropertyService::PropertyNotFound();
 
   // If property is fixed, then raise exception.
   if ((entry_ptr->int_id_.pmode_ == CosPropertyService::fixed_normal)
       || (entry_ptr->int_id_.pmode_ == CosPropertyService::fixed_readonly))
-    ACE_THROW (CosPropertyService::FixedProperty());
+    throw CosPropertyService::FixedProperty();
 
   // Unbind this property.
   if (this->hash_table_.unbind (entry_ptr) != 0)
     {
-      ACE_THROW (CORBA::UNKNOWN ());
+      throw CORBA::UNKNOWN ();
     }
 
   return;
@@ -998,8 +965,7 @@ TAO_PropertySet::delete_property (const char *property_name
 
 
 void
-TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &property_names
-                                    ACE_ENV_ARG_DECL)
+TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &property_names)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::MultipleExceptions))
 {
@@ -1013,13 +979,12 @@ TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &pro
 
   for (CORBA::ULong pi = 0; pi < sequence_length; pi++)
     {
-      ACE_TRY
+      try
         {
           // Delete this property.
-          this->delete_property (property_names[pi]
-                                 ACE_ENV_ARG_PARAMETER);
+          this->delete_property (property_names[pi]);
         }
-      ACE_CATCH (CosPropertyService::InvalidPropertyName, ex)
+      catch (const CosPropertyService::InvalidPropertyName& )
         {
           // Put this exception in the multiple exception.
           CORBA::ULong len = multi_ex->exceptions.length ();
@@ -1029,7 +994,7 @@ TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &pro
           multi_ex->exceptions[len].failing_property_name =
             property_names[pi];
         }
-      ACE_CATCH (CosPropertyService::PropertyNotFound, ex)
+      catch (const CosPropertyService::PropertyNotFound& )
         {
           // Put this exception in the multiple exception.
           CORBA::ULong len = multi_ex->exceptions.length ();
@@ -1039,7 +1004,7 @@ TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &pro
           multi_ex->exceptions[len].failing_property_name =
             property_names[pi];
         }
-      ACE_CATCH (CosPropertyService::FixedProperty, ex)
+      catch (const CosPropertyService::FixedProperty& )
         {
           // Put this exception in the multiple exception.
           CORBA::ULong len = multi_ex->exceptions.length ();
@@ -1049,17 +1014,16 @@ TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &pro
           multi_ex->exceptions[len].failing_property_name =
             property_names[pi];
         }
-      ACE_CATCH (CORBA::SystemException, sysex)
+      catch (const CORBA::SystemException& )
         {
           // We cant afford to get this. Throw this.
-          ACE_RE_THROW;
+          throw;
         }
-      ACE_ENDTRY;
     }
 
   // Raise the multiple exceptions if there are any.
   if (multi_ex->exceptions.length () > 0)
-    ACE_THROW (CosPropertyService::MultipleExceptions (*multi_ex));
+    throw CosPropertyService::MultipleExceptions (*multi_ex);
 }
 
 // Delete all the properties in the current ProperySet : Delete the
@@ -1083,16 +1047,14 @@ TAO_PropertySet::delete_all_properties (void)
 
   this->get_all_property_names (size,
                                 names_out,
-                                iter_out
-                                ACE_ENV_ARG_PARAMETER);
+                                iter_out);
 
   // Get the out values on to the var varibles.
   names = names_out.ptr ();
   iter = iter_out.ptr ();
 
   // Delete all these properties.
-  this->delete_properties (names.in ()
-                           ACE_ENV_ARG_PARAMETER);
+  this->delete_properties (names.in ());
 
   // All properties deleted.
   return 1;
@@ -1102,8 +1064,7 @@ TAO_PropertySet::delete_all_properties (void)
 
 
 CORBA::Boolean
-TAO_PropertySet::is_property_defined (const char *property_name
-                                      ACE_ENV_ARG_DECL_NOT_USED)
+TAO_PropertySet::is_property_defined (const char *property_name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::InvalidPropertyName))
 {
@@ -1133,11 +1094,9 @@ TAO_PropertySetDef::TAO_PropertySetDef (void)
 // Constructor that the factory uses.
 
 TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyTypes allowed_property_types,
-                                        const CosPropertyService::PropertyDefs allowed_property_defs
-                                        ACE_ENV_ARG_DECL)
+                                        const CosPropertyService::PropertyDefs allowed_property_defs)
   : TAO_PropertySet(allowed_property_types,
-                    allowed_property_defs.length ()
-                    ACE_ENV_ARG_PARAMETER)
+                    allowed_property_defs.length ())
 {
   // Set the length of the allowed property names.
   this->allowed_property_names_.length (allowed_property_defs.length ());
@@ -1148,25 +1107,21 @@ TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyTypes
       allowed_property_defs[ni].property_name;
 
   // Define the allowed properties in the hash table.
-  ACE_TRY
+  try
     {
-      this->define_properties_with_modes (allowed_property_defs
-                                          ACE_ENV_ARG_PARAMETER);
+      this->define_properties_with_modes (allowed_property_defs);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 // Constructor that the factory uses.
 
-TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyDefs initial_property_defs
-                                        ACE_ENV_ARG_DECL)
+TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyDefs initial_property_defs)
 {
-  this->define_properties_with_modes (initial_property_defs
-                                      ACE_ENV_ARG_PARAMETER);
+  this->define_properties_with_modes (initial_property_defs);
 }
 
 // Destructor.
@@ -1177,8 +1132,7 @@ TAO_PropertySetDef::~TAO_PropertySetDef (void)
 
 // Return the sequence that is there in side.
 void
-TAO_PropertySetDef::get_allowed_property_types (CosPropertyService::PropertyTypes_out property_types
-                                                ACE_ENV_ARG_DECL_NOT_USED)
+TAO_PropertySetDef::get_allowed_property_types (CosPropertyService::PropertyTypes_out property_types)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Copy contents of the sequence.
@@ -1187,8 +1141,7 @@ TAO_PropertySetDef::get_allowed_property_types (CosPropertyService::PropertyType
 }
 
 void
-TAO_PropertySetDef::get_allowed_properties (CosPropertyService::PropertyDefs_out property_defs
-                                            ACE_ENV_ARG_DECL_NOT_USED)
+TAO_PropertySetDef::get_allowed_properties (CosPropertyService::PropertyDefs_out property_defs)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // We have all the names, get the values and the modes from the Hash
@@ -1211,8 +1164,7 @@ TAO_PropertySetDef::get_allowed_properties (CosPropertyService::PropertyDefs_out
 void
 TAO_PropertySetDef::define_property_with_mode (const char *property_name,
                                                const CORBA::Any &property_value,
-                                               CosPropertyService::PropertyModeType property_mode
-                                               ACE_ENV_ARG_DECL)
+                                               CosPropertyService::PropertyModeType property_mode)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::InvalidPropertyName,
                    CosPropertyService::ConflictingProperty,
@@ -1223,19 +1175,19 @@ TAO_PropertySetDef::define_property_with_mode (const char *property_name,
 {
   // Check the names validity.
   if (property_name == 0)
-    ACE_THROW (CosPropertyService::InvalidPropertyName());
+    throw CosPropertyService::InvalidPropertyName();
 
   // Is this type allowed?
   if (is_type_allowed (property_value.type ()) != 1)
-    ACE_THROW (CosPropertyService::UnsupportedTypeCode());
+    throw CosPropertyService::UnsupportedTypeCode();
 
   // Is this property allowed?
   if (is_property_allowed (property_name) != 1)
-    ACE_THROW (CosPropertyService::UnsupportedProperty());
+    throw CosPropertyService::UnsupportedProperty();
 
   // Is this a valid mode.
   if (property_mode == CosPropertyService::undefined)
-    ACE_THROW (CosPropertyService::UnsupportedMode());
+    throw CosPropertyService::UnsupportedMode();
 
   // Try to bind the Property.
   CosProperty_Hash_Key hash_key (property_name);
@@ -1258,23 +1210,23 @@ TAO_PropertySetDef::define_property_with_mode (const char *property_name,
 
       // Is the pointer valid.
       if (entry_ptr == 0)
-        ACE_THROW (CORBA::UNKNOWN ());
+        throw CORBA::UNKNOWN ();
 
       // If type is not the same, raise exception.
       if (entry_ptr->int_id_.pvalue_.type () != property_value.type ())
-        ACE_THROW (CosPropertyService::ConflictingProperty());
+        throw CosPropertyService::ConflictingProperty();
 
       // If mode is read only, raise exception.
       if ((entry_ptr->int_id_.pmode_ == CosPropertyService::read_only) ||
           (entry_ptr->int_id_.pmode_ == CosPropertyService::fixed_readonly))
-        ACE_THROW (CosPropertyService::ReadOnlyProperty());
+        throw CosPropertyService::ReadOnlyProperty();
 
       // If current mode is fixed_normal, but the new mode is not
       // fixed, reject it.
       if ((entry_ptr->int_id_.pmode_ ==
            CosPropertyService::fixed_normal) &&
           (property_mode < CosPropertyService::fixed_normal))
-        ACE_THROW (CosPropertyService::UnsupportedMode());
+        throw CosPropertyService::UnsupportedMode();
 
       // Everything is fine. Overwrite the value.
       if (this->hash_table_.rebind (hash_key,
@@ -1284,7 +1236,7 @@ TAO_PropertySetDef::define_property_with_mode (const char *property_name,
         }
     default:
       // Error. ret is -1 or rebind returned other than 1.
-      ACE_THROW (CORBA::UNKNOWN ());
+      throw CORBA::UNKNOWN ();
     }
 
   return;
@@ -1293,8 +1245,7 @@ TAO_PropertySetDef::define_property_with_mode (const char *property_name,
 // Define one by one. If any excceptions raised, build
 // MultipleExceptions sequence and raise that.
 void
-TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::PropertyDefs &property_defs
-                                                  ACE_ENV_ARG_DECL)
+TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::PropertyDefs &property_defs)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::MultipleExceptions))
 {
@@ -1307,15 +1258,14 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop
   // Try defining the propdefs one by one.
   for (CORBA::ULong i = 0; i < sequence_length; i++)
     {
-      ACE_TRY
+      try
         {
           // Define the property.
           this->define_property_with_mode (property_defs[i].property_name,
                                            property_defs[i].property_value,
-                                           property_defs[i].property_mode
-                                           ACE_ENV_ARG_PARAMETER);
+                                           property_defs[i].property_mode);
         }
-      ACE_CATCH (CosPropertyService::InvalidPropertyName, ex)
+      catch (const CosPropertyService::InvalidPropertyName& )
         {
           CORBA::ULong len = multi_ex.exceptions.length ();
           multi_ex.exceptions.length (len + 1);
@@ -1324,7 +1274,7 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop
           multi_ex.exceptions[len].failing_property_name =
             property_defs[i].property_name;
         }
-      ACE_CATCH (CosPropertyService::ConflictingProperty, ex)
+      catch (const CosPropertyService::ConflictingProperty& )
         {
           CORBA::ULong len = multi_ex.exceptions.length ();
           multi_ex.exceptions.length (len + 1);
@@ -1333,7 +1283,7 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop
           multi_ex.exceptions[len].failing_property_name =
             property_defs[i].property_name;
         }
-      ACE_CATCH (CosPropertyService::ReadOnlyProperty, ex)
+      catch (const CosPropertyService::ReadOnlyProperty& )
         {
           CORBA::ULong len = multi_ex.exceptions.length ();
           multi_ex.exceptions.length (len + 1);
@@ -1342,7 +1292,7 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop
           multi_ex.exceptions[len].failing_property_name =
             property_defs[i].property_name;
         }
-      ACE_CATCH (CosPropertyService::UnsupportedTypeCode, ex)
+      catch (const CosPropertyService::UnsupportedTypeCode& )
         {
           CORBA::ULong len = multi_ex.exceptions.length ();
           multi_ex.exceptions.length (len + 1);
@@ -1351,7 +1301,7 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop
           multi_ex.exceptions[len].failing_property_name =
             property_defs[i].property_name;
         }
-      ACE_CATCH (CosPropertyService::UnsupportedProperty, ex)
+      catch (const CosPropertyService::UnsupportedProperty& )
          {
            CORBA::ULong len = multi_ex.exceptions.length ();
            multi_ex.exceptions.length (len + 1);
@@ -1360,7 +1310,7 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop
            multi_ex.exceptions[len].failing_property_name =
              property_defs[i].property_name;
          }
-      ACE_CATCH (CosPropertyService::UnsupportedMode, ex)
+      catch (const CosPropertyService::UnsupportedMode& )
         {
           CORBA::ULong len = multi_ex.exceptions.length ();
           multi_ex.exceptions.length (len + 1);
@@ -1369,23 +1319,21 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop
           multi_ex.exceptions[len].failing_property_name =
             property_defs[i].property_name;
         }
-      ACE_CATCH (CORBA::SystemException, sysex)
+      catch (const CORBA::SystemException& )
         {
-          ACE_RE_THROW;
+          throw;
         }
-      ACE_ENDTRY;
     }
 
   // Raise the multi exception if needed.
   if (multi_ex.exceptions.length () > 0)
-    ACE_THROW (CosPropertyService::MultipleExceptions (multi_ex));
+    throw CosPropertyService::MultipleExceptions (multi_ex);
 }
 
 // Get the mode of a property. Raises InvalidpropertyName,
 // PropertyNotFound exceptions.
 CosPropertyService::PropertyModeType
-TAO_PropertySetDef::get_property_mode (const char *property_name
-                                       ACE_ENV_ARG_DECL)
+TAO_PropertySetDef::get_property_mode (const char *property_name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::PropertyNotFound,
                    CosPropertyService::InvalidPropertyName))
@@ -1422,8 +1370,7 @@ TAO_PropertySetDef::get_property_mode (const char *property_name
 // Nil or no, before doing something with it.
 CORBA::Boolean
 TAO_PropertySetDef::get_property_modes (const CosPropertyService::PropertyNames &property_names,
-                                        CosPropertyService::PropertyModes_out property_modes
-                                        ACE_ENV_ARG_DECL)
+                                        CosPropertyService::PropertyModes_out property_modes)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocate memory for the out parameter.
@@ -1447,17 +1394,16 @@ TAO_PropertySetDef::get_property_modes (const CosPropertyService::PropertyNames
   CosPropertyService::PropertyModeType mode;
   for (CORBA::ULong i = 0; i < sequence_length; i++)
     {
-      ACE_TRY
+      try
         {
           // Invoke get_property_mode for this name.
-          mode = this->get_property_mode (property_names[i]
-                                          ACE_ENV_ARG_PARAMETER);
+          mode = this->get_property_mode (property_names[i]);
 
           // Store the mode in the out sequence.
           property_modes[i].property_name = property_names[i];
           property_modes[i].property_mode = mode;
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           // Return value becomes false.
           ret = 1;
@@ -1467,7 +1413,6 @@ TAO_PropertySetDef::get_property_modes (const CosPropertyService::PropertyNames
           property_modes[i].property_name = property_names[i];
           property_modes[i].property_mode = CosPropertyService::undefined;
         }
-      ACE_ENDTRY;
     }
 
   return ret;
@@ -1480,8 +1425,7 @@ TAO_PropertySetDef::get_property_modes (const CosPropertyService::PropertyNames
 // "Fixed-Readonly" to anything is *not* possible.
 void
 TAO_PropertySetDef::set_property_mode (const char *property_name,
-                                       CosPropertyService::PropertyModeType property_mode
-                                       ACE_ENV_ARG_DECL)
+                                       CosPropertyService::PropertyModeType property_mode)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::InvalidPropertyName,
                    CosPropertyService::PropertyNotFound,
@@ -1489,11 +1433,11 @@ TAO_PropertySetDef::set_property_mode (const char *property_name,
 {
   // Check the names validity.
   if (property_name == 0)
-    ACE_THROW (CosPropertyService::InvalidPropertyName());
+    throw CosPropertyService::InvalidPropertyName();
 
   // Trying to set to undefined mode is not allowed.
   if (property_mode == CosPropertyService::undefined)
-    ACE_THROW (CosPropertyService::UnsupportedMode());
+    throw CosPropertyService::UnsupportedMode();
 
   // Find the property from the Hash Table.
   CosProperty_Hash_Key hash_key (property_name);
@@ -1523,13 +1467,13 @@ TAO_PropertySetDef::set_property_mode (const char *property_name,
           if (this->hash_table_.rebind (hash_key,
                                         hash_value) != 1)
             // Return values 0 and -1 are not possible.
-            ACE_THROW (CORBA::UNKNOWN ());
+            throw CORBA::UNKNOWN ();
           break;
 
         case CosPropertyService::read_only:
           // Read_only to fixed read only alone is possible.
           if (property_mode != CosPropertyService::fixed_readonly)
-            ACE_THROW (CosPropertyService::UnsupportedMode());
+            throw CosPropertyService::UnsupportedMode();
           else
             {
               // Change the mode and update hash table.
@@ -1537,14 +1481,14 @@ TAO_PropertySetDef::set_property_mode (const char *property_name,
               if (this->hash_table_.rebind (hash_key,
                                             hash_value) != 1)
                 // Return values 0 and -1 are not possible.
-                ACE_THROW (CORBA::UNKNOWN ());
+                throw CORBA::UNKNOWN ();
             }
           break;
 
         case CosPropertyService::fixed_normal:
           // Fixed_normal to fixed_readonly alone is possible.
           if (property_mode != CosPropertyService::fixed_readonly)
-            ACE_THROW (CosPropertyService::UnsupportedMode());
+            throw CosPropertyService::UnsupportedMode();
           else
             {
               // Change the mode and update the hash table.
@@ -1552,19 +1496,19 @@ TAO_PropertySetDef::set_property_mode (const char *property_name,
               if (this->hash_table_.rebind (hash_key,
                                             hash_value) != 1)
                 // Return values 0 and -1 are not possible.
-                ACE_THROW (CORBA::UNKNOWN ());
+                throw CORBA::UNKNOWN ();
             }
           break;
 
         default:
           // Fixed_readonly to any mode is not possible.
-          ACE_THROW (CosPropertyService::UnsupportedMode());
+          throw CosPropertyService::UnsupportedMode();
         }
       break;
     case -1:
     default:
       // Error or property not found in the Hash Table.
-      ACE_THROW (CosPropertyService::PropertyNotFound());
+      throw CosPropertyService::PropertyNotFound();
     }
 }
 
@@ -1574,8 +1518,7 @@ TAO_PropertySetDef::set_property_mode (const char *property_name,
 // sequence and return.
 
 void
-TAO_PropertySetDef::set_property_modes (const CosPropertyService::PropertyModes &property_modes
-                                        ACE_ENV_ARG_DECL)
+TAO_PropertySetDef::set_property_modes (const CosPropertyService::PropertyModes &property_modes)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::MultipleExceptions))
 {
@@ -1588,13 +1531,12 @@ TAO_PropertySetDef::set_property_modes (const CosPropertyService::PropertyModes
   // Set  modes one by one.
   for (CORBA::ULong i = 0; i < sequence_length; i++)
     {
-      ACE_TRY
+      try
         {
           this->set_property_mode (property_modes[i].property_name,
-                                   property_modes[i].property_mode
-                                   ACE_ENV_ARG_PARAMETER);
+                                   property_modes[i].property_mode);
         }
-      ACE_CATCH (CosPropertyService::PropertyNotFound, ex)
+      catch (const CosPropertyService::PropertyNotFound& )
         {
           // Put this exception in the multiple exception.
           CORBA::ULong len = multi_ex.exceptions.length ();
@@ -1604,7 +1546,7 @@ TAO_PropertySetDef::set_property_modes (const CosPropertyService::PropertyModes
           multi_ex.exceptions[len].failing_property_name =
             property_modes[i].property_name;
         }
-      ACE_CATCH (CosPropertyService::InvalidPropertyName, ex)
+      catch (const CosPropertyService::InvalidPropertyName& )
         {
           // Put this exception in the multiple exception.
           CORBA::ULong len = multi_ex.exceptions.length ();
@@ -1614,7 +1556,7 @@ TAO_PropertySetDef::set_property_modes (const CosPropertyService::PropertyModes
           multi_ex.exceptions[len].failing_property_name =
             property_modes[i].property_name;
         }
-      ACE_CATCH (CosPropertyService::UnsupportedMode, ex)
+      catch (const CosPropertyService::UnsupportedMode& )
         {
           // Put this exception in the multiple exception.
           CORBA::ULong len = multi_ex.exceptions.length ();
@@ -1624,16 +1566,15 @@ TAO_PropertySetDef::set_property_modes (const CosPropertyService::PropertyModes
           multi_ex.exceptions[len].failing_property_name =
             property_modes[i].property_name;
         }
-      ACE_CATCH (CORBA::SystemException, systex)
+      catch (const CORBA::SystemException& )
         {
-          ACE_RE_THROW;
+          throw;
         }
-      ACE_ENDTRY;
     }
 
   // Raise the multi_ex, if needed.
   if (multi_ex.exceptions.length () > 0)
-    ACE_THROW (CosPropertyService::MultipleExceptions (multi_ex));
+    throw CosPropertyService::MultipleExceptions (multi_ex);
 }
 
 //======================================================================
@@ -1667,8 +1608,7 @@ TAO_PropertyNamesIterator::reset (void)
 // iterator.
 
 CORBA::Boolean
-TAO_PropertyNamesIterator::next_one (CORBA::String_out property_name
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+TAO_PropertyNamesIterator::next_one (CORBA::String_out property_name)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   COSPROPERTY_HASH_ENTRY *entry_ptr;
@@ -1686,8 +1626,7 @@ TAO_PropertyNamesIterator::next_one (CORBA::String_out property_name
 
 CORBA::Boolean
 TAO_PropertyNamesIterator::next_n (CORBA::ULong how_many,
-                                   CosPropertyService::PropertyNames_out property_names
-                                   ACE_ENV_ARG_DECL_NOT_USED)
+                                   CosPropertyService::PropertyNames_out property_names)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocate memory for the out parameter.
@@ -1729,11 +1668,9 @@ TAO_PropertyNamesIterator::destroy (void)
 
   PortableServer::POA_var poa = this->_default_POA ();
 
-  PortableServer::ObjectId_var id = poa->servant_to_id (this
-                                                        ACE_ENV_ARG_PARAMETER);
+  PortableServer::ObjectId_var id = poa->servant_to_id (this);
 
-  poa->deactivate_object (id.in ()
-                          ACE_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in ());
 }
 
 //======================================================================
@@ -1755,8 +1692,7 @@ TAO_PropertiesIterator::reset (void)
 }
 
 CORBA::Boolean
-TAO_PropertiesIterator::next_one (CosPropertyService::Property_out aproperty
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+TAO_PropertiesIterator::next_one (CosPropertyService::Property_out aproperty)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   COSPROPERTY_HASH_ENTRY *entry_ptr;
@@ -1778,8 +1714,7 @@ TAO_PropertiesIterator::next_one (CosPropertyService::Property_out aproperty
 
 CORBA::Boolean
 TAO_PropertiesIterator::next_n (CORBA::ULong how_many,
-                                CosPropertyService::Properties_out nproperties
-                                ACE_ENV_ARG_DECL_NOT_USED)
+                                CosPropertyService::Properties_out nproperties)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocate memory for the out parameter.
@@ -1829,11 +1764,9 @@ TAO_PropertiesIterator::destroy (void)
 
   PortableServer::POA_var poa = this->_default_POA ();
 
-  PortableServer::ObjectId_var id = poa->servant_to_id (this
-                                                        ACE_ENV_ARG_PARAMETER);
+  PortableServer::ObjectId_var id = poa->servant_to_id (this);
 
-  poa->deactivate_object (id.in ()
-                          ACE_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in ());
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
index 0f7fe93af58..92f370c9cf8 100644
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
@@ -134,16 +134,14 @@ public:
 
   virtual CosPropertyService::PropertySet_ptr
   create_constrained_propertyset (const CosPropertyService::PropertyTypes &allowed_property_types,
-                                  const CosPropertyService::Properties &allowed_properties
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                  const CosPropertyService::Properties &allowed_properties)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::ConstraintNotSupported));
     // Allows a client to create a new TAO_PropertySet with specific
     // constraints. "All the properties will have *fixed-normal* modes".
 
   virtual CosPropertyService::PropertySet_ptr
-  create_initial_propertyset (const CosPropertyService::Properties &initial_properties
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  create_initial_propertyset (const CosPropertyService::Properties &initial_properties)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::MultipleExceptions));
   // Allows a client to create a new TAO_PropertySet with specific
@@ -186,16 +184,14 @@ public:
 
   virtual CosPropertyService::PropertySetDef_ptr
   create_constrained_propertysetdef (const CosPropertyService::PropertyTypes &allowed_property_types,
-                                     const CosPropertyService::PropertyDefs &allowed_property_defs
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                     const CosPropertyService::PropertyDefs &allowed_property_defs)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::ConstraintNotSupported));
   // Allows a client to create a new TAO_PropertySetDef with specific
   // constraints.
 
   virtual CosPropertyService::PropertySetDef_ptr
-  create_initial_propertysetdef (const CosPropertyService::PropertyDefs &initial_property_defs
-                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  create_initial_propertysetdef (const CosPropertyService::PropertyDefs &initial_property_defs)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::MultipleExceptions));
   // Allows a client to create a new TAO_PropertySetDef with specific
@@ -227,25 +223,21 @@ public:
   // Default constructor.
 
   TAO_PropertySet (const CosPropertyService::PropertyTypes allowed_property_types,
-                   const CosPropertyService::Properties allowed_properties
-                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                   const CosPropertyService::Properties allowed_properties);
   // Init values that the PropertySetFactory will want to specify.
 
-  TAO_PropertySet (const CosPropertyService::Properties initial_properties
-                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  TAO_PropertySet (const CosPropertyService::Properties initial_properties);
   // PropertySetFactory needs this constructor.
 
   TAO_PropertySet (const CosPropertyService::PropertyTypes allowed_property_types,
-                   const CORBA::ULong number_of_allowed_propertydefs
-                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                   const CORBA::ULong number_of_allowed_propertydefs);
   // PropertySetDef's construction needs this.
 
   virtual ~TAO_PropertySet (void);
   // Destructor function.
 
   virtual void define_property (const char *property_name,
-                                const CORBA::Any &property_value
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                const CORBA::Any &property_value)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::InvalidPropertyName,
                      CosPropertyService::ConflictingProperty,
@@ -256,8 +248,7 @@ public:
   // Store the property in the hash after checking for validity of the
   // property name, duplicate name, type code over writing etc.
 
-  virtual void define_properties (const CosPropertyService::Properties &nproperties
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void define_properties (const CosPropertyService::Properties &nproperties)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::MultipleExceptions));
   // Define a sequence of properties at a time.
@@ -269,44 +260,38 @@ public:
 
   virtual void get_all_property_names (CORBA::ULong how_many,
                                        CosPropertyService::PropertyNames_out property_names,
-                                       CosPropertyService::PropertyNamesIterator_out rest
-                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                       CosPropertyService::PropertyNamesIterator_out rest)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get the names of all the properties that are currently defined in
   // the property set.
 
-  virtual CORBA::Any *get_property_value (const char *property_name
-                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Any *get_property_value (const char *property_name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::PropertyNotFound,
                      CosPropertyService::InvalidPropertyName));
   // Get the value of the property, given the name.
 
   virtual CORBA::Boolean get_properties (const CosPropertyService::PropertyNames &property_names,
-                                         CosPropertyService::Properties_out nproperties
-                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                         CosPropertyService::Properties_out nproperties)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get all names and their property values.
 
   virtual void get_all_properties (CORBA::ULong how_many,
                                    CosPropertyService::Properties_out nproperties,
-                                   CosPropertyService::PropertiesIterator_out rest
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                   CosPropertyService::PropertiesIterator_out rest)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns all of the property names currently defined in the
   // PropertySet. If the PropertySet contains more than how_many
   // property names, then the remaining property names are put into the PropertyNamesIterator.
 
-  virtual void delete_property (const char *property_name
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void delete_property (const char *property_name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::PropertyNotFound,
                      CosPropertyService::InvalidPropertyName,
                      CosPropertyService::FixedProperty));
   // Delete a property given a name.
 
-  virtual void delete_properties (const CosPropertyService::PropertyNames &property_names
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void delete_properties (const CosPropertyService::PropertyNames &property_names)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::MultipleExceptions));
   // Delete all the these properties from this property set.
@@ -315,8 +300,7 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Delete everything from this property set.
 
-  virtual CORBA::Boolean is_property_defined (const char *property_name
-                                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Boolean is_property_defined (const char *property_name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::InvalidPropertyName));
   // Tell whether this property is defined or no. Forget about the
@@ -385,19 +369,16 @@ public:
   // Constructor.
 
   TAO_PropertySetDef (const CosPropertyService::PropertyTypes allowed_property_types,
-                      const CosPropertyService::PropertyDefs allowed_property
-                      ACE_ENV_ARG_DECL);
+                      const CosPropertyService::PropertyDefs allowed_property);
   // The factory uses this constructor.
 
-  TAO_PropertySetDef (const CosPropertyService::PropertyDefs initial_property_defs
-                      ACE_ENV_ARG_DECL);
+  TAO_PropertySetDef (const CosPropertyService::PropertyDefs initial_property_defs);
   // This is also for the factory.
 
   virtual ~TAO_PropertySetDef (void);
   // Destructor.
 
-  virtual void get_allowed_property_types (CosPropertyService::PropertyTypes_out property_types
-                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void get_allowed_property_types (CosPropertyService::PropertyTypes_out property_types)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Indicates which types of properties are supported by this
   // PropertySet. If the output sequence is empty, then there is no
@@ -405,8 +386,7 @@ public:
   // field of a Property in this PropertySet, unless the
   // get_allowed_properties output sequence is not empty.
 
-  virtual void get_allowed_properties (CosPropertyService::PropertyDefs_out property_defs
-                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void get_allowed_properties (CosPropertyService::PropertyDefs_out property_defs)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Indicates which properties are supported by this PropertySet. If
@@ -416,8 +396,7 @@ public:
 
   virtual void define_property_with_mode (const char *property_name,
                                           const CORBA::Any &property_value,
-                                          CosPropertyService::PropertyModeType property_mode
-                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                          CosPropertyService::PropertyModeType property_mode)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::InvalidPropertyName,
                      CosPropertyService::ConflictingProperty,
@@ -433,15 +412,13 @@ public:
   // PropertySet. If type or mode is violated, ConflictingProperty
   // exception is thrown.
 
-  virtual void define_properties_with_modes (const CosPropertyService::PropertyDefs &property_defs
-                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void define_properties_with_modes (const CosPropertyService::PropertyDefs &property_defs)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::MultipleExceptions));
   // This operation will modify or add each of the properties in the
   // Properties parameter to the PropertySet.
 
-  virtual CosPropertyService::PropertyModeType get_property_mode (const char *property_name
-                                                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual CosPropertyService::PropertyModeType get_property_mode (const char *property_name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::PropertyNotFound,
                      CosPropertyService::InvalidPropertyName));
@@ -449,8 +426,7 @@ public:
   // PropertyNotFound exceptions.
 
   virtual CORBA::Boolean get_property_modes (const CosPropertyService::PropertyNames &property_names,
-                                             CosPropertyService::PropertyModes_out property_modes
-                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                             CosPropertyService::PropertyModes_out property_modes)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Batch operation for getting the property. Invoke
   // get_property_mode for each name.  Return value False indicates
@@ -461,8 +437,7 @@ public:
   // doing something with it.
 
   virtual void set_property_mode (const char *property_name,
-                                  CosPropertyService::PropertyModeType property_mode
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                  CosPropertyService::PropertyModeType property_mode)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::InvalidPropertyName,
                      CosPropertyService::PropertyNotFound,
@@ -478,8 +453,7 @@ public:
   // all illegal set_mode attempts, UnsupportedMode exception is
   // raised.
 
-  virtual void set_property_modes (const CosPropertyService::PropertyModes &property_modes
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void set_property_modes (const CosPropertyService::PropertyModes &property_modes)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::MultipleExceptions));
   // Batch operation for setting the property. Raises
@@ -514,8 +488,7 @@ public:
   // The reset operation resets the position in an iterator to the
   // first property name, if one exists.
 
-  virtual CORBA::Boolean next_one (CORBA::String_out property_name
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Boolean next_one (CORBA::String_out property_name)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The next_one operation returns true if an item exists at the
   // current position in the iterator with an output parameter of a
@@ -523,8 +496,7 @@ public:
 
 
   virtual CORBA::Boolean next_n (CORBA::ULong how_many,
-                                 CosPropertyService::PropertyNames_out property_names
-                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                 CosPropertyService::PropertyNames_out property_names)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The next_n operation returns true if an item exists at the
   // current position in the iterator and the how_many parameter was
@@ -576,8 +548,7 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Resets the position in an iterator to the first property, if one exists.
 
-  virtual CORBA::Boolean next_one (CosPropertyService::Property_out aproperty
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Boolean next_one (CosPropertyService::Property_out aproperty)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The next_one operation returns true if an item exists at the
   // current position in the iterator with an output parameter of a
@@ -585,8 +556,7 @@ public:
   // iterator.
 
   virtual CORBA::Boolean next_n (CORBA::ULong how_many,
-                                 CosPropertyService::Properties_out nproperties
-                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                 CosPropertyService::Properties_out nproperties)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The next_n operation returns true if an item exists at the
   // current position in the iterator and the how_many parameter was
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp
index 2c14bdcbe5a..745463b8574 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp
@@ -31,7 +31,7 @@ namespace TAO
       char *node_name,
       char *file)
   {
-    ACE_TRY_NEW_ENV
+    try
       {
         /// Read the resources and ceilings from the config file
         /// and put them into the activity_map_
@@ -92,37 +92,30 @@ namespace TAO
          /// another POA then register it now
          if (unregistered)
            {
-             orb_core->add_interceptor(this->client_interceptor_
-                                       ACE_ENV_ARG_PARAMETER);
+             orb_core->add_interceptor(this->client_interceptor_);
            }
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
 
          /// Now resolve a reference to the Real Time ORB
          CORBA::Object_var rt_obj =
-           orb->resolve_initial_references("RTORB"
-                                           ACE_ENV_ARG_PARAMETER);
+           orb->resolve_initial_references("RTORB");
 
          // Get a reference to the real time orb
          RTCORBA::RTORB_var rt_orb =
-           RTCORBA::RTORB::_narrow (rt_obj.in ()
-                                    ACE_ENV_ARG_PARAMETER);
+           RTCORBA::RTORB::_narrow (rt_obj.in ());
 
          /// resolve a reference to RT Current
          rt_obj =
-           orb->resolve_initial_references ("RTCurrent"
-                                            ACE_ENV_ARG_PARAMETER);
+           orb->resolve_initial_references ("RTCurrent");
 
          this->current_ =
-           RTCORBA::Current::_narrow (rt_obj.in () ACE_ENV_ARG_PARAMETER);
-         ACE_TRY_CHECK
+           RTCORBA::Current::_narrow (rt_obj.in ());
 
          /// Resolve a reference to the Linear Priority Mapping Manager
          rt_obj =
-           orb->resolve_initial_references("PriorityMappingManager"
-                                           ACE_ENV_ARG_PARAMETER);
+           orb->resolve_initial_references("PriorityMappingManager");
          RTCORBA::PriorityMappingManager_var mapping_manager =
-           RTCORBA::PriorityMappingManager::_narrow(rt_obj.in()
-                                                    ACE_ENV_ARG_PARAMETER);
+           RTCORBA::PriorityMappingManager::_narrow(rt_obj.in());
 
          /// Create the Linear Priority Mapping Manager
          ACE_NEW_THROW_EX(this->pm_,
@@ -134,12 +127,11 @@ namespace TAO
          mapping_manager->mapping(this->pm_);
        }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
         ACE_ERROR((LM_ERROR, "Could not configure the orb"));
         ACE_OS::exit(1);
     }
- ACE_ENDTRY;
 }
 
 
@@ -154,8 +146,7 @@ RTCosScheduling_ClientScheduler_i::~RTCosScheduling_ClientScheduler_i (void)
 
 
 void  RTCosScheduling_ClientScheduler_i::schedule_activity (
-  const char * activity_name
-  ACE_ENV_ARG_DECL)
+  const char * activity_name)
   ACE_THROW_SPEC ((
     CORBA::SystemException,
     RTCosScheduling::UnknownName))
@@ -170,13 +161,12 @@ void  RTCosScheduling_ClientScheduler_i::schedule_activity (
   /// appropriate priority.
   if (result != -1)
     {
-      this->current_->the_priority(priority
-                                   ACE_ENV_ARG_PARAMETER);
+      this->current_->the_priority(priority);
     }
   /// If the activity was not found, throw an UnknownName exception.
   else
     {
-      ACE_THROW (RTCosScheduling::UnknownName());
+      throw RTCosScheduling::UnknownName();
     }
 }
 
@@ -307,17 +297,15 @@ RTCosScheduling_ClientScheduler_i::tasks(
 
 RTCosScheduling_ClientScheduler_Interceptor::RTCosScheduling_ClientScheduler_Interceptor() : name_("RTCosScheduling_Client_Interceptor")
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       /// resolve a reference to RT Current
       int argc = 0;
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             0,
-                                            0
-                                            ACE_ENV_ARG_PARAMETER);
+                                            0);
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RTCurrent"
-                                     ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RTCurrent");
       if (CORBA::is_nil(obj.in()))
         {
           ACE_OS::exit(1);
@@ -325,12 +313,11 @@ RTCosScheduling_ClientScheduler_Interceptor::RTCosScheduling_ClientScheduler_Int
       else
         {
           this->current_ =
-             RTCORBA::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+             RTCORBA::Current::_narrow (obj.in ());
         }
 
       obj =
-        orb->resolve_initial_references("CodecFactory"
-                                        ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("CodecFactory");
 
       IOP::CodecFactory_var codec_factory;
       if (CORBA::is_nil(obj.in()))
@@ -352,25 +339,23 @@ RTCosScheduling_ClientScheduler_Interceptor::RTCosScheduling_ClientScheduler_Int
 
       this->codec_ = codec_factory->create_codec(encoding);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION(ex,
                           "There was an error constructing the "
                           "ClientScheduler Interceptor\n");
     }
-  ACE_ENDTRY;
 }
 
 
 RTCosScheduling_ClientScheduler_Interceptor::RTCosScheduling_ClientScheduler_Interceptor(
   const CORBA::ORB_var orb)  : name_("RTCosScheduling_Client_Interceptor")
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       /// resolve a reference to RT Current
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RTCurrent"
-                                         ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RTCurrent");
       if (CORBA::is_nil(obj.in()))
         {
           ACE_OS::exit(1);
@@ -378,12 +363,11 @@ RTCosScheduling_ClientScheduler_Interceptor::RTCosScheduling_ClientScheduler_Int
       else
         {
           this->current_ =
-             RTCORBA::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+             RTCORBA::Current::_narrow (obj.in ());
         }
 
       obj =
-        orb->resolve_initial_references("CodecFactory"
-                                        ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("CodecFactory");
 
       // set up the codec factory to create the codec necessary to
       // encode the octet stream for the service context
@@ -408,37 +392,33 @@ RTCosScheduling_ClientScheduler_Interceptor::RTCosScheduling_ClientScheduler_Int
       // Create the codec
       this->codec_ = codec_factory->create_codec(encoding);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION(ex,
                           "Error in creating Client Interceptor\n");
     }
-  ACE_ENDTRY;
 }
 
 char *
-RTCosScheduling_ClientScheduler_Interceptor::name (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+RTCosScheduling_ClientScheduler_Interceptor::name ()
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
 return CORBA::string_dup(this->name_);
 }
 
 void
-RTCosScheduling_ClientScheduler_Interceptor::destroy (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+RTCosScheduling_ClientScheduler_Interceptor::destroy ()
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 RTCosScheduling_ClientScheduler_Interceptor::send_request (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  ACE_TRY
+  try
     {
 
       // Get the Corba priority that the activity is currently running at
@@ -459,35 +439,31 @@ RTCosScheduling_ClientScheduler_Interceptor::send_request (
       ri->add_request_service_context(sc, 0);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            "ERROR - in Client interceptor\n");
-      ACE_TRY_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
-   ACE_ENDTRY;
 }
 
 void
 RTCosScheduling_ClientScheduler_Interceptor::send_poll (
-  PortableInterceptor::ClientRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ClientRequestInfo_ptr)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 RTCosScheduling_ClientScheduler_Interceptor::receive_reply (
-  PortableInterceptor::ClientRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ClientRequestInfo_ptr)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 RTCosScheduling_ClientScheduler_Interceptor::receive_exception (
-  PortableInterceptor::ClientRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ClientRequestInfo_ptr)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest))
 {
@@ -495,8 +471,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
 
 void
 RTCosScheduling_ClientScheduler_Interceptor::receive_other (
-  PortableInterceptor::ClientRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ClientRequestInfo_ptr)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h
index 2ecf9755f0d..8c01a8eb91c 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h
@@ -92,30 +92,25 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_request (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_poll (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_reply (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_exception (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_other (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
   //@}
@@ -174,8 +169,7 @@ class TAO_RTCosScheduling_Export RTCosScheduling_ClientScheduler_i :
      *        the desired priority
      */
     virtual void schedule_activity (
-        const char *activity_name
-        ACE_ENV_ARG_DECL_NOT_USED)
+        const char *activity_name)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         RTCosScheduling::UnknownName));
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp
index 201cd60d568..232e1431c0c 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp
@@ -28,7 +28,7 @@ CosSchedulingLockList::CosSchedulingLockList(CosSchedulingLockNode *lock_array,
   const int size,
   ACE_SYNCH_MUTEX *mutex)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
           /*
        *  The pointers to the beginnings of the lists must be globally visible,
@@ -63,16 +63,15 @@ CosSchedulingLockList::CosSchedulingLockList(CosSchedulingLockNode *lock_array,
       this->granted_ = &lock_array[1];
       this->pending_ = &lock_array[2];
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG((LM_ERROR,
                  "Error in %s: Line %d - Could not generate a Locklist in shared memory\n",
                  __FILE__,
                  __LINE__));
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION(ex,
                           "Exception: CosSchedulingLockList()");
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -254,7 +253,7 @@ PCP_Manager::PCP_Manager(CosSchedulingLockList *locks,
 void
 PCP_Manager::lock(const int priority_ceiling, const int priority)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
 
       /// we do not want the thread to be pre-empted inside
@@ -331,21 +330,20 @@ PCP_Manager::lock(const int priority_ceiling, const int priority)
       this->current_->the_priority(priority_ceiling);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG((LM_ERROR,
                  "Error in %s: Line %d - Could lock resource\n"
                  __FILE__,
                  __LINE__));
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION(ex,
                           "Exception: PCP_Manager::lock");
     }
-  ACE_ENDTRY;
 }
 
 void PCP_Manager::release_lock()
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       /// To prevent pre-emption in the critical section,
       /// which could lead to unbounded blocking
@@ -372,22 +370,21 @@ void PCP_Manager::release_lock()
       /// We do not need to restore priority because we have already set this
       // thread to wait at RTCORBA::maxPriority at the start of this method
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG((LM_ERROR,
                  "Error in %s: Line %d - Could not release lock\n"
                  __FILE__,
                  __LINE__));
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION(ex,
                           "Exception: PCP_Manager::release_lock");
     }
-  ACE_ENDTRY;
 }
 
 
 PCP_Manager_Factory::PCP_Manager_Factory(const char *shared_file)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
 #if !defined (ACE_LACKS_MMAP)
       char temp_file[MAXPATHLEN + 1];
@@ -480,17 +477,16 @@ PCP_Manager_Factory::PCP_Manager_Factory(const char *shared_file)
                           );
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_ERROR((LM_ERROR,
                  "Error in %s: Line %d - Error in creating "
                  "PCP_Manager_Factory to create new PCP_Managers\n"
                  __FILE__,
                  __LINE__));
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION(ex,
                          "PCP_Manager_Factory::PCP_Manager_Factory\n");
     }
-  ACE_ENDTRY;
 }
 
 PCP_Manager_Factory::~PCP_Manager_Factory()
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp
index 0f2f2aad4a1..21bca24743c 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp
@@ -61,7 +61,7 @@ RTCosScheduling_ServerScheduler_i::~RTCosScheduling_ServerScheduler_i (void)
 int
 RTCosScheduling_ServerScheduler_i::configure_ORB(TAO_ORB_Core *orb_core)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
 
      // Get an object reference to orb from the orb core
@@ -103,15 +103,13 @@ RTCosScheduling_ServerScheduler_i::configure_ORB(TAO_ORB_Core *orb_core)
 
       if (unregistered)
         {
-          orb_core->add_interceptor(server_interceptor
-                                    ACE_ENV_ARG_PARAMETER);
+          orb_core->add_interceptor(server_interceptor);
         }
 #endif /*  TAO_HAS_INTERCEPTORS */
 
       /// Resolve a reference to the Linear Priority Mapping Manager
      CORBA::Object_var rt_obj =
-        orb->resolve_initial_references("PriorityMappingManager"
-                                        ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("PriorityMappingManager");
       if (CORBA::is_nil(rt_obj.in()))
         {
           ACE_DEBUG((LM_DEBUG,
@@ -120,8 +118,7 @@ RTCosScheduling_ServerScheduler_i::configure_ORB(TAO_ORB_Core *orb_core)
           return 0;
         }
       RTCORBA::PriorityMappingManager_var mapping_manager =
-        RTCORBA::PriorityMappingManager::_narrow(rt_obj.in()
-                                                 ACE_ENV_ARG_PARAMETER);
+        RTCORBA::PriorityMappingManager::_narrow(rt_obj.in());
 
       /// Create the Linear Priority Mapping Manager
       ACE_NEW_THROW_EX(this->pm_,
@@ -132,12 +129,11 @@ RTCosScheduling_ServerScheduler_i::configure_ORB(TAO_ORB_Core *orb_core)
       mapping_manager->mapping(this->pm_);
 
    }
- ACE_CATCHANY
+ catch (const CORBA::Exception& ex)
    {
         ACE_ERROR((LM_ERROR, "Could not configure the orb"));
         ACE_OS::exit(1);
     }
- ACE_ENDTRY;
  return 1;
 }
 
@@ -146,13 +142,12 @@ RTCosScheduling_ServerScheduler_i::configure_ORB(TAO_ORB_Core *orb_core)
     PortableServer::POA_ptr parent,
     const char * adapter_name,
     PortableServer::POAManager_ptr a_POAManager,
-    const CORBA::PolicyList & policies
-    ACE_ENV_ARG_DECL_NOT_USED)
+    const CORBA::PolicyList & policies)
   ACE_THROW_SPEC (( CORBA::SystemException
     , PortableServer::POA::AdapterAlreadyExists
     , PortableServer::POA::InvalidPolicy))
 {
-  ACE_TRY_NEW_ENV
+  try
     {
         // We should hopefully be using more than one thread
 #if defined (ACE_HAS_THREADS)
@@ -174,8 +169,7 @@ RTCosScheduling_ServerScheduler_i::configure_ORB(TAO_ORB_Core *orb_core)
 
       /// Now resolve a reference to the Real Time ORB
       CORBA::Object_var rt_obj =
-        orb->resolve_initial_references("RTORB"
-                                        ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RTORB");
       if (CORBA::is_nil(rt_obj.in()))
         {
           ACE_DEBUG((LM_DEBUG,
@@ -186,8 +180,7 @@ RTCosScheduling_ServerScheduler_i::configure_ORB(TAO_ORB_Core *orb_core)
 
       /// Get the reference to the RT ORB
       RTCORBA::RTORB_var rt_orb =
-         RTCORBA::RTORB::_narrow (rt_obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+         RTCORBA::RTORB::_narrow (rt_obj.in ());
 
       if (CORBA::is_nil(rt_orb.in ()))
         {
@@ -207,8 +200,7 @@ RTCosScheduling_ServerScheduler_i::configure_ORB(TAO_ORB_Core *orb_core)
       poa_policy_list[policies.length()] =
         rt_orb->create_priority_model_policy (
           RTCORBA::SERVER_DECLARED,
-          RTCORBA::maxPriority
-          ACE_ENV_ARG_PARAMETER);
+          RTCORBA::maxPriority);
 
       // Set up the threadpool
 #if defined (ACE_HAS_THREADS)
@@ -241,12 +233,10 @@ RTCosScheduling_ServerScheduler_i::configure_ORB(TAO_ORB_Core *orb_core)
                                           default_thread_priority,
                                           allow_request_buffering,
                                           max_buffered_requests,
-                                          max_request_buffer_size
-                                          ACE_ENV_ARG_PARAMETER);
+                                          max_request_buffer_size);
 
       poa_policy_list[policies.length()+1] =
-        rt_orb->create_threadpool_policy (threadpool
-                                          ACE_ENV_ARG_PARAMETER);
+        rt_orb->create_threadpool_policy (threadpool);
 #endif /* ACE_HAS_THREADS */
 
 
@@ -254,31 +244,27 @@ RTCosScheduling_ServerScheduler_i::configure_ORB(TAO_ORB_Core *orb_core)
       PortableServer::POA_var poa =
         parent->create_POA (adapter_name,
                             a_POAManager,
-                            poa_policy_list
-                            ACE_ENV_ARG_PARAMETER);
+                            poa_policy_list);
 
       RTPortableServer::POA_var rt_poa =
-        RTPortableServer::POA::_narrow(poa.in()
-                                       ACE_ENV_ARG_PARAMETER);
+        RTPortableServer::POA::_narrow(poa.in());
 
       /// return the reference to the RT POA
       return rt_poa.in();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION(ex,
                 "ERROR: Could not create a Scheduling Service POA\n");
       return parent;
     }
-  ACE_ENDTRY;
   return parent;
 }
 
 void
 RTCosScheduling_ServerScheduler_i::schedule_object (
     CORBA::Object_ptr obj,
-    const char * name
-    ACE_ENV_ARG_DECL)
+    const char * name)
   ACE_THROW_SPEC ((CORBA::SystemException
     , RTCosScheduling::UnknownName))
 {
@@ -288,7 +274,7 @@ RTCosScheduling_ServerScheduler_i::schedule_object (
   /// is no valid ceiling for it, throw an UnknownName exception
   if (this->resource_map_.find(name) == -1)
     {
-      ACE_THROW (RTCosScheduling::UnknownName());
+      throw RTCosScheduling::UnknownName();
     }
   else
     {
@@ -309,7 +295,7 @@ RTCosScheduling_ServerScheduler_Interceptor::RTCosScheduling_ServerScheduler_Int
   object_name_map_(ObjectMap),
   resource_map_(resourceMap)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Create a new Priority Ceiling protocol manager factory
       ACE_NEW_THROW_EX(this->PCP_factory_,
@@ -319,8 +305,7 @@ RTCosScheduling_ServerScheduler_Interceptor::RTCosScheduling_ServerScheduler_Int
 
       /// Now resolve a reference to the Real Time ORB
       CORBA::Object_var obj =
-        this->orb_->resolve_initial_references("RTORB"
-                                       ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references("RTORB");
       RTCORBA::RTORB_var rt_orb;
       if (CORBA::is_nil(obj.in ()))
         {
@@ -331,14 +316,12 @@ RTCosScheduling_ServerScheduler_Interceptor::RTCosScheduling_ServerScheduler_Int
         }
       else
         {
-          rt_orb =RTCORBA::RTORB::_narrow (obj.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+          rt_orb =RTCORBA::RTORB::_narrow (obj.in ());
         }
 
       // Now get a reference to the RTCurrent
       // for the PCP manager to control
-      obj = this->orb_->resolve_initial_references ("RTCurrent"
-                                                    ACE_ENV_ARG_PARAMETER);
+      obj = this->orb_->resolve_initial_references ("RTCurrent");
       if (CORBA::is_nil(obj.in()))
         {
           ACE_DEBUG((LM_DEBUG,
@@ -349,15 +332,13 @@ RTCosScheduling_ServerScheduler_Interceptor::RTCosScheduling_ServerScheduler_Int
       else
         {
           this->current_ =
-            RTCORBA::Current::_narrow (obj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+            RTCORBA::Current::_narrow (obj.in ());
         }
 
       // Now get a reference to the codec factory to create a codec that will
       // decode the client priority sent in the service context
       obj =
-        this->orb_->resolve_initial_references ("CodecFactory"
-                                                ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("CodecFactory");
 
       if (CORBA::is_nil(obj.in()))
         {
@@ -380,12 +361,11 @@ RTCosScheduling_ServerScheduler_Interceptor::RTCosScheduling_ServerScheduler_Int
 
       this->codec_ = this->codec_factory_->create_codec(encoding);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION(ex,
                           "Error in installing the interceptor for the ServerScheduler\n");
     }
-  ACE_ENDTRY;
 }
 
 
@@ -399,13 +379,12 @@ RTCosScheduling_ServerScheduler_Interceptor::~RTCosScheduling_ServerScheduler_In
 
 void
 RTCosScheduling_ServerScheduler_Interceptor::receive_request(
-  PortableInterceptor::ServerRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ServerRequestInfo_ptr ri)
 ACE_THROW_SPEC((
   CORBA::SystemException,
   PortableInterceptor::ForwardRequest))
 {
-  ACE_TRY_NEW_ENV
+  try
     {
 
       ACE_CString name = "";
@@ -419,8 +398,7 @@ ACE_THROW_SPEC((
         (*adapter_seq)[adapter_seq->length() - 1];
 
       CORBA::Object_var obj =
-        this->orb_->resolve_initial_references("RootPOA"
-                                               ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references("RootPOA");
       if (CORBA::is_nil(obj.in()))
         {
           ACE_DEBUG((LM_DEBUG,
@@ -444,12 +422,11 @@ ACE_THROW_SPEC((
       // decode the Client priority sent in the service context
       IOP::ServiceId id = IOP::RTCorbaPriority;
       IOP::ServiceContext_var sc;
-      ACE_TRY_EX(svc_req)
+      try
         {
           sc = ri->get_request_service_context(id);
-          ACE_TRY_CHECK_EX(svc_req);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           // The RTCorbaPriority was not sent, do not use real time
           // Here we cannot let the server continue to run at
@@ -458,7 +435,6 @@ ACE_THROW_SPEC((
           this->current_->the_priority(RTCORBA::minPriority);
           return;
         }
-      ACE_ENDTRY;
 
       CORBA::OctetSeq ocSeq = CORBA::OctetSeq(
         sc->context_data.length(),
@@ -540,19 +516,17 @@ ACE_THROW_SPEC((
         p->threadID(),
         p);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION(ex,
                           "Unknown exception in the receive request\n");
       ACE_OS::exit(1);
     }
-  ACE_ENDTRY;
 }
 
 void
 RTCosScheduling_ServerScheduler_Interceptor::send_reply(
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC((
     CORBA::SystemException
   ))
@@ -590,8 +564,7 @@ RTCosScheduling_ServerScheduler_Interceptor::destroy(void)
 
 void
 RTCosScheduling_ServerScheduler_Interceptor::receive_request_service_contexts(
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC((
     CORBA::SystemException,
     PortableInterceptor::ForwardRequest))
@@ -601,8 +574,7 @@ RTCosScheduling_ServerScheduler_Interceptor::receive_request_service_contexts(
 
 void
 RTCosScheduling_ServerScheduler_Interceptor::send_exception(
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC((CORBA::SystemException,
     PortableInterceptor::ForwardRequest))
 {
@@ -612,8 +584,7 @@ RTCosScheduling_ServerScheduler_Interceptor::send_exception(
 
 void
 RTCosScheduling_ServerScheduler_Interceptor::send_other(
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC((
     CORBA::SystemException,
     PortableInterceptor::ForwardRequest))
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h
index 3e8b5d5a55e..3a54fb5d814 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h
@@ -126,38 +126,33 @@ typedef ACE_Hash_Map_Manager_Ex_Adapter<
     ACE_THROW_SPEC((
       CORBA::SystemException));
 
-    virtual void destroy( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void destroy()
      ACE_THROW_SPEC((CORBA::SystemException));
 
     virtual void receive_request(
-        PortableInterceptor::ServerRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        PortableInterceptor::ServerRequestInfo_ptr ri)
       ACE_THROW_SPEC((
         CORBA::SystemException,
         PortableInterceptor::ForwardRequest));
 
     virtual void receive_request_service_contexts(
-        PortableInterceptor::ServerRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        PortableInterceptor::ServerRequestInfo_ptr ri)
       ACE_THROW_SPEC((
         CORBA::SystemException,
         PortableInterceptor::ForwardRequest));
 
     virtual void send_reply(
-        PortableInterceptor::ServerRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        PortableInterceptor::ServerRequestInfo_ptr ri)
       ACE_THROW_SPEC((CORBA::SystemException));
 
     virtual void send_exception(
-        PortableInterceptor::ServerRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        PortableInterceptor::ServerRequestInfo_ptr ri)
       ACE_THROW_SPEC((
         CORBA::SystemException,
         PortableInterceptor::ForwardRequest));
 
     virtual void send_other(
-        PortableInterceptor::ServerRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        PortableInterceptor::ServerRequestInfo_ptr ri)
       ACE_THROW_SPEC((
         CORBA::SystemException,
         PortableInterceptor::ForwardRequest));
@@ -232,8 +227,7 @@ typedef ACE_Hash_Map_Manager_Ex_Adapter<
         PortableServer::POA_ptr parent,
         const char * adapter_name,
         PortableServer::POAManager_ptr a_POAManager,
-        const CORBA::PolicyList & policies
-        ACE_ENV_ARG_DECL)
+        const CORBA::PolicyList & policies)
       ACE_THROW_SPEC ((
         CORBA::SystemException
         , PortableServer::POA::AdapterAlreadyExists
@@ -248,8 +242,7 @@ typedef ACE_Hash_Map_Manager_Ex_Adapter<
      * @param name name to associate with the CORBA object reference
      */
     virtual void schedule_object (CORBA::Object_ptr obj,
-        const char * name
-        ACE_ENV_ARG_DECL)
+        const char * name)
       ACE_THROW_SPEC (( CORBA::SystemException
         , RTCosScheduling::UnknownName));
 
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
index 88e7f414752..f46920825d3 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
@@ -29,8 +29,7 @@ ACE_Runtime_Scheduler (int config_count,
 // it's not present.
 
 RtecScheduler::handle_t
-ACE_Runtime_Scheduler::create (const char *entry_point
-                               ACE_ENV_ARG_DECL_NOT_USED)
+ACE_Runtime_Scheduler::create (const char *entry_point)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::DUPLICATE_NAME))
 {
@@ -48,19 +47,17 @@ ACE_Runtime_Scheduler::create (const char *entry_point
 // value if it's not present.
 
 RtecScheduler::handle_t
-ACE_Runtime_Scheduler::lookup (const char * entry_point
-                               ACE_ENV_ARG_DECL)
+ACE_Runtime_Scheduler::lookup (const char * entry_point)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return create (entry_point ACE_ENV_ARG_PARAMETER);
+  return create (entry_point);
 }
 
 
 // Return a pointer to the RT_Info corresponding to the passed handle.
 
 RtecScheduler::RT_Info *
-ACE_Runtime_Scheduler::get (RtecScheduler::handle_t handle
-                            ACE_ENV_ARG_DECL)
+ACE_Runtime_Scheduler::get (RtecScheduler::handle_t handle)
      ACE_THROW_SPEC((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK))
 {
@@ -109,8 +106,7 @@ ACE_Runtime_Scheduler::set (::RtecScheduler::handle_t handle,
                             ::RtecScheduler::Importance_t importance,
                             ::RtecScheduler::Quantum_t quantum,
                             ::RtecScheduler::Threads_t threads,
-                            ::RtecScheduler::Info_Type_t info_type
-                            ACE_ENV_ARG_DECL)
+                            ::RtecScheduler::Info_Type_t info_type)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK))
 {
@@ -120,7 +116,7 @@ ACE_Runtime_Scheduler::set (::RtecScheduler::handle_t handle,
     {
       ACE_DEBUG ((LM_DEBUG, "Unknown task: no entry for handle %d\n",
                   handle));
-      ACE_THROW (RtecScheduler::UNKNOWN_TASK());
+      throw RtecScheduler::UNKNOWN_TASK();
       // NOTREACHED
     }
   if (rt_info_[handle - 1].worst_case_execution_time != time
@@ -149,20 +145,18 @@ ACE_Runtime_Scheduler::reset (RtecScheduler::handle_t handle,
                               RtecScheduler::Importance_t importance,
                               RtecScheduler::Quantum_t quantum,
                               RtecScheduler::Threads_t threads,
-                              RtecScheduler::Info_Type_t info_type
-                              ACE_ENV_ARG_DECL)
+                              RtecScheduler::Info_Type_t info_type)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK))
 {
   // Just go ahead and call the set method
   this->set (handle, criticality, time, typical_time, cached_time,
-             period, importance, quantum, threads, info_type ACE_ENV_ARG_PARAMETER );
+             period, importance, quantum, threads, info_type );
 }
 
 
 void
-ACE_Runtime_Scheduler::set_seq (const RtecScheduler::RT_Info_Set& infos
-                                ACE_ENV_ARG_DECL)
+ACE_Runtime_Scheduler::set_seq (const RtecScheduler::RT_Info_Set& infos)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::INTERNAL,
@@ -185,8 +179,7 @@ ACE_Runtime_Scheduler::set_seq (const RtecScheduler::RT_Info_Set& infos
                  info.importance,
                  info.quantum,
                  info.threads,
-                 info.info_type
-                 ACE_ENV_ARG_PARAMETER);
+                 info.info_type);
 #else
       // Call the internal set method.
       this->set (infos[i].handle,
@@ -198,15 +191,13 @@ ACE_Runtime_Scheduler::set_seq (const RtecScheduler::RT_Info_Set& infos
                  infos[i].importance,
                  infos[i].quantum,
                  infos[i].threads,
-                 infos[i].info_type
-                 ACE_ENV_ARG_PARAMETER);
+                 infos[i].info_type);
 #endif
     }
 }
 
 void
-ACE_Runtime_Scheduler::replace_seq (const RtecScheduler::RT_Info_Set& infos
-                                    ACE_ENV_ARG_DECL)
+ACE_Runtime_Scheduler::replace_seq (const RtecScheduler::RT_Info_Set& infos)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::INTERNAL,
@@ -229,8 +220,7 @@ ACE_Runtime_Scheduler::replace_seq (const RtecScheduler::RT_Info_Set& infos
                  info.importance,
                  info.quantum,
                  info.threads,
-                 info.info_type
-                 ACE_ENV_ARG_PARAMETER);
+                 info.info_type);
 #else
       // Call the internal set method.
       this->set (infos[i].handle,
@@ -242,23 +232,21 @@ ACE_Runtime_Scheduler::replace_seq (const RtecScheduler::RT_Info_Set& infos
                  infos[i].importance,
                  infos[i].quantum,
                  infos[i].threads,
-                 infos[i].info_type
-                 ACE_ENV_ARG_PARAMETER);
+                 infos[i].info_type);
 #endif
     }
 }
 
 
 void
-ACE_Runtime_Scheduler::reset_seq (const RtecScheduler::RT_Info_Set& infos
-                                  ACE_ENV_ARG_DECL)
+ACE_Runtime_Scheduler::reset_seq (const RtecScheduler::RT_Info_Set& infos)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::INTERNAL,
                       RtecScheduler::SYNCHRONIZATION_FAILURE))
 {
   // Just call the set sequence method
-  this->set_seq (infos ACE_ENV_ARG_PARAMETER);
+  this->set_seq (infos);
 }
 
 
@@ -269,14 +257,13 @@ void
 ACE_Runtime_Scheduler::priority (RtecScheduler::handle_t handle,
                                  RtecScheduler::OS_Priority& o_priority,
                                  RtecScheduler::Preemption_Subpriority_t& subpriority,
-                                 RtecScheduler::Preemption_Priority_t& p_priority
-                                 ACE_ENV_ARG_DECL)
+                                 RtecScheduler::Preemption_Priority_t& p_priority)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::NOT_SCHEDULED))
 {
   if (handle <= 0 || handle > entry_count_)
-    ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+    throw RtecScheduler::UNKNOWN_TASK ();
     // NOTREACHED
 
   o_priority = rt_info_[handle - 1].priority;
@@ -292,22 +279,20 @@ void
 ACE_Runtime_Scheduler::entry_point_priority (const char * entry_point,
                                              RtecScheduler::OS_Priority& priority,
                                              RtecScheduler::Preemption_Subpriority_t& subpriority,
-                                             RtecScheduler::Preemption_Priority_t& p_priority
-                                             ACE_ENV_ARG_DECL)
+                                             RtecScheduler::Preemption_Priority_t& p_priority)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::NOT_SCHEDULED))
 {
-  RtecScheduler::handle_t handle = lookup (entry_point ACE_ENV_ARG_PARAMETER);
+  RtecScheduler::handle_t handle = lookup (entry_point);
 
   if (handle < -1)
-    // The exception was thrown or is in ACE_ENV_SINGLE_ARG_PARAMETER already.
+    // The exception was thrown or is in already.
     return;
   this->priority (handle,
                   priority,
                   subpriority,
-                  p_priority
-                  ACE_ENV_ARG_PARAMETER);
+                  p_priority);
 }
 
 
@@ -318,13 +303,12 @@ void
 ACE_Runtime_Scheduler::add_dependency (RtecScheduler::handle_t handle,
                                        RtecScheduler::handle_t /* dependency */,
                                        CORBA::Long /* number_of_calls */,
-                                       RtecScheduler::Dependency_Type_t /* dependency_type */
-                                       ACE_ENV_ARG_DECL)
+                                       RtecScheduler::Dependency_Type_t /* dependency_type */)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK))
 {
   if (handle <= 0 || handle > entry_count_)
-    ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+    throw RtecScheduler::UNKNOWN_TASK ();
     // NOTREACHED
 
 #if 0
@@ -352,13 +336,12 @@ void
 ACE_Runtime_Scheduler::remove_dependency (RtecScheduler::handle_t handle,
                                           RtecScheduler::handle_t /* dependency */,
                                           CORBA::Long /* number_of_calls */,
-                                          RtecScheduler::Dependency_Type_t /* dependency_type */
-                                          ACE_ENV_ARG_DECL)
+                                          RtecScheduler::Dependency_Type_t /* dependency_type */)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK))
 {
   if (handle <= 0 || handle > entry_count_)
-    ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+    throw RtecScheduler::UNKNOWN_TASK ();
 }
 
 
@@ -370,13 +353,12 @@ ACE_Runtime_Scheduler::set_dependency_enable_state (RtecScheduler::handle_t hand
                                                     RtecScheduler::handle_t /* dependency */,
                                                     CORBA::Long /* number_of_calls */,
                                                     RtecScheduler::Dependency_Type_t /* dependency_type */,
-                                                    RtecScheduler::Dependency_Enabled_Type_t /* enabled */
-                                                    ACE_ENV_ARG_DECL)
+                                                    RtecScheduler::Dependency_Enabled_Type_t /* enabled */)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK))
 {
   if (handle <= 0 || handle > entry_count_)
-    ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+    throw RtecScheduler::UNKNOWN_TASK ();
 }
 
 
@@ -385,18 +367,16 @@ ACE_Runtime_Scheduler::set_dependency_enable_state (RtecScheduler::handle_t hand
 
 void
 ACE_Runtime_Scheduler::set_rt_info_enable_state (RtecScheduler::handle_t handle,
-                                                 RtecScheduler::RT_Info_Enabled_Type_t /* enabled */
-                                                 ACE_ENV_ARG_DECL)
+                                                 RtecScheduler::RT_Info_Enabled_Type_t /* enabled */)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK))
 {
   if (handle <= 0 || handle > entry_count_)
-    ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+    throw RtecScheduler::UNKNOWN_TASK ();
 }
 
 
-void ACE_Runtime_Scheduler::set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependencies
-                                                ACE_ENV_ARG_DECL)
+void ACE_Runtime_Scheduler::set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependencies)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RtecScheduler::SYNCHRONIZATION_FAILURE,
                    RtecScheduler::UNKNOWN_TASK))
@@ -404,12 +384,11 @@ void ACE_Runtime_Scheduler::set_dependency_enable_state_seq (const RtecScheduler
 {
   ACE_UNUSED_ARG (dependencies);
 
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 void ACE_Runtime_Scheduler::set_rt_info_enable_state_seq (
-                 const RtecScheduler::RT_Info_Enable_State_Pair_Set &
-                 ACE_ENV_ARG_DECL_NOT_USED)
+                 const RtecScheduler::RT_Info_Enable_State_Pair_Set &)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RtecScheduler::SYNCHRONIZATION_FAILURE,
                    RtecScheduler::UNKNOWN_TASK))
@@ -427,8 +406,7 @@ ACE_Runtime_Scheduler::compute_scheduling (CORBA::Long /* minimum_priority */,
                                            RtecScheduler::RT_Info_Set_out /* infos */,
                                            RtecScheduler::Dependency_Set_out /*dependencies */,
                                            RtecScheduler::Config_Info_Set_out /* configs */,
-                                           RtecScheduler::Scheduling_Anomaly_Set_out /* anomalies */
-                                           ACE_ENV_ARG_DECL_NOT_USED)
+                                           RtecScheduler::Scheduling_Anomaly_Set_out /* anomalies */)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                       RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
@@ -445,8 +423,7 @@ ACE_Runtime_Scheduler::compute_scheduling (CORBA::Long /* minimum_priority */,
 void
 ACE_Runtime_Scheduler::recompute_scheduling (CORBA::Long minimum_priority,
                                              CORBA::Long maximum_priority,
-                                             RtecScheduler::Scheduling_Anomaly_Set_out anomalies
-                                             ACE_ENV_ARG_DECL_NOT_USED)
+                                             RtecScheduler::Scheduling_Anomaly_Set_out anomalies)
 
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
@@ -469,8 +446,7 @@ ACE_Runtime_Scheduler::recompute_scheduling (CORBA::Long minimum_priority,
 // of the last schedule re-computation).
 
 void
-ACE_Runtime_Scheduler::get_rt_info_set (RtecScheduler::RT_Info_Set_out infos
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+ACE_Runtime_Scheduler::get_rt_info_set (RtecScheduler::RT_Info_Set_out infos)
 
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -486,8 +462,7 @@ ACE_Runtime_Scheduler::get_rt_info_set (RtecScheduler::RT_Info_Set_out infos
 // of the last schedule re-computation).
 
 void
-ACE_Runtime_Scheduler::get_dependency_set (RtecScheduler::Dependency_Set_out dependencies
-                                           ACE_ENV_ARG_DECL_NOT_USED)
+ACE_Runtime_Scheduler::get_dependency_set (RtecScheduler::Dependency_Set_out dependencies)
 
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -503,8 +478,7 @@ ACE_Runtime_Scheduler::get_dependency_set (RtecScheduler::Dependency_Set_out dep
 // number, types, and priority levels for the dispatching lanes.
 
 void
-ACE_Runtime_Scheduler::get_config_info_set (RtecScheduler::Config_Info_Set_out configs
-                                            ACE_ENV_ARG_DECL_NOT_USED)
+ACE_Runtime_Scheduler::get_config_info_set (RtecScheduler::Config_Info_Set_out configs)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::INTERNAL))
@@ -521,8 +495,7 @@ ACE_Runtime_Scheduler::get_config_info_set (RtecScheduler::Config_Info_Set_out c
 void
 ACE_Runtime_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
                                                RtecScheduler::OS_Priority& priority,
-                                               RtecScheduler::Dispatching_Type_t & d_type
-                                               ACE_ENV_ARG_DECL)
+                                               RtecScheduler::Dispatching_Type_t & d_type)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::NOT_SCHEDULED,
                       RtecScheduler::UNKNOWN_PRIORITY_LEVEL))
@@ -531,13 +504,13 @@ ACE_Runtime_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priorit
   if (config_count_ <= 0
       || config_info_ [p_priority].preemption_priority != p_priority)
     {
-      ACE_THROW (RtecScheduler::NOT_SCHEDULED ());
+      throw RtecScheduler::NOT_SCHEDULED ();
       ACE_NOTREACHED (return);
     }
   // throw an exception if an invalid priority was passed
   else if (p_priority < 0 || p_priority >= config_count_)
     {
-      ACE_THROW (RtecScheduler::UNKNOWN_PRIORITY_LEVEL());
+      throw RtecScheduler::UNKNOWN_PRIORITY_LEVEL();
       ACE_NOTREACHED (return);
     }
   else
@@ -569,20 +542,19 @@ ACE_Runtime_Scheduler::last_scheduled_priority (void)
 
 
 void
-ACE_Runtime_Scheduler::get_config_infos (RtecScheduler::Config_Info_Set_out /*configs */
-                  ACE_ENV_ARG_DECL)
+ACE_Runtime_Scheduler::get_config_infos (RtecScheduler::Config_Info_Set_out /*configs */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   RtecScheduler::NOT_SCHEDULED))
 {
   // throw an exception if a valid schedule has not been loaded
   if (this->config_count_ <= 0)
-    ACE_THROW (RtecScheduler::NOT_SCHEDULED());
+    throw RtecScheduler::NOT_SCHEDULED();
   //TODO: fill the Config_Info_Set with the runtime Config_Infos
   //for now, this function is unimplemented
   //
   // @@ If unimplemented we either return a CORBA::NO_IMPL exception
   // or a proprietary ACE_NOTSUP; -- Bala
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
index 6dc764f2884..0bb5f45c2d7 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
@@ -42,22 +42,19 @@ public:
                          ACE_Scheduler_Factory::POD_RT_Info rt_info[]);
   // Constructor. Initialize the data from the POD_RT_Info array.
 
-  virtual RtecScheduler::handle_t create (const char * entry_point
-                                          ACE_ENV_ARG_DECL)
+  virtual RtecScheduler::handle_t create (const char * entry_point)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::DUPLICATE_NAME));
   // Create an RT_Info.  In the config run scheduler this actually constructs
   // a new RT_Info.  Here, we just return its handle, or an error value if
   // it's not present.
 
-  virtual RtecScheduler::handle_t lookup (const char * entry_point
-                                          ACE_ENV_ARG_DECL)
+  virtual RtecScheduler::handle_t lookup (const char * entry_point)
     ACE_THROW_SPEC((CORBA::SystemException));
   // Lookup a handle for an RT_Info, and return its handle, or an error
   // value if it's not present.
 
-  virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle
-                                       ACE_ENV_ARG_DECL)
+  virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK));
   // Return a pointer to the RT_Info corresponding to the passed handle.
@@ -71,8 +68,7 @@ public:
                     ::RtecScheduler::Importance_t importance,
                     ::RtecScheduler::Quantum_t quantum,
                     ::RtecScheduler::Threads_t threads,
-                    ::RtecScheduler::Info_Type_t info_type
-                    ACE_ENV_ARG_DECL)
+                    ::RtecScheduler::Info_Type_t info_type)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK));
   // Set characteristics of the RT_Info corresponding to the passed handle.
@@ -86,14 +82,12 @@ public:
                       RtecScheduler::Importance_t importance,
                       RtecScheduler::Quantum_t quantum,
                       RtecScheduler::Threads_t threads,
-                      RtecScheduler::Info_Type_t info_type
-                      ACE_ENV_ARG_DECL)
+                      RtecScheduler::Info_Type_t info_type)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK));
   // Reset characteristics of the RT_Info corresponding to the passed handle.
 
-  virtual void set_seq (const RtecScheduler::RT_Info_Set& infos
-                        ACE_ENV_ARG_DECL)
+  virtual void set_seq (const RtecScheduler::RT_Info_Set& infos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::INTERNAL,
@@ -101,8 +95,7 @@ public:
   // Set characteristics of the RT_Infos corresponding to the passed handles.
   // Tuples are added in the case of existing and/or multiple definitions.
 
-  virtual void replace_seq (const RtecScheduler::RT_Info_Set& infos
-                        ACE_ENV_ARG_DECL)
+  virtual void replace_seq (const RtecScheduler::RT_Info_Set& infos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::INTERNAL,
@@ -110,8 +103,7 @@ public:
   // Replace characteristics of the RT_Infos corresponding to the
   // passed handles.
 
-  virtual void reset_seq (const RtecScheduler::RT_Info_Set& infos
-                          ACE_ENV_ARG_DECL)
+  virtual void reset_seq (const RtecScheduler::RT_Info_Set& infos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::INTERNAL,
@@ -122,8 +114,7 @@ public:
   virtual void priority (RtecScheduler::handle_t handle,
                          RtecScheduler::OS_Priority& o_priority,
                          RtecScheduler::Preemption_Subpriority_t& p_subpriority,
-                         RtecScheduler::Preemption_Priority_t& p_priority
-                         ACE_ENV_ARG_DECL)
+                         RtecScheduler::Preemption_Priority_t& p_priority)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::NOT_SCHEDULED));
@@ -133,8 +124,7 @@ public:
   virtual void entry_point_priority (const char * entry_point,
                                      RtecScheduler::OS_Priority& o_priority,
                                      RtecScheduler::Preemption_Subpriority_t& p_subpriority,
-                                     RtecScheduler::Preemption_Priority_t& p_priority
-                                     ACE_ENV_ARG_DECL)
+                                     RtecScheduler::Preemption_Priority_t& p_priority)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::NOT_SCHEDULED));
@@ -144,8 +134,7 @@ public:
   virtual void add_dependency (RtecScheduler::handle_t handle,
                                RtecScheduler::handle_t dependency,
                                CORBA::Long number_of_calls,
-                               RtecScheduler::Dependency_Type_t dependency_type
-                               ACE_ENV_ARG_DECL)
+                               RtecScheduler::Dependency_Type_t dependency_type)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK));
   // In the config run scheduler, this method registers a dependency between
@@ -154,8 +143,7 @@ public:
   virtual void remove_dependency (RtecScheduler::handle_t handle,
                                   RtecScheduler::handle_t dependency,
                                   CORBA::Long number_of_calls,
-                                  RtecScheduler::Dependency_Type_t dependency_type
-                                  ACE_ENV_ARG_DECL)
+                                  RtecScheduler::Dependency_Type_t dependency_type)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK));
   // In the reconfig scheduler, this method removes a dependency between
@@ -165,30 +153,26 @@ public:
                                             RtecScheduler::handle_t dependency,
                                             CORBA::Long number_of_calls,
                                             RtecScheduler::Dependency_Type_t dependency_type,
-                                            RtecScheduler::Dependency_Enabled_Type_t enabled
-                                            ACE_ENV_ARG_DECL)
+                                            RtecScheduler::Dependency_Enabled_Type_t enabled)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK));
   // In the reconfig scheduler, this method (re)enabes a dependency between
   // two RT_Infos.  In the run time scheduler, this is a no-op.
 
   virtual void set_rt_info_enable_state (RtecScheduler::handle_t handle,
-                                         RtecScheduler::RT_Info_Enabled_Type_t enabled
-                                         ACE_ENV_ARG_DECL)
+                                         RtecScheduler::RT_Info_Enabled_Type_t enabled)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK));
   // In the reconfig scheduler, enables or disables an RT_Info.
   // In the run time scheduler, this is a no-op.
 
-  virtual void set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependencies
-                                                ACE_ENV_ARG_DECL)
+  virtual void set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependencies)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::UNKNOWN_TASK));
   // This method sets the enable state of a sequence of dependencies.
 
-  virtual void set_rt_info_enable_state_seq (const RtecScheduler::RT_Info_Enable_State_Pair_Set & pair_set
-                                             ACE_ENV_ARG_DECL)
+  virtual void set_rt_info_enable_state_seq (const RtecScheduler::RT_Info_Enable_State_Pair_Set & pair_set)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::UNKNOWN_TASK));
@@ -199,8 +183,7 @@ public:
                                    RtecScheduler::RT_Info_Set_out infos,
                                    RtecScheduler::Dependency_Set_out deps,
                                    RtecScheduler::Config_Info_Set_out configs,
-                                   RtecScheduler::Scheduling_Anomaly_Set_out anomalies
-                                   ACE_ENV_ARG_DECL)
+                                   RtecScheduler::Scheduling_Anomaly_Set_out anomalies)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                      RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
@@ -211,8 +194,7 @@ public:
 
   virtual void recompute_scheduling (CORBA::Long minimum_priority,
                                      CORBA::Long maximum_priority,
-                                     RtecScheduler::Scheduling_Anomaly_Set_out anomalies
-                                     ACE_ENV_ARG_DECL)
+                                     RtecScheduler::Scheduling_Anomaly_Set_out anomalies)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -222,24 +204,21 @@ public:
                      RtecScheduler::DUPLICATE_NAME));
   // Recomputes the scheduling priorities, etc.
 
-  virtual void get_rt_info_set (RtecScheduler::RT_Info_Set_out infos
-                                ACE_ENV_ARG_DECL)
+  virtual void get_rt_info_set (RtecScheduler::RT_Info_Set_out infos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::INTERNAL));
   // Returns the set of rt_infos, with their assigned priorities (as
   // of the last schedule re-computation).
 
-  virtual void get_dependency_set (RtecScheduler::Dependency_Set_out dependencies
-                                   ACE_ENV_ARG_DECL)
+  virtual void get_dependency_set (RtecScheduler::Dependency_Set_out dependencies)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::INTERNAL));
   // Returns the set of rt_infos, with their assigned priorities (as
   // of the last schedule re-computation).
 
-  virtual void get_config_info_set (RtecScheduler::Config_Info_Set_out configs
-                                    ACE_ENV_ARG_DECL)
+  virtual void get_config_info_set (RtecScheduler::Config_Info_Set_out configs)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::INTERNAL));
@@ -248,8 +227,7 @@ public:
 
   virtual void dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
                                        RtecScheduler::OS_Priority& o_priority,
-                                       RtecScheduler::Dispatching_Type_t & d_type
-                                       ACE_ENV_ARG_DECL)
+                                       RtecScheduler::Dispatching_Type_t & d_type)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED,
                     RtecScheduler::UNKNOWN_PRIORITY_LEVEL));
@@ -263,8 +241,7 @@ public:
   // of scheduled priorities.  All scheduled priorities range from 0
   // to the number returned, inclusive.
 
-  virtual void get_config_infos (RtecScheduler::Config_Info_Set_out configs
-				 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void get_config_infos (RtecScheduler::Config_Info_Set_out configs)
     ACE_THROW_SPEC ((CORBA::SystemException,
 		     RtecScheduler::NOT_SCHEDULED));
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
index 53719a6f00b..e8ed218c0b5 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
@@ -46,16 +46,14 @@ TAO::SSLIOP::ClientCredentials::client_principal (void)
 }
 
 SecurityLevel3::StatementList *
-TAO::SSLIOP::ClientCredentials::client_supporting_statements (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::ClientCredentials::client_supporting_statements ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 SecurityLevel3::ResourceNameList *
-TAO::SSLIOP::ClientCredentials::client_restricted_resources (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::ClientCredentials::client_restricted_resources ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
@@ -69,16 +67,14 @@ TAO::SSLIOP::ClientCredentials::target_principal (void)
 }
 
 SecurityLevel3::StatementList *
-TAO::SSLIOP::ClientCredentials::target_supporting_statements (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::ClientCredentials::target_supporting_statements ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 SecurityLevel3::ResourceNameList *
-TAO::SSLIOP::ClientCredentials::target_restricted_resources (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::ClientCredentials::target_restricted_resources ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
@@ -101,8 +97,7 @@ TAO::SSLIOP::ClientCredentials::parent_credentials (void)
 }
 
 CORBA::Boolean
-TAO::SSLIOP::ClientCredentials::client_authentication (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SSLIOP::ClientCredentials::client_authentication ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // If the client presented no certificate (i.e. cert_.ptr() == 0),
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h
index d2dc1d6dee5..fd688d2dc15 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h
@@ -66,8 +66,7 @@ namespace TAO
        * interface.
        */
       //@{
-      virtual SecurityLevel3::CredentialsType creds_type (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::CredentialsType creds_type ()
         ACE_THROW_SPEC ((CORBA::SystemException));
       //@}
 
@@ -81,32 +80,25 @@ namespace TAO
       virtual char * context_id (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::Principal * client_principal (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::Principal * client_principal ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::StatementList * client_supporting_statements (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::StatementList * client_supporting_statements ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::ResourceNameList * client_restricted_resources (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::ResourceNameList * client_restricted_resources ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::Principal * target_principal (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::Principal * target_principal ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::StatementList * target_supporting_statements (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::StatementList * target_supporting_statements ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::ResourceNameList * target_restricted_resources (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::ResourceNameList * target_restricted_resources ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::OwnCredentials_ptr parent_credentials (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::OwnCredentials_ptr parent_credentials ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       virtual CORBA::Boolean client_authentication (void)
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
index b836a8119b0..7f1d35f2f07 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
@@ -101,28 +101,24 @@ TAO::SSLIOP::Connection_Handler::open (void *)
   int client =
     this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE;;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       if (client)
         {
           tph->client_protocol_properties_at_orb_level (
-            protocol_properties
-            ACE_ENV_ARG_PARAMETER);
+            protocol_properties);
         }
       else
         {
           tph->server_protocol_properties_at_orb_level (
-            protocol_properties
-            ACE_ENV_ARG_PARAMETER);
+            protocol_properties);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       return -1;
     }
-  ACE_ENDTRY;
 
   if (this->set_socket_option (this->peer (),
                                protocol_properties.send_buffer_size_,
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
index 2dbf0e6c9e8..fae6be7238d 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
@@ -87,8 +87,7 @@ TAO::SSLIOP::Connector::close (void)
 TAO_Transport *
 TAO::SSLIOP::Connector::connect (TAO::Profile_Transport_Resolver *resolver,
                                  TAO_Transport_Descriptor_Interface *desc,
-                                 ACE_Time_Value *timeout
-                                 ACE_ENV_ARG_DECL)
+                                 ACE_Time_Value *timeout)
 {
   if (TAO_debug_level > 0)
       ACE_DEBUG ((LM_DEBUG,
@@ -113,12 +112,10 @@ TAO::SSLIOP::Connector::connect (TAO::Profile_Transport_Resolver *resolver,
   // Check if the user overrode the default establishment of trust
   // policy for the current object.
   CORBA::Policy_var policy =
-    resolver->stub ()->get_policy (::Security::SecEstablishTrustPolicy
-                                   ACE_ENV_ARG_PARAMETER);
+    resolver->stub ()->get_policy (::Security::SecEstablishTrustPolicy);
 
   SecurityLevel2::EstablishTrustPolicy_var trust_policy =
-    SecurityLevel2::EstablishTrustPolicy::_narrow (policy.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
+    SecurityLevel2::EstablishTrustPolicy::_narrow (policy.in ());
 
   // We use a pointer and temporary to make it obvious to determine
   // if no establishment of trust policy was set.  Specifically, if
@@ -158,12 +155,10 @@ TAO::SSLIOP::Connector::connect (TAO::Profile_Transport_Resolver *resolver,
 
   // Check if the user overrode the default Quality-of-Protection for
   // the current object.
-  policy = resolver->stub ()->get_policy (::Security::SecQOPPolicy
-                                          ACE_ENV_ARG_PARAMETER);
+  policy = resolver->stub ()->get_policy (::Security::SecQOPPolicy);
 
   SecurityLevel2::QOPPolicy_var qop_policy =
-    SecurityLevel2::QOPPolicy::_narrow (policy.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+    SecurityLevel2::QOPPolicy::_narrow (policy.in ());
 
   // Temporary variable used to avoid overwriting the default value
   // set when the ORB was initialized.
@@ -198,8 +193,7 @@ TAO::SSLIOP::Connector::connect (TAO::Profile_Transport_Resolver *resolver,
     {
       return this->iiop_connect (ssl_endpoint,
                                  resolver,
-                                 timeout
-                                 ACE_ENV_ARG_PARAMETER);
+                                 timeout);
     }
 
   return this->ssliop_connect (ssl_endpoint,
@@ -207,8 +201,7 @@ TAO::SSLIOP::Connector::connect (TAO::Profile_Transport_Resolver *resolver,
                                trust,
                                resolver,
                                desc,
-                               timeout
-                               ACE_ENV_ARG_PARAMETER);
+                               timeout);
 }
 
 
@@ -277,8 +270,7 @@ TAO::SSLIOP::Connector::make_secure_profile (void)
 
 TAO_Profile *
 TAO::SSLIOP::Connector::corbaloc_scan (const char *endpoint,
-                                       size_t &len
-                                       ACE_ENV_ARG_DECL)
+                                       size_t &len)
 {
    int ssl_only = 0;
    if (this->check_prefix (endpoint) == 0)
@@ -361,8 +353,7 @@ TAO_Transport*
 TAO::SSLIOP::Connector::iiop_connect (
   TAO_SSLIOP_Endpoint *ssl_endpoint,
   TAO::Profile_Transport_Resolver *resolver,
-  ACE_Time_Value *timeout
-  ACE_ENV_ARG_DECL)
+  ACE_Time_Value *timeout)
 {
   const ::SSLIOP::SSL &ssl_component = ssl_endpoint->ssl_component ();
 
@@ -399,8 +390,7 @@ TAO::SSLIOP::Connector::iiop_connect (
     this->TAO::IIOP_SSL_Connector::connect (
       resolver,
       &iiop_desc,
-      timeout
-      ACE_ENV_ARG_PARAMETER);
+      timeout);
 }
 
 TAO_Transport *
@@ -410,8 +400,7 @@ TAO::SSLIOP::Connector::ssliop_connect (
   const ::Security::EstablishTrust &trust,
   TAO::Profile_Transport_Resolver *resolver,
   TAO_Transport_Descriptor_Interface *desc,
-  ACE_Time_Value *max_wait_time
-  ACE_ENV_ARG_DECL)
+  ACE_Time_Value *max_wait_time)
 {
   const ::SSLIOP::SSL &ssl_component = ssl_endpoint->ssl_component ();
 
@@ -497,8 +486,7 @@ TAO::SSLIOP::Connector::ssliop_connect (
         safe_handler (svc_handler);
       TAO::SSLIOP::OwnCredentials_var credentials =
         this->retrieve_credentials (resolver->stub (),
-                                    svc_handler->peer ().ssl ()
-                                    ACE_ENV_ARG_PARAMETER);
+                                    svc_handler->peer ().ssl ());
 
       svc_handler = safe_handler.release ();
       ssl_endpoint->set_sec_attrs (qop, trust, credentials.in());
@@ -773,18 +761,15 @@ TAO::SSLIOP::Connector::ssliop_connect (
 
 TAO::SSLIOP::OwnCredentials *
 TAO::SSLIOP::Connector::retrieve_credentials (TAO_Stub *stub,
-                                              SSL *ssl
-                                              ACE_ENV_ARG_DECL)
+                                              SSL *ssl)
 {
   // Check if the user overrode the default invocation credentials.
   CORBA::Policy_var policy =
-    stub->get_policy (::SecurityLevel3::ContextEstablishmentPolicyType
-                      ACE_ENV_ARG_PARAMETER);
+    stub->get_policy (::SecurityLevel3::ContextEstablishmentPolicyType);
 
   SecurityLevel3::ContextEstablishmentPolicy_var creds_policy =
     SecurityLevel3::ContextEstablishmentPolicy::_narrow (
-      policy.in ()
-      ACE_ENV_ARG_PARAMETER);
+      policy.in ());
 
   TAO::SSLIOP::OwnCredentials_var ssliop_credentials;
 
@@ -802,8 +787,7 @@ TAO::SSLIOP::Connector::retrieve_credentials (TAO_Stub *stub,
             creds_list[0u];
 
           ssliop_credentials =
-            TAO::SSLIOP::OwnCredentials::_narrow (credentials
-                                                  ACE_ENV_ARG_PARAMETER);
+            TAO::SSLIOP::OwnCredentials::_narrow (credentials);
 
           if (!CORBA::is_nil (ssliop_credentials.in ()))
             {
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h
index 9a7bd87c2de..0666438f85c 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h
@@ -69,14 +69,12 @@ namespace TAO
       virtual int close (void);
       virtual TAO_Transport *connect (TAO::Profile_Transport_Resolver *r,
                                       TAO_Transport_Descriptor_Interface *desc,
-                                      ACE_Time_Value *timeout
-                                      ACE_ENV_ARG_DECL);
+                                      ACE_Time_Value *timeout);
 
       virtual TAO_Profile *create_profile (TAO_InputCDR& cdr);
       virtual int check_prefix (const char *endpoint);
       virtual TAO_Profile * corbaloc_scan (const char *ior,
-                                           size_t &len
-                                           ACE_ENV_ARG_DECL);
+                                           size_t &len);
 
       //@}
 
@@ -103,8 +101,7 @@ namespace TAO
        */
       TAO_Transport* iiop_connect (TAO_SSLIOP_Endpoint *ssliop_endpoint,
                                    TAO::Profile_Transport_Resolver *r,
-                                   ACE_Time_Value *timeout
-                                   ACE_ENV_ARG_DECL);
+                                   ACE_Time_Value *timeout);
 
       /// SSLIOP-specific connection establishment.
       TAO_Transport* ssliop_connect (TAO_SSLIOP_Endpoint *ssliop_endpoint,
@@ -112,15 +109,13 @@ namespace TAO
                                      const ::Security::EstablishTrust &trust,
                                      TAO::Profile_Transport_Resolver *r,
                                      TAO_Transport_Descriptor_Interface *desc,
-                                     ACE_Time_Value *timeout
-                                     ACE_ENV_ARG_DECL);
+                                     ACE_Time_Value *timeout);
 
       /// Retrieve SSLIOP credentials from the policy overrides list
       /// and set up the underlying SSL connection to use the X.509
       /// certificates stored within them.
       TAO::SSLIOP::OwnCredentials * retrieve_credentials (TAO_Stub *stub,
-                                                          SSL *ssl
-                                                          ACE_ENV_ARG_DECL);
+                                                          SSL *ssl);
 
     public:
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
index 49a79ba790b..8a0ef38e424 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
@@ -152,19 +152,17 @@ TAO::SSLIOP_Credentials::creds_state (void)
 
 char *
 TAO::SSLIOP_Credentials::add_relinquished_listener (
-    SecurityLevel3::RelinquishedCredentialsListener_ptr /* listener */
-    ACE_ENV_ARG_DECL)
+    SecurityLevel3::RelinquishedCredentialsListener_ptr /* listener */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 void
-TAO::SSLIOP_Credentials::remove_relinquished_listener (const char * /* id */
-                                                        ACE_ENV_ARG_DECL)
+TAO::SSLIOP_Credentials::remove_relinquished_listener (const char * /* id */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 bool
@@ -175,15 +173,13 @@ TAO::SSLIOP_Credentials::operator== (const TAO::SSLIOP_Credentials &rhs)
   // EVP_PKEY *ea = this->evp_.in ();
   // EVP_PKEY *eb = rhs.evp_.in ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
   // No need for a full blown ACE_TRY/CATCH block.
 
   const SecurityLevel3::CredentialsType lct =
     this->creds_type ();
 
   const SecurityLevel3::CredentialsType rct =
-    const_cast<TAO::SSLIOP_Credentials &> (rhs).creds_type (
-      ACE_ENV_SINGLE_ARG_PARAMETER);
+    const_cast<TAO::SSLIOP_Credentials &> (rhs).creds_type ();
 
   // Don't bother check the creds_id and expiry_time attributes.  They
   // are checked implicitly by the below X509_cmp() call.
@@ -209,8 +205,7 @@ TAO::SSLIOP_Credentials::hash (void) const
 }
 
 TAO::SSLIOP::Credentials_ptr
-TAO::SSLIOP_Credentials::_narrow (CORBA::Object_ptr obj
-                                 ACE_ENV_ARG_DECL_NOT_USED)
+TAO::SSLIOP_Credentials::_narrow (CORBA::Object_ptr obj)
 {
   return  TAO::SSLIOP_Credentials::_duplicate (
               dynamic_cast<TAO::SSLIOP_Credentials *> (obj));
@@ -246,11 +241,9 @@ tao_TAO_SSLIOP_Credentials_nil (void)
 }
 
 TAO::SSLIOP::Credentials_ptr
-tao_TAO_SSLIOP_Credentials_narrow (CORBA::Object *p
-                                   ACE_ENV_ARG_DECL)
+tao_TAO_SSLIOP_Credentials_narrow (CORBA::Object *p)
 {
-  return TAO::SSLIOP_Credentials::_narrow (p
-                                           ACE_ENV_ARG_PARAMETER);
+  return TAO::SSLIOP_Credentials::_narrow (p);
 }
 
 CORBA::Object_ptr
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
index 00f500102bb..c3b94c4bf6d 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
@@ -81,24 +81,20 @@ namespace TAO
       SecurityLevel3::CredentialsType creds_type (void)
         ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
-      virtual SecurityLevel3::CredentialsUsage creds_usage (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::CredentialsUsage creds_usage ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       virtual TimeBase::UtcT expiry_time (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::CredentialsState creds_state (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::CredentialsState creds_state ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       virtual char * add_relinquished_listener (
-          SecurityLevel3::RelinquishedCredentialsListener_ptr listener
-          ACE_ENV_ARG_DECL)
+          SecurityLevel3::RelinquishedCredentialsListener_ptr listener)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual void remove_relinquished_listener (const char * id
-                                                 ACE_ENV_ARG_DECL)
+      virtual void remove_relinquished_listener (const char * id)
         ACE_THROW_SPEC ((CORBA::SystemException));
       //@}
 
@@ -129,8 +125,7 @@ namespace TAO
       // The static operations.
       static SSLIOP::Credentials_ptr _duplicate (SSLIOP::Credentials_ptr obj);
 
-      static SSLIOP::Credentials_ptr _narrow (CORBA::Object_ptr obj
-                                              ACE_ENV_ARG_DECL);
+      static SSLIOP::Credentials_ptr _narrow (CORBA::Object_ptr obj);
 
       static SSLIOP::Credentials_ptr _nil (void)
       {
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
index d92db73ba03..3e866342315 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
@@ -119,8 +119,7 @@ TAO::SSLIOP::CredentialsAcquirer::nth_iteration (void)
 }
 
 CORBA::Any *
-TAO::SSLIOP::CredentialsAcquirer::get_continuation_data (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::CredentialsAcquirer::get_continuation_data ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // SSL/TLS credentials acquisition does generate continuation data.
@@ -129,8 +128,7 @@ TAO::SSLIOP::CredentialsAcquirer::get_continuation_data (
 
 SecurityLevel3::AcquisitionStatus
 TAO::SSLIOP::CredentialsAcquirer::continue_acquisition (
-    const CORBA::Any & /* acquisition_arguments */
-    ACE_ENV_ARG_DECL)
+    const CORBA::Any & /* acquisition_arguments */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // SSL/TLS credentials acquisition does generate continuation data.
@@ -139,8 +137,7 @@ TAO::SSLIOP::CredentialsAcquirer::continue_acquisition (
 }
 
 SecurityLevel3::OwnCredentials_ptr
-TAO::SSLIOP::CredentialsAcquirer::get_credentials (CORBA::Boolean on_list
-                                                   ACE_ENV_ARG_DECL)
+TAO::SSLIOP::CredentialsAcquirer::get_credentials (CORBA::Boolean on_list)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->check_validity ();
@@ -184,8 +181,7 @@ TAO::SSLIOP::CredentialsAcquirer::get_credentials (CORBA::Boolean on_list
 
   if (on_list)
     {
-      this->curator_->_tao_add_own_credentials (creds
-                                                ACE_ENV_ARG_PARAMETER);
+      this->curator_->_tao_add_own_credentials (creds);
     }
 
   this->destroy ();
@@ -220,7 +216,7 @@ TAO::SSLIOP::CredentialsAcquirer::check_validity (void)
              this->lock_);
 
   if (this->destroyed_)
-    ACE_THROW (CORBA::BAD_INV_ORDER ());
+    throw CORBA::BAD_INV_ORDER ();
 }
 
 ::X509 *
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h
index d2c5254e923..910c4826c90 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h
@@ -78,8 +78,7 @@ namespace TAO
       virtual char * acquisition_method (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::AcquisitionStatus current_status (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::AcquisitionStatus current_status ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       virtual CORBA::ULong nth_iteration (void)
@@ -89,13 +88,11 @@ namespace TAO
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       virtual SecurityLevel3::AcquisitionStatus continue_acquisition (
-          const CORBA::Any & acquisition_arguments
-          ACE_ENV_ARG_DECL)
+          const CORBA::Any & acquisition_arguments)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       virtual SecurityLevel3::OwnCredentials_ptr get_credentials (
-          CORBA::Boolean on_list
-          ACE_ENV_ARG_DECL)
+          CORBA::Boolean on_list)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       virtual void destroy (void)
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp
index 8f96ff049f2..98408532f38 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp
@@ -14,8 +14,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 SecurityLevel3::CredentialsAcquirer_ptr
 TAO::SSLIOP::CredentialsAcquirerFactory::make (
   TAO::SL3::CredentialsCurator_ptr curator,
-  const CORBA::Any & acquisition_arguments
-  ACE_ENV_ARG_DECL)
+  const CORBA::Any & acquisition_arguments)
 {
   SecurityLevel3::CredentialsAcquirer_ptr ca;
   ACE_NEW_THROW_EX (ca,
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h
index dcc44e36919..a663418b057 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h
@@ -50,8 +50,7 @@ namespace TAO
       /// Create a TAO::SSLIOP::CredentialsAcquirerFactory.
       virtual SecurityLevel3::CredentialsAcquirer_ptr make (
         TAO::SL3::CredentialsCurator_ptr curator,
-        const CORBA::Any & acquisition_arguments
-        ACE_ENV_ARG_DECL);
+        const CORBA::Any & acquisition_arguments);
 
     };
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
index ba494fc96bf..4e6a1a8bab5 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
@@ -24,8 +24,7 @@ TAO::SSLIOP::Current::~Current (void)
 }
 
 ::SSLIOP::ASN_1_Cert *
-TAO::SSLIOP::Current::get_peer_certificate (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::Current::get_peer_certificate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    SSLIOP::Current::NoContext))
 {
@@ -57,8 +56,7 @@ TAO::SSLIOP::Current::get_peer_certificate (
 }
 
 SSLIOP::SSL_Cert *
-TAO::SSLIOP::Current::get_peer_certificate_chain (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::Current::get_peer_certificate_chain ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    SSLIOP::Current::NoContext))
 {
@@ -125,8 +123,7 @@ TAO::SSLIOP::Current::teardown (TAO::SSLIOP::Current_Impl *prev_impl,
 
 TAO::SSLIOP::Current_ptr
 TAO::SSLIOP::Current::_narrow (
-  CORBA::Object_ptr obj
-  ACE_ENV_ARG_DECL_NOT_USED)
+  CORBA::Object_ptr obj)
 {
   return  TAO::SSLIOP::Current::_duplicate (
               dynamic_cast<TAO::SSLIOP::Current *> (obj));
@@ -176,10 +173,9 @@ tao_TAO_SSLIOP_Current_nil (
 TAO::SSLIOP::Current_ptr
 tao_TAO_SSLIOP_Current_narrow (
     CORBA::Object *p
-    ACE_ENV_ARG_DECL
   )
 {
-  return TAO::SSLIOP::Current::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return TAO::SSLIOP::Current::_narrow (p);
 }
 
 CORBA::Object *
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
index 55daa20bb8d..e290ca7abd5 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
@@ -69,8 +69,7 @@ namespace TAO
 
       /// Return the peer certificate associated with the current
       /// request.
-      virtual ::SSLIOP::ASN_1_Cert * get_peer_certificate (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual ::SSLIOP::ASN_1_Cert * get_peer_certificate ()
         ACE_THROW_SPEC ((CORBA::SystemException,
                          ::SSLIOP::Current::NoContext));
 
@@ -82,8 +81,7 @@ namespace TAO
        * certficate.  However, the certificate chain on the server
        * side does NOT contain the peer (client) certificate.
        */
-      virtual ::SSLIOP::SSL_Cert * get_peer_certificate_chain (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual ::SSLIOP::SSL_Cert * get_peer_certificate_chain ()
         ACE_THROW_SPEC ((CORBA::SystemException,
                          ::SSLIOP::Current::NoContext));
 
@@ -119,8 +117,7 @@ namespace TAO
       // The static operations.
       static Current_ptr _duplicate (Current_ptr obj);
 
-      static Current_ptr _narrow (CORBA::Object_ptr obj
-                                  ACE_ENV_ARG_DECL);
+      static Current_ptr _narrow (CORBA::Object_ptr obj);
 
       static Current_ptr _nil (void)
       {
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
index 3c7610fd9e3..c70172bf4b8 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
@@ -26,8 +26,7 @@ TAO::SSLIOP::Current_Impl::~Current_Impl (void)
 }
 
 SecurityLevel3::ClientCredentials_ptr
-TAO::SSLIOP::Current_Impl::client_credentials (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::Current_Impl::client_credentials ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::SSLIOP::X509_var cert = ::SSL_get_peer_certificate (this->ssl_);
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h
index 32bc8c7a283..030b28d7d6d 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h
@@ -54,14 +54,12 @@ namespace TAO
 
       /// Implementation of the SSLIOP-specific
       /// SecurityLevel3::client_credentials() method.
-      virtual SecurityLevel3::ClientCredentials_ptr client_credentials (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::ClientCredentials_ptr client_credentials ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       /// Implementation of the SSLIOP-specific
       /// SecurityLevel3::request_is_local() method.
-      virtual CORBA::Boolean request_is_local (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual CORBA::Boolean request_is_local ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       /// Return the SSL peer certificate associated with the
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
index 364803c4a26..34fd0988aef 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
@@ -528,8 +528,7 @@ TAO::SSLIOP::Protocol_Factory::register_orb_initializer (
   CSIIOP::AssociationOptions csiv2_target_supports,
   CSIIOP::AssociationOptions csiv2_target_requires)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // @todo: This hard-coding should be fixed once SECIOP is
       // supported.
@@ -545,8 +544,7 @@ TAO::SSLIOP::Protocol_Factory::register_orb_initializer (
 
       PortableInterceptor::ORBInitializer_var initializer = tmp;
 
-      PortableInterceptor::register_orb_initializer (initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+      PortableInterceptor::register_orb_initializer (initializer.in ());
 
       // Register the SSLIOP ORB initializer.
       // PortableInterceptor::ORBInitializer_ptr tmp;
@@ -563,17 +561,15 @@ TAO::SSLIOP::Protocol_Factory::register_orb_initializer (
       //PortableInterceptor::ORBInitializer_var initializer = tmp;
       initializer = tmp;
 
-      PortableInterceptor::register_orb_initializer (initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+      PortableInterceptor::register_orb_initializer (initializer.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            "Unable to register SSLIOP ORB "
                            "initializer.");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
index edb953a45d2..5ce2d53c82c 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
@@ -31,16 +31,14 @@ TAO::SSLIOP::Server_Invocation_Interceptor::~Server_Invocation_Interceptor (
 }
 
 char *
-TAO::SSLIOP::Server_Invocation_Interceptor::name (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SSLIOP::Server_Invocation_Interceptor::name ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("TAO::SSLIOP::Server_Invocation_Interceptor");
 }
 
 void
-TAO::SSLIOP::Server_Invocation_Interceptor::destroy (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SSLIOP::Server_Invocation_Interceptor::destroy ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -48,8 +46,7 @@ TAO::SSLIOP::Server_Invocation_Interceptor::destroy (
 
 void
 TAO::SSLIOP::Server_Invocation_Interceptor::receive_request_service_contexts (
-                                              PortableInterceptor::ServerRequestInfo_ptr /*ri*/
-    ACE_ENV_ARG_DECL)
+                                              PortableInterceptor::ServerRequestInfo_ptr /*ri*/)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -69,18 +66,17 @@ TAO::SSLIOP::Server_Invocation_Interceptor::receive_request_service_contexts (
     ACE_DEBUG ((LM_DEBUG, "SSLIOP (%P|%t) Interceptor (context), ssl=%d\n", !(no_ssl)));
 
   if (no_ssl && this->qop_ != ::Security::SecQOPNoProtection)
-    ACE_THROW (CORBA::NO_PERMISSION ());
+    throw CORBA::NO_PERMISSION ();
 
 #if defined(DEBUG_PEER_CERTIFICATES)
-  ACE_TRY
+  try
     {
       // If the request was not made through an SSL connection, then
       // this method will throw the SSLIOP::Current::NoContext
       // exception.  Otherwise, it will return a DER encoded X509
       // certificate.
       ::SSLIOP::ASN_1_Cert_var cert =
-        this->ssliop_current_->get_peer_certificate (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->ssliop_current_->get_peer_certificate ();
 
       // @@ The following debugging code works but I don't think that
       //    we should include it since it dumps alot of information,
@@ -115,7 +111,7 @@ TAO::SSLIOP::Server_Invocation_Interceptor::receive_request_service_contexts (
             }
         }
     }
-  ACE_CATCH (::SSLIOP::Current::NoContext, exc)
+  catch (const ::SSLIOP::Current::NoContext& )
     {
       // The current upcall is not being performed through an SSL
       // connection.  If server is configured to disallow insecure
@@ -127,17 +123,15 @@ TAO::SSLIOP::Server_Invocation_Interceptor::receive_request_service_contexts (
       //          accept or reject requests on a per-object basis
       //          instead on a per-endpoint basis.
       if (this->qop_ != ::Security::SecQOPNoProtection)
-        ACE_THROW (CORBA::NO_PERMISSION ());
+        throw CORBA::NO_PERMISSION ();
     }
-  ACE_ENDTRY;
 #endif /* DEBUG_PEER_CERTIFICATES */
 }
 
 
 void
 TAO::SSLIOP::Server_Invocation_Interceptor::receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr /* ri */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr /* ri */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -145,16 +139,14 @@ TAO::SSLIOP::Server_Invocation_Interceptor::receive_request (
 
 void
 TAO::SSLIOP::Server_Invocation_Interceptor::send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr /* ri */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr /* ri */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO::SSLIOP::Server_Invocation_Interceptor::send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr /* ri */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr /* ri */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -162,8 +154,7 @@ TAO::SSLIOP::Server_Invocation_Interceptor::send_exception (
 
 void
 TAO::SSLIOP::Server_Invocation_Interceptor::send_other (
-    PortableInterceptor::ServerRequestInfo_ptr /* ri */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr /* ri */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
index c098061f8fe..e382a2042a2 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
@@ -73,31 +73,26 @@ namespace TAO
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       virtual void receive_request_service_contexts (
-          PortableInterceptor::ServerRequestInfo_ptr ri
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+          PortableInterceptor::ServerRequestInfo_ptr ri)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableInterceptor::ForwardRequest));
 
       virtual void receive_request (
-          PortableInterceptor::ServerRequestInfo_ptr ri
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+          PortableInterceptor::ServerRequestInfo_ptr ri)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableInterceptor::ForwardRequest));
 
       virtual void send_reply (
-          PortableInterceptor::ServerRequestInfo_ptr ri
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+          PortableInterceptor::ServerRequestInfo_ptr ri)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       virtual void send_exception (
-          PortableInterceptor::ServerRequestInfo_ptr ri
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+          PortableInterceptor::ServerRequestInfo_ptr ri)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableInterceptor::ForwardRequest));
 
       virtual void send_other (
-          PortableInterceptor::ServerRequestInfo_ptr ri
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+          PortableInterceptor::ServerRequestInfo_ptr ri)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableInterceptor::ForwardRequest));
       //@}
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
index 0fc96b2eee7..102fbeb2246 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
@@ -38,16 +38,14 @@ TAO::SSLIOP::ORBInitializer::ORBInitializer (
 
 void
 TAO::SSLIOP::ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ORBInitInfo_var tao_info =
-    TAO_ORBInitInfo::_narrow (info
-                              ACE_ENV_ARG_PARAMETER);
+    TAO_ORBInitInfo::_narrow (info);
 
   if (CORBA::is_nil (tao_info.in ()))
-    ACE_THROW (CORBA::INV_OBJREF ());
+    throw CORBA::INV_OBJREF ();
 
   // SSLIOP doesn't use the ORB Core until a request invocation occurs
   // so there is no problem in retrieving the ORB Core pointer in this
@@ -72,14 +70,12 @@ TAO::SSLIOP::ORBInitializer::pre_init (
 
   // Register the SSLIOP::Current object reference with the ORB.
   info->register_initial_reference ("SSLIOPCurrent",
-                                    ssliop_current.in ()
-                                    ACE_ENV_ARG_PARAMETER);
+                                    ssliop_current.in ());
 }
 
 void
 TAO::SSLIOP::ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Note we do not store the SSLIOP::Current as a class member since
@@ -93,11 +89,10 @@ TAO::SSLIOP::ORBInitializer::post_init (
   // pre_init() method.
 
   CORBA::Object_var obj =
-    info->resolve_initial_references ("SSLIOPCurrent"
-                                      ACE_ENV_ARG_PARAMETER);
+    info->resolve_initial_references ("SSLIOPCurrent");
 
   SSLIOP::Current_var ssliop_current =
-    SSLIOP::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+    SSLIOP::Current::_narrow (obj.in ());
 
   if (!CORBA::is_nil (ssliop_current.in ()))
     {
@@ -107,12 +102,12 @@ TAO::SSLIOP::ORBInitializer::post_init (
       if (tao_current != 0)
         {
           const size_t slot =
-            this->get_tss_slot_id (info ACE_ENV_ARG_PARAMETER);
+            this->get_tss_slot_id (info);
 
           tao_current->tss_slot (slot);
         }
       else
-        ACE_THROW (CORBA::INTERNAL ());
+        throw CORBA::INTERNAL ();
     }
 
   // Create the SSLIOP secure invocation server request interceptor.
@@ -133,12 +128,11 @@ TAO::SSLIOP::ORBInitializer::post_init (
 
   // Register the SSLIOP secure invocation server request interceptor
   // with the ORB.
-  info->add_server_request_interceptor (si_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+  info->add_server_request_interceptor (si_interceptor.in ());
 
 //   TAO_ORBInitInfo_var tao_info =
 //     TAO_ORBInitInfo::_narrow (info
-//                               ACE_ENV_ARG_PARAMETER);
+//);
 
 //   if (CORBA::is_nil (tao_info.in ()))
 //     ACE_THROW (CORBA::INV_OBJREF ());
@@ -163,23 +157,20 @@ TAO::SSLIOP::ORBInitializer::post_init (
 
 //   // Register the SSLIOP IORInterceptor.
 //   info->add_ior_interceptor (ior_interceptor.in ()
-//                              ACE_ENV_ARG_PARAMETER);
+//);
 
   // Register the SSLIOP-specific vault with the
   // PrincipalAuthenticator.
-  obj = info->resolve_initial_references ("SecurityLevel3:SecurityManager"
-                                          ACE_ENV_ARG_PARAMETER);
+  obj = info->resolve_initial_references ("SecurityLevel3:SecurityManager");
 
   SecurityLevel3::SecurityManager_var manager =
-    SecurityLevel3::SecurityManager::_narrow (obj.in ()
-                                              ACE_ENV_ARG_PARAMETER);
+    SecurityLevel3::SecurityManager::_narrow (obj.in ());
 
   SecurityLevel3::CredentialsCurator_var curator =
     manager->credentials_curator ();
 
   TAO::SL3::CredentialsCurator_var tao_curator =
-    TAO::SL3::CredentialsCurator::_narrow (curator.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+    TAO::SL3::CredentialsCurator::_narrow (curator.in ());
 
   TAO::SSLIOP::CredentialsAcquirerFactory * factory;
   ACE_NEW_THROW_EX (factory,
@@ -189,8 +180,7 @@ TAO::SSLIOP::ORBInitializer::post_init (
   auto_ptr<TAO::SSLIOP::CredentialsAcquirerFactory> safe_factory;
 
   tao_curator->register_acquirer_factory ("SL3TLS",
-                                          factory
-                                          ACE_ENV_ARG_PARAMETER);
+                                          factory);
 
   (void) safe_factory.release ();  // CredentialsCurator now owns
                                    // CredentialsAcquirerFactory.
@@ -198,18 +188,15 @@ TAO::SSLIOP::ORBInitializer::post_init (
 
 size_t
 TAO::SSLIOP::ORBInitializer::get_tss_slot_id (
-  PortableInterceptor::ORBInitInfo_ptr info
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ORBInitInfo_ptr info)
 {
   // Obtain the Security Service TSS slot ID from the SecurityCurrent
   // object.
   CORBA::Object_var obj =
-    info->resolve_initial_references ("SecurityLevel3:SecurityCurrent"
-                                      ACE_ENV_ARG_PARAMETER);
+    info->resolve_initial_references ("SecurityLevel3:SecurityCurrent");
 
   SecurityLevel3::SecurityCurrent_var current =
-    SecurityLevel3::SecurityCurrent::_narrow (obj.in ()
-                                              ACE_ENV_ARG_PARAMETER);
+    SecurityLevel3::SecurityCurrent::_narrow (obj.in ());
 
   TAO::SL3::SecurityCurrent * security_current =
     dynamic_cast<TAO::SL3::SecurityCurrent *> (current.in ());
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h
index 905b526d000..f589a6a8e18 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h
@@ -60,19 +60,16 @@ namespace TAO
                       CSIIOP::AssociationOptions csiv2_target_supports,
                       CSIIOP::AssociationOptions csiv2_target_requires);
 
-      virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
     private:
 
       // Obtain the TSS slot ID assigned to the "SSLIOPCurrent" object.
-      size_t get_tss_slot_id (PortableInterceptor::ORBInitInfo_ptr info
-                              ACE_ENV_ARG_DECL);
+      size_t get_tss_slot_id (PortableInterceptor::ORBInitInfo_ptr info);
 
     private:
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
index 9c9b82c32c9..20e20a6bc3c 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
@@ -29,8 +29,7 @@ TAO::SSLIOP::OwnCredentials::_duplicate (TAO::SSLIOP::OwnCredentials_ptr obj)
 }
 
 TAO::SSLIOP::OwnCredentials_ptr
-TAO::SSLIOP::OwnCredentials::_narrow (CORBA::Object_ptr obj
-                                      ACE_ENV_ARG_DECL_NOT_USED)
+TAO::SSLIOP::OwnCredentials::_narrow (CORBA::Object_ptr obj)
 {
   return  TAO::SSLIOP::OwnCredentials::_duplicate (
               dynamic_cast<TAO::SSLIOP::OwnCredentials *> (obj));
@@ -67,8 +66,7 @@ TAO::SSLIOP::OwnCredentials::creds_acceptor (void)
 }
 
 void
-TAO::SSLIOP::OwnCredentials::release_credentials (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SSLIOP::OwnCredentials::release_credentials ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->creds_state_ = SecurityLevel3::CS_PendingRelease;
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h
index 6cbad6b38b2..0ac90730636 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h
@@ -63,8 +63,7 @@ namespace TAO
 
       static OwnCredentials_ptr _duplicate (OwnCredentials_ptr obj);
       static OwnCredentials_ptr _nil (void);
-      static OwnCredentials_ptr _narrow (CORBA::Object_ptr obj
-                                         ACE_ENV_ARG_DECL);
+      static OwnCredentials_ptr _narrow (CORBA::Object_ptr obj);
 
       /**
        * @name SecurityLevel3::TargetCredentials Methods
@@ -84,12 +83,10 @@ namespace TAO
        * interface.
        */
       //@{
-      virtual SecurityLevel3::CredsInitiator_ptr creds_initiator (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::CredsInitiator_ptr creds_initiator ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::CredsAcceptor_ptr creds_acceptor (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::CredsAcceptor_ptr creds_acceptor ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       virtual void release_credentials (void)
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp
index 28d1e537fe1..3920b4fa110 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp
@@ -334,11 +334,9 @@ TAO_SSLIOP_Profile::decode_tagged_endpoints (void)
 }
 
 void
-TAO_SSLIOP_Profile::parse_string (const char * ior
-                                  ACE_ENV_ARG_DECL)
+TAO_SSLIOP_Profile::parse_string (const char * ior)
 {
-   TAO_IIOP_Profile::parse_string (ior
-                                   ACE_ENV_ARG_PARAMETER);
+   TAO_IIOP_Profile::parse_string (ior);
 
    this->ssl_endpoint_.iiop_endpoint (&this->endpoint_, true);
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h
index 849914f148d..fef84fbd685 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h
@@ -88,8 +88,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
        * Initialize this object using the given input string.
        * URL-style string contain only one endpoint.
        */
-      virtual void parse_string (const char * string
-                                 ACE_ENV_ARG_DECL);
+      virtual void parse_string (const char * string);
 
       /**
        * Add @a endp to this profile's list of endpoints (it is
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
index 3e9d409aca0..418b6d60600 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
@@ -36,16 +36,14 @@ TAO::SSLIOP::TargetCredentials::client_principal (void)
 }
 
 SecurityLevel3::StatementList *
-TAO::SSLIOP::TargetCredentials::client_supporting_statements (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::TargetCredentials::client_supporting_statements ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 SecurityLevel3::ResourceNameList *
-TAO::SSLIOP::TargetCredentials::client_restricted_resources (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::TargetCredentials::client_restricted_resources ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
@@ -59,16 +57,14 @@ TAO::SSLIOP::TargetCredentials::target_principal (void)
 }
 
 SecurityLevel3::StatementList *
-TAO::SSLIOP::TargetCredentials::target_supporting_statements (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::TargetCredentials::target_supporting_statements ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 SecurityLevel3::ResourceNameList *
-TAO::SSLIOP::TargetCredentials::target_restricted_resources (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::TargetCredentials::target_restricted_resources ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
@@ -128,7 +124,7 @@ void
 TAO::SSLIOP::TargetCredentials::release (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h
index d9780aafc94..0127c1e8a77 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h
@@ -53,8 +53,7 @@ namespace TAO
        * interface.
        */
       //@{
-      virtual SecurityLevel3::CredentialsType creds_type (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::CredentialsType creds_type ()
         ACE_THROW_SPEC ((CORBA::SystemException));
       //@}
 
@@ -68,32 +67,25 @@ namespace TAO
       virtual char * context_id (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::Principal * client_principal (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::Principal * client_principal ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::StatementList * client_supporting_statements (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::StatementList * client_supporting_statements ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::ResourceNameList * client_restricted_resources (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::ResourceNameList * client_restricted_resources ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::Principal * target_principal (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::Principal * target_principal ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::StatementList * target_supporting_statements (
-         ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::StatementList * target_supporting_statements ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::ResourceNameList * target_restricted_resources (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::ResourceNameList * target_restricted_resources ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::OwnCredentials_ptr parent_credentials (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::OwnCredentials_ptr parent_credentials ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       virtual CORBA::Boolean client_authentication (void)
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
index b5ae1e33037..f5d35fe32cd 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
@@ -19,8 +19,7 @@ TAO::SSLIOP::Current_ptr
 TAO::SSLIOP::Util::current (
   TAO_ORB_Core *orb_core)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Go straight to the object_ref_table in the ORB Core to avoid
       // the ORB::resolve_initial_references() mechanism's complaints
@@ -31,24 +30,22 @@ TAO::SSLIOP::Util::current (
           "SSLIOPCurrent");
 
       TAO::SSLIOP::Current_var tao_current =
-        TAO::SSLIOP::Current::_narrow (obj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+        TAO::SSLIOP::Current::_narrow (obj.in ());
 
       if (CORBA::is_nil (tao_current.in ()))
-        ACE_TRY_THROW (CORBA::INV_OBJREF ());
+        throw CORBA::INV_OBJREF ();
 
       return tao_current._retn ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+        ACE_PRINT_EXCEPTION (ex,
                              "Could not resolve "
                              "\"SSLIOPCurrent\" object");
 
       return 0;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
index cf5831cfa93..0910e97a3df 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
@@ -30,8 +30,7 @@ ACE_Config_Scheduler::~ACE_Config_Scheduler (void)
 }
 
 RtecScheduler::handle_t
-ACE_Config_Scheduler::create (const char * entry_point
-                              ACE_ENV_ARG_DECL_NOT_USED)
+ACE_Config_Scheduler::create (const char * entry_point)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::DUPLICATE_NAME))
 {
@@ -82,8 +81,7 @@ ACE_Config_Scheduler::create (const char * entry_point
 }
 
 RtecScheduler::handle_t
-ACE_Config_Scheduler::lookup (const char * entry_point
-                              ACE_ENV_ARG_DECL_NOT_USED)
+ACE_Config_Scheduler::lookup (const char * entry_point)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecScheduler::RT_Info* rt_info = 0;
@@ -104,8 +102,7 @@ ACE_Config_Scheduler::lookup (const char * entry_point
 }
 
 RtecScheduler::RT_Info*
-ACE_Config_Scheduler::get (RtecScheduler::handle_t handle
-                           ACE_ENV_ARG_DECL_NOT_USED)
+ACE_Config_Scheduler::get (RtecScheduler::handle_t handle)
      ACE_THROW_SPEC((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK))
 {
@@ -140,8 +137,7 @@ void ACE_Config_Scheduler::set (RtecScheduler::handle_t handle,
                                 RtecScheduler::Importance_t importance,
                                 RtecScheduler::Quantum_t quantum,
                                 CORBA::Long threads,
-                                RtecScheduler::Info_Type_t info_type
-                                ACE_ENV_ARG_DECL_NOT_USED)
+                                RtecScheduler::Info_Type_t info_type)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK))
 {
@@ -172,8 +168,7 @@ void ACE_Config_Scheduler::set (RtecScheduler::handle_t handle,
 void ACE_Config_Scheduler::priority (RtecScheduler::handle_t handle,
                                      RtecScheduler::OS_Priority& priority,
                                      RtecScheduler::Preemption_Subpriority_t& p_subpriority,
-                                     RtecScheduler::Preemption_Priority_t& p_priority
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+                                     RtecScheduler::Preemption_Priority_t& p_priority)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::NOT_SCHEDULED))
@@ -190,23 +185,20 @@ void ACE_Config_Scheduler::priority (RtecScheduler::handle_t handle,
 void ACE_Config_Scheduler::entry_point_priority (const char * entry_point,
                                                  RtecScheduler::OS_Priority& priority,
                                                  RtecScheduler::Preemption_Subpriority_t& p_subpriority,
-                                                 RtecScheduler::Preemption_Priority_t& p_priority
-                                                 ACE_ENV_ARG_DECL)
+                                                 RtecScheduler::Preemption_Priority_t& p_priority)
      ACE_THROW_SPEC((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::NOT_SCHEDULED))
 {
-  this->priority (lookup (entry_point ACE_ENV_ARG_PARAMETER),
-                  priority, p_subpriority, p_priority
-                  ACE_ENV_ARG_PARAMETER);
+  this->priority (lookup (entry_point),
+                  priority, p_subpriority, p_priority);
 }
 
 void ACE_Config_Scheduler::add_dependency (RtecScheduler::handle_t handle,
                                            RtecScheduler::handle_t dependency,
                                            CORBA::Long number_of_calls,
                                            RtecScheduler::Dependency_Type_t
-                                             dependency_type
-                                           ACE_ENV_ARG_DECL_NOT_USED)
+                                             dependency_type)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK))
 {
@@ -243,8 +235,7 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
                                                RtecScheduler::RT_Info_Set_out infos,
                                                RtecScheduler::Dependency_Set_out dependencies,
                                                RtecScheduler::Config_Info_Set_out configs,
-                                               RtecScheduler::Scheduling_Anomaly_Set_out anomalies
-                                               ACE_ENV_ARG_DECL_NOT_USED)
+                                               RtecScheduler::Scheduling_Anomaly_Set_out anomalies)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                       RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
@@ -453,8 +444,7 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
 
 void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
                                                    RtecScheduler::OS_Priority& priority,
-                                                   RtecScheduler::Dispatching_Type_t & d_type
-                                                   ACE_ENV_ARG_DECL_NOT_USED)
+                                                   RtecScheduler::Dispatching_Type_t & d_type)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED,
                     RtecScheduler::UNKNOWN_PRIORITY_LEVEL))
@@ -493,8 +483,7 @@ ACE_Config_Scheduler::last_scheduled_priority (void)
   // All scheduled priorities range from 0 to the number returned, inclusive.
 
 void
-ACE_Config_Scheduler::get_config_infos (RtecScheduler::Config_Info_Set_out configs
-                                         ACE_ENV_ARG_DECL_NOT_USED)
+ACE_Config_Scheduler::get_config_infos (RtecScheduler::Config_Info_Set_out configs)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RtecScheduler::SYNCHRONIZATION_FAILURE,
                    RtecScheduler::NOT_SCHEDULED))
@@ -515,18 +504,16 @@ void ACE_Config_Scheduler::reset (RtecScheduler::handle_t,
             RtecScheduler::Importance_t,
             RtecScheduler::Quantum_t,
             CORBA::Long,
-            RtecScheduler::Info_Type_t
-            ACE_ENV_ARG_DECL)
+            RtecScheduler::Info_Type_t)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RtecScheduler::UNKNOWN_TASK,
                    RtecScheduler::INTERNAL,
                    RtecScheduler::SYNCHRONIZATION_FAILURE))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
-void ACE_Config_Scheduler::set_seq (const RtecScheduler::RT_Info_Set&
-                      ACE_ENV_ARG_DECL)
+void ACE_Config_Scheduler::set_seq (const RtecScheduler::RT_Info_Set&)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RtecScheduler::UNKNOWN_TASK,
                    RtecScheduler::INTERNAL,
@@ -534,11 +521,10 @@ void ACE_Config_Scheduler::set_seq (const RtecScheduler::RT_Info_Set&
 // Set characteristics of the RT_Infos corresponding to the passed handles.
 // Tuples are added in the case of existing and/or multiple definitions.
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
-void ACE_Config_Scheduler::reset_seq (const RtecScheduler::RT_Info_Set&
-                        ACE_ENV_ARG_DECL)
+void ACE_Config_Scheduler::reset_seq (const RtecScheduler::RT_Info_Set&)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RtecScheduler::UNKNOWN_TASK,
                    RtecScheduler::INTERNAL,
@@ -546,11 +532,10 @@ void ACE_Config_Scheduler::reset_seq (const RtecScheduler::RT_Info_Set&
 // Reset characteristics of the RT_Infos corresponding to the passed handles.
 // Tuples are replaced in the case of existing and/or multiple definitions.
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
-void ACE_Config_Scheduler::replace_seq (const RtecScheduler::RT_Info_Set&
-                          ACE_ENV_ARG_DECL)
+void ACE_Config_Scheduler::replace_seq (const RtecScheduler::RT_Info_Set&)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RtecScheduler::UNKNOWN_TASK,
                    RtecScheduler::INTERNAL,
@@ -560,72 +545,66 @@ void ACE_Config_Scheduler::replace_seq (const RtecScheduler::RT_Info_Set&
 // reset to their uninitialized values, i.e., the same they have
 // just after the create call.
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 void ACE_Config_Scheduler::remove_dependency (RtecScheduler::handle_t,
                                 RtecScheduler::handle_t,
                                 CORBA::Long,
-                                RtecScheduler::Dependency_Type_t
-                                ACE_ENV_ARG_DECL)
+                                RtecScheduler::Dependency_Type_t)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RtecScheduler::SYNCHRONIZATION_FAILURE,
                    RtecScheduler::UNKNOWN_TASK))
 // This method removes a dependency between two RT_Infos.
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 void ACE_Config_Scheduler::set_dependency_enable_state (RtecScheduler::handle_t,
                                   RtecScheduler::handle_t,
                                   CORBA::Long,
                                   RtecScheduler::Dependency_Type_t,
-                                  RtecScheduler::Dependency_Enabled_Type_t
-                                  ACE_ENV_ARG_DECL)
+                                  RtecScheduler::Dependency_Enabled_Type_t)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RtecScheduler::SYNCHRONIZATION_FAILURE,
                    RtecScheduler::UNKNOWN_TASK))
 // This method sets the enable state of a dependency between two RT_Infos.
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
-void ACE_Config_Scheduler::set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set &
-                                      ACE_ENV_ARG_DECL)
+void ACE_Config_Scheduler::set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set &)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RtecScheduler::SYNCHRONIZATION_FAILURE,
                    RtecScheduler::UNKNOWN_TASK))
 // This method sets the enable state of a sequence of dependencies.
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 void ACE_Config_Scheduler::set_rt_info_enable_state (RtecScheduler::handle_t,
-                               RtecScheduler::RT_Info_Enabled_Type_t
-                                       ACE_ENV_ARG_DECL)
+                               RtecScheduler::RT_Info_Enabled_Type_t)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RtecScheduler::SYNCHRONIZATION_FAILURE,
                    RtecScheduler::UNKNOWN_TASK))
 // This method enables or disables an RT_Info.
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 void ACE_Config_Scheduler::set_rt_info_enable_state_seq (
-                  const RtecScheduler::RT_Info_Enable_State_Pair_Set &
-                  ACE_ENV_ARG_DECL)
+                  const RtecScheduler::RT_Info_Enable_State_Pair_Set &)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RtecScheduler::SYNCHRONIZATION_FAILURE,
                    RtecScheduler::UNKNOWN_TASK))
 // This method enables or disables a sequence of RT_Infos.
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 void ACE_Config_Scheduler::recompute_scheduling (CORBA::Long,
                            CORBA::Long,
-                           RtecScheduler::Scheduling_Anomaly_Set_out
-                           ACE_ENV_ARG_DECL)
+                           RtecScheduler::Scheduling_Anomaly_Set_out)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                    RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -635,40 +614,37 @@ void ACE_Config_Scheduler::recompute_scheduling (CORBA::Long,
                    RtecScheduler::DUPLICATE_NAME))
 // Recomputes the scheduling priorities, etc.
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
-void ACE_Config_Scheduler::get_rt_info_set (RtecScheduler::RT_Info_Set_out
-                              ACE_ENV_ARG_DECL)
+void ACE_Config_Scheduler::get_rt_info_set (RtecScheduler::RT_Info_Set_out)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RtecScheduler::SYNCHRONIZATION_FAILURE,
                    RtecScheduler::INTERNAL))
 // Returns the set of rt_infos, with their assigned priorities (as
 // of the last schedule re-computation).
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
-void ACE_Config_Scheduler::get_dependency_set (RtecScheduler::Dependency_Set_out
-                                 ACE_ENV_ARG_DECL)
+void ACE_Config_Scheduler::get_dependency_set (RtecScheduler::Dependency_Set_out)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RtecScheduler::SYNCHRONIZATION_FAILURE,
                    RtecScheduler::INTERNAL))
 // Returns the set of rt_infos, with their assigned priorities (as
 // of the last schedule re-computation).
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
-void ACE_Config_Scheduler::get_config_info_set (RtecScheduler::Config_Info_Set_out
-                                  ACE_ENV_ARG_DECL)
+void ACE_Config_Scheduler::get_config_info_set (RtecScheduler::Config_Info_Set_out)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RtecScheduler::SYNCHRONIZATION_FAILURE,
                    RtecScheduler::INTERNAL))
 // Returns the set of config_infos, describing the appropriate
 // number, types, and priority levels for the dispatching lanes.
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
index 3d93093f9ea..cc872ee8863 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
@@ -41,16 +41,13 @@ public:
   ACE_Config_Scheduler (void);
   virtual ~ACE_Config_Scheduler (void);
 
-  virtual RtecScheduler::handle_t create (const char * entry_point
-                                          ACE_ENV_ARG_DECL)
+  virtual RtecScheduler::handle_t create (const char * entry_point)
     ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME));
 
-  virtual RtecScheduler::handle_t lookup (const char * entry_point
-                                          ACE_ENV_ARG_DECL)
+  virtual RtecScheduler::handle_t lookup (const char * entry_point)
     ACE_THROW_SPEC((CORBA::SystemException));
 
-  virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle
-                                       ACE_ENV_ARG_DECL)
+  virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle)
     ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK));
 
   virtual void set (RtecScheduler::handle_t handle,
@@ -62,15 +59,13 @@ public:
                     RtecScheduler::Importance_t importance,
                     RtecScheduler::Quantum_t quantum,
                     CORBA::Long threads,
-                    RtecScheduler::Info_Type_t info_type
-                    ACE_ENV_ARG_DECL)
+                    RtecScheduler::Info_Type_t info_type)
     ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK));
 
   virtual void priority (RtecScheduler::handle_t handle,
                          RtecScheduler::OS_Priority& priority,
                          RtecScheduler::Preemption_Subpriority_t& p_subpriority,
-                         RtecScheduler::Preemption_Priority_t& p_priority
-                         ACE_ENV_ARG_DECL)
+                         RtecScheduler::Preemption_Priority_t& p_priority)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::NOT_SCHEDULED));
@@ -78,8 +73,7 @@ public:
   virtual void entry_point_priority (const char * entry_point,
                                      RtecScheduler::OS_Priority& priority,
                                      RtecScheduler::Preemption_Subpriority_t& p_subpriority,
-                                     RtecScheduler::Preemption_Priority_t& p_priority
-                                     ACE_ENV_ARG_DECL)
+                                     RtecScheduler::Preemption_Priority_t& p_priority)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::NOT_SCHEDULED));
@@ -87,8 +81,7 @@ public:
   virtual void add_dependency (RtecScheduler::handle_t handle,
                                RtecScheduler::handle_t dependency,
                                CORBA::Long number_of_calls,
-                               RtecScheduler::Dependency_Type_t dependency_type
-                               ACE_ENV_ARG_DECL)
+                               RtecScheduler::Dependency_Type_t dependency_type)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK));
 
@@ -97,8 +90,7 @@ public:
                                    RtecScheduler::RT_Info_Set_out infos,
                                    RtecScheduler::Dependency_Set_out dependencies,
                                    RtecScheduler::Config_Info_Set_out configs,
-                                   RtecScheduler::Scheduling_Anomaly_Set_out anomalies
-                                   ACE_ENV_ARG_DECL)
+                                   RtecScheduler::Scheduling_Anomaly_Set_out anomalies)
     ACE_THROW_SPEC((CORBA::SystemException,
                     RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                     RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
@@ -106,8 +98,7 @@ public:
 
   virtual void dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
                                        RtecScheduler::OS_Priority& priority,
-                                       RtecScheduler::Dispatching_Type_t & d_type
-                                       ACE_ENV_ARG_DECL)
+                                       RtecScheduler::Dispatching_Type_t & d_type)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED,
                     RtecScheduler::UNKNOWN_PRIORITY_LEVEL));
@@ -124,8 +115,7 @@ public:
   // All scheduled priorities range from 0 to the number returned,
   // inclusive.
 
-  virtual void get_config_infos (RtecScheduler::Config_Info_Set_out configs
-				 ACE_ENV_ARG_DECL)
+  virtual void get_config_infos (RtecScheduler::Config_Info_Set_out configs)
     ACE_THROW_SPEC ((CORBA::SystemException,
 		     RtecScheduler::SYNCHRONIZATION_FAILURE,
 		     RtecScheduler::NOT_SCHEDULED));
@@ -140,16 +130,14 @@ public:
                       RtecScheduler::Importance_t importance,
                       RtecScheduler::Quantum_t quantum,
                       CORBA::Long threads,
-                      RtecScheduler::Info_Type_t info_type
-                      ACE_ENV_ARG_DECL)
+                      RtecScheduler::Info_Type_t info_type)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::INTERNAL,
                      RtecScheduler::SYNCHRONIZATION_FAILURE));
   // Reset characteristics of the RT_Info corresponding to the passed handle.
 
-  virtual void set_seq (const RtecScheduler::RT_Info_Set& infos
-                        ACE_ENV_ARG_DECL)
+  virtual void set_seq (const RtecScheduler::RT_Info_Set& infos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::INTERNAL,
@@ -157,8 +145,7 @@ public:
   // Set characteristics of the RT_Infos corresponding to the passed handles.
   // Tuples are added in the case of existing and/or multiple definitions.
 
-  virtual void reset_seq (const RtecScheduler::RT_Info_Set& infos
-                          ACE_ENV_ARG_DECL)
+  virtual void reset_seq (const RtecScheduler::RT_Info_Set& infos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::INTERNAL,
@@ -166,8 +153,7 @@ public:
   // Reset characteristics of the RT_Infos corresponding to the passed handles.
   // Tuples are replaced in the case of existing and/or multiple definitions.
 
-  virtual void replace_seq (const RtecScheduler::RT_Info_Set& infos
-                            ACE_ENV_ARG_DECL)
+  virtual void replace_seq (const RtecScheduler::RT_Info_Set& infos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::INTERNAL,
@@ -180,8 +166,7 @@ public:
   virtual void remove_dependency (RtecScheduler::handle_t handle,
                                   RtecScheduler::handle_t dependency,
                                   CORBA::Long number_of_calls,
-                                  RtecScheduler::Dependency_Type_t dependency_type
-                                  ACE_ENV_ARG_DECL)
+                                  RtecScheduler::Dependency_Type_t dependency_type)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::UNKNOWN_TASK));
@@ -191,30 +176,26 @@ public:
                                             RtecScheduler::handle_t dependency,
                                             CORBA::Long number_of_calls,
                                             RtecScheduler::Dependency_Type_t dependency_type,
-                                            RtecScheduler::Dependency_Enabled_Type_t enabled
-                                            ACE_ENV_ARG_DECL)
+                                            RtecScheduler::Dependency_Enabled_Type_t enabled)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::UNKNOWN_TASK));
   // This method sets the enable state of a dependency between two RT_Infos.
 
-  virtual void set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependencies
-                                                ACE_ENV_ARG_DECL)
+  virtual void set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependencies)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::UNKNOWN_TASK));
   // This method sets the enable state of a sequence of dependencies.
 
   virtual void set_rt_info_enable_state (RtecScheduler::handle_t handle,
-                                         RtecScheduler::RT_Info_Enabled_Type_t enabled
-                                         ACE_ENV_ARG_DECL)
+                                         RtecScheduler::RT_Info_Enabled_Type_t enabled)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::UNKNOWN_TASK));
   // This method enables or disables an RT_Info.
 
-  virtual void set_rt_info_enable_state_seq (const RtecScheduler::RT_Info_Enable_State_Pair_Set & pair_set
-                                             ACE_ENV_ARG_DECL)
+  virtual void set_rt_info_enable_state_seq (const RtecScheduler::RT_Info_Enable_State_Pair_Set & pair_set)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::UNKNOWN_TASK));
@@ -222,8 +203,7 @@ public:
 
   virtual void recompute_scheduling (CORBA::Long minimum_priority,
                                      CORBA::Long maximum_priority,
-                                     RtecScheduler::Scheduling_Anomaly_Set_out anomalies
-                                     ACE_ENV_ARG_DECL)
+                                     RtecScheduler::Scheduling_Anomaly_Set_out anomalies)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -233,24 +213,21 @@ public:
                      RtecScheduler::DUPLICATE_NAME));
   // Recomputes the scheduling priorities, etc.
 
-  virtual void get_rt_info_set (RtecScheduler::RT_Info_Set_out infos
-                                ACE_ENV_ARG_DECL)
+  virtual void get_rt_info_set (RtecScheduler::RT_Info_Set_out infos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::INTERNAL));
   // Returns the set of rt_infos, with their assigned priorities (as
   // of the last schedule re-computation).
 
-  virtual void get_dependency_set (RtecScheduler::Dependency_Set_out dependencies
-                                   ACE_ENV_ARG_DECL)
+  virtual void get_dependency_set (RtecScheduler::Dependency_Set_out dependencies)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::INTERNAL));
   // Returns the set of rt_infos, with their assigned priorities (as
   // of the last schedule re-computation).
 
-  virtual void get_config_info_set (RtecScheduler::Config_Info_Set_out configs
-                                    ACE_ENV_ARG_DECL)
+  virtual void get_config_info_set (RtecScheduler::Config_Info_Set_out configs)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::INTERNAL));
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
index 5686c913de8..04da5cd7097 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
@@ -112,20 +112,19 @@ TAO_Reconfig_Scheduler (int config_count,
   // The init method can throw an exception, which must be caught
   // *inside* the constructor to be portable between compilers that
   // differ in whether they support native C++ exceptions.
-  ACE_TRY_NEW_ENV
+  try
     {
       this->init (config_count, config_infos,
                   rt_info_count, rt_infos,
                   dependency_count, dependency_infos,
-                  stability_flags ACE_ENV_ARG_PARAMETER);
+                  stability_flags);
     }
-  ACE_CATCH (CORBA::SystemException, corba_sysex)
+  catch (const CORBA::SystemException& )
     {
        ACE_ERROR ((LM_ERROR, "TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, "
                              "ACE_LOCK>::TAO_Reconfig_Scheduler "
                              "system exception: cannot init scheduler.\n"));
     }
-  ACE_ENDTRY;
 }
 
 
@@ -140,17 +139,16 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
               " TAO_Reconfig_Scheduler dtor.\n"));
 #endif /* SCHEDULER_LOGGING */
 
-  ACE_TRY_NEW_ENV
+  try
     {
       this->close ();
     }
-  ACE_CATCH (CORBA::SystemException, corba_sysex)
+  catch (const CORBA::SystemException& )
     {
       ACE_ERROR ((LM_ERROR, "TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, "
                             "ACE_LOCK>::~TAO_Reconfig_Scheduler "
                             "exception: cannot close scheduler.\n"));
     }
-  ACE_ENDTRY;
 
   // Delete the entry and tuple pointer arrays.
   delete [] entry_ptr_array_;
@@ -168,8 +166,7 @@ init (int config_count,
       ACE_Scheduler_Factory::POD_RT_Info rt_info[],
       int dependency_count,
       ACE_Scheduler_Factory::POD_Dependency_Info dependency_info[],
-      u_long stability_flags
-      ACE_ENV_ARG_DECL)
+      u_long stability_flags)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::DUPLICATE_NAME,
                      RtecScheduler::UNKNOWN_TASK,
@@ -268,8 +265,7 @@ init (int config_count,
   for (int num_rt_infos = 0; num_rt_infos < rt_info_count; ++num_rt_infos)
     {
       new_rt_info = create_i (rt_info [num_rt_infos].entry_point,
-                              rt_info [num_rt_infos].handle, 1
-                              ACE_ENV_ARG_PARAMETER);
+                              rt_info [num_rt_infos].handle, 1);
 
       if (new_rt_info == 0)
         {
@@ -289,8 +285,7 @@ init (int config_count,
              RtecScheduler::Importance_t (rt_info [num_rt_infos].importance),
              rt_info [num_rt_infos].quantum,
              rt_info [num_rt_infos].threads,
-             RtecScheduler::Info_Type_t (rt_info [num_rt_infos].info_type)
-             ACE_ENV_ARG_PARAMETER);
+             RtecScheduler::Info_Type_t (rt_info [num_rt_infos].info_type));
 
       // Fill in the scheduler managed portions.
       new_rt_info->priority =
@@ -308,8 +303,7 @@ init (int config_count,
                             dependency_info [dependency_count_].info_depended_on,
                             dependency_info [dependency_count_].number_of_calls,
                             dependency_info [dependency_count_].dependency_type,
-                            dependency_info [dependency_count_].enabled
-                            ACE_ENV_ARG_PARAMETER);
+                            dependency_info [dependency_count_].enabled);
 
           ++this->dependency_count_;
         }
@@ -358,12 +352,12 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::close (void)
             }
           else
             {
-              ACE_THROW (RtecScheduler::INTERNAL ());
+              throw RtecScheduler::INTERNAL ();
             }
          }
       else
         {
-          ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+          throw RtecScheduler::UNKNOWN_TASK ();
         }
     }
 
@@ -379,7 +373,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::close (void)
         }
       else
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
     }
 
@@ -394,7 +388,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::close (void)
         }
       else
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
     }
 
@@ -408,7 +402,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::close (void)
         }
       else
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
     }
 
@@ -444,8 +438,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::close (void)
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 RtecScheduler::handle_t
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-create (const char *entry_point
-        ACE_ENV_ARG_DECL)
+create (const char *entry_point)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::DUPLICATE_NAME,
                       RtecScheduler::INTERNAL,
@@ -460,7 +453,7 @@ create (const char *entry_point
                       RtecScheduler::SYNCHRONIZATION_FAILURE ());
 
   RtecScheduler::handle_t handle = next_handle_;
-  create_i (entry_point, handle, 0 ACE_ENV_ARG_PARAMETER);
+  create_i (entry_point, handle, 0);
 
   // Set affected stability flags.
   this->stability_flags_ |=
@@ -476,8 +469,7 @@ create (const char *entry_point
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 RtecScheduler::handle_t
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-lookup (const char * entry_point
-        ACE_ENV_ARG_DECL)
+lookup (const char * entry_point)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::SYNCHRONIZATION_FAILURE))
@@ -491,7 +483,7 @@ lookup (const char * entry_point
                       RtecScheduler::SYNCHRONIZATION_FAILURE ());
 
   RtecScheduler::handle_t handle;
-  handle = this->lookup_i (entry_point ACE_ENV_ARG_PARAMETER);
+  handle = this->lookup_i (entry_point);
 
   return handle;
 }
@@ -502,8 +494,7 @@ lookup (const char * entry_point
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 RtecScheduler::RT_Info *
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-get (RtecScheduler::handle_t handle
-     ACE_ENV_ARG_DECL)
+get (RtecScheduler::handle_t handle)
      ACE_THROW_SPEC((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::SYNCHRONIZATION_FAILURE))
@@ -549,8 +540,7 @@ set (::RtecScheduler::handle_t handle,
      ::RtecScheduler::Importance_t importance,
      ::RtecScheduler::Quantum_t quantum,
      ::RtecScheduler::Threads_t threads,
-     ::RtecScheduler::Info_Type_t info_type
-     ACE_ENV_ARG_DECL)
+     ::RtecScheduler::Info_Type_t info_type)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::INTERNAL,
@@ -568,12 +558,12 @@ set (::RtecScheduler::handle_t handle,
   TAO_RT_Info_Ex *rt_info_ptr = 0;
   if (rt_info_map_.find (handle, rt_info_ptr) != 0)
     {
-      ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+      throw RtecScheduler::UNKNOWN_TASK ();
     }
 
   if (rt_info_ptr == 0)
     {
-      ACE_THROW (RtecScheduler::INTERNAL ());
+      throw RtecScheduler::INTERNAL ();
     }
 
   // Enable the RT_Info if it was disabled.  Does not modify NON_VOLATILE ops.
@@ -585,7 +575,7 @@ set (::RtecScheduler::handle_t handle,
   // Call the internal set method.
   this->set_i (rt_info_ptr, criticality, time, typical_time,
                cached_time, period, importance, quantum,
-               threads, info_type ACE_ENV_ARG_PARAMETER);
+               threads, info_type);
 
 
   // Update stability flags.  For now, just mark everything as unstable.
@@ -610,8 +600,7 @@ reset (RtecScheduler::handle_t handle,
        RtecScheduler::Importance_t importance,
        RtecScheduler::Quantum_t quantum,
        CORBA::Long threads,
-       RtecScheduler::Info_Type_t info_type
-       ACE_ENV_ARG_DECL)
+       RtecScheduler::Info_Type_t info_type)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::INTERNAL,
@@ -629,17 +618,17 @@ reset (RtecScheduler::handle_t handle,
   TAO_RT_Info_Ex *rt_info_ptr = 0;
   if (rt_info_map_.find (handle, rt_info_ptr) != 0)
     {
-      ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+      throw RtecScheduler::UNKNOWN_TASK ();
     }
   if (rt_info_ptr == 0)
     {
-      ACE_THROW (RtecScheduler::INTERNAL ());
+      throw RtecScheduler::INTERNAL ();
     }
 
   // Enable the RT_Info if it was disabled.  Does not modify NON_VOLATILE ops.
   if (rt_info_ptr->enabled_state () == RtecScheduler::RT_INFO_NON_VOLATILE)
     {
-      ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+      throw RtecScheduler::UNKNOWN_TASK ();
     }
   else
     {
@@ -656,7 +645,7 @@ reset (RtecScheduler::handle_t handle,
   // Then call the internal set method.
   this->set_i (rt_info_ptr, criticality, time, typical_time,
                cached_time, period, importance, quantum,
-               threads, info_type ACE_ENV_ARG_PARAMETER);
+               threads, info_type);
 
 
   // Update stability flags.  For now, just mark everything as unstable.
@@ -674,8 +663,7 @@ reset (RtecScheduler::handle_t handle,
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-set_seq (const RtecScheduler::RT_Info_Set& infos
-         ACE_ENV_ARG_DECL)
+set_seq (const RtecScheduler::RT_Info_Set& infos)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::INTERNAL,
@@ -695,12 +683,12 @@ set_seq (const RtecScheduler::RT_Info_Set& infos
       TAO_RT_Info_Ex *rt_info_ptr = 0;
       if (rt_info_map_.find (infos[i].handle, rt_info_ptr) != 0)
         {
-          ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+          throw RtecScheduler::UNKNOWN_TASK ();
         }
 
       if (rt_info_ptr == 0)
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
 
       // Enable the RT_Info if it was disabled.  Does not modify NON_VOLATILE ops.
@@ -724,8 +712,7 @@ set_seq (const RtecScheduler::RT_Info_Set& infos
                    info.importance,
                    info.quantum,
                    info.threads,
-                   info.info_type
-                   ACE_ENV_ARG_PARAMETER);
+                   info.info_type);
 #else
       this->set_i (rt_info_ptr,
                    infos[i].criticality,
@@ -736,8 +723,7 @@ set_seq (const RtecScheduler::RT_Info_Set& infos
                    infos[i].importance,
                    infos[i].quantum,
                    infos[i].threads,
-                   infos[i].info_type
-                   ACE_ENV_ARG_PARAMETER);
+                   infos[i].info_type);
 #endif
     }
 
@@ -755,8 +741,7 @@ set_seq (const RtecScheduler::RT_Info_Set& infos
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-reset_seq (const RtecScheduler::RT_Info_Set& infos
-           ACE_ENV_ARG_DECL)
+reset_seq (const RtecScheduler::RT_Info_Set& infos)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::INTERNAL,
@@ -778,13 +763,13 @@ reset_seq (const RtecScheduler::RT_Info_Set& infos
       // Look up the RT_Info by its handle, throw an exception if it's not there.
       if (rt_info_map_.find (infos[i].handle, rt_info_ptr) != 0)
         {
-          ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+          throw RtecScheduler::UNKNOWN_TASK ();
         }
 
       // Enable the RT_Info.  Does not modify NON_VOLATILE ops.
       if (rt_info_ptr->enabled_state () == RtecScheduler::RT_INFO_NON_VOLATILE)
         {
-          ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+          throw RtecScheduler::UNKNOWN_TASK ();
         }
       else
         {
@@ -804,12 +789,12 @@ reset_seq (const RtecScheduler::RT_Info_Set& infos
       // Look up the RT_Info by its handle, throw an exception if it's not there.
       if (rt_info_map_.find (infos[i].handle, rt_info_ptr) != 0)
         {
-          ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+          throw RtecScheduler::UNKNOWN_TASK ();
         }
 
       if (rt_info_ptr == 0)
     {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
 
 #if defined (__BORLANDC__) && (__BORLANDC__ <= 0x582) && defined (NDEBUG)
@@ -828,8 +813,7 @@ reset_seq (const RtecScheduler::RT_Info_Set& infos
                    info.importance,
                    info.quantum,
                    info.threads,
-                   info.info_type
-                   ACE_ENV_ARG_PARAMETER);
+                   info.info_type);
 #else
       // Call the internal set method.
       this->set_i (rt_info_ptr,
@@ -841,8 +825,7 @@ reset_seq (const RtecScheduler::RT_Info_Set& infos
                    infos[i].importance,
                    infos[i].quantum,
                    infos[i].threads,
-                   infos[i].info_type
-                   ACE_ENV_ARG_PARAMETER);
+                   infos[i].info_type);
 #endif
     }
 
@@ -859,8 +842,7 @@ reset_seq (const RtecScheduler::RT_Info_Set& infos
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-replace_seq (const RtecScheduler::RT_Info_Set& infos
-             ACE_ENV_ARG_DECL)
+replace_seq (const RtecScheduler::RT_Info_Set& infos)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::INTERNAL,
@@ -884,7 +866,7 @@ replace_seq (const RtecScheduler::RT_Info_Set& infos
       rt_info_ptr = (*info_iter).int_id_;
       if (! rt_info_ptr)
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
 
       switch (rt_info_ptr->enabled_state ())
@@ -918,12 +900,12 @@ replace_seq (const RtecScheduler::RT_Info_Set& infos
       // Look up the RT_Info by its handle, throw an exception if it's not there.
       if (rt_info_map_.find (infos[i].handle, rt_info_ptr) != 0)
         {
-          ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+          throw RtecScheduler::UNKNOWN_TASK ();
     }
 
       if (rt_info_ptr == 0)
     {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
 
       // Enable the RT_Info if it was disabled.  Does not modify NON_VOLATILE ops.
@@ -948,8 +930,7 @@ replace_seq (const RtecScheduler::RT_Info_Set& infos
                    info.importance,
                    info.quantum,
                    info.threads,
-                   info.info_type
-                   ACE_ENV_ARG_PARAMETER);
+                   info.info_type);
 #else
       // Call the internal set method.
       this->set_i (rt_info_ptr,
@@ -961,8 +942,7 @@ replace_seq (const RtecScheduler::RT_Info_Set& infos
                    infos[i].importance,
                    infos[i].quantum,
                    infos[i].threads,
-                   infos[i].info_type
-                   ACE_ENV_ARG_PARAMETER);
+                   infos[i].info_type);
 #endif
     }
 
@@ -986,8 +966,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 priority (RtecScheduler::handle_t handle,
           RtecScheduler::OS_Priority& o_priority,
           RtecScheduler::Preemption_Subpriority_t& subpriority,
-          RtecScheduler::Preemption_Priority_t& p_priority
-          ACE_ENV_ARG_DECL)
+          RtecScheduler::Preemption_Priority_t& p_priority)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -1000,7 +979,7 @@ priority (RtecScheduler::handle_t handle,
   if ((this->stability_flags_ & SCHED_PRIORITY_NOT_STABLE)
       && this->enforce_schedule_stability_)
     {
-      ACE_THROW (RtecScheduler::NOT_SCHEDULED ());
+      throw RtecScheduler::NOT_SCHEDULED ();
     }
 
   // CDG - TBD - address priority "generations" i.e., after an
@@ -1010,7 +989,7 @@ priority (RtecScheduler::handle_t handle,
   TAO_RT_Info_Ex *rt_info = 0;
   if (rt_info_map_.find (handle, rt_info) != 0)
     {
-      ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+      throw RtecScheduler::UNKNOWN_TASK ();
     }
 
   o_priority = rt_info->priority;
@@ -1028,8 +1007,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 entry_point_priority (const char * entry_point,
                       RtecScheduler::OS_Priority& priority,
                       RtecScheduler::Preemption_Subpriority_t& subpriority,
-                      RtecScheduler::Preemption_Priority_t& p_priority
-                      ACE_ENV_ARG_DECL)
+                      RtecScheduler::Preemption_Priority_t& p_priority)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -1044,13 +1022,12 @@ entry_point_priority (const char * entry_point,
                       RtecScheduler::SYNCHRONIZATION_FAILURE ());
 
   RtecScheduler::handle_t handle =
-    this->lookup_i (entry_point ACE_ENV_ARG_PARAMETER);
+    this->lookup_i (entry_point);
 
   this->priority_i (handle,
                   priority,
                   subpriority,
-                  p_priority
-                  ACE_ENV_ARG_PARAMETER);
+                  p_priority);
 }
 
 
@@ -1062,8 +1039,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 add_dependency (RtecScheduler::handle_t handle /* RT_Info that has the dependency */,
                 RtecScheduler::handle_t dependency /* RT_Info on which it depends */,
                 CORBA::Long number_of_calls,
-                RtecScheduler::Dependency_Type_t dependency_type
-                ACE_ENV_ARG_DECL)
+                RtecScheduler::Dependency_Type_t dependency_type)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::SYNCHRONIZATION_FAILURE,
                       RtecScheduler::UNKNOWN_TASK))
@@ -1078,7 +1054,7 @@ add_dependency (RtecScheduler::handle_t handle /* RT_Info that has the dependenc
 
   // Delegate to the internal method.
   add_dependency_i (handle, dependency, number_of_calls, dependency_type,
-                    RtecBase::DEPENDENCY_ENABLED ACE_ENV_ARG_PARAMETER);
+                    RtecBase::DEPENDENCY_ENABLED);
 
   // Since the call graph topology has changed, set *all*
   // stability flags before incrementing the dependency count.
@@ -1095,8 +1071,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 remove_dependency (RtecScheduler::handle_t handle,
                    RtecScheduler::handle_t dependency,
                    CORBA::Long number_of_calls,
-                   RtecScheduler::Dependency_Type_t dependency_type
-                   ACE_ENV_ARG_DECL)
+                   RtecScheduler::Dependency_Type_t dependency_type)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::SYNCHRONIZATION_FAILURE,
                       RtecScheduler::UNKNOWN_TASK))
@@ -1111,7 +1086,7 @@ remove_dependency (RtecScheduler::handle_t handle,
 
   // Delegate to the internal method.
   remove_dependency_i (handle, dependency, number_of_calls,
-                       dependency_type ACE_ENV_ARG_PARAMETER);
+                       dependency_type);
 
   // Since the call graph topology has changed, set *all*
   // stability flags before incrementing the dependency count.
@@ -1128,8 +1103,7 @@ set_dependency_enable_state (RtecScheduler::handle_t handle,
                              RtecScheduler::handle_t dependency,
                              CORBA::Long number_of_calls,
                              RtecScheduler::Dependency_Type_t dependency_type,
-                             RtecScheduler::Dependency_Enabled_Type_t enabled
-                             ACE_ENV_ARG_DECL)
+                             RtecScheduler::Dependency_Enabled_Type_t enabled)
      ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                       RtecScheduler::UNKNOWN_TASK))
@@ -1144,7 +1118,7 @@ set_dependency_enable_state (RtecScheduler::handle_t handle,
 
   // Delegate to the internal method.
   set_dependency_enable_state_i (handle, dependency, number_of_calls,
-                                 dependency_type, enabled ACE_ENV_ARG_PARAMETER);
+                                 dependency_type, enabled);
 }
 
 
@@ -1153,8 +1127,7 @@ set_dependency_enable_state (RtecScheduler::handle_t handle,
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependencies
-                                 ACE_ENV_ARG_DECL)
+set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependencies)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::UNKNOWN_TASK))
@@ -1174,8 +1147,7 @@ set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependenc
                                      dependencies[i].rt_info_depended_on,
                                      dependencies[i].number_of_calls,
                                      dependencies[i].dependency_type,
-                                     dependencies[i].enabled
-                                     ACE_ENV_ARG_PARAMETER);
+                                     dependencies[i].enabled);
     }
 }
 
@@ -1186,8 +1158,7 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 set_rt_info_enable_state (RtecScheduler::handle_t handle,
-                          RtecScheduler::RT_Info_Enabled_Type_t enabled
-                          ACE_ENV_ARG_DECL)
+                          RtecScheduler::RT_Info_Enabled_Type_t enabled)
      ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                       RtecScheduler::INTERNAL,
@@ -1205,12 +1176,12 @@ set_rt_info_enable_state (RtecScheduler::handle_t handle,
   TAO_RT_Info_Ex *rt_info_ptr = 0;
   if (rt_info_map_.find (handle, rt_info_ptr) != 0)
     {
-      ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+      throw RtecScheduler::UNKNOWN_TASK ();
     }
 
   if (rt_info_ptr == 0)
     {
-      ACE_THROW (RtecScheduler::INTERNAL ());
+      throw RtecScheduler::INTERNAL ();
     }
 
   // Enable the RT_Info.
@@ -1223,8 +1194,7 @@ set_rt_info_enable_state (RtecScheduler::handle_t handle,
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-set_rt_info_enable_state_seq (const RtecScheduler::RT_Info_Enable_State_Pair_Set & pair_set
-                              ACE_ENV_ARG_DECL)
+set_rt_info_enable_state_seq (const RtecScheduler::RT_Info_Enable_State_Pair_Set & pair_set)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                       RtecScheduler::INTERNAL,
@@ -1244,12 +1214,12 @@ set_rt_info_enable_state_seq (const RtecScheduler::RT_Info_Enable_State_Pair_Set
       TAO_RT_Info_Ex *rt_info_ptr = 0;
       if (rt_info_map_.find (pair_set[i].handle, rt_info_ptr) != 0)
         {
-          ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+          throw RtecScheduler::UNKNOWN_TASK ();
         }
 
       if (rt_info_ptr == 0)
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
 
       // Enable the RT_Info.
@@ -1271,8 +1241,7 @@ compute_scheduling (CORBA::Long minimum_priority,
                     RtecScheduler::RT_Info_Set_out infos,
                     RtecScheduler::Dependency_Set_out dependencies,
                     RtecScheduler::Config_Info_Set_out configs,
-                    RtecScheduler::Scheduling_Anomaly_Set_out anomalies
-                    ACE_ENV_ARG_DECL)
+                    RtecScheduler::Scheduling_Anomaly_Set_out anomalies)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                       RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -1283,13 +1252,13 @@ compute_scheduling (CORBA::Long minimum_priority,
 {
   // Delegates to recompute_scheduling and the respective accessors.
   this->recompute_scheduling (minimum_priority, maximum_priority,
-                              anomalies ACE_ENV_ARG_PARAMETER);
+                              anomalies);
 
-  this->get_rt_info_set (infos ACE_ENV_ARG_PARAMETER);
+  this->get_rt_info_set (infos);
 
-  this->get_dependency_set (dependencies ACE_ENV_ARG_PARAMETER);
+  this->get_dependency_set (dependencies);
 
-  this->get_config_info_set (configs ACE_ENV_ARG_PARAMETER);
+  this->get_config_info_set (configs);
 
 #if defined (SCHEDULER_DUMP)
   ACE_DEBUG ((LM_TRACE, "Schedule prepared.\n"));
@@ -1309,8 +1278,7 @@ void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 recompute_scheduling (CORBA::Long /* minimum_priority */,
                       CORBA::Long /* maximum_priority */,
-                      RtecScheduler::Scheduling_Anomaly_Set_out anomalies
-                      ACE_ENV_ARG_DECL)
+                      RtecScheduler::Scheduling_Anomaly_Set_out anomalies)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -1469,8 +1437,7 @@ recompute_scheduling (CORBA::Long /* minimum_priority */,
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-get_rt_info_set (RtecScheduler::RT_Info_Set_out infos
-                 ACE_ENV_ARG_DECL)
+get_rt_info_set (RtecScheduler::RT_Info_Set_out infos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::INTERNAL))
@@ -1505,8 +1472,7 @@ get_rt_info_set (RtecScheduler::RT_Info_Set_out infos
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-get_dependency_set (RtecScheduler::Dependency_Set_out dependencies
-                    ACE_ENV_ARG_DECL_NOT_USED)
+get_dependency_set (RtecScheduler::Dependency_Set_out dependencies)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::INTERNAL))
@@ -1550,8 +1516,7 @@ get_dependency_set (RtecScheduler::Dependency_Set_out dependencies
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-get_config_info_set (RtecScheduler::Config_Info_Set_out configs
-                     ACE_ENV_ARG_DECL)
+get_config_info_set (RtecScheduler::Config_Info_Set_out configs)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::INTERNAL))
@@ -1588,8 +1553,7 @@ void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
                         RtecScheduler::OS_Priority& t_priority,
-                        RtecScheduler::Dispatching_Type_t & d_type
-                        ACE_ENV_ARG_DECL)
+                        RtecScheduler::Dispatching_Type_t & d_type)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::NOT_SCHEDULED,
                       RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -1607,13 +1571,13 @@ dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
   if ((this->stability_flags_ & SCHED_PRIORITY_NOT_STABLE)
       && this->enforce_schedule_stability_)
     {
-      ACE_THROW (RtecScheduler::NOT_SCHEDULED ());
+      throw RtecScheduler::NOT_SCHEDULED ();
     }
 
   RtecScheduler::Config_Info *config_info = 0;
   if (config_info_map_.find (p_priority, config_info) != 0)
     {
-      ACE_THROW (RtecScheduler::UNKNOWN_PRIORITY_LEVEL());
+      throw RtecScheduler::UNKNOWN_PRIORITY_LEVEL();
     }
 
   t_priority = config_info->thread_priority;
@@ -1658,8 +1622,7 @@ last_scheduled_priority (void)
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-get_config_infos (RtecScheduler::Config_Info_Set_out configs
-		  ACE_ENV_ARG_DECL)
+get_config_infos (RtecScheduler::Config_Info_Set_out configs)
   ACE_THROW_SPEC ((CORBA::SystemException,
 		   RtecScheduler::SYNCHRONIZATION_FAILURE,
 		   RtecScheduler::NOT_SCHEDULED))
@@ -1671,7 +1634,7 @@ get_config_infos (RtecScheduler::Config_Info_Set_out configs
   if ((this->stability_flags_ & SCHED_PRIORITY_NOT_STABLE)
       && this->enforce_schedule_stability_)
     {
-      ACE_THROW (RtecScheduler::NOT_SCHEDULED ());
+      throw RtecScheduler::NOT_SCHEDULED ();
     }
 
   // return the set of Config_Infos
@@ -1705,8 +1668,7 @@ TAO_RT_Info_Ex *
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 create_i (const char *entry_point,
           RtecScheduler::handle_t handle,
-          int ignore_duplicates
-          ACE_ENV_ARG_DECL)
+          int ignore_duplicates)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::DUPLICATE_NAME,
                      RtecScheduler::INTERNAL))
@@ -1793,7 +1755,7 @@ create_i (const char *entry_point,
 
   // Maintain the size of the entry pointer array.
   maintain_scheduling_array (entry_ptr_array_, entry_ptr_array_size_,
-                             handle ACE_ENV_ARG_PARAMETER);
+                             handle);
 
 
   // Store the new entry in the scheduling entry pointer array.
@@ -1836,8 +1798,7 @@ set_i (TAO_RT_Info_Ex *rt_info,
        RtecScheduler::Importance_t importance,
        RtecScheduler::Quantum_t quantum,
        CORBA::Long threads,
-       RtecScheduler::Info_Type_t info_type
-       ACE_ENV_ARG_DECL)
+       RtecScheduler::Info_Type_t info_type)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::INTERNAL))
 {
@@ -1851,7 +1812,7 @@ set_i (TAO_RT_Info_Ex *rt_info,
     {
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT("Conjunction Nodes are not supported currently.")));
-      ACE_THROW (RtecScheduler::INTERNAL ());
+      throw RtecScheduler::INTERNAL ();
     }
 
 
@@ -1875,13 +1836,13 @@ set_i (TAO_RT_Info_Ex *rt_info,
 //      ACE_DEBUG((LM_DEBUG, "Updating or inserting tuple for RT_Info: %d, entry_ptr: %x\n", rt_info->handle, rse_ptr));
       if (rse_ptr == 0)
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
 
       int result = rse_ptr->update_tuple (*rt_info);
       if (result < 0)
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
       else if (result == 0)  // We did not find an existing tuple.
         {
@@ -1903,14 +1864,13 @@ set_i (TAO_RT_Info_Ex *rt_info,
           result = rse_ptr->insert_tuple (*tuple_ptr);
           if (result < 0)
             {
-              ACE_THROW (RtecScheduler::INTERNAL ());
+              throw RtecScheduler::INTERNAL ();
             }
 
           // Maintain the size of the entry pointer array.
           maintain_scheduling_array (tuple_ptr_array_,
                                      tuple_ptr_array_size_,
-                                     rt_info_tuple_count_
-                                     ACE_ENV_ARG_PARAMETER);
+                                     rt_info_tuple_count_);
 
           // Store the new tuple in the tuple pointer array.
           tuple_ptr_array_ [this->rt_info_tuple_count_] = tuple_ptr;
@@ -1931,8 +1891,7 @@ set_i (TAO_RT_Info_Ex *rt_info,
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 RtecScheduler::handle_t
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-lookup_i (const char * entry_point
-          ACE_ENV_ARG_DECL)
+lookup_i (const char * entry_point)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK))
 {
@@ -1959,8 +1918,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 priority_i (RtecScheduler::handle_t handle,
             RtecScheduler::OS_Priority& o_priority,
             RtecScheduler::Preemption_Subpriority_t& subpriority,
-            RtecScheduler::Preemption_Priority_t& p_priority
-            ACE_ENV_ARG_DECL)
+            RtecScheduler::Preemption_Priority_t& p_priority)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::NOT_SCHEDULED))
@@ -1969,13 +1927,13 @@ priority_i (RtecScheduler::handle_t handle,
   if ((this->stability_flags_ & SCHED_PRIORITY_NOT_STABLE)
       && this->enforce_schedule_stability_)
     {
-      ACE_THROW (RtecScheduler::NOT_SCHEDULED ());
+      throw RtecScheduler::NOT_SCHEDULED ();
     }
 
   TAO_RT_Info_Ex *rt_info = 0;
   if (rt_info_map_.find (handle, rt_info) != 0)
     {
-      ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+      throw RtecScheduler::UNKNOWN_TASK ();
     }
 
   o_priority = rt_info->priority;
@@ -1992,8 +1950,7 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende
                   RtecScheduler::handle_t dependency /* RT_Info on which it depends */,
                   CORBA::Long number_of_calls,
                   RtecScheduler::Dependency_Type_t dependency_type,
-                  RtecScheduler::Dependency_Enabled_Type_t enabled
-                  ACE_ENV_ARG_DECL)
+                  RtecScheduler::Dependency_Enabled_Type_t enabled)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::INTERNAL,
                       RtecScheduler::UNKNOWN_TASK))
@@ -2022,8 +1979,7 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende
                         calling_dependency_set_map_,   // calling map
                         number_of_calls,
                         dependency_type,
-                        enabled
-                        ACE_ENV_ARG_PARAMETER);
+                        enabled);
 
       // Add the called dependency map entry
       map_dependency_i (dependency,                    // called handle
@@ -2031,8 +1987,7 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende
                         called_dependency_set_map_,    // called map
                         number_of_calls,
                         dependency_type,
-                        enabled
-                        ACE_ENV_ARG_PARAMETER);
+                        enabled);
 
       break;
 
@@ -2046,8 +2001,7 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende
                         calling_dependency_set_map_,   // calling map
                         number_of_calls,
                         dependency_type,
-                        enabled
-                        ACE_ENV_ARG_PARAMETER);
+                        enabled);
 
       // Add the called dependency map entry
       map_dependency_i (handle,                        // called handle
@@ -2055,14 +2009,13 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende
                         called_dependency_set_map_,    // called map
                         number_of_calls,
                         dependency_type,
-                        enabled
-                        ACE_ENV_ARG_PARAMETER);
+                        enabled);
       break;
 
     default:
 
       // There should not be any other kinds of dependencies.
-      ACE_THROW (RtecScheduler::INTERNAL ());
+      throw RtecScheduler::INTERNAL ();
   }
 
  // Add the criticality dependency map entry.
@@ -2082,8 +2035,7 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende
                    crit_dependency_set_map_,// crit dependency map
                    number_of_calls,
                    dependency_type,
-                   enabled
-                   ACE_ENV_ARG_PARAMETER);
+                   enabled);
 
 }
 
@@ -2095,8 +2047,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 remove_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the dependency */,
                      RtecScheduler::handle_t dependency /* RT_Info on which it depends */,
                      CORBA::Long number_of_calls,
-                     RtecScheduler::Dependency_Type_t dependency_type
-                     ACE_ENV_ARG_DECL)
+                     RtecScheduler::Dependency_Type_t dependency_type)
      ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                       RtecScheduler::INTERNAL,
@@ -2125,16 +2076,14 @@ remove_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depe
                           dependency,                    // called handle
                           calling_dependency_set_map_,   // calling map
                           number_of_calls,
-                          dependency_type
-                          ACE_ENV_ARG_PARAMETER);
+                          dependency_type);
 
       // Remove the called dependency map entry
       unmap_dependency_i (dependency,                    // called handle
                           handle,                        // calling handle
                           called_dependency_set_map_,    // called map
                           number_of_calls,
-                          dependency_type
-                          ACE_ENV_ARG_PARAMETER);
+                          dependency_type);
       break;
 
     // In a one-way call, the called operation depends on the
@@ -2146,22 +2095,20 @@ remove_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depe
                           handle,                        // called handle
                           calling_dependency_set_map_,   // calling map
                           number_of_calls,
-                          dependency_type
-                          ACE_ENV_ARG_PARAMETER);
+                          dependency_type);
 
       // Remove the called dependency map entry
       unmap_dependency_i (handle,                        // called handle
                           dependency,                    // calling handle
                           called_dependency_set_map_,    // called map
                           number_of_calls,
-                          dependency_type
-                          ACE_ENV_ARG_PARAMETER);
+                          dependency_type);
       break;
 
     default:
 
       // There should not be any other kinds of dependencies.
-      ACE_THROW (RtecScheduler::INTERNAL ());
+      throw RtecScheduler::INTERNAL ();
   }
 }
 
@@ -2175,8 +2122,7 @@ set_dependency_enable_state_i (RtecScheduler::handle_t handle,
                                RtecScheduler::handle_t dependency,
                                CORBA::Long number_of_calls,
                                RtecScheduler::Dependency_Type_t dependency_type,
-                               RtecScheduler::Dependency_Enabled_Type_t enabled
-                               ACE_ENV_ARG_DECL)
+                               RtecScheduler::Dependency_Enabled_Type_t enabled)
      ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                       RtecScheduler::INTERNAL,
@@ -2206,8 +2152,7 @@ set_dependency_enable_state_i (RtecScheduler::handle_t handle,
                                      calling_dependency_set_map_,   // calling map
                                      number_of_calls,
                                      dependency_type,
-                                     enabled
-                                     ACE_ENV_ARG_PARAMETER);
+                                     enabled);
 
       // Update the called dependency map entry
       map_dependency_enable_state_i (dependency,                    // called handle
@@ -2215,8 +2160,7 @@ set_dependency_enable_state_i (RtecScheduler::handle_t handle,
                                      called_dependency_set_map_,    // called map
                                      number_of_calls,
                                      dependency_type,
-                                     enabled
-                                     ACE_ENV_ARG_PARAMETER);
+                                     enabled);
       break;
 
     // In a one-way call, the called operation depends on the
@@ -2229,8 +2173,7 @@ set_dependency_enable_state_i (RtecScheduler::handle_t handle,
                                      calling_dependency_set_map_,   // calling map
                                      number_of_calls,
                                      dependency_type,
-                                     enabled
-                                     ACE_ENV_ARG_PARAMETER);
+                                     enabled);
 
       // Update the called dependency map entry
       map_dependency_enable_state_i (handle,                        // called handle
@@ -2238,14 +2181,13 @@ set_dependency_enable_state_i (RtecScheduler::handle_t handle,
                                      called_dependency_set_map_,    // called map
                                      number_of_calls,
                                      dependency_type,
-                                     enabled
-                                     ACE_ENV_ARG_PARAMETER);
+                                     enabled);
       break;
 
     default:
 
       // There should not be any other kinds of dependencies.
-      ACE_THROW (RtecScheduler::INTERNAL ());
+      throw RtecScheduler::INTERNAL ();
   }
 }
 
@@ -2258,8 +2200,7 @@ map_dependency_i (RtecScheduler::handle_t key,
                   ACE_TYPENAME TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP &dependency_map,
                   CORBA::Long number_of_calls,
                   RtecScheduler::Dependency_Type_t dependency_type,
-                  RtecScheduler::Dependency_Enabled_Type_t enabled
-                  ACE_ENV_ARG_DECL)
+                  RtecScheduler::Dependency_Enabled_Type_t enabled)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::INTERNAL,
                       RtecScheduler::UNKNOWN_TASK))
@@ -2282,7 +2223,7 @@ map_dependency_i (RtecScheduler::handle_t key,
       if (dependency_map.bind (key, dependency_set) != 0)
         {
           delete dependency_set;
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
     }
 
@@ -2306,8 +2247,7 @@ unmap_dependency_i (RtecScheduler::handle_t key,
                     RtecScheduler::handle_t handle,
                     ACE_TYPENAME TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP &dependency_map,
                     CORBA::Long number_of_calls,
-                    RtecScheduler::Dependency_Type_t dependency_type
-                    ACE_ENV_ARG_DECL)
+                    RtecScheduler::Dependency_Type_t dependency_type)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::INTERNAL,
                       RtecScheduler::UNKNOWN_TASK))
@@ -2350,17 +2290,17 @@ unmap_dependency_i (RtecScheduler::handle_t key,
 
           if (!found)
             {
-              ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+              throw RtecScheduler::UNKNOWN_TASK ();
             }
         }
       else
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
     }
   else
     {
-      ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+      throw RtecScheduler::UNKNOWN_TASK ();
     }
 }
 
@@ -2376,8 +2316,7 @@ map_dependency_enable_state_i (RtecScheduler::handle_t key,
                                  TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP &dependency_map,
                                CORBA::Long number_of_calls,
                                RtecScheduler::Dependency_Type_t dependency_type,
-                               RtecScheduler::Dependency_Enabled_Type_t enabled
-                               ACE_ENV_ARG_DECL)
+                               RtecScheduler::Dependency_Enabled_Type_t enabled)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::INTERNAL,
                      RtecScheduler::UNKNOWN_TASK))
@@ -2412,17 +2351,17 @@ map_dependency_enable_state_i (RtecScheduler::handle_t key,
 
           if (!found)
             {
-              ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+              throw RtecScheduler::UNKNOWN_TASK ();
             }
         }
       else
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
     }
   else
     {
-      ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+      throw RtecScheduler::UNKNOWN_TASK ();
     }
 }
 
@@ -2450,7 +2389,7 @@ dfs_traverse_i (void)
     {
       if (reset_visitor.visit (* (entry_ptr_array_ [i])) < 0)
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
     }
 
@@ -2462,7 +2401,7 @@ dfs_traverse_i (void)
     {
       if (dfs_visitor.visit (* (entry_ptr_array_ [i])) < 0)
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
     }
 }
@@ -2503,14 +2442,14 @@ detect_cycles_i (void)
 
       if (scc_visitor.visit (* (entry_ptr_array_ [i])) < 0)
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
     }
 
   // Check whether any cycles were detected.
   if (scc_visitor.number_of_cycles () > 0)
     {
-      ACE_THROW (RtecScheduler::CYCLIC_DEPENDENCIES ());
+      throw RtecScheduler::CYCLIC_DEPENDENCIES ();
     }
 }
 
@@ -2542,7 +2481,7 @@ perform_admission_i (void)
     {
       if (prop_visitor.visit (* (entry_ptr_array_ [i])) < 0)
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
     }
 
@@ -2569,7 +2508,7 @@ perform_admission_i (void)
     {
       if (admit_visitor.visit (* (tuple_ptr_array_ [i])) < 0)
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
     }
 
@@ -2600,7 +2539,7 @@ crit_dfs_traverse_i (void)
     {
       if (reset_visitor.visit (* (entry_ptr_array_ [i])) < 0)
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
     }
 
@@ -2612,7 +2551,7 @@ crit_dfs_traverse_i (void)
     {
       if (dfs_visitor.visit (* (entry_ptr_array_ [i])) < 0)
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
     }
 }
@@ -2648,14 +2587,14 @@ propagate_criticalities_i (void)
     {
       if (crit_prop_visitor.visit (* (entry_ptr_array_ [i])) < 0)
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
     }
   for (i = this->rt_info_count_-1; i>=0; --i)
     {
       if (crit_prop_visitor.visit (* (entry_ptr_array_ [i])) < 0)
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
     }
 }
@@ -2684,20 +2623,20 @@ propagate_characteristics_i (void)
     {
       if (prop_visitor.visit (* (entry_ptr_array_ [i])) < 0)
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
     }
 
   // Check whether any unresolved local dependencies were detected.
   if (prop_visitor.unresolved_locals () > 0)
     {
-      ACE_THROW (RtecScheduler::UNRESOLVED_LOCAL_DEPENDENCIES ());
+      throw RtecScheduler::UNRESOLVED_LOCAL_DEPENDENCIES ();
     }
 
   // Check whether any thread specification errors were detected.
   if (prop_visitor.thread_specification_errors () > 0)
     {
-      ACE_THROW (RtecScheduler::THREAD_SPECIFICATION ());
+      throw RtecScheduler::THREAD_SPECIFICATION ();
     }
 }
 
@@ -2769,7 +2708,7 @@ assign_priorities_i (void)
         }
       else
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
     }
   this->config_info_count_ = 0;
@@ -2797,7 +2736,7 @@ assign_priorities_i (void)
       if (result < 0)
         {
           // Something bad happened with the internal data structures.
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
       else if (result == 1)
         {
@@ -2814,7 +2753,7 @@ assign_priorities_i (void)
           if  (RECONFIG_SCHED_STRATEGY::assign_config (*new_config_info,
                                                        *(entry_ptr_array_ [i])) < 0)
             {
-              ACE_THROW (RtecScheduler::INTERNAL ());
+              throw RtecScheduler::INTERNAL ();
             }
 
           if (new_config_info->preemption_priority >
@@ -2830,11 +2769,11 @@ assign_priorities_i (void)
             {
               case -1:
                 // Something bad but unknown occurred while trying to bind in map.
-                ACE_THROW (RtecScheduler::INTERNAL ());
+                throw RtecScheduler::INTERNAL ();
 
               case 1:
                 // Tried to bind an operation that was already in the map.
-                ACE_THROW (RtecScheduler::DUPLICATE_NAME ());
+                throw RtecScheduler::DUPLICATE_NAME ();
 
               default:
                 ++this->config_info_count_;
@@ -2873,7 +2812,7 @@ refresh_tuple_ptr_array_i (void)
       if (entry_ptr_array_ [i]->register_tuples (this->tuple_ptr_array_,
                                                  this->rt_info_tuple_count_) < 0)
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
     }
 }
@@ -3037,8 +2976,7 @@ critical_utilization_threshold (const CORBA::Double &d)
 template <class ARRAY_ELEMENT_TYPE> void
 maintain_scheduling_array (ARRAY_ELEMENT_TYPE ** & current_ptr_array,
                            long & current_ptr_array_size,
-                           RtecScheduler::handle_t handle
-                           ACE_ENV_ARG_DECL)
+                           RtecScheduler::handle_t handle)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (current_ptr_array_size <= handle)
@@ -3094,7 +3032,7 @@ compute_utilization_i (void)
     {
       if (util_visitor.visit (* (entry_ptr_array_ [i])) < 0)
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
     }
 
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
index e147e057790..4c914f8fe37 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
@@ -107,8 +107,7 @@ public:
             ACE_Scheduler_Factory::POD_RT_Info rt_info[],
             int dependency_count,
             ACE_Scheduler_Factory::POD_Dependency_Info dependency_info[],
-            u_long stability_flags
-            ACE_ENV_ARG_DECL)
+            u_long stability_flags)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::DUPLICATE_NAME,
                      RtecScheduler::UNKNOWN_TASK,
@@ -123,8 +122,7 @@ public:
                      RtecScheduler::SYNCHRONIZATION_FAILURE));
   // Closes the scheduler, releasing all current resources.
 
-  virtual RtecScheduler::handle_t create (const char * entry_point
-                                          ACE_ENV_ARG_DECL)
+  virtual RtecScheduler::handle_t create (const char * entry_point)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::DUPLICATE_NAME,
                      RtecScheduler::INTERNAL,
@@ -134,16 +132,14 @@ public:
   // RT_Info is returned.  If the RT_Info already exists, an exception
   // is thrown.
 
-  virtual RtecScheduler::handle_t lookup (const char * entry_point
-                                          ACE_ENV_ARG_DECL)
+  virtual RtecScheduler::handle_t lookup (const char * entry_point)
     ACE_THROW_SPEC((CORBA::SystemException,
                     RtecScheduler::UNKNOWN_TASK,
                     RtecScheduler::SYNCHRONIZATION_FAILURE));
   // Lookup a handle for an RT_Info, and return its handle, or an error
   // value if it's not present.
 
-  virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle
-                                       ACE_ENV_ARG_DECL)
+  virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::SYNCHRONIZATION_FAILURE));
@@ -158,8 +154,7 @@ public:
                     ::RtecScheduler::Importance_t importance,
                     ::RtecScheduler::Quantum_t quantum,
                     ::RtecScheduler::Threads_t threads,
-                    ::RtecScheduler::Info_Type_t info_type
-                    ACE_ENV_ARG_DECL)
+                    ::RtecScheduler::Info_Type_t info_type)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::INTERNAL,
@@ -175,16 +170,14 @@ public:
                       RtecScheduler::Importance_t importance,
                       RtecScheduler::Quantum_t quantum,
                       CORBA::Long threads,
-                      RtecScheduler::Info_Type_t info_type
-                      ACE_ENV_ARG_DECL)
+                      RtecScheduler::Info_Type_t info_type)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::INTERNAL,
                      RtecScheduler::SYNCHRONIZATION_FAILURE));
   // Reset characteristics of the RT_Info corresponding to the passed handle.
 
-  virtual void set_seq (const RtecScheduler::RT_Info_Set& infos
-                        ACE_ENV_ARG_DECL)
+  virtual void set_seq (const RtecScheduler::RT_Info_Set& infos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::INTERNAL,
@@ -192,8 +185,7 @@ public:
   // Set characteristics of the RT_Infos corresponding to the passed handles.
   // Tuples are added in the case of existing and/or multiple definitions.
 
-  virtual void reset_seq (const RtecScheduler::RT_Info_Set& infos
-                          ACE_ENV_ARG_DECL)
+  virtual void reset_seq (const RtecScheduler::RT_Info_Set& infos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::INTERNAL,
@@ -201,8 +193,7 @@ public:
   // Reset characteristics of the RT_Infos corresponding to the passed handles.
   // Tuples are replaced in the case of existing and/or multiple definitions.
 
-  virtual void replace_seq (const RtecScheduler::RT_Info_Set& infos
-                            ACE_ENV_ARG_DECL)
+  virtual void replace_seq (const RtecScheduler::RT_Info_Set& infos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::INTERNAL,
@@ -215,8 +206,7 @@ public:
   virtual void priority (RtecScheduler::handle_t handle,
                          RtecScheduler::OS_Priority& o_priority,
                          RtecScheduler::Preemption_Subpriority_t& p_subpriority,
-                         RtecScheduler::Preemption_Priority_t& p_priority
-                         ACE_ENV_ARG_DECL)
+                         RtecScheduler::Preemption_Priority_t& p_priority)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -227,8 +217,7 @@ public:
   virtual void entry_point_priority (const char * entry_point,
                                      RtecScheduler::OS_Priority& o_priority,
                                      RtecScheduler::Preemption_Subpriority_t& p_subpriority,
-                                     RtecScheduler::Preemption_Priority_t& p_priority
-                                     ACE_ENV_ARG_DECL)
+                                     RtecScheduler::Preemption_Priority_t& p_priority)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -239,8 +228,7 @@ public:
   virtual void add_dependency (RtecScheduler::handle_t handle,
                                RtecScheduler::handle_t dependency,
                                CORBA::Long number_of_calls,
-                               RtecScheduler::Dependency_Type_t dependency_type
-                               ACE_ENV_ARG_DECL)
+                               RtecScheduler::Dependency_Type_t dependency_type)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::UNKNOWN_TASK));
@@ -249,8 +237,7 @@ public:
   virtual void remove_dependency (RtecScheduler::handle_t handle,
                                   RtecScheduler::handle_t dependency,
                                   CORBA::Long number_of_calls,
-                                  RtecScheduler::Dependency_Type_t dependency_type
-                                  ACE_ENV_ARG_DECL)
+                                  RtecScheduler::Dependency_Type_t dependency_type)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::UNKNOWN_TASK));
@@ -260,31 +247,27 @@ public:
                                             RtecScheduler::handle_t dependency,
                                             CORBA::Long number_of_calls,
                                             RtecScheduler::Dependency_Type_t dependency_type,
-                                            RtecScheduler::Dependency_Enabled_Type_t enabled
-                                            ACE_ENV_ARG_DECL)
+                                            RtecScheduler::Dependency_Enabled_Type_t enabled)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::UNKNOWN_TASK));
   // This method sets the enable state of a dependency between two RT_Infos.
 
-  virtual void set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependencies
-                                                ACE_ENV_ARG_DECL)
+  virtual void set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependencies)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::UNKNOWN_TASK));
   // This method sets the enable state of a sequence of dependencies.
 
   virtual void set_rt_info_enable_state (RtecScheduler::handle_t handle,
-                                         RtecScheduler::RT_Info_Enabled_Type_t enabled
-                                         ACE_ENV_ARG_DECL)
+                                         RtecScheduler::RT_Info_Enabled_Type_t enabled)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                       RtecScheduler::INTERNAL,
                      RtecScheduler::UNKNOWN_TASK));
   // This method enables or disables an RT_Info.
 
-  virtual void set_rt_info_enable_state_seq (const RtecScheduler::RT_Info_Enable_State_Pair_Set & pair_set
-                                             ACE_ENV_ARG_DECL)
+  virtual void set_rt_info_enable_state_seq (const RtecScheduler::RT_Info_Enable_State_Pair_Set & pair_set)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                       RtecScheduler::INTERNAL,
@@ -296,8 +279,7 @@ public:
                                    RtecScheduler::RT_Info_Set_out infos,
                                    RtecScheduler::Dependency_Set_out dependencies,
                                    RtecScheduler::Config_Info_Set_out configs,
-                                   RtecScheduler::Scheduling_Anomaly_Set_out anomalies
-                                   ACE_ENV_ARG_DECL)
+                                   RtecScheduler::Scheduling_Anomaly_Set_out anomalies)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -312,8 +294,7 @@ public:
 
   virtual void recompute_scheduling (CORBA::Long minimum_priority,
                                      CORBA::Long maximum_priority,
-                                     RtecScheduler::Scheduling_Anomaly_Set_out anomalies
-                                     ACE_ENV_ARG_DECL)
+                                     RtecScheduler::Scheduling_Anomaly_Set_out anomalies)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -323,24 +304,21 @@ public:
                      RtecScheduler::DUPLICATE_NAME));
   // Recomputes the scheduling priorities, etc.
 
-  virtual void get_rt_info_set (RtecScheduler::RT_Info_Set_out infos
-                                ACE_ENV_ARG_DECL)
+  virtual void get_rt_info_set (RtecScheduler::RT_Info_Set_out infos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::INTERNAL));
   // Returns the set of rt_infos, with their assigned priorities (as
   // of the last schedule re-computation).
 
-  virtual void get_dependency_set (RtecScheduler::Dependency_Set_out dependencies
-                                   ACE_ENV_ARG_DECL)
+  virtual void get_dependency_set (RtecScheduler::Dependency_Set_out dependencies)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::INTERNAL));
   // Returns the set of rt_infos, with their assigned priorities (as
   // of the last schedule re-computation).
 
-  virtual void get_config_info_set (RtecScheduler::Config_Info_Set_out configs
-                                    ACE_ENV_ARG_DECL)
+  virtual void get_config_info_set (RtecScheduler::Config_Info_Set_out configs)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::INTERNAL));
@@ -350,8 +328,7 @@ public:
 
   virtual void dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
                                        RtecScheduler::OS_Priority& o_priority,
-                                       RtecScheduler::Dispatching_Type_t & d_type
-                                       ACE_ENV_ARG_DECL)
+                                       RtecScheduler::Dispatching_Type_t & d_type)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::NOT_SCHEDULED,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -367,8 +344,7 @@ public:
   // of scheduled priorities.  All scheduled priorities range from 0
   // to the number returned, inclusive.
 
-  virtual void get_config_infos (RtecScheduler::Config_Info_Set_out configs
-				 ACE_ENV_ARG_DECL)
+  virtual void get_config_infos (RtecScheduler::Config_Info_Set_out configs)
     ACE_THROW_SPEC ((CORBA::SystemException,
 		     RtecScheduler::SYNCHRONIZATION_FAILURE,
 		     RtecScheduler::NOT_SCHEDULED));
@@ -465,8 +441,7 @@ protected:
 
   TAO_RT_Info_Ex * create_i (const char * entry_point,
                              RtecScheduler::handle_t handle,
-                             int ignore_duplicates
-                             ACE_ENV_ARG_DECL)
+                             int ignore_duplicates)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::DUPLICATE_NAME,
                      RtecScheduler::INTERNAL));
@@ -485,14 +460,12 @@ protected:
                       RtecScheduler::Importance_t importance,
                       RtecScheduler::Quantum_t quantum,
                       CORBA::Long threads,
-              RtecScheduler::Info_Type_t info_type
-              ACE_ENV_ARG_DECL)
+              RtecScheduler::Info_Type_t info_type)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::INTERNAL));
   // Internal method to set characteristics of the passed RT_Info.
 
-  virtual RtecScheduler::handle_t lookup_i (const char * entry_point
-                                            ACE_ENV_ARG_DECL)
+  virtual RtecScheduler::handle_t lookup_i (const char * entry_point)
     ACE_THROW_SPEC((CORBA::SystemException,
                     RtecScheduler::UNKNOWN_TASK));
   // Internal method to look up a handle for an RT_Info, and return
@@ -501,8 +474,7 @@ protected:
   virtual void priority_i (RtecScheduler::handle_t handle,
                            RtecScheduler::OS_Priority& o_priority,
                            RtecScheduler::Preemption_Subpriority_t& p_subpriority,
-                           RtecScheduler::Preemption_Priority_t& p_priority
-                           ACE_ENV_ARG_DECL)
+                           RtecScheduler::Preemption_Priority_t& p_priority)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::NOT_SCHEDULED));
@@ -513,8 +485,7 @@ protected:
                                  RtecScheduler::handle_t dependency,
                                  CORBA::Long number_of_calls,
                          RtecScheduler::Dependency_Type_t dependency_type,
-                         RtecScheduler::Dependency_Enabled_Type_t enabled
-                         ACE_ENV_ARG_DECL)
+                         RtecScheduler::Dependency_Enabled_Type_t enabled)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::INTERNAL,
                      RtecScheduler::UNKNOWN_TASK));
@@ -525,8 +496,7 @@ protected:
   virtual void remove_dependency_i (RtecScheduler::handle_t handle,
                                     RtecScheduler::handle_t dependency,
                                     CORBA::Long number_of_calls,
-                                    RtecScheduler::Dependency_Type_t dependency_type
-                                    ACE_ENV_ARG_DECL)
+                                    RtecScheduler::Dependency_Type_t dependency_type)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                       RtecScheduler::INTERNAL,
@@ -539,8 +509,7 @@ protected:
                                               RtecScheduler::handle_t dependency,
                                               CORBA::Long number_of_calls,
                                               RtecScheduler::Dependency_Type_t dependency_type,
-                                              RtecScheduler::Dependency_Enabled_Type_t enabled
-                                              ACE_ENV_ARG_DECL)
+                                              RtecScheduler::Dependency_Enabled_Type_t enabled)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                       RtecScheduler::INTERNAL,
@@ -556,8 +525,7 @@ protected:
                          typename TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP &dependency_map,
                   CORBA::Long number_of_calls,
                          RtecScheduler::Dependency_Type_t dependency_type,
-                         RtecScheduler::Dependency_Enabled_Type_t enabled
-                         ACE_ENV_ARG_DECL)
+                         RtecScheduler::Dependency_Enabled_Type_t enabled)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::INTERNAL,
                       RtecScheduler::UNKNOWN_TASK));
@@ -567,8 +535,7 @@ protected:
                            RtecScheduler::handle_t handle,
                            typename TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP &dependency_map,
                            CORBA::Long number_of_calls,
-                           RtecScheduler::Dependency_Type_t dependency_type
-                           ACE_ENV_ARG_DECL)
+                           RtecScheduler::Dependency_Type_t dependency_type)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::INTERNAL,
                       RtecScheduler::UNKNOWN_TASK));
@@ -580,8 +547,7 @@ protected:
                                         TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP &dependency_map,
                                       CORBA::Long number_of_calls,
                                       RtecScheduler::Dependency_Type_t dependency_type,
-                                      RtecScheduler::Dependency_Enabled_Type_t enabled
-                                      ACE_ENV_ARG_DECL)
+                                      RtecScheduler::Dependency_Enabled_Type_t enabled)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::INTERNAL,
                      RtecScheduler::UNKNOWN_TASK));
@@ -755,8 +721,7 @@ protected:
 template <class ARRAY_ELEMENT_TYPE> void
 maintain_scheduling_array (ARRAY_ELEMENT_TYPE ** & current_ptr_array,
                            long & current_ptr_array_size,
-                           RtecScheduler::handle_t handle
-                           ACE_ENV_ARG_DECL)
+                           RtecScheduler::handle_t handle)
     ACE_THROW_SPEC ((CORBA::SystemException));
 // Helper function: makes sure there is room in the scheduling pointer
 // arrays.  This function expands the array eagerly, to minimize time
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
index b05f178e9ea..8945b5067bc 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
@@ -160,21 +160,19 @@ static_server (void)
                        ACE_Null_Mutex>::instance ()) == 0)
         return 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       server_ = ace_scheduler_factory_data->scheduler_._this ();
 
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT("ACE_Scheduler_Factory - configured static server\n")));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            ACE_TEXT("ACE_Scheduler_Factory::config_runtime - ")
                            ACE_TEXT("cannot allocate server\n"));
     }
-  ACE_ENDTRY;
 
   return server_;
 }
@@ -195,28 +193,24 @@ ACE_Scheduler_Factory::use_config (CosNaming::NamingContext_ptr naming,
     // config runs.
     return 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CosNaming::Name schedule_name (1);
       schedule_name.length (1);
       schedule_name[0].id = CORBA::string_dup (name);
       CORBA::Object_var objref =
-        naming->resolve (schedule_name
-                         ACE_ENV_ARG_PARAMETER);
+        naming->resolve (schedule_name);
 
       server_ =
-        RtecScheduler::Scheduler::_narrow(objref.in ()
-                                          ACE_ENV_ARG_PARAMETER);
+        RtecScheduler::Scheduler::_narrow(objref.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       server_ = 0;
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            ACE_TEXT("ACE_Scheduler_Factory::use_config - ")
                            ACE_TEXT(" exception while resolving server\n"));
     }
-  ACE_ENDTRY;
 
   status_ = ACE_Scheduler_Factory::CONFIG;
   return 0;
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp
index 244b3dd3e6e..a943d276918 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp
@@ -23,8 +23,7 @@ TAO::Security::EstablishTrustPolicy::~EstablishTrustPolicy (void)
 }
 
 CORBA::PolicyType
-TAO::Security::EstablishTrustPolicy::policy_type (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::Security::EstablishTrustPolicy::policy_type ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return ::Security::SecEstablishTrustPolicy;
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp
index ce1f7d6f1f9..c3322d69bb3 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp
@@ -30,8 +30,7 @@ TAO::SL3::ContextEstablishmentPolicy::~ContextEstablishmentPolicy (void)
 }
 
 SecurityLevel3::CredsDirective
-TAO::SL3::ContextEstablishmentPolicy::creds_directive (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SL3::ContextEstablishmentPolicy::creds_directive ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->creds_directive_;
@@ -51,40 +50,35 @@ TAO::SL3::ContextEstablishmentPolicy::creds_list (void)
 }
 
 SecurityLevel3::FeatureDirective
-TAO::SL3::ContextEstablishmentPolicy::use_client_auth (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SL3::ContextEstablishmentPolicy::use_client_auth ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->use_client_auth_;
 }
 
 SecurityLevel3::FeatureDirective
-TAO::SL3::ContextEstablishmentPolicy::use_target_auth (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SL3::ContextEstablishmentPolicy::use_target_auth ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->use_target_auth_;
 }
 
 SecurityLevel3::FeatureDirective
-TAO::SL3::ContextEstablishmentPolicy::use_confidentiality (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SL3::ContextEstablishmentPolicy::use_confidentiality ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->use_confidentiality_;
 }
 
 SecurityLevel3::FeatureDirective
-TAO::SL3::ContextEstablishmentPolicy::use_integrity (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SL3::ContextEstablishmentPolicy::use_integrity ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->use_integrity_;
 }
 
 CORBA::PolicyType
-TAO::SL3::ContextEstablishmentPolicy::policy_type (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SL3::ContextEstablishmentPolicy::policy_type ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return SecurityLevel3::ContextEstablishmentPolicyType;
@@ -109,8 +103,7 @@ TAO::SL3::ContextEstablishmentPolicy::copy (void)
 }
 
 void
-TAO::SL3::ContextEstablishmentPolicy::destroy (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SL3::ContextEstablishmentPolicy::destroy ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->creds_directive_     = SecurityLevel3::CD_Default;
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h
index dfb5b5a2516..bd664701111 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h
@@ -65,28 +65,22 @@ namespace TAO
        * SecurityLevel3::ContextEstablishmentPolicy interface.
        */
       //@{
-      virtual SecurityLevel3::CredsDirective creds_directive (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::CredsDirective creds_directive ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::OwnCredentialsList * creds_list (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::OwnCredentialsList * creds_list ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::FeatureDirective use_client_auth (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::FeatureDirective use_client_auth ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::FeatureDirective use_target_auth (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::FeatureDirective use_target_auth ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::FeatureDirective use_confidentiality (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::FeatureDirective use_confidentiality ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::FeatureDirective use_integrity (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::FeatureDirective use_integrity ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       virtual CORBA::PolicyType policy_type (void)
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h
index 6320a50b252..1e05626032f 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h
@@ -52,8 +52,7 @@ namespace TAO
       /// Create a TAO::SL3::CredentialsAcquirerFactory.
       virtual SecurityLevel3::CredentialsAcquirer_ptr make (
         TAO::SL3::CredentialsCurator_ptr curator,
-        const CORBA::Any & acquisition_arguments
-        ACE_ENV_ARG_DECL) = 0;
+        const CORBA::Any & acquisition_arguments) = 0;
 
     };
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
index d9b4e0db1b2..612b818c930 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
@@ -62,8 +62,7 @@ TAO::SL3::CredentialsCurator::_duplicate (TAO::SL3::CredentialsCurator_ptr obj)
 }
 
 TAO::SL3::CredentialsCurator_ptr
-TAO::SL3::CredentialsCurator::_narrow (CORBA::Object_ptr obj
-                                       ACE_ENV_ARG_DECL_NOT_USED)
+TAO::SL3::CredentialsCurator::_narrow (CORBA::Object_ptr obj)
 {
   return TAO::SL3::CredentialsCurator::_duplicate (
              dynamic_cast<TAO::SL3::CredentialsCurator *> (obj));
@@ -108,8 +107,7 @@ TAO::SL3::CredentialsCurator::supported_methods (void)
 SecurityLevel3::CredentialsAcquirer_ptr
 TAO::SL3::CredentialsCurator::acquire_credentials (
     const char * acquisition_method,
-    const CORBA::Any & acquisition_arguments
-    ACE_ENV_ARG_DECL)
+    const CORBA::Any & acquisition_arguments)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::SL3::CredentialsAcquirerFactory * factory;
@@ -118,8 +116,7 @@ TAO::SL3::CredentialsCurator::acquire_credentials (
                                       factory) == 0)
     {
       return factory->make (this,
-                            acquisition_arguments
-                            ACE_ENV_ARG_PARAMETER);
+                            acquisition_arguments);
     }
 
   ACE_THROW_RETURN (CORBA::BAD_PARAM (),
@@ -191,8 +188,7 @@ TAO::SL3::CredentialsCurator::default_creds_ids (void)
 
 SecurityLevel3::OwnCredentials_ptr
 TAO::SL3::CredentialsCurator::get_own_credentials (
-    const char * credentials_id
-    ACE_ENV_ARG_DECL_NOT_USED)
+    const char * credentials_id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Credentials_Table::ENTRY * entry;
@@ -213,8 +209,7 @@ TAO::SL3::CredentialsCurator::get_own_credentials (
 
 void
 TAO::SL3::CredentialsCurator::release_own_credentials (
-    const char * credentials_id
-    ACE_ENV_ARG_DECL_NOT_USED)
+    const char * credentials_id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Credentials_Table::ENTRY * entry;
@@ -233,11 +228,10 @@ TAO::SL3::CredentialsCurator::release_own_credentials (
 void
 TAO::SL3::CredentialsCurator:: register_acquirer_factory (
   const char * acquisition_method,
-  TAO::SL3::CredentialsAcquirerFactory * factory
-  ACE_ENV_ARG_DECL)
+  TAO::SL3::CredentialsAcquirerFactory * factory)
 {
   if (acquisition_method == 0 || factory == 0)
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   CORBA::String_var method = CORBA::string_dup (acquisition_method);
 
@@ -247,9 +241,9 @@ TAO::SL3::CredentialsCurator:: register_acquirer_factory (
     this->acquirer_factories_.bind (method.in (), factory);
 
   if (result == 1)  // Entry already exists in table.
-    ACE_THROW (CORBA::BAD_INV_ORDER ());
+    throw CORBA::BAD_INV_ORDER ();
   else if (result == -1)  // Failure.
-    ACE_THROW (CORBA::INTERNAL ());
+    throw CORBA::INTERNAL ();
 
 
   // CredentialsCurator now owns the acquisition method id.
@@ -260,8 +254,7 @@ TAO::SL3::CredentialsCurator:: register_acquirer_factory (
 
 void
 TAO::SL3::CredentialsCurator::_tao_add_own_credentials (
-  SecurityLevel3::OwnCredentials_ptr credentials
-  ACE_ENV_ARG_DECL)
+  SecurityLevel3::OwnCredentials_ptr credentials)
 {
   CORBA::String_var credentials_id =
     credentials->creds_id ();
@@ -272,7 +265,7 @@ TAO::SL3::CredentialsCurator::_tao_add_own_credentials (
   if (this->credentials_table_.bind (credentials_id.in (),
                                      creds) != 0)
     {
-      ACE_THROW (CORBA::NO_RESOURCES ());
+      throw CORBA::NO_RESOURCES ();
     }
 
  // CredentialsCurator nows owns the id.
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h
index 85edccb3963..db6523f2948 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h
@@ -87,8 +87,7 @@ namespace TAO
 
       static CredentialsCurator_ptr _duplicate (CredentialsCurator_ptr obj);
       static CredentialsCurator_ptr _nil (void);
-      static CredentialsCurator_ptr _narrow (CORBA::Object_ptr obj
-                                             ACE_ENV_ARG_DECL);
+      static CredentialsCurator_ptr _narrow (CORBA::Object_ptr obj);
 
       /**
        * @name SecurityLevel3::CredentialsCurator Methods
@@ -97,31 +96,25 @@ namespace TAO
        * interface.
        */
       //@{
-      virtual SecurityLevel3::AcquisitionMethodList * supported_methods (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::AcquisitionMethodList * supported_methods ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       virtual SecurityLevel3::CredentialsAcquirer_ptr acquire_credentials (
           const char * acquisition_method,
-          const CORBA::Any & acquisition_arguments
-          ACE_ENV_ARG_DECL)
+          const CORBA::Any & acquisition_arguments)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::OwnCredentialsList * default_creds_list (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::OwnCredentialsList * default_creds_list ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::CredentialsIdList * default_creds_ids (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::CredentialsIdList * default_creds_ids ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       virtual SecurityLevel3::OwnCredentials_ptr get_own_credentials (
-          const char * credentials_id
-          ACE_ENV_ARG_DECL)
+          const char * credentials_id)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual void release_own_credentials (const char * credentials_id
-                                            ACE_ENV_ARG_DECL)
+      virtual void release_own_credentials (const char * credentials_id)
         ACE_THROW_SPEC ((CORBA::SystemException));
       //@}
 
@@ -132,14 +125,12 @@ namespace TAO
        */
       void register_acquirer_factory (
         const char * acquisition_method,
-        TAO::SL3::CredentialsAcquirerFactory * factory
-        ACE_ENV_ARG_DECL);
+        TAO::SL3::CredentialsAcquirerFactory * factory);
 
       /// TAO-specific means of adding credentials to this
       /// CredentialsCurator's "own credentials" list.
       void _tao_add_own_credentials (
-        SecurityLevel3::OwnCredentials_ptr credentials
-        ACE_ENV_ARG_DECL);
+        SecurityLevel3::OwnCredentials_ptr credentials);
 
     protected:
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp
index 3088ce32014..96f517b894a 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp
@@ -34,8 +34,7 @@ TAO::SL3::ObjectCredentialsPolicy::creds_list (void)
 }
 
 CORBA::PolicyType
-TAO::SL3::ObjectCredentialsPolicy::policy_type (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SL3::ObjectCredentialsPolicy::policy_type ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return SecurityLevel3::ObjectCredentialsPolicyType;
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h
index 37a3dfd6ecb..03741cd8e89 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h
@@ -65,8 +65,7 @@ namespace TAO
        * SecurityLevel3::ObjectCredentialsPolicy interface.
        */
       //@{
-      virtual SecurityLevel3::OwnCredentialsList * creds_list (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::OwnCredentialsList * creds_list ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       virtual CORBA::PolicyType policy_type (void)
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp
index 8fc5eec666e..ecc4c6b6513 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp
@@ -14,8 +14,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Policy_ptr
 TAO::SL3::PolicyFactory::create_policy (CORBA::PolicyType type,
-                                        const CORBA::Any & value
-                                        ACE_ENV_ARG_DECL)
+                                        const CORBA::Any & value)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA::PolicyError))
 {
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h
index 9c3a36b0913..e770e7d697b 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h
@@ -61,8 +61,7 @@ namespace TAO
 
         /// Construct a Test::Policy object as a test.
         virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                                 const CORBA::Any & value
-                                                 ACE_ENV_ARG_DECL)
+                                                 const CORBA::Any & value)
           ACE_THROW_SPEC ((CORBA::SystemException,
                            CORBA::PolicyError));
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h
index b995b51cd25..ee33fdb8452 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h
@@ -69,8 +69,7 @@ namespace TAO
        * interface.
        */
       //@{
-      virtual SecurityLevel3::ClientCredentials_ptr client_credentials (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::ClientCredentials_ptr client_credentials ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       virtual CORBA::Boolean request_is_local (void)
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h
index 59501c69339..ab07794ba60 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h
@@ -60,13 +60,11 @@ namespace TAO
       //@{
       /// Return the Credentials received from the client associate with
       /// the current request.
-      virtual SecurityLevel3::ClientCredentials_ptr client_credentials (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::ClientCredentials_ptr client_credentials ()
         ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
       /// Is the current request local?
-      virtual CORBA::Boolean request_is_local (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual CORBA::Boolean request_is_local ()
         ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
       //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp
index d675bbb17c3..033908152ec 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp
@@ -23,8 +23,7 @@ TAO::SL3::SecurityManager::~SecurityManager (void)
 }
 
 SecurityLevel3::CredentialsCurator_ptr
-TAO::SL3::SecurityManager::credentials_curator (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SL3::SecurityManager::credentials_curator ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -33,8 +32,7 @@ TAO::SL3::SecurityManager::credentials_curator (
 }
 
 SecurityLevel3::TargetCredentials_ptr
-TAO::SL3::SecurityManager::get_target_credentials (CORBA::Object_ptr /* the_object */
-                                                   ACE_ENV_ARG_DECL)
+TAO::SL3::SecurityManager::get_target_credentials (CORBA::Object_ptr /* the_object */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
@@ -48,8 +46,7 @@ TAO::SL3::SecurityManager::create_context_estab_policy (
     SecurityLevel3::FeatureDirective use_client_auth,
     SecurityLevel3::FeatureDirective use_target_auth,
     SecurityLevel3::FeatureDirective use_confidentiality,
-    SecurityLevel3::FeatureDirective use_integrity
-    ACE_ENV_ARG_DECL)
+    SecurityLevel3::FeatureDirective use_integrity)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   SecurityLevel3::ContextEstablishmentPolicy_ptr policy;
@@ -67,8 +64,7 @@ TAO::SL3::SecurityManager::create_context_estab_policy (
 
 SecurityLevel3::ObjectCredentialsPolicy_ptr
 TAO::SL3::SecurityManager::create_object_creds_policy (
-    const SecurityLevel3::OwnCredentialsList & creds_list
-    ACE_ENV_ARG_DECL)
+    const SecurityLevel3::OwnCredentialsList & creds_list)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   SecurityLevel3::ObjectCredentialsPolicy_ptr policy;
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h
index 3f1ac2054ae..716345d94ed 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h
@@ -60,13 +60,11 @@ namespace TAO
        * interface.
        */
       //@{
-      virtual SecurityLevel3::CredentialsCurator_ptr credentials_curator (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::CredentialsCurator_ptr credentials_curator ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       virtual SecurityLevel3::TargetCredentials_ptr get_target_credentials (
-          CORBA::Object_ptr the_object
-          ACE_ENV_ARG_DECL)
+          CORBA::Object_ptr the_object)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       virtual SecurityLevel3::ContextEstablishmentPolicy_ptr
@@ -76,14 +74,12 @@ namespace TAO
           SecurityLevel3::FeatureDirective use_client_auth,
           SecurityLevel3::FeatureDirective use_target_auth,
           SecurityLevel3::FeatureDirective use_confidentiality,
-          SecurityLevel3::FeatureDirective use_integrity
-          ACE_ENV_ARG_DECL)
+          SecurityLevel3::FeatureDirective use_integrity)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       virtual SecurityLevel3::ObjectCredentialsPolicy_ptr
       create_object_creds_policy (
-          const SecurityLevel3::OwnCredentialsList & cred_list
-          ACE_ENV_ARG_DECL)
+          const SecurityLevel3::OwnCredentialsList & cred_list)
         ACE_THROW_SPEC ((CORBA::SystemException));
       //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp
index 7e0edc5be59..cfdc4a541eb 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp
@@ -27,8 +27,7 @@ TAO_Security_Current::~TAO_Security_Current (void)
 
 Security::AttributeList *
 TAO_Security_Current::get_attributes (
-    const Security::AttributeTypeList &attributes
-    ACE_ENV_ARG_DECL)
+    const Security::AttributeTypeList &attributes)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Security::Current_Impl *impl = this->implementation ();
@@ -39,12 +38,11 @@ TAO_Security_Current::get_attributes (
   if (impl == 0)
     ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
 
-  return impl->get_attributes (attributes ACE_ENV_ARG_PARAMETER);
+  return impl->get_attributes (attributes);
 }
 
 SecurityLevel2::ReceivedCredentials_ptr
-TAO_Security_Current::received_credentials (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO_Security_Current::received_credentials ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Security::Current_Impl *impl = this->implementation ();
@@ -63,15 +61,13 @@ TAO_Security_Current::init (void)
 {
   int result = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       int argc = 0;
       char **argv = 0;
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            this->orb_id_.in ()
-                                            ACE_ENV_ARG_PARAMETER);
+                                            this->orb_id_.in ());
 
       this->orb_core_ = orb.in ()->orb_core ();
 
@@ -79,15 +75,14 @@ TAO_Security_Current::init (void)
       // occupying.
       (void) this->orb_id_.out ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       if (TAO_debug_level >= 1)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+        ACE_PRINT_EXCEPTION (ex,
                              "Could not initialize SecurityCurrent:");
 
       result = -1;
     }
-  ACE_ENDTRY;
 
   return result;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h
index 118689ca9d4..eeed650d20b 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h
@@ -63,8 +63,7 @@ public:
   /// Return the security attributes corresponding to the types in the
   /// given attribute type list associated with the current request.
   virtual Security::AttributeList * get_attributes (
-      const Security::AttributeTypeList & attributes
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const Security::AttributeTypeList & attributes)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
@@ -77,8 +76,7 @@ public:
   //@{
   /// Return the Credentials received from the client associate with
   /// the current request.
-  virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials ()
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
index f92e121fddf..a0cfbaccbee 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
@@ -61,8 +61,7 @@ namespace TAO
       /// the given attribute type list associated with the current
       /// request.
       virtual ::Security::AttributeList * get_attributes (
-          const ::Security::AttributeTypeList & attributes
-          ACE_ENV_ARG_DECL)
+          const ::Security::AttributeTypeList & attributes)
         ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
       //@}
 
@@ -75,8 +74,7 @@ namespace TAO
       //@{
       /// Return the Credentials received from the client associate with
       /// the current request.
-      virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials ()
         ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
       //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
index f735c30dcbf..e7830c498cc 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
@@ -22,15 +22,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 TAO::Security::ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Narrow to a TAO_ORBInitInfo object to get access to the
   // allocate_tss_slot_id() TAO extension.
   TAO_ORBInitInfo_var tao_info =
-    TAO_ORBInitInfo::_narrow (info
-                              ACE_ENV_ARG_PARAMETER);
+    TAO_ORBInitInfo::_narrow (info);
 
   if (CORBA::is_nil (tao_info.in ()))
     {
@@ -41,13 +39,13 @@ TAO::Security::ORBInitializer::pre_init (
                     "\"PortableInterceptor::ORBInitInfo_ptr\" to\n"
                     "(%P|%t)   \"TAO_ORBInitInfo_ptr.\"\n"));
 
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
 //   // Reserve a TSS slot in the ORB core internal TSS resources for the
 //   // thread-specific portion of Security::Current.
 //   size_t old_tss_slot = tao_info->allocate_tss_slot_id (0
-//                                                         ACE_ENV_ARG_PARAMETER);
+//);
 
 //   CORBA::String_var orb_id = info->orb_id ();
 
@@ -67,13 +65,12 @@ TAO::Security::ORBInitializer::pre_init (
 //   // ORB.
 //   info->register_initial_reference ("SecurityCurrent",
 //                                     security_current.in ()
-//                                     ACE_ENV_ARG_PARAMETER);
+//);
 
   // Reserve a TSS slot in the ORB core internal TSS resources for the
   // thread-specific portion of SecurityLevel3::SecurityCurrent
   // object.
-  size_t tss_slot = tao_info->allocate_tss_slot_id (0
-                                                    ACE_ENV_ARG_PARAMETER);
+  size_t tss_slot = tao_info->allocate_tss_slot_id (0);
 
 
   // Create the SecurityLevel3::Current object.
@@ -92,8 +89,7 @@ TAO::Security::ORBInitializer::pre_init (
   // Register the SecurityLevel2::Current object reference with the
   // ORB.
   info->register_initial_reference ("SecurityLevel3:SecurityCurrent",
-                                    security_current3.in ()
-                                    ACE_ENV_ARG_PARAMETER);
+                                    security_current3.in ());
 
   // Create the SecurityLevel3::CredentialsCurator object.
   SecurityLevel3::CredentialsCurator_ptr curator;
@@ -110,8 +106,7 @@ TAO::Security::ORBInitializer::pre_init (
   // Register the SecurityLevel3::CredentialsCurator object reference
   // with the ORB.
   info->register_initial_reference ("SecurityLevel3:CredentialsCurator",
-                                    credentials_curator.in ()
-                                    ACE_ENV_ARG_PARAMETER);
+                                    credentials_curator.in ());
 
   // Create the SecurityLevel3::SecurityManager object.
   SecurityLevel3::SecurityManager_ptr manager3;
@@ -128,24 +123,20 @@ TAO::Security::ORBInitializer::pre_init (
   // Register the SecurityLevel3::SecurityManager object reference
   // with the ORB.
   info->register_initial_reference ("SecurityLevel3:SecurityManager",
-                                    security_manager3.in ()
-                                    ACE_ENV_ARG_PARAMETER);
+                                    security_manager3.in ());
 }
 
 void
 TAO::Security::ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->register_policy_factories (info
-                                   ACE_ENV_ARG_PARAMETER);
+  this->register_policy_factories (info);
 }
 
 void
 TAO::Security::ORBInitializer::register_policy_factories (
-  PortableInterceptor::ORBInitInfo_ptr info
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ORBInitInfo_ptr info)
 {
   // Register the security policy factories.
 
@@ -171,45 +162,37 @@ TAO::Security::ORBInitializer::register_policy_factories (
 
   type = ::Security::SecQOPPolicy;
   info->register_policy_factory (type,
-                                 this->policy_factory_.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+                                 this->policy_factory_.in ());
 
   type = ::Security::SecMechanismsPolicy;
   info->register_policy_factory (type,
-                                 this->policy_factory_.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+                                 this->policy_factory_.in ());
 
   type = ::Security::SecInvocationCredentialsPolicy;
   info->register_policy_factory (type,
-                                 this->policy_factory_.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+                                 this->policy_factory_.in ());
 
   type = ::Security::SecFeaturePolicy;   // Deprecated
   info->register_policy_factory (type,
-                                 this->policy_factory_.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+                                 this->policy_factory_.in ());
 
   type = ::Security::SecDelegationDirectivePolicy;
   info->register_policy_factory (type,
-                                 this->policy_factory_.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+                                 this->policy_factory_.in ());
 
   type = ::Security::SecEstablishTrustPolicy;
   info->register_policy_factory (type,
-                                 this->policy_factory_.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+                                 this->policy_factory_.in ());
 
 
   type = SecurityLevel3::ContextEstablishmentPolicyType;
   info->register_policy_factory (type,
-                                 this->policy_factory_.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+                                 this->policy_factory_.in ());
 
 
   type = SecurityLevel3::ObjectCredentialsPolicyType;
   info->register_policy_factory (type,
-                                 this->policy_factory_.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+                                 this->policy_factory_.in ());
 
 
   // ----------------------------------------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h
index c6a17685f4d..758b02e6227 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h
@@ -69,20 +69,17 @@ namespace TAO
        * interface.
        */
       //@{
-      virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
         ACE_THROW_SPEC ((CORBA::SystemException));
       //@}
 
     private:
 
       /// Register Security policy factories.
-      void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info
-                                      ACE_ENV_ARG_DECL);
+      void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info);
 
     private:
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
index 624827950ef..cb91d9c18ec 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
@@ -22,8 +22,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 CORBA::Policy_ptr
 TAO::Security::PolicyFactory::create_policy (
     CORBA::PolicyType type,
-    const CORBA::Any &value
-    ACE_ENV_ARG_DECL)
+    const CORBA::Any &value)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA::PolicyError))
 {
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h
index 4596caadcb3..9d460b2998b 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h
@@ -53,8 +53,7 @@ namespace TAO
     public:
 
       virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                               const CORBA::Any & value
-                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                               const CORBA::Any & value)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          CORBA::PolicyError));
     };
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
index 1d842a19e35..9df87c4087f 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
@@ -34,13 +34,12 @@ TAO_TIO::time_interval (void)
 
 CosTime::OverlapType
 TAO_TIO::spans (CosTime::UTO_ptr uto,
-                CosTime::TIO_out overlap
-                ACE_ENV_ARG_DECL)
+                CosTime::TIO_out overlap)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TIO *tio = 0;
 
-  ACE_TRY
+  try
     {
       TimeBase::TimeT lb1 =
         this->time_interval ().lower_bound;
@@ -132,11 +131,10 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
           overlap = tio->_this ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception:");
+      ex._tao_print_exception ("Exception:");
     }
-  ACE_ENDTRY;
 
   return CosTime::OTNoOverlap;
 }
@@ -149,8 +147,7 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
 
 CosTime::OverlapType
 TAO_TIO::overlaps (CosTime::TIO_ptr tio,
-                   CosTime::TIO_out overlap
-                   ACE_ENV_ARG_DECL)
+                   CosTime::TIO_out overlap)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TIO *tio_i = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
index 1eec9784995..fb67c5abc65 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
@@ -46,8 +46,7 @@ public:
   ~TAO_TIO (void);
 
   /// This is the get method for the attribute time interval.
-  virtual TimeBase::IntervalT  time_interval (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual TimeBase::IntervalT  time_interval ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -59,8 +58,7 @@ public:
    * intervals.
    */
   virtual CosTime::OverlapType spans (CosTime::UTO_ptr time,
-                                      CosTime::TIO_out overlap
-                                      ACE_ENV_ARG_DECL)
+                                      CosTime::TIO_out overlap)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -71,8 +69,7 @@ public:
    * out parameter contains the gap between the two intervals.
    */
   virtual CosTime::OverlapType overlaps (CosTime::TIO_ptr interval,
-                                         CosTime::TIO_out overlap
-                                         ACE_ENV_ARG_DECL)
+                                         CosTime::TIO_out overlap)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
index 3d1fc0acc62..d4db0eb7c17 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
@@ -74,8 +74,7 @@ TAO_Time_Service_Clerk::secure_universal_time (void)
 CosTime::UTO_ptr
 TAO_Time_Service_Clerk::new_universal_time (TimeBase::TimeT time,
                                             TimeBase::InaccuracyT inaccuracy,
-                                            TimeBase::TdfT tdf
-                                            ACE_ENV_ARG_DECL)
+                                            TimeBase::TdfT tdf)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_UTO *uto = 0;
@@ -92,8 +91,7 @@ TAO_Time_Service_Clerk::new_universal_time (TimeBase::TimeT time,
 // This creates a new UTO given a time in the UtcT form.
 
 CosTime::UTO_ptr
-TAO_Time_Service_Clerk::uto_from_utc (const TimeBase::UtcT &utc
-                                      ACE_ENV_ARG_DECL)
+TAO_Time_Service_Clerk::uto_from_utc (const TimeBase::UtcT &utc)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_UTO *uto = 0;
@@ -117,8 +115,7 @@ TAO_Time_Service_Clerk::uto_from_utc (const TimeBase::UtcT &utc
 
 CosTime::TIO_ptr
 TAO_Time_Service_Clerk::new_interval (TimeBase::TimeT lower,
-                                      TimeBase::TimeT upper
-                                      ACE_ENV_ARG_DECL)
+                                      TimeBase::TimeT upper)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TIO *tio = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
index d4efbe75f93..b9938706055 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
@@ -77,19 +77,16 @@ public:
   /// This creates a new UTO based on the given parameters.
   virtual CosTime::UTO_ptr new_universal_time (TimeBase::TimeT time,
                                                TimeBase::InaccuracyT inaccuracy,
-                                               TimeBase::TdfT tdf
-                                               ACE_ENV_ARG_DECL)
+                                               TimeBase::TdfT tdf)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// This creates a new UTO given a time in the UtcT form.
-  virtual CosTime::UTO_ptr uto_from_utc (const TimeBase::UtcT &utc
-                                         ACE_ENV_ARG_DECL)
+  virtual CosTime::UTO_ptr uto_from_utc (const TimeBase::UtcT &utc)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// This creates a new TIO with the given parameters.
   virtual CosTime::TIO_ptr new_interval (TimeBase::TimeT lower,
-                                         TimeBase::TimeT upper
-                                         ACE_ENV_ARG_DECL)
+                                         TimeBase::TimeT upper)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the globally synchronized time.
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
index 5d083a12023..78b5861e658 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
@@ -69,8 +69,7 @@ TAO_Time_Service_Server::secure_universal_time (void)
 CosTime::UTO_ptr
 TAO_Time_Service_Server::new_universal_time (TimeBase::TimeT time,
                                              TimeBase::InaccuracyT inaccuracy,
-                                             TimeBase::TdfT tdf
-                                             ACE_ENV_ARG_DECL)
+                                             TimeBase::TdfT tdf)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_UTO *uto = 0;
@@ -87,8 +86,7 @@ TAO_Time_Service_Server::new_universal_time (TimeBase::TimeT time,
 // This creates a new UTO given a time in the UtcT form.
 
 CosTime::UTO_ptr
-TAO_Time_Service_Server::uto_from_utc (const TimeBase::UtcT &utc
-                                       ACE_ENV_ARG_DECL)
+TAO_Time_Service_Server::uto_from_utc (const TimeBase::UtcT &utc)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_UTO *uto = 0;
@@ -106,8 +104,7 @@ TAO_Time_Service_Server::uto_from_utc (const TimeBase::UtcT &utc
 
 CosTime::TIO_ptr
 TAO_Time_Service_Server::new_interval (TimeBase::TimeT lower,
-                                       TimeBase::TimeT upper
-                                       ACE_ENV_ARG_DECL)
+                                       TimeBase::TimeT upper)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TIO *tio = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
index 3aec44a728d..1bc33a07e4f 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
@@ -64,19 +64,16 @@ public:
   /// This creates a new UTO based on the given parameters.
   virtual CosTime::UTO_ptr new_universal_time (TimeBase::TimeT time,
                                                TimeBase::InaccuracyT inaccuracy,
-                                               TimeBase::TdfT tdf
-                                               ACE_ENV_ARG_DECL)
+                                               TimeBase::TdfT tdf)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// This creates a new UTO given a time in the UtcT form.
-  virtual CosTime::UTO_ptr uto_from_utc (const TimeBase::UtcT &utc
-                                         ACE_ENV_ARG_DECL)
+  virtual CosTime::UTO_ptr uto_from_utc (const TimeBase::UtcT &utc)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// This creates a new TIO with the given parameters.
   virtual CosTime::TIO_ptr new_interval (TimeBase::TimeT lower,
-                                         TimeBase::TimeT upper
-                                         ACE_ENV_ARG_DECL)
+                                         TimeBase::TimeT upper)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 };
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
index 249be17323a..0d4f0eaefe0 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
@@ -101,8 +101,7 @@ TAO_UTO::absolute_time (void)
 
 CosTime::TimeComparison
 TAO_UTO::compare_time (CosTime::ComparisonType comparison_type,
-                       CosTime::UTO_ptr uto
-                       ACE_ENV_ARG_DECL)
+                       CosTime::UTO_ptr uto)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TimeBase::TimeT uto_time = uto->time ();
@@ -161,13 +160,12 @@ TAO_UTO::compare_time (CosTime::ComparisonType comparison_type,
 // is meaningless if the base times of UTOs are different.
 
 CosTime::TIO_ptr
-TAO_UTO::time_to_interval (CosTime::UTO_ptr uto
-                           ACE_ENV_ARG_DECL)
+TAO_UTO::time_to_interval (CosTime::UTO_ptr uto)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TIO *tio = 0;
 
-  ACE_TRY
+  try
     {
       TimeBase::TimeT uto_time = uto->time ();
 
@@ -188,12 +186,11 @@ TAO_UTO::time_to_interval (CosTime::UTO_ptr uto
 
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception:");
+      ex._tao_print_exception ("Exception:");
       return CosTime::TIO::_nil ();
     }
-  ACE_ENDTRY;
 
   return tio->_this ();
 }
@@ -207,7 +204,7 @@ TAO_UTO::interval (void)
 {
   TAO_TIO *tio = 0;
 
-  ACE_TRY
+  try
     {
       TimeBase::TimeT this_inaccuracy =
           this->inaccuracy ();
@@ -223,12 +220,11 @@ TAO_UTO::interval (void)
                                  upper),
                         CORBA::NO_MEMORY ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception:");
+      ex._tao_print_exception ("Exception:");
       return CosTime::TIO::_nil ();
     }
-  ACE_ENDTRY;
 
   return tio->_this ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h
index c6319056f35..daa20dfffb2 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h
@@ -54,8 +54,7 @@ public:
   ~TAO_UTO (void);
 
   /// For the readonly attribute <time>.
-  virtual TimeBase::TimeT time (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual TimeBase::TimeT time ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// For the readonly attribute <inaccuracy>.
@@ -82,8 +81,7 @@ public:
   /// Compares the time contained in the object with the time in the
   /// supplied uto according to the supplied comparison type.
   CosTime::TimeComparison compare_time (CosTime::ComparisonType comparison_type,
-                                        CosTime::UTO_ptr uto
-                                        ACE_ENV_ARG_DECL)
+                                        CosTime::UTO_ptr uto)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -93,8 +91,7 @@ public:
    * two UTOs. Inaccuracies are ignored.  Note the result of this
    * operation is meaningless if the base times of UTOs are different.
    */
-  CosTime::TIO_ptr time_to_interval (CosTime::UTO_ptr
-                                     ACE_ENV_ARG_DECL)
+  CosTime::TIO_ptr time_to_interval (CosTime::UTO_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Returns a TIO object representing the error interval around the
diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
index 2c2c23d95e7..c51ad8c8627 100644
--- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
@@ -46,8 +46,7 @@ Timer_Helper::handle_timeout (const ACE_Time_Value &,
 
   CORBA::ULongLong highest_time  = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       IORS::TYPE* value;
       for (IORS::ITERATOR server_iterator (this->clerk_->server_);
@@ -137,15 +136,14 @@ Timer_Helper::handle_timeout (const ACE_Time_Value &,
         static_cast<ACE_UINT32> (10000000) +
         static_cast<CORBA::ULongLong> (timeofday.usec () * 10);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+        ACE_PRINT_EXCEPTION (ex,
                              "Exception in handle_timeout()\n");
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
index 49871b384c5..b3bf71083c7 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
@@ -14,7 +14,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 TAO_Constraint_Interpreter::TAO_Constraint_Interpreter (
     const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts,
     const char* constraints
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CosTrading::IllegalConstraint,
                    CORBA::NO_MEMORY))
@@ -34,17 +33,16 @@ TAO_Constraint_Interpreter::TAO_Constraint_Interpreter (
   else
     {
       if (this->build_tree (constraints) != 0)
-        ACE_THROW (CosTrading::IllegalConstraint (constraints));
+        throw CosTrading::IllegalConstraint (constraints);
 
       if (type_checker.validate (this->root_) == -1)
-        ACE_THROW (CosTrading::IllegalConstraint (constraints));
+        throw CosTrading::IllegalConstraint (constraints);
     }
 }
 
 TAO_Constraint_Interpreter::
 TAO_Constraint_Interpreter (TAO_Constraint_Validator& validator,
-                           const char* constraints
-                           ACE_ENV_ARG_DECL)
+                           const char* constraints)
   ACE_THROW_SPEC ((CosTrading::IllegalConstraint,
                    CORBA::NO_MEMORY))
 {
@@ -57,10 +55,10 @@ TAO_Constraint_Interpreter (TAO_Constraint_Validator& validator,
   else
     {
       if (this->build_tree (constraints) != 0)
-        ACE_THROW (CosTrading::IllegalConstraint (constraints));
+        throw CosTrading::IllegalConstraint (constraints);
 
       if (validator.validate (this->root_) == -1)
-        ACE_THROW (CosTrading::IllegalConstraint (constraints));
+        throw CosTrading::IllegalConstraint (constraints);
     }
 }
 
@@ -84,7 +82,6 @@ TAO_Constraint_Interpreter::evaluate (TAO_Constraint_Evaluator& evaluator)
 TAO_Preference_Interpreter::TAO_Preference_Interpreter (
     const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts,
     const char* preference
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference,
                    CORBA::NO_MEMORY))
@@ -101,17 +98,16 @@ TAO_Preference_Interpreter::TAO_Preference_Interpreter (
   else
     {
       if (this->build_tree (preference) != 0)
-        ACE_THROW (CosTrading::Lookup::IllegalPreference (preference));
+        throw CosTrading::Lookup::IllegalPreference (preference);
 
       if (type_checker.validate (this->root_) == -1)
-        ACE_THROW (CosTrading::Lookup::IllegalPreference (preference));
+        throw CosTrading::Lookup::IllegalPreference (preference);
     }
 }
 
 TAO_Preference_Interpreter::
 TAO_Preference_Interpreter (TAO_Constraint_Validator& validator,
-                           const char* preference
-                           ACE_ENV_ARG_DECL)
+                           const char* preference)
   ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference,
                    CORBA::NO_MEMORY))
     : TAO_Interpreter ()
@@ -125,10 +121,10 @@ TAO_Preference_Interpreter (TAO_Constraint_Validator& validator,
   else
     {
       if (this->build_tree (preference) != 0)
-        ACE_THROW (CosTrading::Lookup::IllegalPreference (preference));
+        throw CosTrading::Lookup::IllegalPreference (preference);
 
       if (validator.validate (this->root_) == -1)
-        ACE_THROW (CosTrading::Lookup::IllegalPreference (preference));
+        throw CosTrading::Lookup::IllegalPreference (preference);
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
index 586f82080e4..32e46a62abf 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
@@ -48,8 +48,7 @@ class TAO_Trading_Serv_Export TAO_Constraint_Interpreter : public TAO_Interprete
 public:
   // = Initialization and termination methods.
   TAO_Constraint_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts,
-                              const char* constraints
-                              ACE_ENV_ARG_DECL)
+                              const char* constraints)
     ACE_THROW_SPEC ((CosTrading::IllegalConstraint,
                      CORBA::NO_MEMORY));
 
@@ -60,8 +59,7 @@ public:
    * semantic errors, such as mismatched types.
    */
   TAO_Constraint_Interpreter (TAO_Constraint_Validator& validator,
-                              const char* constraints
-                              ACE_ENV_ARG_DECL)
+                              const char* constraints)
     ACE_THROW_SPEC ((CosTrading::IllegalConstraint,
                      CORBA::NO_MEMORY));
 
@@ -95,8 +93,7 @@ class TAO_Trading_Serv_Export TAO_Preference_Interpreter : public TAO_Interprete
 public:
   // = Initialization and termination methods.
   TAO_Preference_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts,
-                              const char* preference
-                              ACE_ENV_ARG_DECL)
+                              const char* preference)
     ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference,
                      CORBA::NO_MEMORY));
 
@@ -106,8 +103,7 @@ public:
 	* doesn't conform to the BNF grammar for preferences.
 	*/
   TAO_Preference_Interpreter (TAO_Constraint_Validator& validator,
-                              const char* preference
-                              ACE_ENV_ARG_DECL)
+                              const char* preference)
     ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference,
                      CORBA::NO_MEMORY));
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
index 250eda650cc..550064534be 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
@@ -306,22 +306,20 @@ TAO_Literal_Constraint (const TAO_Literal_Constraint& lit)
 TAO_Literal_Constraint::
 TAO_Literal_Constraint (CORBA::Any* any)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
   CORBA::Any& any_ref = *any;
   CORBA::TypeCode_var type = any_ref.type ();
   // @@ No where to throw exception back.
   CORBA::TCKind corba_type = CORBA::tk_null;
-  ACE_TRY
+  try
     {
       corba_type = type->kind ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // @@ Seth: Don't know what else to do.  Make sure we can tell
       // when this constructor fails.
       return;
     }
-  ACE_ENDTRY;
 
   this->type_ = TAO_Literal_Constraint::comparable_type (type.in ());
   switch (this->type_)
@@ -500,18 +498,16 @@ TAO_Expression_Type
 TAO_Literal_Constraint::comparable_type (CORBA::TypeCode_ptr type)
 {
   // Convert a CORBA::TCKind into a TAO_Literal_Type
-  ACE_DECLARE_NEW_CORBA_ENV;
   TAO_Expression_Type return_value = TAO_UNKNOWN;
   CORBA::TCKind kind = CORBA::tk_null;
-  ACE_TRY
+  try
     {
       kind = type->kind ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       return return_value;
     }
-  ACE_ENDTRY;
   // Since this is a "top level try block, no need to check again.
 
   switch (kind)
@@ -542,18 +538,16 @@ TAO_Literal_Constraint::comparable_type (CORBA::TypeCode_ptr type)
     case CORBA::tk_alias:
       {
         CORBA::TCKind kind = CORBA::tk_void;
-        ACE_TRY_EX (label2)
+        try
           {
             CORBA::TypeCode_var typecode = type->content_type ();
-            ACE_TRY_CHECK_EX (label2);
             kind = typecode->kind ();
-            ACE_TRY_CHECK_EX (label2);;
+            ;
           }
-        ACE_CATCHANY
+        catch (const CORBA::Exception& ex)
           {
             return return_value;
           }
-        ACE_ENDTRY;
         // Since this is a "top level try block, no need to check again.
 
         if (kind == CORBA::tk_sequence)
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
index 8de809e2631..fcd379d7add 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
@@ -517,20 +517,18 @@ sequence_does_contain (CORBA::Any* sequence,
   // wrapper uses the [] operator to locate the target element in the
   // sequence.
 
-  ACE_DECLARE_NEW_CORBA_ENV;
   CORBA::Boolean return_value = 0;
   CORBA::TypeCode_var type = sequence->type ();
   CORBA::TCKind sequence_type = CORBA::tk_void;
-  ACE_TRY
+  try
     {
       sequence_type =
-        TAO_Sequence_Extracter_Base::sequence_type (type.in () ACE_ENV_ARG_PARAMETER);
+        TAO_Sequence_Extracter_Base::sequence_type (type.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       return return_value;
     }
-  ACE_ENDTRY;
 
   if (sequence_type == CORBA::tk_void)
     return return_value;
@@ -612,15 +610,14 @@ operator () (TAO_DynSequence_i& dyn_any,
              CORBA::Short element) const
 {
   int return_value = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Short value = dyn_any.get_short ();
       return_value = (value == element);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
     }
-  ACE_ENDTRY;
   return return_value;
 }
 
@@ -630,15 +627,14 @@ operator () (TAO_DynSequence_i& dyn_any,
              CORBA::UShort element) const
 {
   int return_value = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::UShort value = dyn_any.get_ushort ();
       return_value = (value == element);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
     }
-  ACE_ENDTRY;
   return return_value;
 }
 
@@ -648,15 +644,14 @@ operator () (TAO_DynSequence_i& dyn_any,
              CORBA::Long element) const
 {
   int return_value = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Long value = dyn_any.get_long ();
       return_value = (value == element);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
     }
-  ACE_ENDTRY;
   return return_value;
 }
 
@@ -666,15 +661,14 @@ operator () (TAO_DynSequence_i& dyn_any,
              CORBA::ULong element) const
 {
   int return_value = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ULong value = dyn_any.get_ulong ();
       return_value = (value == element);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
     }
-  ACE_ENDTRY;
   return return_value;
 }
 
@@ -684,15 +678,14 @@ operator () (TAO_DynSequence_i& dyn_any,
              CORBA::LongLong element) const
 {
   int return_value = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::LongLong value = dyn_any.get_longlong ();
       return_value = (value == element);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
     }
-  ACE_ENDTRY;
   return return_value;
 }
 
@@ -702,15 +695,14 @@ operator () (TAO_DynSequence_i& dyn_any,
              CORBA::ULongLong element) const
 {
   int return_value = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ULongLong value = dyn_any.get_ulonglong ();
       return_value = (value == element);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
     }
-  ACE_ENDTRY;
   return return_value;
 }
 
@@ -720,12 +712,12 @@ operator () (TAO_DynSequence_i& dyn_any,
              CORBA::Float element) const
 {
   int return_value = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Float value = dyn_any.get_float ();
       return_value = (value == element);
     }
-  ACE_CATCHANY {} ACE_ENDTRY;
+  catch (const CORBA::Exception& ex){}
   return return_value;
 }
 
@@ -735,12 +727,12 @@ operator () (TAO_DynSequence_i& dyn_any,
              CORBA::Double element) const
 {
   int return_value = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Double value = dyn_any.get_short ();
       return_value = (value == element);
     }
-  ACE_CATCHANY {} ACE_ENDTRY;
+  catch (const CORBA::Exception& ex){}
   return return_value;
 }
 
@@ -750,12 +742,12 @@ operator () (TAO_DynSequence_i& dyn_any,
              CORBA::Boolean element) const
 {
   int return_value = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
     CORBA::Boolean value = (CORBA::Boolean) dyn_any.get_short ();
       return_value = (value == element);
     }
-  ACE_CATCHANY {} ACE_ENDTRY;
+  catch (const CORBA::Exception& ex){}
   return return_value;
 }
 
@@ -765,12 +757,12 @@ operator () (TAO_DynSequence_i& dyn_any,
              const char* element) const
 {
   int return_value = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
       const char* value = dyn_any.get_string ();
       return_value = (ACE_OS::strcmp (value, element) == 0);
     }
-  ACE_CATCHANY {} ACE_ENDTRY;
+  catch (const CORBA::Exception& ex){}
   return return_value;
 }
 
@@ -1050,19 +1042,17 @@ visit_in (TAO_Binary_Constraint* binary_in)
 
   if (right_type == TAO_SEQUENCE)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
       CORBA::Boolean types_match = 0;
       CORBA::TCKind seq_type = CORBA::tk_void;
-      ACE_TRY
+      try
         {
           seq_type =
-            TAO_Sequence_Extracter_Base::sequence_type (prop_type ACE_ENV_ARG_PARAMETER);
+            TAO_Sequence_Extracter_Base::sequence_type (prop_type);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           return return_value;
         }
-      ACE_ENDTRY;
 
       if (seq_type != CORBA::tk_void)
         {
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
index 045c750ca75..7f3b9c5190d 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
@@ -8,8 +8,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::TCKind
 TAO_Sequence_Extracter_Base::
-sequence_type (CORBA::TypeCode* type_code
-               ACE_ENV_ARG_DECL)
+sequence_type (CORBA::TypeCode* type_code)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ Seth, why do you use a comma to separate the two statements?
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
index b258b921ef1..fe86953e15f 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
@@ -86,8 +86,7 @@ class TAO_Sequence_Extracter_Base
 {
 public:
 
-  static CORBA::TCKind sequence_type (CORBA::TypeCode* code
-                                      ACE_ENV_ARG_DECL)
+  static CORBA::TCKind sequence_type (CORBA::TypeCode* code)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the sequence element type for the sequence whose typecode
   // is <code>.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp
index 791eab90f62..33894bdc007 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp
@@ -16,29 +16,27 @@ TAO_find (const CORBA::Any& sequence, const OPERAND_TYPE& element)
   TAO_Element_Equal<OPERAND_TYPE> functor;
   TAO_DynSequence_i dyn_seq;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      dyn_seq.init (sequence ACE_ENV_ARG_PARAMETER);
+      dyn_seq.init (sequence);
 
       CORBA::ULong length =
-        dyn_seq.get_length ( ACE_ENV_SINGLE_ARG_PARAMETER );
+        dyn_seq.get_length ( );
 
-      dyn_seq.rewind( ACE_ENV_SINGLE_ARG_PARAMETER );
+      dyn_seq.rewind( );
 
       for (CORBA::ULong i = 0 ; i < length && ! return_value; i++)
         {
           if (functor (dyn_seq, element))
             return_value = 1;
 
-          dyn_seq.next( ACE_ENV_SINGLE_ARG_PARAMETER );
+          dyn_seq.next( );
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       return 0;
     }
-  ACE_ENDTRY;
 
   return return_value;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
index 381e6bc2b5d..ad7fb1aa617 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
@@ -150,8 +150,7 @@ remove_offer (const char* type, CORBA::ULong id)
 
 template <class LOCK_TYPE> int
 TAO_Offer_Database<LOCK_TYPE>::
-remove_offer (const CosTrading::OfferId offer_id
-              ACE_ENV_ARG_DECL)
+remove_offer (const CosTrading::OfferId offer_id)
   ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
                   CosTrading::UnknownOfferId))
 {
@@ -160,8 +159,7 @@ remove_offer (const CosTrading::OfferId offer_id
 
   this->parse_offer_id (offer_id,
                         stype,
-                        index
-                        ACE_ENV_ARG_PARAMETER);
+                        index);
 
   if (this->remove_offer (stype,
                           index) == -1)
@@ -174,14 +172,13 @@ remove_offer (const CosTrading::OfferId offer_id
 template <class LOCK_TYPE> CosTrading::Offer*
 TAO_Offer_Database<LOCK_TYPE>::
 lookup_offer (const CosTrading::OfferId offer_id,
-              char*& type_name
-              ACE_ENV_ARG_DECL)
+              char*& type_name)
   ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
                   CosTrading::UnknownOfferId))
 {
   CORBA::ULong index;
   CosTrading::Offer* offer = 0;
-  this->parse_offer_id (offer_id, type_name, index ACE_ENV_ARG_PARAMETER);
+  this->parse_offer_id (offer_id, type_name, index);
 
   if ((offer = this->lookup_offer (type_name, index)) == 0)
     ACE_THROW_RETURN (CosTrading::UnknownOfferId (offer_id), offer);
@@ -192,8 +189,7 @@ lookup_offer (const CosTrading::OfferId offer_id,
 
 template <class LOCK_TYPE> CosTrading::Offer*
 TAO_Offer_Database<LOCK_TYPE>::
-lookup_offer (const CosTrading::OfferId offer_id
-              ACE_ENV_ARG_DECL)
+lookup_offer (const CosTrading::OfferId offer_id)
   ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
                   CosTrading::UnknownOfferId))
 {
@@ -201,7 +197,7 @@ lookup_offer (const CosTrading::OfferId offer_id
   CORBA::ULong index;
   CosTrading::Offer* offer = 0;
 
-  this->parse_offer_id (offer_id, type_name, index ACE_ENV_ARG_PARAMETER);
+  this->parse_offer_id (offer_id, type_name, index);
 
   if ((offer = this->lookup_offer (type_name, index)) == 0)
     ACE_THROW_RETURN (CosTrading::UnknownOfferId (offer_id), offer);
@@ -273,8 +269,7 @@ template <class LOCK_TYPE> void
 TAO_Offer_Database<LOCK_TYPE>::
 parse_offer_id (const CosTrading::OfferId offer_id,
                 char*&service_type,
-                CORBA::ULong& id
-                ACE_ENV_ARG_DECL)
+                CORBA::ULong& id)
   ACE_THROW_SPEC ((CosTrading::IllegalOfferId))
 {
   // Get service type: it is everything from 17th character to the end.
@@ -290,7 +285,7 @@ parse_offer_id (const CosTrading::OfferId offer_id,
   *start_of_type = temp;
 
   if (! TAO_Trader_Base::is_valid_identifier_name (service_type))
-    ACE_THROW (CosTrading::IllegalOfferId (offer_id));
+    throw CosTrading::IllegalOfferId (offer_id);
 }
 
 template <class LOCK_TYPE> CosTrading::OfferId
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
index 3087ea49d94..5a8f5d56395 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
@@ -66,15 +66,13 @@ public:
   CosTrading::OfferId insert_offer (const char* type,
                                     CosTrading::Offer* offer);
 
-  int remove_offer (const CosTrading::OfferId offer_id
-                    ACE_ENV_ARG_DECL)
+  int remove_offer (const CosTrading::OfferId offer_id)
     ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
                     CosTrading::UnknownOfferId));
 
   /// Lookup an offer whose offer_id is <offer_id>, and return
   /// it. Otherwise, throw the appropriate exception.
-  CosTrading::Offer* lookup_offer (const CosTrading::OfferId offer_id
-                                   ACE_ENV_ARG_DECL)
+  CosTrading::Offer* lookup_offer (const CosTrading::OfferId offer_id)
     ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
                     CosTrading::UnknownOfferId));
 
@@ -84,8 +82,7 @@ public:
    * pointer to a location in offer_id, so DON'T DELETE IT.
    */
   CosTrading::Offer* lookup_offer (const CosTrading::OfferId offer_id,
-                                   char*& type_name
-                                   ACE_ENV_ARG_DECL)
+                                   char*& type_name)
     ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
                     CosTrading::UnknownOfferId));
 
@@ -138,8 +135,7 @@ private:
   /// and id that were used to generate the offer id.
   static void parse_offer_id (const CosTrading::OfferId offer_id,
                               char* &service_type,
-                              CORBA::ULong& id
-                              ACE_ENV_ARG_DECL)
+                              CORBA::ULong& id)
     ACE_THROW_SPEC ((CosTrading::IllegalOfferId));
 
   // = Disallow these operations.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
index 63a06f1ca20..08a1ce4896a 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
@@ -25,9 +25,9 @@ TAO_Offer_Iterator::destroy (void)
     this->_default_POA ();
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
+    poa->servant_to_id (this);
 
-  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in ());
 }
 
 TAO_Query_Only_Offer_Iterator::
@@ -58,8 +58,7 @@ TAO_Query_Only_Offer_Iterator::max_left (void)
 
 CORBA::Boolean
 TAO_Query_Only_Offer_Iterator::next_n (CORBA::ULong n,
-                                       CosTrading::OfferSeq_out offers
-                                                               ACE_ENV_ARG_DECL_NOT_USED)
+                                       CosTrading::OfferSeq_out offers)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   offers = new CosTrading::OfferSeq;
@@ -91,18 +90,17 @@ TAO_Offer_Iterator_Collection::~TAO_Offer_Iterator_Collection (void)
       CosTrading::OfferIterator* offer_iter = 0;
       this->iters_.dequeue_head (offer_iter);
 
-      ACE_TRY_NEW_ENV
+      try
         {
           offer_iter->destroy ();
 
           CORBA::release (offer_iter);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           // Don't let the exceptions propagate since we're in a
           // destructor!
         }
-      ACE_ENDTRY;
     }
 }
 
@@ -116,8 +114,7 @@ add_offer_iterator (CosTrading::OfferIterator_ptr offer_iter)
 
 CORBA::Boolean
 TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n,
-                                       CosTrading::OfferSeq_out offers
-                                       ACE_ENV_ARG_DECL)
+                                       CosTrading::OfferSeq_out offers)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong offers_left = n;
@@ -141,8 +138,7 @@ TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n,
       // Retrieve the set of offers.
       any_left =
         iter->next_n (offers_left,
-                      CosTrading::OfferSeq_out (out_offers.out ())
-                      ACE_ENV_ARG_PARAMETER);
+                      CosTrading::OfferSeq_out (out_offers.out ()));
 
       // If we've exhausted this iterator, destroy it.
       if (any_left == 0)
@@ -190,9 +186,9 @@ TAO_Offer_Iterator_Collection::destroy (void)
     this->_default_POA ();
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
+    poa->servant_to_id (this);
 
-  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in ());
 }
 
 CORBA::ULong
@@ -241,16 +237,14 @@ TAO_Offer_Id_Iterator::destroy (void)
     this->_default_POA ();
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
+    poa->servant_to_id (this);
 
-  poa->deactivate_object (id.in ()
-                          ACE_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in ());
 }
 
 CORBA::Boolean
 TAO_Offer_Id_Iterator::next_n (CORBA::ULong n,
-                               CosTrading::OfferIdSeq_out _ids
-                               ACE_ENV_ARG_DECL_NOT_USED)
+                               CosTrading::OfferIdSeq_out _ids)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Calculate the number of Ids to be returned in this.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
index 6bf784f63e9..a9508b81998 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
@@ -94,8 +94,7 @@ public:
    * END SPEC
    */
   virtual CORBA::Boolean next_n (CORBA::ULong n,
-                                 CosTrading::OfferSeq_out offers
-                                 ACE_ENV_ARG_DECL)
+                                 CosTrading::OfferSeq_out offers)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
  protected:
 
@@ -133,8 +132,7 @@ public:
   /// Deposit at maximum n offers into the return sequence and return 1,
   /// or return 0 if the iterator is done and no offers are returned.
   virtual CORBA::Boolean next_n (CORBA::ULong n,
-                                 CosTrading::OfferSeq_out offers
-                                 ACE_ENV_ARG_DECL)
+                                 CosTrading::OfferSeq_out offers)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the number of items left in the iterator.
@@ -187,8 +185,7 @@ public:
 
   /// Retrieve n offers from the set of iterators.
   virtual CORBA::Boolean next_n (CORBA::ULong n,
-                                 CosTrading::OfferSeq_out offers
-                                 ACE_ENV_ARG_DECL)
+                                 CosTrading::OfferSeq_out offers)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Destroy the collection of iterators.
@@ -273,8 +270,7 @@ class TAO_Offer_Id_Iterator :
    * further offer identifiers to be extracted.
    */
   virtual CORBA::Boolean next_n(CORBA::ULong _n,
-                                CosTrading::OfferIdSeq_out _ids
-                                ACE_ENV_ARG_DECL)
+                                CosTrading::OfferIdSeq_out _ids)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Insert a <new_id> into the contents of the iterator.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
index 436fd76fb55..1deb800e3a0 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
@@ -49,8 +49,7 @@ max_left (void)
 template <class MAP_LOCK_TYPE> CORBA::Boolean
 TAO_Register_Offer_Iterator<MAP_LOCK_TYPE>::
 next_n (CORBA::ULong n,
-        CosTrading::OfferSeq_out offers
-        ACE_ENV_ARG_DECL)
+        CosTrading::OfferSeq_out offers)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong ret_offers = 0;
@@ -77,7 +76,7 @@ next_n (CORBA::ULong n,
       this->offer_ids_.dequeue_head (id);
 
       CosTrading::OfferId_var offerid_var (id);
-      CosTrading::Offer* offer = this->db_.lookup_offer (id ACE_ENV_ARG_PARAMETER);
+      CosTrading::Offer* offer = this->db_.lookup_offer (id);
 
       if (offer != 0)
         this->pfilter_.filter_offer (offer,
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h
index 43dea0ef133..f988790a61f 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h
@@ -55,8 +55,7 @@ public:
   /// Deposit at maximum n offers into the return sequence and return 1,
   /// or return 0 if the iterator is done and no offers are returned.
   virtual CORBA::Boolean next_n (CORBA::ULong n,
-                                 CosTrading::OfferSeq_out offers
-                                 ACE_ENV_ARG_DECL_NOT_USED)
+                                 CosTrading::OfferSeq_out offers)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
index 13a9b952490..94232d93a98 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
@@ -70,8 +70,7 @@ TAO_Service_Type_Repository::
 add_type (const char *name,
           const char *if_name,
           const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props,
-          const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types
-          ACE_ENV_ARG_DECL)
+          const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
@@ -107,20 +106,18 @@ add_type (const char *name,
 
   // Make sure all property names are valid and appear only once.
   this->validate_properties (prop_map,
-                             props
-                             ACE_ENV_ARG_PARAMETER);
+                             props);
 
   // Check that all super_types exist, and none are duplicated.
   this->validate_supertypes (super_map,
-                             super_types
-                             ACE_ENV_ARG_PARAMETER);
+                             super_types);
 
   // NOTE: I don't really know a way to do this without an Interface
   // Repository, since the Interface Repository IDs don't contain
   // information about supertypes.
   //
   // make sure interface name is legal.
-  //  this->validate_interface (if_name, super_types ACE_ENV_ARG_PARAMETER);
+  //  this->validate_interface (if_name, super_types);
   //
   // Instead, we do this:
   //
@@ -132,8 +129,7 @@ add_type (const char *name,
   // type are compatible.  We can use prop_map and super_types_map for
   // the job.
   this->validate_inheritance (prop_map,
-                              super_types
-                              ACE_ENV_ARG_PARAMETER);
+                              super_types);
 
   // We can now use prop_map to construct a sequence of all properties
   // the this type.
@@ -158,15 +154,14 @@ add_type (const char *name,
 }
 
 void
-TAO_Service_Type_Repository::remove_type (const char *name
-                                          ACE_ENV_ARG_DECL)
+TAO_Service_Type_Repository::remove_type (const char *name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
                    CosTradingRepos::ServiceTypeRepository::HasSubTypes))
 {
   if (TAO_Trader_Base::is_valid_identifier_name (name) == 0)
-    ACE_THROW (CosTrading::IllegalServiceType (name));
+    throw CosTrading::IllegalServiceType (name);
 
   ACE_WRITE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ());
 
@@ -174,12 +169,12 @@ TAO_Service_Type_Repository::remove_type (const char *name
   Service_Type_Map::ENTRY* type_entry = 0; ;
   if (this->type_map_.find (name,
                             type_entry) == -1)
-    ACE_THROW (CosTrading::UnknownServiceType (name));
+    throw CosTrading::UnknownServiceType (name);
 
   // Check if it has any subtypes.
   Type_Info *type_info = type_entry->int_id_;
   if (type_info->has_subtypes_)
-    ACE_THROW (CosTradingRepos::ServiceTypeRepository::HasSubTypes (name, ""));
+    throw CosTradingRepos::ServiceTypeRepository::HasSubTypes (name, "");
 
   // Remove the type from the map.
   this->type_map_.unbind (type_entry);
@@ -188,8 +183,7 @@ TAO_Service_Type_Repository::remove_type (const char *name
 
 CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq *
 TAO_Service_Type_Repository::
-list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes &which_types
-            ACE_ENV_ARG_DECL)
+list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes &which_types)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_READ_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ());
@@ -233,8 +227,7 @@ list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes
 
 CosTradingRepos::ServiceTypeRepository::TypeStruct *
 TAO_Service_Type_Repository::
-describe_type (const char * name
-               ACE_ENV_ARG_DECL)
+describe_type (const char * name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType))
@@ -282,8 +275,7 @@ describe_type (const char * name
 
 CosTradingRepos::ServiceTypeRepository::TypeStruct *
 TAO_Service_Type_Repository::
-fully_describe_type (const char *name
-                     ACE_ENV_ARG_DECL)
+fully_describe_type (const char *name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType))
@@ -327,15 +319,14 @@ fully_describe_type (const char *name
 
 void
 TAO_Service_Type_Repository::
-mask_type (const char *name
-           ACE_ENV_ARG_DECL)
+mask_type (const char *name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
                    CosTradingRepos::ServiceTypeRepository::AlreadyMasked))
 {
   if (TAO_Trader_Base::is_valid_identifier_name (name) == 0)
-    ACE_THROW (CosTrading::IllegalServiceType (name));
+    throw CosTrading::IllegalServiceType (name);
 
   ACE_WRITE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ());
 
@@ -344,29 +335,28 @@ mask_type (const char *name
   Service_Type_Map::ENTRY *type_entry = 0;
   if (this->type_map_.find (type_name,
                             type_entry) != -1)
-    ACE_THROW (CosTrading::UnknownServiceType (name));
+    throw CosTrading::UnknownServiceType (name);
 
   // Make sure the type is unmasked.
   CORBA::Boolean &mask =
     type_entry->int_id_->type_struct_.masked;
 
   if (mask == 1)
-    ACE_THROW (CosTradingRepos::ServiceTypeRepository::AlreadyMasked (name));
+    throw CosTradingRepos::ServiceTypeRepository::AlreadyMasked (name);
   else
     mask = 1;
 }
 
 void
 TAO_Service_Type_Repository::
-unmask_type (const char *name
-             ACE_ENV_ARG_DECL)
+unmask_type (const char *name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::IllegalServiceType,
                   CosTrading::UnknownServiceType,
                   CosTradingRepos::ServiceTypeRepository::NotMasked))
 {
   if (TAO_Trader_Base::is_valid_identifier_name (name) == 0)
-    ACE_THROW (CosTrading::IllegalServiceType (name));
+    throw CosTrading::IllegalServiceType (name);
 
   ACE_WRITE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ());
 
@@ -375,13 +365,13 @@ unmask_type (const char *name
   Service_Type_Map::ENTRY *type_entry = 0;
   if (this->type_map_.find (type_name,
                             type_entry) != -1)
-    ACE_THROW (CosTrading::UnknownServiceType (name));
+    throw CosTrading::UnknownServiceType (name);
 
   // Make sure the type is masked.
   CORBA::Boolean &mask = type_entry->int_id_->type_struct_.masked;
 
   if (mask == 0)
-    ACE_THROW (CosTradingRepos::ServiceTypeRepository::NotMasked (name));
+    throw CosTradingRepos::ServiceTypeRepository::NotMasked (name);
   else
     mask = 0;
 }
@@ -492,8 +482,7 @@ collect_inheritance_hierarchy (const CosTradingRepos::ServiceTypeRepository::Typ
 void
 TAO_Service_Type_Repository::
 validate_properties (Prop_Map &prop_map,
-                     const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props
-                     ACE_ENV_ARG_DECL)
+                     const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props)
   ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                    CosTrading::DuplicatePropertyName))
 {
@@ -503,7 +492,7 @@ validate_properties (Prop_Map &prop_map,
     {
       const char *n = props[i].name;
       if (TAO_Trader_Base::is_valid_property_name (n) == 0)
-        ACE_THROW (CosTrading::IllegalPropertyName (n));
+        throw CosTrading::IllegalPropertyName (n);
       else
         {
           CORBA::String_var prop_name (n);
@@ -512,7 +501,7 @@ validate_properties (Prop_Map &prop_map,
 
           if (prop_map.bind (prop_name,
                              prop_val) == 1)
-            ACE_THROW (CosTrading::DuplicatePropertyName (n));
+            throw CosTrading::DuplicatePropertyName (n);
         }
     }
 }
@@ -520,8 +509,7 @@ validate_properties (Prop_Map &prop_map,
 void
 TAO_Service_Type_Repository::
 validate_supertypes (Service_Type_Map &super_map,
-                     const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types
-                     ACE_ENV_ARG_DECL)
+                     const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types)
   ACE_THROW_SPEC ((CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
                    CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName))
@@ -534,7 +522,7 @@ validate_supertypes (Service_Type_Map &super_map,
         super_types[i];
 
       if (TAO_Trader_Base::is_valid_identifier_name (type) == 0)
-        ACE_THROW (CosTrading::IllegalServiceType (type));
+        throw CosTrading::IllegalServiceType (type);
       else
         {
           CORBA::String_var hash_type (type);
@@ -542,12 +530,13 @@ validate_supertypes (Service_Type_Map &super_map,
 
           if (this->type_map_.find (hash_type,
                                     type_entry) == -1)
-            ACE_THROW (CosTrading::UnknownServiceType (type));
+            throw CosTrading::UnknownServiceType (type);
           else
             {
               if (super_map.bind (hash_type,
                                   type_entry->int_id_) == 1)
-                ACE_THROW (CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName (type));
+                throw CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName (
+                  type);
             }
         }
     }
@@ -556,8 +545,7 @@ validate_supertypes (Service_Type_Map &super_map,
 void
 TAO_Service_Type_Repository::
 validate_inheritance (Prop_Map &prop_map,
-                      const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types
-                      ACE_ENV_ARG_DECL)
+                      const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types)
   ACE_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition))
 {
   CORBA::ULong num_super_types = super_types.length ();
@@ -602,29 +590,27 @@ validate_inheritance (Prop_Map &prop_map,
 
               CORBA::TypeCode_ptr prop_type = property_in_map.value_type.in ();
               int compare = 0;
-              ACE_TRY
+              try
                 {
                   compare =
-                    super_props[j].value_type->equal (prop_type
-                                                      ACE_ENV_ARG_PARAMETER);
+                    super_props[j].value_type->equal (prop_type);
                 }
-              ACE_CATCHANY
+              catch (const CORBA::Exception& ex)
                 {
-                ACE_TRY_THROW (CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition
-                               (super_props[j].name,
-                                super_props[j],
-                                property_in_map.name,
-                                property_in_map));
+                throw CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition(
+                  super_props[j].name,
+                  super_props[j],
+                  property_in_map.name,
+                  property_in_map);
                 }
-              ACE_ENDTRY;
 
               if (compare == 0
                   || super_props[j].mode > property_in_map.mode)
-                ACE_THROW (CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition
-                           (super_props[j].name,
-                            super_props[j],
-                            property_in_map.name,
-                            property_in_map));
+                throw CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition(
+                  super_props[j].name,
+                  super_props[j],
+                  property_in_map.name,
+                  property_in_map);
             }
         }
     }
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
index 347e35c59e0..e2f1ff9de94 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
@@ -59,8 +59,7 @@ public:
   add_type (const char *name,
             const char *if_name,
             const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props,
-            const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types
-            ACE_ENV_ARG_DECL_NOT_USED)
+            const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
@@ -116,16 +115,14 @@ public:
    * "name" has a service type which has been derived from it, then
    * the HasSubTypes exception is raised.  END SPEC
    */
-  virtual void remove_type (const char  *name
-                            ACE_ENV_ARG_DECL_NOT_USED)
+  virtual void remove_type (const char  *name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
                      CosTradingRepos::ServiceTypeRepository::HasSubTypes));
 
   virtual CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq *
-  list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes &which_types
-              ACE_ENV_ARG_DECL_NOT_USED)
+  list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes &which_types)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // BEGIN SPEC
@@ -149,8 +146,7 @@ public:
    * END SPEC
    */
   virtual CosTradingRepos::ServiceTypeRepository::TypeStruct *
-  describe_type (const char *name
-                 ACE_ENV_ARG_DECL_NOT_USED)
+  describe_type (const char *name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType));
@@ -169,8 +165,7 @@ public:
    * END SPEC
    */
   virtual CosTradingRepos::ServiceTypeRepository::TypeStruct *
-  fully_describe_type (const char *name
-                       ACE_ENV_ARG_DECL_NOT_USED)
+  fully_describe_type (const char *name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType));
@@ -189,8 +184,7 @@ public:
    * exception is raised.
    * END SPEC
    */
-  virtual void mask_type (const char *name
-                          ACE_ENV_ARG_DECL_NOT_USED)
+  virtual void mask_type (const char *name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -208,8 +202,7 @@ public:
    * exception is raised.
    * END SPEC
    */
-  virtual void unmask_type (const char  *name
-                            ACE_ENV_ARG_DECL_NOT_USED)
+  virtual void unmask_type (const char  *name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -268,15 +261,13 @@ private:
   /// Confirm that the properties in props have valid names, and aren't
   /// duplicated. Cram those properties into the prop_map.
   void validate_properties (Prop_Map &prop_map,
-                            const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props
-                            ACE_ENV_ARG_DECL_NOT_USED)
+                            const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props)
     ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                      CosTrading::DuplicatePropertyName));
 
   /// Confirm that the each super type exists, and cram them into super_map.
   void validate_supertypes (Service_Type_Map &super_map,
-                            const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types
-                            ACE_ENV_ARG_DECL_NOT_USED)
+                            const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types)
     ACE_THROW_SPEC ((CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
                      CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName));
@@ -284,13 +275,12 @@ private:
   /// Ensure that properties of a super_type aren't having their types
   /// or retstrictions redefined.
   void validate_inheritance (Prop_Map &prop_map,
-                             const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types
-                             ACE_ENV_ARG_DECL_NOT_USED)
+                             const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types)
     ACE_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition));
 
   //  void validate_interface (const char *if_name,
   //                       Service_Type_Map &super_map,
-  //                       ACE_ENV_SINGLE_ARG_DECL)
+  //)
   //    ACE_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch));
   // Ensure that the interface type derives from its superclasses'.
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
index 14d035ee0e5..7610561a7c2 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
@@ -247,11 +247,10 @@ type_repos (CosTrading::TypeRepository_ptr new_value)
   // @@ Seth, There is no way to propagate the exception out.
   ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->locker_.lock ());
 
-  ACE_DECLARE_NEW_CORBA_ENV;
   this->type_repos_ = new_value;
   // @@ What can we do even if we catch this?
   this->service_type_repos_ =
-    CosTradingRepos::ServiceTypeRepository::_narrow (new_value ACE_ENV_ARG_PARAMETER);
+    CosTradingRepos::ServiceTypeRepository::_narrow (new_value);
 }
 
 CosTradingRepos::ServiceTypeRepository_ptr
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp
index 387b859dbd5..526b94062eb 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp
@@ -31,19 +31,17 @@ visit_property (TAO_Property_Constraint* literal)
 
   if (this->props_.find (prop_name, prop_index) == 0)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
 
       CORBA::Any *value = 0;
       // Retrieve the value of the property from the Property_Evaluator
-      ACE_TRY
+      try
         {
-          value = this->prop_eval_.property_value (prop_index ACE_ENV_ARG_PARAMETER);
+          value = this->prop_eval_.property_value (prop_index);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           return -1;
         }
-      ACE_ENDTRY;
 
       if (value != 0)
         {
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
index b75fbbae2f1..c4a3c9aba48 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
@@ -47,8 +47,7 @@ query (const char *type,
        CORBA::ULong how_many,
        CosTrading::OfferSeq_out returned_offers,
        CosTrading::OfferIterator_out returned_offer_iterator,
-       CosTrading::PolicyNameSeq_out returned_limits_applied
-       ACE_ENV_ARG_DECL)
+       CosTrading::PolicyNameSeq_out returned_limits_applied)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -62,12 +61,12 @@ query (const char *type,
                    CosTrading::DuplicatePolicyName))
 {
   // Instantiate a class to help interpret query policies.
-  TAO_Policies policies (this->trader_, in_policies ACE_ENV_ARG_PARAMETER);
+  TAO_Policies policies (this->trader_, in_policies);
 
   // If a federated query returns to us, ignore it to prevent
   // redundant results and infinite loops.
   CosTrading::Admin::OctetSeq* request_id = 0;
-  int check = this->seen_request_id (policies, request_id ACE_ENV_ARG_PARAMETER);
+  int check = this->seen_request_id (policies, request_id);
 
   if (check)
     {
@@ -100,8 +99,7 @@ query (const char *type,
                            how_many,
                            returned_offers,
                            returned_offer_iterator,
-                           returned_limits_applied
-                           ACE_ENV_ARG_PARAMETER);
+                           returned_limits_applied);
       return;
     }
 
@@ -111,7 +109,7 @@ query (const char *type,
   CosTradingRepos::ServiceTypeRepository_ptr rep =
     support_attrs.service_type_repos ();
   CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct =
-    rep->fully_describe_type (type ACE_ENV_ARG_PARAMETER);
+    rep->fully_describe_type (type);
 
   // @@ Should throw a NO_MEMORY exception here...
   ACE_NEW (returned_offers,
@@ -130,15 +128,12 @@ query (const char *type,
   // meets those constraints.  TAO_Preference_Interpreter -- parses
   // the preference string and orders offers according to those
   // constraints.
-  TAO_Offer_Filter offer_filter (policies
-                                 ACE_ENV_ARG_PARAMETER);
+  TAO_Offer_Filter offer_filter (policies);
   TAO_Trader_Constraint_Validator validator (type_struct.in ());
   TAO_Constraint_Interpreter constr_inter (validator,
-                                           constraint
-                                           ACE_ENV_ARG_PARAMETER);
+                                           constraint);
   TAO_Preference_Interpreter pref_inter (validator,
-                                         preferences
-                                         ACE_ENV_ARG_PARAMETER);
+                                         preferences);
 
   // Try to find the map of offers of desired service type.
   offer_filter.configure_type (type_struct.ptr ());
@@ -164,8 +159,7 @@ query (const char *type,
                                  rep,
                                  constr_inter,
                                  pref_inter,
-                                 offer_filter
-                                 ACE_ENV_ARG_PARAMETER);
+                                 offer_filter);
     }
 
   // Take note of the limits applied in this query.
@@ -179,8 +173,7 @@ query (const char *type,
                             policies,
                             pref_inter,
                             *returned_offers.ptr (),
-                            returned_offer_iterator
-                            ACE_ENV_ARG_PARAMETER);
+                            returned_offer_iterator);
 
   // The following steps are only appropriate for a linked trader.
   if (! CORBA::is_nil (link_if))
@@ -191,8 +184,7 @@ query (const char *type,
       CORBA::Boolean should_follow =
         this->retrieve_links (policies,
                               offers_returned,
-                              CosTrading::LinkNameSeq_out (links.out ())
-                              ACE_ENV_ARG_PARAMETER);
+                              CosTrading::LinkNameSeq_out (links.out ()));
 
       if (should_follow && links->length () != 0)
         {
@@ -208,8 +200,7 @@ query (const char *type,
                                  how_many,
                                  *returned_offers.ptr (),
                                  returned_offer_iterator.ptr (),
-                                 *returned_limits_applied.ptr ()
-                                 ACE_ENV_ARG_PARAMETER);
+                                 *returned_limits_applied.ptr ());
         }
     }
 }
@@ -275,8 +266,7 @@ lookup_all_subtypes (const char* type,
                      CosTradingRepos::ServiceTypeRepository_ptr rep,
                      TAO_Constraint_Interpreter& constr_inter,
                      TAO_Preference_Interpreter& pref_inter,
-                     TAO_Offer_Filter& offer_filter
-                     ACE_ENV_ARG_DECL)
+                     TAO_Offer_Filter& offer_filter)
 {
   // BEGIN SPEC
   // The trader may return a service offer of a subtype of the "type"
@@ -297,7 +287,7 @@ lookup_all_subtypes (const char* type,
   // types with lower incarnation numbers.
   sst.incarnation (inc_num);
 
-  all_types = rep->list_types (sst ACE_ENV_ARG_PARAMETER);
+  all_types = rep->list_types (sst);
 
   // Scan all types inserted after the super types. If the transitive
   // closure of a type's super type relation includes the super type
@@ -309,8 +299,7 @@ lookup_all_subtypes (const char* type,
        i++)
     {
       // Obtain a description of the prospective type.
-      type_struct = rep->fully_describe_type (all_types[i]
-                                              ACE_ENV_ARG_PARAMETER);
+      type_struct = rep->fully_describe_type (all_types[i]);
 
       CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq&
         super_types = type_struct->super_types;
@@ -343,8 +332,7 @@ fill_receptacles (const char* /* type */,
                   TAO_Policies& policies,
                   TAO_Preference_Interpreter& pref_inter,
                   CosTrading::OfferSeq& offers,
-                  CosTrading::OfferIterator_ptr& offer_itr
-                  ACE_ENV_ARG_DECL)
+                  CosTrading::OfferIterator_ptr& offer_itr)
   ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                   CosTrading::DuplicatePropertyName))
 {
@@ -359,7 +347,7 @@ fill_receptacles (const char* /* type */,
   // "offer_itr" will be nil.
   // END SPEC
 
-  TAO_Property_Filter prop_filter (desired_props ACE_ENV_ARG_PARAMETER);
+  TAO_Property_Filter prop_filter (desired_props);
 
   // RETURNING: Calculate how many offers go into the sequence
   //  Calculate how many go into the iterator
@@ -476,8 +464,7 @@ CORBA::Boolean
 TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 retrieve_links (TAO_Policies& policies,
                 CORBA::ULong offers_returned,
-                CosTrading::LinkNameSeq_out links
-                ACE_ENV_ARG_DECL)
+                CosTrading::LinkNameSeq_out links)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::Lookup::PolicyTypeMismatch))
 {
@@ -514,11 +501,11 @@ retrieve_links (TAO_Policies& policies,
         {
           // Grab the link information.
           CosTrading::Link::LinkInfo_var
-            link_info (link_if->describe_link (links[i] ACE_ENV_ARG_PARAMETER));
+            link_info (link_if->describe_link (links[i]));
 
           // Compute the link follow rule.
           CosTrading::FollowOption link_rule =
-            policies.link_follow_rule (link_info.in () ACE_ENV_ARG_PARAMETER);
+            policies.link_follow_rule (link_info.in ());
 
           // Determine if the link follow rule applies.
           if (link_rule == CosTrading::always
@@ -553,8 +540,7 @@ federated_query (const CosTrading::LinkNameSeq& links,
                  CORBA::ULong how_many,
                  CosTrading::OfferSeq& offers,
                  CosTrading::OfferIterator_ptr& offer_iter,
-                 CosTrading::PolicyNameSeq& limits
-                 ACE_ENV_ARG_DECL)
+                 CosTrading::PolicyNameSeq& limits)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -591,7 +577,7 @@ federated_query (const CosTrading::LinkNameSeq& links,
   offer_iter_collection->add_offer_iterator (offer_iter);
 
   CosTrading::PolicySeq policies_to_pass;
-  policies.copy_to_pass (policies_to_pass, request_id ACE_ENV_ARG_PARAMETER);
+  policies.copy_to_pass (policies_to_pass, request_id);
 
   for (int i = links.length () - 1; i >= 0; i--)
     {
@@ -599,16 +585,15 @@ federated_query (const CosTrading::LinkNameSeq& links,
       CosTrading::OfferIterator *out_offer_iter = 0;
       CosTrading::PolicyNameSeq *out_limits = 0;
 
-      ACE_TRY
+      try
         {
           // Obtain information about the link we're traversing.
           CosTrading::Link::LinkInfo_var link_info =
-            link_interface->describe_link (links[i] ACE_ENV_ARG_PARAMETER);
+            link_interface->describe_link (links[i]);
 
           // Set the link follow policy for the query over the link.
           policies.copy_in_follow_option (policies_to_pass,
-                                          link_info.in ()
-                                          ACE_ENV_ARG_PARAMETER);
+                                          link_info.in ());
 
           CosTrading::Lookup_var remote_lookup =
             CosTrading::Lookup::_duplicate (link_info->target.in ());
@@ -622,8 +607,7 @@ federated_query (const CosTrading::LinkNameSeq& links,
                                 how_many - offers.length (),
                                 CosTrading::OfferSeq_out (out_offers),
                                 CosTrading::OfferIterator_out (out_offer_iter),
-                                CosTrading::PolicyNameSeq_out (out_limits)
-                                ACE_ENV_ARG_PARAMETER);
+                                CosTrading::PolicyNameSeq_out (out_limits));
 
           CORBA::ULong j = 0;
           CosTrading::OfferSeq_var out_offers_var (out_offers);
@@ -651,11 +635,10 @@ federated_query (const CosTrading::LinkNameSeq& links,
           for (j = 0; j < source_length; j++)
             offers[j + target_length] = out_offers_var[j];
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           // Ah, well, this query failed, move on to the next one.
         }
-      ACE_ENDTRY;
     }
 
   // Sort the sequence in preference order.
@@ -716,8 +699,7 @@ forward_query (const char* next_hop,
                CORBA::ULong how_many,
                CosTrading::OfferSeq_out offers,
                CosTrading::OfferIterator_out offer_itr,
-               CosTrading::PolicyNameSeq_out limits_applied
-               ACE_ENV_ARG_DECL)
+               CosTrading::PolicyNameSeq_out limits_applied)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -734,10 +716,10 @@ forward_query (const char* next_hop,
   CosTrading::Link_ptr link_interface
     = this->trader_.trading_components ().link_if ();
 
-  ACE_TRY
+  try
     {
       CosTrading::Link::LinkInfo_var link_info =
-        link_interface->describe_link (next_hop ACE_ENV_ARG_PARAMETER);
+        link_interface->describe_link (next_hop);
 
       CosTrading::Lookup_var remote_lookup =
         CosTrading::Lookup::_duplicate (link_info->target.in ());
@@ -745,7 +727,7 @@ forward_query (const char* next_hop,
       CORBA::Object_var us = this->_this ();
 
       CORBA::Boolean self_loop =
-        remote_lookup->_is_equivalent (us.in () ACE_ENV_ARG_PARAMETER);
+        remote_lookup->_is_equivalent (us.in ());
 
       if (! self_loop)
         {
@@ -758,8 +740,7 @@ forward_query (const char* next_hop,
                                 how_many,
                                 offers,
                                 offer_itr,
-                                limits_applied
-                                ACE_ENV_ARG_PARAMETER);
+                                limits_applied);
         }
       else
         {
@@ -771,26 +752,23 @@ forward_query (const char* next_hop,
                        how_many,
                        offers,
                        offer_itr,
-                       limits_applied
-                       ACE_ENV_ARG_PARAMETER);
+                       limits_applied);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       CosTrading::Policy policy;
       policy.name = TAO_Policies::POLICY_NAMES[TAO_Policies::STARTING_TRADER];
       policy.value <<= next_hop;
-      ACE_TRY_THROW (CosTrading::Lookup::InvalidPolicyValue (policy));
+      throw CosTrading::Lookup::InvalidPolicyValue (policy);
     }
-  ACE_ENDTRY;
 }
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::Boolean
 TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 seen_request_id (TAO_Policies& policies,
-                 CosTrading::Admin::OctetSeq*& seq
-                 ACE_ENV_ARG_DECL)
+                 CosTrading::Admin::OctetSeq*& seq)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::Lookup::PolicyTypeMismatch))
 {
@@ -862,8 +840,7 @@ CosTrading::OfferId
 TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 _cxx_export (CORBA::Object_ptr reference,
              const char *type,
-             const CosTrading::PropertySeq &properties
-             ACE_ENV_ARG_DECL)
+             const CosTrading::PropertySeq &properties)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::Register::InvalidObjectRef,
                   CosTrading::IllegalServiceType,
@@ -891,7 +868,7 @@ _cxx_export (CORBA::Object_ptr reference,
   // Yank our friend, the type struct, and confirm that the given
   // properties match the type definition.
   CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct =
-    rep->fully_describe_type (type ACE_ENV_ARG_PARAMETER);
+    rep->fully_describe_type (type);
 
   // Oops the type is masked, we shouldn't let exporters know the type
   // exists.
@@ -900,14 +877,14 @@ _cxx_export (CORBA::Object_ptr reference,
 
   // TAO-specific way to determine if an object is derived from or is
   // an interface type.
-  int check = (! reference->_is_a (type_struct->if_name ACE_ENV_ARG_PARAMETER));
+  int check = (! reference->_is_a (type_struct->if_name));
   if (check)
     ACE_THROW_RETURN (CosTrading::Register::
                       InterfaceTypeMismatch (type, reference), 0);
 
   // Validate that the properties defined for this offer are correct
   // to their types and strength.
-  this->validate_properties (type, type_struct.ptr (), properties ACE_ENV_ARG_PARAMETER);
+  this->validate_properties (type, type_struct.ptr (), properties);
 
   // CORBA::ULong plength = properties.length ();
   ACE_NEW_THROW_EX (offer, CosTrading::Offer, CORBA::NO_MEMORY ());
@@ -935,8 +912,7 @@ _cxx_export (CORBA::Object_ptr reference,
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 void
 TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-withdraw (const char *id
-          ACE_ENV_ARG_DECL)
+withdraw (const char *id)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalOfferId,
                    CosTrading::UnknownOfferId,
@@ -944,14 +920,13 @@ withdraw (const char *id
 {
   // Get service type map.
   TAO_Offer_Database<MAP_LOCK_TYPE> &offer_database = this->trader_.offer_database ();
-  offer_database.remove_offer ((CosTrading::OfferId) id ACE_ENV_ARG_PARAMETER);
+  offer_database.remove_offer ((CosTrading::OfferId) id);
 }
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::Register::OfferInfo *
 TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-describe (const char *id
-          ACE_ENV_ARG_DECL)
+describe (const char *id)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::IllegalOfferId,
                   CosTrading::UnknownOfferId,
@@ -963,7 +938,7 @@ describe (const char *id
 
   // Perform a lookup to find the offer.
   CosTrading::Offer* offer =
-    offer_database.lookup_offer ((CosTrading::OfferId) id, type ACE_ENV_ARG_PARAMETER);
+    offer_database.lookup_offer ((CosTrading::OfferId) id, type);
 
   CosTrading::Register::OfferInfo *offer_info = 0;
   ACE_NEW_THROW_EX (offer_info, CosTrading::Register::OfferInfo, CORBA::NO_MEMORY ());
@@ -984,8 +959,7 @@ void
 TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 modify (const char *id,
         const CosTrading::PropertyNameSeq& del_list,
-        const CosTrading::PropertySeq& modify_list
-        ACE_ENV_ARG_DECL)
+        const CosTrading::PropertySeq& modify_list)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::NotImplemented,
                   CosTrading::IllegalOfferId,
@@ -1004,7 +978,7 @@ modify (const char *id,
   int check =  (! this->supports_modifiable_properties ());
 
   if (check)
-    ACE_THROW (CosTrading::NotImplemented ());
+    throw CosTrading::NotImplemented ();
 
   char* type = 0;
   TAO_Support_Attributes_i& support_attrs =
@@ -1014,19 +988,19 @@ modify (const char *id,
   TAO_Offer_Database<MAP_LOCK_TYPE> &offer_database = this->trader_.offer_database ();
 
   CosTrading::Offer* offer = offer_database.
-    lookup_offer (const_cast<CosTrading::OfferId> (id), type ACE_ENV_ARG_PARAMETER);
+    lookup_offer (const_cast<CosTrading::OfferId> (id), type);
 
   if (offer != 0)
     {
       // Yank our friend, the type struct.
       CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct =
-        rep->fully_describe_type (type ACE_ENV_ARG_PARAMETER);
+        rep->fully_describe_type (type);
       TAO_Offer_Modifier offer_mod (type, type_struct.in (), offer);
 
       // Delete, add, and change properties of the offer.
-      offer_mod.delete_properties (del_list ACE_ENV_ARG_PARAMETER);
+      offer_mod.delete_properties (del_list);
 
-      offer_mod.merge_properties (modify_list ACE_ENV_ARG_PARAMETER);
+      offer_mod.merge_properties (modify_list);
 
       // Alter our reference to the offer. We do this last, since the
       // spec says: modify either suceeds completely or fails
@@ -1039,8 +1013,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 void
 TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 withdraw_using_constraint (const char *type,
-                           const char *constr
-                           ACE_ENV_ARG_DECL)
+                           const char *constr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -1057,7 +1030,7 @@ withdraw_using_constraint (const char *type,
 
   // Retrieve the type struct
   CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct =
-    rep->fully_describe_type (type ACE_ENV_ARG_PARAMETER);
+    rep->fully_describe_type (type);
 
   // Try to find the map of offers of desired service type.
   // @@ Again, should be Offer_Database::offer_iterator
@@ -1075,7 +1048,7 @@ withdraw_using_constraint (const char *type,
 #endif /* _MSC_VER */
 
     TAO_Trader_Constraint_Validator validator (type_struct.in ());
-    TAO_Constraint_Interpreter constr_inter (validator, constr ACE_ENV_ARG_PARAMETER);
+    TAO_Constraint_Interpreter constr_inter (validator, constr);
 
     while (offer_iter.has_more_offers ())
       {
@@ -1097,19 +1070,18 @@ withdraw_using_constraint (const char *type,
           char* offer_id = 0;
 
           ids.dequeue_head (offer_id);
-          offer_database.remove_offer (offer_id ACE_ENV_ARG_PARAMETER);
+          offer_database.remove_offer (offer_id);
           CORBA::string_free (offer_id);
         }
     }
   else
-    ACE_THROW (CosTrading::Register::NoMatchingOffers (constr));
+    throw CosTrading::Register::NoMatchingOffers (constr);
 }
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::Register_ptr
 TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-resolve (const CosTrading::TraderName &name
-         ACE_ENV_ARG_DECL)
+resolve (const CosTrading::TraderName &name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::Register::IllegalTraderName,
                   CosTrading::Register::UnknownTraderName,
@@ -1131,19 +1103,18 @@ resolve (const CosTrading::TraderName &name
   CosTrading::Link::LinkInfo_var link_info;
   CosTrading::Register_var remote_reg;
 
-  ACE_TRY
+  try
     {
       // Ensure that the link to the next trader exists.
-      link_info = link_if->describe_link (name[0] ACE_ENV_ARG_PARAMETER);
+      link_info = link_if->describe_link (name[0]);
 
       remote_reg =
-        CosTrading::Register::_narrow (link_info->target_reg.in () ACE_ENV_ARG_PARAMETER);
+        CosTrading::Register::_narrow (link_info->target_reg.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_TRY_THROW (CosTrading::Register::UnknownTraderName (name));
+      throw CosTrading::Register::UnknownTraderName (name);
     }
-  ACE_ENDTRY;
 
   // Ensure that the register pointer isn't nil.
   if (! CORBA::is_nil (remote_reg.in ()))
@@ -1159,7 +1130,7 @@ resolve (const CosTrading::TraderName &name
       for (int i = trader_name.length () - 1; i >= 0; i--)
         trader_name[i] = name[i + 1];
 
-      return_value = remote_reg->resolve (trader_name ACE_ENV_ARG_PARAMETER);
+      return_value = remote_reg->resolve (trader_name);
     }
 
   return return_value;
@@ -1170,8 +1141,7 @@ void
 TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 validate_properties (const char* type,
                      const CosTradingRepos::ServiceTypeRepository::TypeStruct* type_struct,
-                     const CosTrading::PropertySeq& properties
-                     ACE_ENV_ARG_DECL)
+                     const CosTrading::PropertySeq& properties)
   ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                   CosTrading::PropertyTypeMismatch,
                   CosTrading::ReadonlyDynamicProperty,
@@ -1181,7 +1151,7 @@ validate_properties (const char* type,
   CORBA::ULong length = properties.length ();
   const CosTradingRepos::ServiceTypeRepository::PropStructSeq&
     prop_types = type_struct->props;
-  TAO_Property_Evaluator_By_Name prop_eval (properties ACE_ENV_ARG_PARAMETER);
+  TAO_Property_Evaluator_By_Name prop_eval (properties);
 
   // Perform property validation
   length = prop_types.length ();
@@ -1200,24 +1170,23 @@ validate_properties (const char* type,
           // Offer cannot have a missing mandatory property.
           if (prop_types[i].mode ==
               CosTradingRepos::ServiceTypeRepository::PROP_MANDATORY)
-            ACE_THROW (CosTrading::MissingMandatoryProperty (type, prop_name));
+            throw CosTrading::MissingMandatoryProperty (type, prop_name);
         }
       else
         {
           int check =
-            (! prop_type->equal (prop_struct.value_type.in ()
-                                 ACE_ENV_ARG_PARAMETER));
+            (! prop_type->equal (prop_struct.value_type.in ()));
           if (check)
             {
               // Offer cannot redefine the type of an property.
               const CosTrading::Property* prop =
                 prop_eval.get_property (prop_name);
-              ACE_THROW (CosTrading::PropertyTypeMismatch (type, *prop));
+              throw CosTrading::PropertyTypeMismatch (type, *prop);
             }
           else if (prop_struct.mode ==
                    CosTradingRepos::ServiceTypeRepository::PROP_READONLY &&
                    prop_eval.is_dynamic_property (prop_name))
-            ACE_THROW (CosTrading::ReadonlyDynamicProperty (type, prop_name));
+            throw CosTrading::ReadonlyDynamicProperty (type, prop_name);
         }
     }
 }
@@ -1310,7 +1279,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_def_search_card (CORBA::ULong value
-                     ACE_ENV_ARG_DECL_NOT_USED )
+ )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1324,7 +1293,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_max_search_card (CORBA::ULong value
-                     ACE_ENV_ARG_DECL_NOT_USED )
+ )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1338,7 +1307,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_def_match_card (CORBA::ULong value
-                    ACE_ENV_ARG_DECL_NOT_USED )
+ )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1352,7 +1321,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_max_match_card (CORBA::ULong value
-                    ACE_ENV_ARG_DECL_NOT_USED )
+ )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1366,7 +1335,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_def_return_card (CORBA::ULong value
-                     ACE_ENV_ARG_DECL_NOT_USED )
+ )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1380,7 +1349,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_max_return_card (CORBA::ULong value
-                     ACE_ENV_ARG_DECL_NOT_USED )
+ )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1394,7 +1363,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_max_list (CORBA::ULong value
-              ACE_ENV_ARG_DECL_NOT_USED )
+ )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1408,7 +1377,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::Boolean
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_supports_modifiable_properties (CORBA::Boolean value
-                                    ACE_ENV_ARG_DECL_NOT_USED )
+ )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean return_value =
@@ -1422,7 +1391,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::Boolean
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_supports_dynamic_properties (CORBA::Boolean value
-                                 ACE_ENV_ARG_DECL_NOT_USED )
+ )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean return_value =
@@ -1436,7 +1405,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::Boolean
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_supports_proxy_offers (CORBA::Boolean value
-                           ACE_ENV_ARG_DECL_NOT_USED )
+ )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean return_value =
@@ -1450,7 +1419,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_def_hop_count (CORBA::ULong value
-                   ACE_ENV_ARG_DECL_NOT_USED )
+ )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1464,7 +1433,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_max_hop_count (CORBA::ULong value
-                   ACE_ENV_ARG_DECL_NOT_USED )
+ )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1478,7 +1447,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::FollowOption
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_def_follow_policy (CosTrading::FollowOption policy
-                       ACE_ENV_ARG_DECL_NOT_USED )
+ )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosTrading::FollowOption return_value =
@@ -1492,7 +1461,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::FollowOption
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_max_follow_policy (CosTrading::FollowOption policy
-                       ACE_ENV_ARG_DECL_NOT_USED )
+ )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosTrading::FollowOption return_value =
@@ -1505,8 +1474,7 @@ set_max_follow_policy (CosTrading::FollowOption policy
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::FollowOption
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-set_max_link_follow_policy (CosTrading::FollowOption policy
-                            ACE_ENV_ARG_DECL_NOT_USED)
+set_max_link_follow_policy (CosTrading::FollowOption policy)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosTrading::FollowOption return_value =
@@ -1519,8 +1487,7 @@ set_max_link_follow_policy (CosTrading::FollowOption policy
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::TypeRepository_ptr
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-set_type_repos (CosTrading::TypeRepository_ptr repository
-                ACE_ENV_ARG_DECL_NOT_USED)
+set_type_repos (CosTrading::TypeRepository_ptr repository)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosTrading::TypeRepository_ptr return_value =
@@ -1533,8 +1500,7 @@ set_type_repos (CosTrading::TypeRepository_ptr repository
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::Admin::OctetSeq*
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-set_request_id_stem (const CosTrading::Admin::OctetSeq& stem
-                       ACE_ENV_ARG_DECL_NOT_USED)
+set_request_id_stem (const CosTrading::Admin::OctetSeq& stem)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (TRADER_LOCK_TYPE, trader_mon, this->lock_,
@@ -1548,13 +1514,12 @@ void
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 list_offers (CORBA::ULong how_many,
              CosTrading::OfferIdSeq_out ids,
-             CosTrading::OfferIdIterator_out id_itr
-             ACE_ENV_ARG_DECL)
+             CosTrading::OfferIdIterator_out id_itr)
   ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::NotImplemented))
 {
   // This method only applies when the register interface is implemented
   if (CORBA::is_nil (this->trader_.trading_components().register_if()))
-    ACE_THROW (CosTrading::NotImplemented());
+    throw CosTrading::NotImplemented();
 
   TAO_Offer_Database<MAP_LOCK_TYPE>& type_map = this->trader_.offer_database ();
   TAO_Offer_Id_Iterator* offer_id_iter = type_map.retrieve_all_offer_ids ();
@@ -1562,7 +1527,7 @@ list_offers (CORBA::ULong how_many,
   id_itr = CosTrading::OfferIdIterator::_nil ();
   if (how_many > 0)
     {
-      int check = offer_id_iter->next_n (how_many, ids ACE_ENV_ARG_PARAMETER);
+      int check = offer_id_iter->next_n (how_many, ids);
 
       if (check == 1)
         {
@@ -1581,12 +1546,11 @@ void
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 list_proxies (CORBA::ULong,
               CosTrading::OfferIdSeq_out,
-              CosTrading::OfferIdIterator_out
-              ACE_ENV_ARG_DECL)
+              CosTrading::OfferIdIterator_out)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::NotImplemented))
 {
-  ACE_THROW (CosTrading::NotImplemented ());
+  throw CosTrading::NotImplemented ();
 }
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
@@ -1609,8 +1573,7 @@ TAO_Link<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::
 add_link (const char *name,
           CosTrading::Lookup_ptr target,
           CosTrading::FollowOption def_pass_on_follow_rule,
-          CosTrading::FollowOption limiting_follow_rule
-          ACE_ENV_ARG_DECL)
+          CosTrading::FollowOption limiting_follow_rule)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::Link::IllegalLinkName,
                   CosTrading::Link::DuplicateLinkName,
@@ -1620,30 +1583,32 @@ add_link (const char *name,
 {
   // Ensure the link name is valid.
   if (! TAO_Trader_Base::is_valid_link_name (name))
-    ACE_THROW (CosTrading::Link::IllegalLinkName (name));
+    throw CosTrading::Link::IllegalLinkName (name);
 
   // Ensure this isn't a duplicate link name.
   CORBA::String_var link_name (name);
   if (this->links_.find (link_name) == 0)
-    ACE_THROW (CosTrading::Link::DuplicateLinkName (name));
+    throw CosTrading::Link::DuplicateLinkName (name);
 
   // Ensure the lookup_ptr isn't nil.
   if (CORBA::is_nil (target))
-    ACE_THROW (CosTrading::InvalidLookupRef (target));
+    throw CosTrading::InvalidLookupRef (target);
 
   // Ensure that the default link behavior isn't stronger than the
   // limiting link behavior.
   if (def_pass_on_follow_rule > limiting_follow_rule)
-    ACE_THROW (CosTrading::Link::DefaultFollowTooPermissive
-               (def_pass_on_follow_rule, limiting_follow_rule));
+    throw CosTrading::Link::DefaultFollowTooPermissive(
+      def_pass_on_follow_rule,
+      limiting_follow_rule);
 
   // Ensure that the limiting link behavior for this link doesn't
   // exceed the maximum allowed for a link.
   CosTrading::FollowOption follow_policy =
     this->max_link_follow_policy ();
   if (limiting_follow_rule < follow_policy)
-    ACE_THROW (CosTrading::Link::LimitingFollowTooPermissive
-               (limiting_follow_rule, follow_policy));
+    throw CosTrading::Link::LimitingFollowTooPermissive(
+      limiting_follow_rule,
+      follow_policy);
 
   // Create a link info structure for this link of the federation.
   CosTrading::Link::LinkInfo link_info;
@@ -1660,20 +1625,19 @@ add_link (const char *name,
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 void
 TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-remove_link (const char *name
-             ACE_ENV_ARG_DECL)
+remove_link (const char *name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::Link::IllegalLinkName,
                   CosTrading::Link::UnknownLinkName))
 {
   // Ensure the link name is valid.
   if (! TAO_Trader_Base::is_valid_link_name (name))
-    ACE_THROW (CosTrading::Link::IllegalLinkName (name));
+    throw CosTrading::Link::IllegalLinkName (name);
 
   // Ensure this isn't a duplicate link name.
   CORBA::String_var link_name (name);
   if (this->links_.find (link_name) == -1)
-    ACE_THROW (CosTrading::Link::UnknownLinkName (name));
+    throw CosTrading::Link::UnknownLinkName (name);
 
   // Erase the link state from the map.
   this->links_.unbind (link_name);
@@ -1681,8 +1645,7 @@ remove_link (const char *name
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::Link::LinkInfo *
-TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::describe_link (const char *name
-                                               ACE_ENV_ARG_DECL)
+TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::describe_link (const char *name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::Link::IllegalLinkName,
                    CosTrading::Link::UnknownLinkName))
@@ -1747,8 +1710,7 @@ void
 TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 modify_link (const char *name,
              CosTrading::FollowOption def_pass_on_follow_rule,
-             CosTrading::FollowOption limiting_follow_rule
-             ACE_ENV_ARG_DECL)
+             CosTrading::FollowOption limiting_follow_rule)
   ACE_THROW_SPEC ((CosTrading::Link::IllegalLinkName,
                    CosTrading::Link::UnknownLinkName,
                    CosTrading::Link::DefaultFollowTooPermissive,
@@ -1756,19 +1718,20 @@ modify_link (const char *name,
 {
   // Ensure the link name is valid.
   if (! TAO_Trader_Base::is_valid_link_name (name))
-    ACE_THROW (CosTrading::Link::IllegalLinkName (name));
+    throw CosTrading::Link::IllegalLinkName (name);
 
   // Ensure this isn't a duplicate link name.
   ACE_TYPENAME Links::ENTRY* link_entry = 0;
   CORBA::String_var link_name (name);
   if (this->links_.find (link_name, link_entry) == -1)
-    ACE_THROW (CosTrading::Link::UnknownLinkName (name));
+    throw CosTrading::Link::UnknownLinkName (name);
 
   // Ensure that the default link behavior isn't stronger than the
   // limiting link behavior.
   if (def_pass_on_follow_rule > limiting_follow_rule)
-    ACE_THROW (CosTrading::Link::DefaultFollowTooPermissive
-               (def_pass_on_follow_rule, limiting_follow_rule));
+    throw CosTrading::Link::DefaultFollowTooPermissive(
+      def_pass_on_follow_rule,
+      limiting_follow_rule);
 
   // Ensure that the limiting link behavior for this link doesn't
   // exceed the maximum allowed for a link.
@@ -1776,8 +1739,9 @@ modify_link (const char *name,
     this->max_link_follow_policy ();
 
   if (limiting_follow_rule < follow_policy)
-    ACE_THROW (CosTrading::Link::LimitingFollowTooPermissive
-               (limiting_follow_rule, follow_policy));
+    throw CosTrading::Link::LimitingFollowTooPermissive(
+      limiting_follow_rule,
+      follow_policy);
 
   // Adjust the link settings
   CosTrading::Link::LinkInfo& link_info = link_entry->int_id_;
@@ -1807,8 +1771,7 @@ export_proxy (CosTrading::Lookup_ptr,
               const CosTrading::PropertySeq&,
               CORBA::Boolean,
               const char *,
-              const CosTrading::PolicySeq&
-              ACE_ENV_ARG_DECL)
+              const CosTrading::PolicySeq&)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::IllegalServiceType,
                   CosTrading::UnknownServiceType,
@@ -1829,21 +1792,19 @@ export_proxy (CosTrading::Lookup_ptr,
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 void
 TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-withdraw_proxy (const char *
-                ACE_ENV_ARG_DECL)
+withdraw_proxy (const char *)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::IllegalOfferId,
                   CosTrading::UnknownOfferId,
                   CosTrading::Proxy::NotProxyOfferId))
 {
-  ACE_THROW (CORBA::UNKNOWN ());
+  throw CORBA::UNKNOWN ();
 }
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::Proxy::ProxyInfo *
 TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-describe_proxy (const char *
-                ACE_ENV_ARG_DECL)
+describe_proxy (const char *)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::IllegalOfferId,
                   CosTrading::UnknownOfferId,
@@ -1859,12 +1820,11 @@ void
 TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 list_proxies (CORBA::ULong,
               CosTrading::OfferIdSeq*&,
-              CosTrading::OfferIdIterator_ptr&
-              ACE_ENV_ARG_DECL)
+              CosTrading::OfferIdIterator_ptr&)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::NotImplemented))
 {
-  ACE_THROW (CORBA::UNKNOWN ());
+  throw CORBA::UNKNOWN ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
index a8ea0c35422..2c3f0f61288 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
@@ -73,8 +73,7 @@ public:
            CORBA::ULong how_many,
            CosTrading::OfferSeq_out offers,
            CosTrading::OfferIterator_out offer_itr,
-           CosTrading::PolicyNameSeq_out limits_applied
-           ACE_ENV_ARG_DECL)
+           CosTrading::PolicyNameSeq_out limits_applied)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::IllegalServiceType,
                     CosTrading::UnknownServiceType,
@@ -180,8 +179,7 @@ private:
                             CosTradingRepos::ServiceTypeRepository_ptr rep,
                             TAO_Constraint_Interpreter& constr_inter,
                             TAO_Preference_Interpreter& pref_inter,
-                            TAO_Offer_Filter& offer_filter
-                            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                            TAO_Offer_Filter& offer_filter);
 
   /// Check if offers of a type fit the constraints and order them
   /// according to the preferences submitted.
@@ -204,8 +202,7 @@ private:
                         TAO_Policies& policies,
                         TAO_Preference_Interpreter& pref_inter,
                         CosTrading::OfferSeq& offers,
-                        CosTrading::OfferIterator_ptr& offer_itr
-                        ACE_ENV_ARG_DECL)
+                        CosTrading::OfferIterator_ptr& offer_itr)
     ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                     CosTrading::DuplicatePropertyName));
 
@@ -220,8 +217,7 @@ private:
                       CORBA::ULong how_many,
                       CosTrading::OfferSeq_out offers,
                       CosTrading::OfferIterator_out offer_itr,
-                      CosTrading::PolicyNameSeq_out limits_applied
-                      ACE_ENV_ARG_DECL)
+                      CosTrading::PolicyNameSeq_out limits_applied)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -242,8 +238,7 @@ private:
    */
   CORBA::Boolean retrieve_links (TAO_Policies& policies,
                                  CORBA::ULong offer_returned,
-                                 CosTrading::LinkNameSeq_out links
-                                 ACE_ENV_ARG_DECL)
+                                 CosTrading::LinkNameSeq_out links)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::Lookup::PolicyTypeMismatch));
 
@@ -263,8 +258,7 @@ private:
                         CORBA::ULong how_many,
                         CosTrading::OfferSeq& offers,
                         CosTrading::OfferIterator_ptr& offer_itr,
-                        CosTrading::PolicyNameSeq& limits_applied
-                        ACE_ENV_ARG_DECL)
+                        CosTrading::PolicyNameSeq& limits_applied)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -282,8 +276,7 @@ private:
                               CosTrading::OfferSeq& offers);
 
   CORBA::Boolean seen_request_id (TAO_Policies& policies,
-                                  CosTrading::Admin::OctetSeq*& seq
-                                  ACE_ENV_ARG_DECL)
+                                  CosTrading::Admin::OctetSeq*& seq)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::Lookup::PolicyTypeMismatch));
 
@@ -323,8 +316,7 @@ public:
 
   virtual CosTrading::OfferId _cxx_export (CORBA::Object_ptr reference,
                                            const char *type,
-                                           const CosTrading::PropertySeq& properties
-                                           ACE_ENV_ARG_DECL)
+                                           const CosTrading::PropertySeq& properties)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::Register::InvalidObjectRef,
                     CosTrading::IllegalServiceType,
@@ -390,7 +382,7 @@ public:
   // parameter, the DuplicatePropertyName exception is raised.
   // END SPEC
 
-  virtual void withdraw (const char *id ACE_ENV_ARG_DECL)
+  virtual void withdraw (const char *id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalOfferId,
                      CosTrading::UnknownOfferId,
@@ -410,8 +402,7 @@ public:
   // END SPEC
 
   virtual CosTrading::Register::OfferInfo*
-    describe (const char * id
-              ACE_ENV_ARG_DECL)
+    describe (const char * id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalOfferId,
                      CosTrading::UnknownOfferId,
@@ -433,8 +424,7 @@ public:
 
   virtual void modify (const char * id,
                        const CosTrading::PropertyNameSeq& del_list,
-                       const CosTrading::PropertySeq& modify_list
-                       ACE_ENV_ARG_DECL)
+                       const CosTrading::PropertySeq& modify_list)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::NotImplemented,
                      CosTrading::IllegalOfferId,
@@ -502,8 +492,7 @@ public:
   // END SPEC
 
   virtual void withdraw_using_constraint (const char *type,
-                                          const char *constr
-                                          ACE_ENV_ARG_DECL)
+                                          const char *constr)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -534,8 +523,7 @@ public:
   // END SPEC
 
   virtual CosTrading::Register_ptr
-    resolve (const CosTrading::TraderName &name
-             ACE_ENV_ARG_DECL)
+    resolve (const CosTrading::TraderName &name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::Register::IllegalTraderName,
                      CosTrading::Register::UnknownTraderName,
@@ -568,8 +556,7 @@ public:
 
   void validate_properties (const char* type,
                             const CosTradingRepos::ServiceTypeRepository::TypeStruct* type_struct,
-                            const CosTrading::PropertySeq& properties
-                            ACE_ENV_ARG_DECL)
+                            const CosTrading::PropertySeq& properties)
     ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                      CosTrading::PropertyTypeMismatch,
                      CosTrading::ReadonlyDynamicProperty,
@@ -623,77 +610,61 @@ public:
 
   /// Search card is the cardinality of the offers searched for
   /// constraint compliance.
-  virtual CORBA::ULong set_def_search_card (CORBA::ULong value
-                                            ACE_ENV_ARG_DECL_NOT_USED)
+  virtual CORBA::ULong set_def_search_card (CORBA::ULong value)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual CORBA::ULong set_max_search_card (CORBA::ULong value
-                                            ACE_ENV_ARG_DECL_NOT_USED)
+  virtual CORBA::ULong set_max_search_card (CORBA::ULong value)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
   /// Match card is the cardinality of offers found compliant with the
   /// constraints.
-  virtual CORBA::ULong set_def_match_card (CORBA::ULong value
-                                            ACE_ENV_ARG_DECL_NOT_USED)
+  virtual CORBA::ULong set_def_match_card (CORBA::ULong value)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual CORBA::ULong set_max_match_card (CORBA::ULong value
-                                            ACE_ENV_ARG_DECL_NOT_USED)
+  virtual CORBA::ULong set_max_match_card (CORBA::ULong value)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return card is the cardinality of the offers returned from
   /// Lookup.
-  virtual CORBA::ULong set_def_return_card (CORBA::ULong value
-                                            ACE_ENV_ARG_DECL_NOT_USED)
+  virtual CORBA::ULong set_def_return_card (CORBA::ULong value)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual CORBA::ULong set_max_return_card (CORBA::ULong value
-                                            ACE_ENV_ARG_DECL_NOT_USED)
+  virtual CORBA::ULong set_max_return_card (CORBA::ULong value)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Types of offers available for consideration. Ween out those
   /// offers with modifiable properties
-  virtual CORBA::ULong set_max_list (CORBA::ULong value
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+  virtual CORBA::ULong set_max_list (CORBA::ULong value)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual CORBA::Boolean
-    set_supports_modifiable_properties (CORBA::Boolean value
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+    set_supports_modifiable_properties (CORBA::Boolean value)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual CORBA::Boolean
-    set_supports_dynamic_properties (CORBA::Boolean value
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+    set_supports_dynamic_properties (CORBA::Boolean value)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual CORBA::Boolean
-    set_supports_proxy_offers (CORBA::Boolean value
-                               ACE_ENV_ARG_DECL_NOT_USED)
+    set_supports_proxy_offers (CORBA::Boolean value)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = Link Interface parameters
 
-  virtual CORBA::ULong set_def_hop_count (CORBA::ULong value
-                                          ACE_ENV_ARG_DECL_NOT_USED)
+  virtual CORBA::ULong set_def_hop_count (CORBA::ULong value)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual CORBA::ULong set_max_hop_count (CORBA::ULong value
-                                          ACE_ENV_ARG_DECL_NOT_USED)
+  virtual CORBA::ULong set_max_hop_count (CORBA::ULong value)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CosTrading::FollowOption
-    set_def_follow_policy (CosTrading::FollowOption policy
-                           ACE_ENV_ARG_DECL_NOT_USED)
+    set_def_follow_policy (CosTrading::FollowOption policy)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual CosTrading::FollowOption
-    set_max_follow_policy (CosTrading::FollowOption policy
-                           ACE_ENV_ARG_DECL_NOT_USED)
+    set_max_follow_policy (CosTrading::FollowOption policy)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual CosTrading::FollowOption
-    set_max_link_follow_policy (CosTrading::FollowOption policy
-                                ACE_ENV_ARG_DECL_NOT_USED)
+    set_max_link_follow_policy (CosTrading::FollowOption policy)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = Set Type Repository
 
   virtual CosTrading::TypeRepository_ptr
-    set_type_repos (CosTrading::TypeRepository_ptr repository
-                    ACE_ENV_ARG_DECL_NOT_USED)
+    set_type_repos (CosTrading::TypeRepository_ptr repository)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CosTrading::Admin::OctetSeq*
@@ -701,14 +672,12 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CosTrading::Admin::OctetSeq*
-    set_request_id_stem (const CosTrading::Admin::OctetSeq& stem
-                         ACE_ENV_ARG_DECL_NOT_USED)
+    set_request_id_stem (const CosTrading::Admin::OctetSeq& stem)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void list_offers (CORBA::ULong how_many,
                             CosTrading::OfferIdSeq_out ids,
-                            CosTrading::OfferIdIterator_out id_itr
-                            ACE_ENV_ARG_DECL)
+                            CosTrading::OfferIdIterator_out id_itr)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::NotImplemented));
 
@@ -733,8 +702,7 @@ public:
 
   virtual void list_proxies (CORBA::ULong,
                              CosTrading::OfferIdSeq_out,
-                             CosTrading::OfferIdIterator_out
-                             ACE_ENV_ARG_DECL)
+                             CosTrading::OfferIdIterator_out)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::NotImplemented));
 
@@ -780,8 +748,7 @@ public:
   virtual void add_link (const char *name,
                          CosTrading::Lookup_ptr target,
                          CosTrading::FollowOption def_pass_on_follow_rule,
-                         CosTrading::FollowOption limiting_follow_rule
-                         ACE_ENV_ARG_DECL)
+                         CosTrading::FollowOption limiting_follow_rule)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::Link::IllegalLinkName,
                     CosTrading::Link::DuplicateLinkName,
@@ -825,8 +792,7 @@ public:
   // creation of the link.
   // END SPEC
 
-  virtual void remove_link (const char *name
-                            ACE_ENV_ARG_DECL)
+  virtual void remove_link (const char *name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::Link::IllegalLinkName,
                     CosTrading::Link::UnknownLinkName));
@@ -842,8 +808,7 @@ public:
   // not in the trader.
   // END SPEC
 
-  virtual CosTrading::Link::LinkInfo* describe_link (const char *name
-                                                     ACE_ENV_ARG_DECL_NOT_USED)
+  virtual CosTrading::Link::LinkInfo* describe_link (const char *name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::Link::IllegalLinkName,
                     CosTrading::Link::UnknownLinkName));
@@ -883,8 +848,7 @@ public:
 
   virtual void modify_link (const char *name,
                             CosTrading::FollowOption def_pass_on_follow_rule,
-                            CosTrading::FollowOption limiting_follow_rule
-                            ACE_ENV_ARG_DECL)
+                            CosTrading::FollowOption limiting_follow_rule)
     ACE_THROW_SPEC ((CosTrading::Link::IllegalLinkName,
                     CosTrading::Link::UnknownLinkName,
                     CosTrading::Link::DefaultFollowTooPermissive,
@@ -957,8 +921,7 @@ public:
                   const CosTrading::PropertySeq &,
                   CORBA::Boolean if_match_all,
                   const char *,
-                  const CosTrading::PolicySeq &
-                  ACE_ENV_ARG_DECL)
+                  const CosTrading::PolicySeq &)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::IllegalServiceType,
                     CosTrading::UnknownServiceType,
@@ -971,16 +934,14 @@ public:
                     CosTrading::DuplicatePropertyName,
                     CosTrading::DuplicatePolicyName));
 
-  virtual void withdraw_proxy (const char *
-                               ACE_ENV_ARG_DECL)
+  virtual void withdraw_proxy (const char *)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::IllegalOfferId,
                     CosTrading::UnknownOfferId,
                     CosTrading::Proxy::NotProxyOfferId));
 
   virtual CosTrading::Proxy::ProxyInfo *
-  describe_proxy (const char *
-                  ACE_ENV_ARG_DECL)
+  describe_proxy (const char *)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::IllegalOfferId,
                     CosTrading::UnknownOfferId,
@@ -990,8 +951,7 @@ public:
 
   virtual void list_proxies (CORBA::ULong,
                              CosTrading::OfferIdSeq *&,
-                             CosTrading::OfferIdIterator_ptr &
-                             ACE_ENV_ARG_DECL)
+                             CosTrading::OfferIdIterator_ptr &)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::NotImplemented));
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
index 29b46370049..8781e19bdd4 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
@@ -12,7 +12,6 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::
 TAO_Trader (TAO_Trader_Base::Trader_Components components)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   // @@ Seth, we need a way to propagate the exception out.  This will
   // not work on platforms using environment variable.
@@ -86,28 +85,26 @@ TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::~TAO_Trader (void)
 {
   // Remove Trading Components from POA
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   for (int i = LOOKUP_IF; i <= LINK_IF; i++)
     {
       if (this->ifs_[i] != 0)
         {
-          ACE_TRY
+          try
             {
               PortableServer::POA_var poa =
                 this->ifs_[i]->_default_POA ();
 
               PortableServer::ObjectId_var id =
-                poa->servant_to_id (this->ifs_[i] ACE_ENV_ARG_PARAMETER);
+                poa->servant_to_id (this->ifs_[i]);
 
-              poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
+              poa->deactivate_object (id.in ());
             }
-          ACE_CATCHANY
+          catch (const CORBA::Exception& ex)
             {
               // Don't let exceptions propagate out of this call since
               // it's the destructor!
             }
-          ACE_ENDTRY;
         }
     }
 }
@@ -195,7 +192,7 @@ TAO_Support_Attributes<IF>::supports_proxy_offers (void)
 }
 
 template <class IF> CosTrading::TypeRepository_ptr
-TAO_Support_Attributes<IF>::type_repos (ACE_ENV_SINGLE_ARG_DECL_NOT_USED )
+TAO_Support_Attributes<IF>::type_repos ( )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CosTrading::TypeRepository::_duplicate (this->attrs_.type_repos ());
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
index 60c11374b88..31e51e01143 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
@@ -240,9 +240,7 @@ TAO_Property_Evaluator::is_dynamic_property (int index)
       CORBA::TypeCode_var type = value.type ();
 
       // @@ Seth, this will not work on platforms using environment variable.
-      ACE_DECLARE_NEW_CORBA_ENV;
-      CORBA::Boolean equal = type->equal (CosTradingDynamic::_tc_DynamicProp
-                                          ACE_ENV_ARG_PARAMETER);
+      CORBA::Boolean equal = type->equal (CosTradingDynamic::_tc_DynamicProp);
 
       if (equal)
         return_value = 1;
@@ -252,8 +250,7 @@ TAO_Property_Evaluator::is_dynamic_property (int index)
 }
 
 CORBA::Any*
-TAO_Property_Evaluator::property_value (int index
-                                        ACE_ENV_ARG_DECL)
+TAO_Property_Evaluator::property_value (int index)
     ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure))
 {
   CORBA::Any* prop_val = 0;
@@ -292,20 +289,19 @@ TAO_Property_Evaluator::property_value (int index
           CORBA::TypeCode* type = dp_struct->returned_type.in ();
           CORBA::Any& info = dp_struct->extra_info;
 
-          ACE_TRY
+          try
             {
               // Retrieve the value of the dynamic property.
-              prop_val = dp_eval->evalDP(name, type, info ACE_ENV_ARG_PARAMETER);
+              prop_val = dp_eval->evalDP(name, type, info);
 
               if (this->dp_cache_ != 0)
                 this->dp_cache_[index] = prop_val;
             }
-          ACE_CATCH (CORBA::SystemException, excp)
+          catch (const CORBA::SystemException& excp)
             {
-              ACE_TRY_THROW
+              throw
                 (CosTradingDynamic::DPEvalFailure (name, type, info));
             }
-          ACE_ENDTRY;
         }
     }
 
@@ -337,7 +333,7 @@ TAO_Property_Evaluator::property_type (int index)
 
 TAO_Property_Evaluator_By_Name::
 TAO_Property_Evaluator_By_Name (const CosTrading::PropertySeq& properties
-                                ACE_ENV_ARG_DECL,
+,
                                 CORBA::Boolean supports_dp)
   ACE_THROW_SPEC ((CosTrading::DuplicatePropertyName,
                    CosTrading::IllegalPropertyName))
@@ -350,11 +346,11 @@ TAO_Property_Evaluator_By_Name (const CosTrading::PropertySeq& properties
       const CosTrading::Property& prop = this->props_[i];
 
       if (! TAO_Trader_Base::is_valid_property_name (prop.name))
-        ACE_THROW (CosTrading::IllegalPropertyName (prop.name));
+        throw CosTrading::IllegalPropertyName (prop.name);
 
       CORBA::String_var prop_name = prop.name.in ();
       if (this->table_.bind (prop_name, i))
-        ACE_THROW (CosTrading::DuplicatePropertyName (prop.name));
+        throw CosTrading::DuplicatePropertyName (prop.name);
     }
 }
 
@@ -389,8 +385,7 @@ is_dynamic_property(const char* property_name)
 }
 
 CORBA::Any*
-TAO_Property_Evaluator_By_Name::property_value (const char* property_name
-                                                ACE_ENV_ARG_DECL)
+TAO_Property_Evaluator_By_Name::property_value (const char* property_name)
   ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure))
 {
   int index = 0;
@@ -402,8 +397,7 @@ TAO_Property_Evaluator_By_Name::property_value (const char* property_name
   if (this->table_.find (prop_name, index) == 0)
     {
       prop_value =
-        this->TAO_Property_Evaluator::property_value (index
-                                                      ACE_ENV_ARG_PARAMETER);
+        this->TAO_Property_Evaluator::property_value (index);
     }
 
   return prop_value;
@@ -458,7 +452,6 @@ construct_dynamic_prop (const char* name,
   if (this->prop_.in () == CosTradingDynamic::DynamicPropEval::_nil ())
     {
       // Seth, we need a way to either propagate exceptions out.
-      ACE_DECLARE_NEW_CORBA_ENV;
 
       this->prop_ = this->_this ();
 
@@ -481,15 +474,12 @@ TAO_Dynamic_Property::destroy (void)
   if (this->prop_.in () != CosTradingDynamic::DynamicPropEval::_nil ())
     {
       // @@ Seth, we need a way to propagate exceptions out.
-      ACE_DECLARE_NEW_CORBA_ENV;
       PortableServer::POA_var poa = this->_default_POA ();
 
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this
-                            ACE_ENV_ARG_PARAMETER);
+        poa->servant_to_id (this);
 
-      poa->deactivate_object (id.in ()
-                              ACE_ENV_ARG_PARAMETER);
+      poa->deactivate_object (id.in ());
     }
 }
 
@@ -509,8 +499,7 @@ const char* TAO_Policies::POLICY_NAMES[] =
 };
 
 TAO_Policies::TAO_Policies (TAO_Trader_Base& trader,
-                            const CosTrading::PolicySeq& policies
-                            ACE_ENV_ARG_DECL)
+                            const CosTrading::PolicySeq& policies)
   ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPolicyName,
                   CosTrading::DuplicatePolicyName))
   : trader_ (trader)
@@ -525,7 +514,7 @@ TAO_Policies::TAO_Policies (TAO_Trader_Base& trader,
       int index = -1;
 
       if (length < ACE_OS::strlen (POLICY_NAMES[HOP_COUNT]))
-        ACE_THROW (CosTrading::Lookup::IllegalPolicyName (pol_name));
+        throw CosTrading::Lookup::IllegalPolicyName (pol_name);
 
       switch (pol_name[0])
         {
@@ -565,9 +554,9 @@ TAO_Policies::TAO_Policies (TAO_Trader_Base& trader,
       // Match the name of the policy, and insert its value into the
       // vector.
       if (index == -1 || ACE_OS::strcmp (POLICY_NAMES[index], pol_name) != 0)
-        ACE_THROW (CosTrading::Lookup::IllegalPolicyName (pol_name));
+        throw CosTrading::Lookup::IllegalPolicyName (pol_name);
       else if (this->policies_[index] != 0)
-        ACE_THROW (CosTrading::DuplicatePolicyName (pol_name));
+        throw CosTrading::DuplicatePolicyName (pol_name);
       else
         this->policies_[index] = (CosTrading::Policy *) &(policies[j]);
     }
@@ -578,8 +567,7 @@ TAO_Policies::~TAO_Policies (void)
 }
 
 CORBA::ULong
-TAO_Policies::ulong_prop (POLICY_TYPE pol
-                          ACE_ENV_ARG_DECL) const
+TAO_Policies::ulong_prop (POLICY_TYPE pol) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   CORBA::ULong return_value = 0, max_value = 0;
@@ -617,7 +605,7 @@ TAO_Policies::ulong_prop (POLICY_TYPE pol
       const CosTrading::PolicyValue& value = policy->value;
       CORBA::TypeCode_var type = value.type ();
 
-      CORBA::Boolean equal_ulong = type->equal (CORBA::_tc_ulong ACE_ENV_ARG_PARAMETER);
+      CORBA::Boolean equal_ulong = type->equal (CORBA::_tc_ulong);
 
       if (!equal_ulong)
         ACE_THROW_RETURN (CosTrading::Lookup::PolicyTypeMismatch (*policy),
@@ -636,26 +624,25 @@ CORBA::ULong
 TAO_Policies::search_card (void) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
-  return this->ulong_prop (SEARCH_CARD ACE_ENV_ARG_PARAMETER);
+  return this->ulong_prop (SEARCH_CARD);
 }
 
 CORBA::ULong
 TAO_Policies::match_card (void) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
-  return this->ulong_prop (MATCH_CARD ACE_ENV_ARG_PARAMETER);
+  return this->ulong_prop (MATCH_CARD);
 }
 
 CORBA::ULong
 TAO_Policies::return_card (void) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
-  return this->ulong_prop (RETURN_CARD ACE_ENV_ARG_PARAMETER);
+  return this->ulong_prop (RETURN_CARD);
 }
 
 CORBA::Boolean
-TAO_Policies::boolean_prop (POLICY_TYPE pol
-                            ACE_ENV_ARG_DECL) const
+TAO_Policies::boolean_prop (POLICY_TYPE pol) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   CORBA::Boolean def_value = 1,
@@ -688,7 +675,7 @@ TAO_Policies::boolean_prop (POLICY_TYPE pol
       CORBA::TypeCode_var type = value.type ();
 
       CORBA::Boolean equal_boolean =
-        type->equal (CORBA::_tc_boolean ACE_ENV_ARG_PARAMETER);
+        type->equal (CORBA::_tc_boolean);
 
       if (!equal_boolean)
         ACE_THROW_RETURN (CosTrading::Lookup::PolicyTypeMismatch (*policy),
@@ -711,28 +698,28 @@ CORBA::Boolean
 TAO_Policies::use_modifiable_properties (void) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
-  return this->boolean_prop (USE_MODIFIABLE_PROPERTIES ACE_ENV_ARG_PARAMETER);
+  return this->boolean_prop (USE_MODIFIABLE_PROPERTIES);
 }
 
 CORBA::Boolean
 TAO_Policies::use_dynamic_properties (void) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
-  return this->boolean_prop (USE_DYNAMIC_PROPERTIES ACE_ENV_ARG_PARAMETER);
+  return this->boolean_prop (USE_DYNAMIC_PROPERTIES);
 }
 
 CORBA::Boolean
 TAO_Policies::use_proxy_offers (void) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
-  return this->boolean_prop (USE_PROXY_OFFERS ACE_ENV_ARG_PARAMETER);
+  return this->boolean_prop (USE_PROXY_OFFERS);
 }
 
 CORBA::Boolean
 TAO_Policies::exact_type_match (void) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
-  return this->boolean_prop (EXACT_TYPE_MATCH ACE_ENV_ARG_PARAMETER);
+  return this->boolean_prop (EXACT_TYPE_MATCH);
 }
 
 
@@ -750,10 +737,10 @@ TAO_Policies::starting_trader (void) const
       CORBA::TypeCode_var type = value.type ();
 
       CORBA::Boolean equal_tradername =
-        type->equal (CosTrading::_tc_TraderName ACE_ENV_ARG_PARAMETER);
+        type->equal (CosTrading::_tc_TraderName);
 
       CORBA::Boolean equal_linknameseq =
-        type->equal (CosTrading::_tc_LinkNameSeq ACE_ENV_ARG_PARAMETER);
+        type->equal (CosTrading::_tc_LinkNameSeq);
 
       if (!equal_tradername ||
           !equal_linknameseq)
@@ -784,7 +771,7 @@ TAO_Policies::link_follow_rule (void) const
 
       // Extract the link follow rule
       CORBA::Boolean type_equal =
-        type->equal (CosTrading::_tc_FollowOption ACE_ENV_ARG_PARAMETER);
+        type->equal (CosTrading::_tc_FollowOption);
 
       if (!type_equal)
         ACE_THROW_RETURN (CosTrading::Lookup::PolicyTypeMismatch (*policy),
@@ -800,8 +787,7 @@ TAO_Policies::link_follow_rule (void) const
 }
 
 CosTrading::FollowOption
-TAO_Policies::link_follow_rule (const CosTrading::Link::LinkInfo& link_info
-                                ACE_ENV_ARG_DECL) const
+TAO_Policies::link_follow_rule (const CosTrading::Link::LinkInfo& link_info) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
                    CosTrading::Lookup::InvalidPolicyValue,
                    CosTrading::Link::IllegalLinkName,
@@ -829,7 +815,7 @@ CORBA::ULong
 TAO_Policies::hop_count (void) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
-  return this->ulong_prop (HOP_COUNT ACE_ENV_ARG_PARAMETER);
+  return this->ulong_prop (HOP_COUNT);
 }
 
 CosTrading::Admin::OctetSeq*
@@ -845,7 +831,7 @@ TAO_Policies::request_id (void) const
       CORBA::TypeCode_var type = value.type ();
 
       CORBA::Boolean equal_octetseq =
-        type->equal (CosTrading::Admin::_tc_OctetSeq ACE_ENV_ARG_PARAMETER);
+        type->equal (CosTrading::Admin::_tc_OctetSeq);
 
       if (!equal_octetseq)
         ACE_THROW_RETURN (CosTrading::Lookup::PolicyTypeMismatch (*policy),
@@ -860,8 +846,7 @@ TAO_Policies::request_id (void) const
 void
 TAO_Policies::
 copy_in_follow_option (CosTrading::PolicySeq& policy_seq,
-                       const CosTrading::Link::LinkInfo& link_info
-                       ACE_ENV_ARG_DECL) const
+                       const CosTrading::Link::LinkInfo& link_info) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
                    CosTrading::Lookup::InvalidPolicyValue))
 {
@@ -909,8 +894,7 @@ copy_in_follow_option (CosTrading::PolicySeq& policy_seq,
 void
 TAO_Policies::
 copy_to_pass (CosTrading::PolicySeq& policy_seq,
-              const CosTrading::Admin::OctetSeq& request_id
-              ACE_ENV_ARG_DECL) const
+              const CosTrading::Admin::OctetSeq& request_id) const
 {
   CORBA::ULong counter = 0;
   CosTrading::Policy* policy_buffer =
@@ -1086,8 +1070,7 @@ TAO_Offer_Modifier::~TAO_Offer_Modifier (void)
 
 void
 TAO_Offer_Modifier::
-delete_properties (const CosTrading::PropertyNameSeq& deletes
-                   ACE_ENV_ARG_DECL)
+delete_properties (const CosTrading::PropertyNameSeq& deletes)
   ACE_THROW_SPEC ((CosTrading::Register::UnknownPropertyName,
                   CosTrading::Register::MandatoryProperty,
                   CosTrading::IllegalPropertyName,
@@ -1102,16 +1085,16 @@ delete_properties (const CosTrading::PropertyNameSeq& deletes
     {
       const char* dname = static_cast<const char*> (deletes[i]);
       if (! TAO_Trader_Base::is_valid_property_name (dname))
-        ACE_THROW (CosTrading::IllegalPropertyName (dname));
+        throw CosTrading::IllegalPropertyName (dname);
       else
         {
           CORBA::String_var prop_name (dname);
           if (this->mandatory_.find (prop_name) == 0)
-            ACE_THROW (CosTrading::Register::MandatoryProperty (this->type_, dname));
+            throw CosTrading::Register::MandatoryProperty (this->type_, dname);
           else if (delete_me.insert (prop_name) == 1)
-            ACE_THROW (CosTrading::DuplicatePropertyName (dname));
+            throw CosTrading::DuplicatePropertyName (dname);
           else if (this->props_.find (prop_name) == -1)
-            ACE_THROW (CosTrading::Register::UnknownPropertyName (dname));
+            throw CosTrading::Register::UnknownPropertyName (dname);
         }
     }
 
@@ -1126,8 +1109,7 @@ delete_properties (const CosTrading::PropertyNameSeq& deletes
 
 void
 TAO_Offer_Modifier::
-merge_properties (const CosTrading::PropertySeq& modifies
-                  ACE_ENV_ARG_DECL)
+merge_properties (const CosTrading::PropertySeq& modifies)
   ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                    CosTrading::DuplicatePropertyName,
                    CosTrading::PropertyTypeMismatch,
@@ -1151,9 +1133,11 @@ merge_properties (const CosTrading::PropertySeq& modifies
               // Can't assign a dynamic property to a property with
               // readonly mode, and can't reassign a readonly property.
               if (prop_eval.is_dynamic_property (i))
-                ACE_THROW (CosTrading::ReadonlyDynamicProperty (this->type_, mname));
+                throw CosTrading::ReadonlyDynamicProperty (this->type_, mname);
               else if (this->props_.find (prop_name) == 0)
-                ACE_THROW (CosTrading::Register::ReadonlyProperty (this->type_, mname));
+                throw CosTrading::Register::ReadonlyProperty (
+                  this->type_,
+                  mname);
             }
 
           // Validate the property type if the property is defined in
@@ -1173,17 +1157,17 @@ merge_properties (const CosTrading::PropertySeq& modifies
               // seemed "safest".
 
               CORBA::Boolean td_equal =
-                type_def->equal (prop_type.in () ACE_ENV_ARG_PARAMETER);
+                type_def->equal (prop_type.in ());
 
               if (!td_equal)
-                ACE_THROW (CosTrading::PropertyTypeMismatch (mname, modifies[i]));
+                throw CosTrading::PropertyTypeMismatch (mname, modifies[i]);
             }
 
           if (modify_me.insert (prop_name) == 1)
-            ACE_THROW (CosTrading::DuplicatePropertyName (mname));
+            throw CosTrading::DuplicatePropertyName (mname);
         }
       else
-        ACE_THROW (CosTrading::IllegalPropertyName (mname));
+        throw CosTrading::IllegalPropertyName (mname);
     }
 }
 
@@ -1246,8 +1230,7 @@ TAO_Offer_Modifier::affect_change (const CosTrading::PropertySeq& modifies)
   //  CosTrading::PropertySeq::freebuf (prop_buf);
 }
 
-TAO_Offer_Filter::TAO_Offer_Filter (TAO_Policies& policies
-                                    ACE_ENV_ARG_DECL)
+TAO_Offer_Filter::TAO_Offer_Filter (TAO_Policies& policies)
 {
   search_card_ = policies.search_card ();
 
@@ -1414,8 +1397,7 @@ TAO_Offer_Filter::limits_applied (void)
 }
 
 TAO_Property_Filter::
-TAO_Property_Filter (const SPECIFIED_PROPS& desired_props
-                     ACE_ENV_ARG_DECL)
+TAO_Property_Filter (const SPECIFIED_PROPS& desired_props)
   ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                    CosTrading::DuplicatePropertyName))
   : policy_  (desired_props._d ())
@@ -1435,10 +1417,10 @@ TAO_Property_Filter (const SPECIFIED_PROPS& desired_props
             {
               CORBA::String_var prop_name (pname);
               if (this->props_.insert (prop_name) == 1)
-                ACE_THROW (CosTrading::DuplicatePropertyName (pname));
+                throw CosTrading::DuplicatePropertyName (pname);
             }
           else
-            ACE_THROW (CosTrading::IllegalPropertyName (pname));
+            throw CosTrading::IllegalPropertyName (pname);
         }
     }
 }
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
index e9beaec6ab3..ee75b52740c 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
@@ -70,7 +70,7 @@ public:
 	* CosTradingDynamic::DPEvalFailure exception on failure. If the
 	* property index is undefined, the method returns a null pointer.
 	*/
-  CORBA::Any* property_value(int index ACE_ENV_ARG_DECL)
+  CORBA::Any* property_value(int index)
     ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure));
 
 
@@ -128,7 +128,7 @@ class TAO_Trading_Serv_Export TAO_Property_Evaluator_By_Name : public TAO_Proper
 public:
 
   TAO_Property_Evaluator_By_Name (const CosTrading::PropertySeq& properties
-                                  ACE_ENV_ARG_DECL ,
+ ,
                                   CORBA::Boolean supports_dp = 1)
     ACE_THROW_SPEC ((CosTrading::DuplicatePropertyName,
                      CosTrading::IllegalPropertyName));
@@ -153,8 +153,7 @@ public:
 	* TAO_Property_Evaluator, except property_value first discovers the
 	* index through a string matching lookup.
 	*/
-  CORBA::Any* property_value(const char* property_name
-                             ACE_ENV_ARG_DECL)
+  CORBA::Any* property_value(const char* property_name)
     ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure));
 
   /**
@@ -195,8 +194,7 @@ public:
   /// Dynamic property evaluation call-back method.
   virtual CORBA::Any* evalDP(const char* name,
                              CORBA::TypeCode_ptr returned_type,
-                             const CORBA::Any& extra_info
-                             ACE_ENV_ARG_DECL)
+                             const CORBA::Any& extra_info)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTradingDynamic::DPEvalFailure)) = 0;
 
@@ -256,8 +254,7 @@ public:
   static const char * POLICY_NAMES[];
 
   TAO_Policies (TAO_Trader_Base& trader,
-                const CosTrading::PolicySeq& policies
-                ACE_ENV_ARG_DECL)
+                const CosTrading::PolicySeq& policies)
     ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPolicyName,
                      CosTrading::DuplicatePolicyName));
 
@@ -415,8 +412,7 @@ public:
    * else min(trader.max_follow_policy, link.limiting_follow_rule,
    *          trader.def_follow_policy)
    */
-  CosTrading::FollowOption link_follow_rule (const CosTrading::Link::LinkInfo& link_info
-                                             ACE_ENV_ARG_DECL) const
+  CosTrading::FollowOption link_follow_rule (const CosTrading::Link::LinkInfo& link_info) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
                      CosTrading::Lookup::InvalidPolicyValue,
                      CosTrading::Link::IllegalLinkName,
@@ -444,8 +440,7 @@ public:
 
   /// Policies to forward to the next trader in a federated query.
   void copy_to_pass (CosTrading::PolicySeq& policy_seq,
-                     const CosTrading::Admin::OctetSeq& request_id
-                     ACE_ENV_ARG_DECL) const;
+                     const CosTrading::Admin::OctetSeq& request_id) const;
 
   /// Policies to forward to the next trader in a directed query.
   void copy_to_forward (CosTrading::PolicySeq& policy_seq,
@@ -462,21 +457,18 @@ public:
    *                  trader.max_follow_policy)
    */
   void copy_in_follow_option (CosTrading::PolicySeq& policy_seq,
-                              const CosTrading::Link::LinkInfo& link_info
-                              ACE_ENV_ARG_DECL) const
+                              const CosTrading::Link::LinkInfo& link_info) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
                      CosTrading::Lookup::InvalidPolicyValue));
 
 private:
 
   /// Reconclile a ULong property with its default.
-  CORBA::ULong ulong_prop (POLICY_TYPE pol
-                           ACE_ENV_ARG_DECL) const
+  CORBA::ULong ulong_prop (POLICY_TYPE pol) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
   /// Reconcile a Boolean property with its debault.
-  CORBA::Boolean boolean_prop (POLICY_TYPE pol
-                               ACE_ENV_ARG_DECL) const
+  CORBA::Boolean boolean_prop (POLICY_TYPE pol) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
   TAO_Policies (const TAO_Policies&);
@@ -592,8 +584,7 @@ public:
 
   /// Delete the properties whose names were given to the
   /// constructor. Ensure we don't delete mandatory properties.
-  void delete_properties (const CosTrading::PropertyNameSeq& deletes
-                          ACE_ENV_ARG_DECL)
+  void delete_properties (const CosTrading::PropertyNameSeq& deletes)
     ACE_THROW_SPEC ((CosTrading::Register::UnknownPropertyName,
                      CosTrading::Register::MandatoryProperty,
                      CosTrading::IllegalPropertyName,
@@ -605,8 +596,7 @@ public:
    * destination with the source's value. This class claims the memory
    * in the modifies sequence.
    */
-  void merge_properties (const CosTrading::PropertySeq& modifies
-                         ACE_ENV_ARG_DECL)
+  void merge_properties (const CosTrading::PropertySeq& modifies)
     ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                      CosTrading::DuplicatePropertyName,
                      CosTrading::PropertyTypeMismatch,
@@ -668,8 +658,7 @@ public:
 
   /// Glean from the TypeStruct and Policy setting the appropriate way
   /// to screen unsuitable offers from consideration.
-  TAO_Offer_Filter (TAO_Policies& policies
-                    ACE_ENV_ARG_DECL);
+  TAO_Offer_Filter (TAO_Policies& policies);
 
   /// Set the offer filter to screen for offers containing properties
   /// that aren't marked as readonly in this TypeStruct.
@@ -751,8 +740,7 @@ public:
   TAO_Property_Filter (void) : policy_ (CosTrading::Lookup::all) {}
 
   /// Verify that the specified properties are correct.
-  TAO_Property_Filter (const SPECIFIED_PROPS& desired_props
-                       ACE_ENV_ARG_DECL)
+  TAO_Property_Filter (const SPECIFIED_PROPS& desired_props)
     ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                      CosTrading::DuplicatePropertyName));
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
index aa452de16c3..72713f4c791 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
@@ -80,38 +80,35 @@ TAO_Trading_Loader::~TAO_Trading_Loader (void)
 int
 TAO_Trading_Loader::init (int argc, ACE_TCHAR *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Copy command line parameter.
       ACE_Argv_Type_Converter command_line(argc, argv);
 
       // Initialize the ORB Manager
       this->orb_manager_.init (command_line.get_argc(),
-                               command_line.get_ASCII_argv()
-                               ACE_ENV_ARG_PARAMETER);
+                               command_line.get_ASCII_argv());
 
       CORBA::ORB_var orb =
         this->orb_manager_.orb ();
 
       // Initializes and sets up the Trading Service
       CORBA::Object_var object =
-        this->create_object (orb.in (), command_line.get_argc(), command_line.get_TCHAR_argv() ACE_ENV_ARG_PARAMETER);
+        this->create_object (orb.in (), command_line.get_argc(), command_line.get_TCHAR_argv());
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       //    @@ Should we log this???
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 int
 TAO_Trading_Loader::fini (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       if (this->trader_.get () != 0)
         {
@@ -136,14 +133,12 @@ TAO_Trading_Loader::fini (void)
               ACE_DEBUG ((LM_DEBUG,
                           "*** Describing the next link.\n"));
               CosTrading::Link::LinkInfo_var link_info =
-                our_link->describe_link (link_name_seq[i]
-                                         ACE_ENV_ARG_PARAMETER);
+                our_link->describe_link (link_name_seq[i]);
 
               ACE_DEBUG ((LM_DEBUG,
                           "*** Removing link to %s.\n",
                           static_cast<const char *> (link_name_seq[i])));
-              our_link->remove_link (link_name_seq[i]
-                                     ACE_ENV_ARG_PARAMETER);
+              our_link->remove_link (link_name_seq[i]);
 
               CosTrading::Lookup_ptr remote_lookup;
               remote_lookup =
@@ -159,22 +154,19 @@ TAO_Trading_Loader::fini (void)
 
               if (this->bootstrapper_)
                 {
-                  remote_link->remove_link ("Bootstrap"
-                                            ACE_ENV_ARG_PARAMETER);
+                  remote_link->remove_link ("Bootstrap");
                 }
               else
                 {
-                  remote_link->remove_link (this->name_.in ()
-                                            ACE_ENV_ARG_PARAMETER);
+                  remote_link->remove_link (this->name_.in ());
                 }
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Trading Service shutting down");
+      ex._tao_print_exception ("Trading Service shutting down");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -191,8 +183,7 @@ TAO_Trading_Loader::run (void)
 CORBA::Object_ptr
 TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr,
                                    int argc,
-                                   ACE_TCHAR *argv[]
-                                   ACE_ENV_ARG_DECL)
+                                   ACE_TCHAR *argv[])
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Duplicate the ORB
@@ -220,8 +211,7 @@ TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr,
     trd_comp.lookup_if ();
 
   this->ior_ =
-    orb->object_to_string (lookup
-                           ACE_ENV_ARG_PARAMETER);
+    orb->object_to_string (lookup);
 
   // Parse the args
   if (this->parse_args (argc, argv) == -1)
@@ -237,10 +227,10 @@ TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr,
     }
 
   CORBA::Object_var table_object =
-    orb->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
+    orb->resolve_initial_references ("IORTable");
 
   IORTable::Table_var adapter =
-    IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
+    IORTable::Table::_narrow (table_object.in ());
 
   if (CORBA::is_nil (adapter.in ()))
     {
@@ -249,7 +239,7 @@ TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr,
   else
     {
       adapter->bind ("TradingService",
-                     this->ior_.in () ACE_ENV_ARG_PARAMETER);
+                     this->ior_.in ());
     }
 
   if (this->federate_)
@@ -281,7 +271,7 @@ TAO_Trading_Loader::bootstrap_to_federation (void)
   ACE_DEBUG ((LM_DEBUG,
               "*** Bootstrapping to another Trading Service.\n"));
   CORBA::Object_var trading_obj =
-    orb->resolve_initial_references ("TradingService" ACE_ENV_ARG_PARAMETER);
+    orb->resolve_initial_references ("TradingService");
 
   if (CORBA::is_nil (trading_obj.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -292,8 +282,7 @@ TAO_Trading_Loader::bootstrap_to_federation (void)
   ACE_DEBUG ((LM_DEBUG,
               "*** Narrowing the lookup interface.\n"));
   CosTrading::Lookup_var lookup_if =
-    CosTrading::Lookup::_narrow (trading_obj.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+    CosTrading::Lookup::_narrow (trading_obj.in ());
 
   ACE_DEBUG ((LM_DEBUG,
               "*** Obtaining the link interface.\n"));
@@ -312,16 +301,14 @@ TAO_Trading_Loader::bootstrap_to_federation (void)
   link_if->add_link (this->name_.in (),
                      our_lookup,
                      CosTrading::always,
-                     CosTrading::always
-                     ACE_ENV_ARG_PARAMETER);
+                     CosTrading::always);
 
   ACE_DEBUG ((LM_DEBUG,
               "*** Linking self to found trader.\n"));
   our_link->add_link ("Bootstrap",
                       lookup_if.in (),
                       CosTrading::always,
-                      CosTrading::always
-                      ACE_ENV_ARG_PARAMETER);
+                      CosTrading::always);
 
   ACE_DEBUG ((LM_DEBUG,
               "*** Retrieving list of known linked traders.\n"));
@@ -342,8 +329,7 @@ TAO_Trading_Loader::bootstrap_to_federation (void)
                       "*** Getting info for link %s.\n",
                       static_cast<const char *> (link_name_seq[i])));
           CosTrading::Link::LinkInfo_var link_info =
-            link_if->describe_link (link_name_seq[i]
-                                    ACE_ENV_ARG_PARAMETER);
+            link_if->describe_link (link_name_seq[i]);
 
           CosTrading::Lookup_ptr remote_lookup;
           remote_lookup = link_info->target.in ();
@@ -358,16 +344,14 @@ TAO_Trading_Loader::bootstrap_to_federation (void)
           remote_link->add_link (this->name_.in (),
                                  our_lookup,
                                  CosTrading::always,
-                                 CosTrading::always
-                                 ACE_ENV_ARG_PARAMETER);
+                                 CosTrading::always);
 
           ACE_DEBUG ((LM_DEBUG,
                       "*** Creating a link to it from me.\n"));
           our_link->add_link (link_name_seq[i],
                               remote_lookup,
                               CosTrading::always,
-                              CosTrading::always
-                              ACE_ENV_ARG_PARAMETER);
+                              CosTrading::always);
         }
     }
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
index 9a14bb345cd..a12b8e2a3f3 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
@@ -54,8 +54,7 @@ public:
 
   CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                    int argc,
-                                   ACE_TCHAR *argv[]
-                                   ACE_ENV_ARG_DECL)
+                                   ACE_TCHAR *argv[])
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This function call initializes the Trading Service given a reference to the
   // ORB and the command line parameters.
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp
index a8c5085b91a..5903d6e7ec4 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp
@@ -17,16 +17,14 @@ ORBInitializer::ORBInitializer (void)
 
 void
 ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ServerRequestInterceptor_ptr reject_interceptor;
@@ -41,8 +39,7 @@ ORBInitializer::post_init (
   PortableInterceptor::ServerRequestInterceptor_var safe_reject_interceptor =
     reject_interceptor;
 
-  info->add_server_request_interceptor (safe_reject_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+  info->add_server_request_interceptor (safe_reject_interceptor.in ());
 }
 
 
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.h
index b288bb12c48..5a190fb2006 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.h
@@ -58,12 +58,10 @@ public:
    * interface.
    */
   //@{
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp
index c9ee46f95bc..4d770e79ef2 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp
@@ -17,8 +17,7 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 
 Test::Timestamp
 Roundtrip::test_method (Test::Timestamp send_time,
-                        Test::number  cl_number
-                        ACE_ENV_ARG_DECL_NOT_USED)
+                        Test::number  cl_number)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (cl_number % 2 == 0)
@@ -43,5 +42,5 @@ void
 Roundtrip::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h
index 3ef3babc13a..70aec84ecc9 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h
@@ -23,8 +23,7 @@ public:
 
   // = The skeleton methods
   virtual Test::Timestamp test_method (Test::Timestamp send_time,
-		                       Test::number cl_number
-                                       ACE_ENV_ARG_DECL)
+		                       Test::number cl_number)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void shutdown (void)
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp
index b9d71afb69a..160cf111f80 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp
@@ -94,19 +94,19 @@ main (int argc, char *argv[])
                     "client (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior);
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        Test::Roundtrip::_narrow (object.in ());
 
       if (CORBA::is_nil (roundtrip.in ()))
         {
@@ -119,7 +119,7 @@ main (int argc, char *argv[])
       for (int j = 0; j < 100; ++j)
         {
           ACE_hrtime_t start = 0;
-          (void) roundtrip->test_method (start, number ACE_ENV_ARG_PARAMETER);
+          (void) roundtrip->test_method (start, number);
         }
 
       ACE_Sample_History history (niterations);
@@ -143,8 +143,7 @@ main (int argc, char *argv[])
 	  }
 	  */
 
-          (void) roundtrip->test_method (start, number
-					 ACE_ENV_ARG_PARAMETER);
+          (void) roundtrip->test_method (start, number);
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
           history.sample (now - start);
@@ -177,12 +176,11 @@ main (int argc, char *argv[])
           roundtrip->shutdown ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp
index cbfdc4b9066..13242530af3 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp
@@ -72,16 +72,13 @@ parse_args (int argc, char *argv[])
 CORBA::Object_ptr
 join_object_group (CORBA::ORB_ptr orb,
                    CosLoadBalancing::LoadManager_ptr lm,
-                   const PortableGroup::Location & location
-                   ACE_ENV_ARG_PARAMETER)
+                   const PortableGroup::Location & location)
 {
   CORBA::Object_var ns_object =
-    orb->resolve_initial_references ("NameService"
-                                     ACE_ENV_ARG_PARAMETER);
+    orb->resolve_initial_references ("NameService");
 
   CosNaming::NamingContext_var nc =
-    CosNaming::NamingContext::_narrow (ns_object.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+    CosNaming::NamingContext::_narrow (ns_object.in ());
 
   CosNaming::Name name (1);
   name.length (1);
@@ -91,12 +88,11 @@ join_object_group (CORBA::ORB_ptr orb,
 
   CORBA::Object_var group;
 
-  ACE_TRY
+  try
     {
-      group = nc->resolve (name
-                           ACE_ENV_ARG_PARAMETER);
+      group = nc->resolve (name);
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+  catch (const CosNaming::NamingContext::NotFound& )
     {
       // Object group not created.  Create one.
       const char repository_id[] = "IDL:Test/Roundtrip:1.0";
@@ -118,15 +114,12 @@ join_object_group (CORBA::ORB_ptr orb,
 
       group = lm->create_object (repository_id,
                                  criteria,
-                                 fcid.out ()
-                                 ACE_ENV_ARG_PARAMETER);
+                                 fcid.out ());
 
-      ACE_TRY_EX (foo)
+      try
         {
           nc->bind (name,
-                    group.in ()
-                    ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (foo);
+                    group.in ());
 
           PortableGroup::Properties props (1);
           props.length (1);
@@ -188,24 +181,17 @@ join_object_group (CORBA::ORB_ptr orb,
 
           props[0].val <<= strategy_info;
 
-          lm->set_default_properties (props
-                                      ACE_ENV_ARG_PARAMETER);
+          lm->set_default_properties (props);
         }
-      ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
+      catch (const CosNaming::NamingContext::AlreadyBound& )
         {
           // Somebody beat us to creating the object group.  Clean up
           // the one we created.
-          lm->delete_object (fcid.in ()
-                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (foo);
+          lm->delete_object (fcid.in ());
 
-          group = nc->resolve (name
-                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (foo);
+          group = nc->resolve (name);
         }
-      ACE_ENDTRY;
     }
-  ACE_ENDTRY;
 
   Roundtrip * roundtrip_impl;
   ACE_NEW_THROW_EX (roundtrip_impl,
@@ -219,8 +205,7 @@ join_object_group (CORBA::ORB_ptr orb,
 
   group = lm->add_member (group.in (),
                           location,
-                          roundtrip.in ()
-                          ACE_ENV_ARG_PARAMETER);
+                          roundtrip.in ());
 
   return group._retn ();
 }
@@ -253,7 +238,7 @@ main (int argc, char *argv[])
 
 
 
-  ACE_TRY_NEW_ENV
+  try
     {
       ORBInitializer *initializer = 0;
       ACE_NEW_RETURN (initializer,
@@ -262,16 +247,14 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -279,8 +262,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -291,12 +273,10 @@ main (int argc, char *argv[])
       poa_manager->activate ();
 
       CORBA::Object_var lm_object =
-        orb->resolve_initial_references ("LoadManager"
-                                         ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("LoadManager");
 
       CosLoadBalancing::LoadManager_var load_manager =
-        CosLoadBalancing::LoadManager::_narrow (lm_object.in ()
-                                                ACE_ENV_ARG_PARAMETER);
+        CosLoadBalancing::LoadManager::_narrow (lm_object.in ());
 
       TAO_LB_CPU_Utilization_Monitor * monitor_servant;
       ACE_NEW_THROW_EX (monitor_servant,
@@ -314,8 +294,7 @@ main (int argc, char *argv[])
       CORBA::Object_var roundtrip =
         ::join_object_group (orb.in (),
                              load_manager.in (),
-                             location.in ()
-                             ACE_ENV_ARG_PARAMETER);
+                             location.in ());
 
       TAO_LB_LoadAlert & alert_servant = initializer->load_alert ();
 
@@ -323,7 +302,7 @@ main (int argc, char *argv[])
         alert_servant._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (roundtrip.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -336,27 +315,24 @@ main (int argc, char *argv[])
       ACE_OS::fclose (output_file);
 
       load_manager->register_load_monitor (location.in (),
-                                           load_monitor.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+                                           load_monitor.in ());
 
       load_manager->register_load_alert (location.in (),
-                                         load_alert.in ()
-                                         ACE_ENV_ARG_PARAMETER);
+                                         load_alert.in ());
 
       orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1);
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp
index b421b7feb6a..ec190f3298c 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp
@@ -18,16 +18,14 @@ ORBInitializer::ORBInitializer (void)
 
 void
 ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_NEW_THROW_EX (this->interceptor_,
@@ -41,8 +39,7 @@ ORBInitializer::post_init (
   PortableInterceptor::ServerRequestInterceptor_var sr_interceptor =
     this->interceptor_;
 
-  info->add_server_request_interceptor (sr_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+  info->add_server_request_interceptor (sr_interceptor.in ());
 
   PortableInterceptor::ServerRequestInterceptor_ptr reject_interceptor;
   ACE_NEW_THROW_EX (reject_interceptor,
@@ -56,8 +53,7 @@ ORBInitializer::post_init (
   PortableInterceptor::ServerRequestInterceptor_var safe_reject_interceptor =
     reject_interceptor;
 
-  info->add_server_request_interceptor (safe_reject_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+  info->add_server_request_interceptor (safe_reject_interceptor.in ());
 }
 
 
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h
index 77132d3adc8..83734927f65 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h
@@ -58,12 +58,10 @@ public:
    * interface.
    */
   //@{
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h
index 765656037b8..821e3964021 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h
@@ -49,8 +49,7 @@ public:
   /**
    * The returned "Location" is a sequence of length 1.
    */
-  virtual CosLoadBalancing::Location * the_location (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CosLoadBalancing::Location * the_location ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the average CPU load at the location which this
@@ -60,8 +59,7 @@ public:
    *         equal to CosLoadBalancing::LoadAverage, and the average CPU
    *         load.
    */
-  virtual CosLoadBalancing::LoadList * loads (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CosLoadBalancing::LoadList * loads ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@}
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp
index dceba1eea0f..4c8cf73a5c2 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp
@@ -17,8 +17,7 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 
 Test::Timestamp
 Roundtrip::test_method (Test::Timestamp send_time,
-                        Test::number  cl_number
-                        ACE_ENV_ARG_DECL_NOT_USED)
+                        Test::number  cl_number)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -37,5 +36,5 @@ void
 Roundtrip::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h
index 3ef3babc13a..70aec84ecc9 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h
@@ -23,8 +23,7 @@ public:
 
   // = The skeleton methods
   virtual Test::Timestamp test_method (Test::Timestamp send_time,
-		                       Test::number cl_number
-                                       ACE_ENV_ARG_DECL)
+		                       Test::number cl_number)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void shutdown (void)
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp
index 2f8d5ab91cb..b7d2ca0b5f9 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp
@@ -28,8 +28,7 @@ ServerRequestInterceptor::destroy (void)
 
 void
 ServerRequestInterceptor::receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr /* ri */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr /* ri */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -38,8 +37,7 @@ ServerRequestInterceptor::receive_request_service_contexts (
 
 void
 ServerRequestInterceptor::receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -47,16 +45,14 @@ ServerRequestInterceptor::receive_request (
 
 void
 ServerRequestInterceptor::send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr /* ri */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr /* ri */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ServerRequestInterceptor::send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -64,8 +60,7 @@ ServerRequestInterceptor::send_exception (
 
 void
 ServerRequestInterceptor::send_other (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h
index 6e350ceb444..556a67570bf 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h
@@ -67,31 +67,26 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_request_service_contexts (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_request (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_reply (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_exception (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_other (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
   //@}
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp
index abd035a418e..b362a753c85 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp
@@ -94,19 +94,19 @@ main (int argc, char *argv[])
                     "client (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior);
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        Test::Roundtrip::_narrow (object.in ());
 
       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, number ACE_ENV_ARG_PARAMETER);
+          (void) roundtrip->test_method (start, number);
         }
 
       ACE_Sample_History history (niterations);
@@ -142,8 +142,7 @@ main (int argc, char *argv[])
 	  }
 	  */
 
-          (void) roundtrip->test_method (start, number
-					 ACE_ENV_ARG_PARAMETER);
+          (void) roundtrip->test_method (start, number);
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
           history.sample (now - start);
@@ -176,12 +175,11 @@ main (int argc, char *argv[])
           roundtrip->shutdown ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp
index ba8896407be..dc7076250bf 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp
@@ -75,16 +75,13 @@ parse_args (int argc, char *argv[])
 CORBA::Object_ptr
 join_object_group (CORBA::ORB_ptr orb,
                    CosLoadBalancing::LoadManager_ptr lm,
-                   const PortableGroup::Location & location
-                   ACE_ENV_ARG_DECL)
+                   const PortableGroup::Location & location)
 {
   CORBA::Object_var ns_object =
-    orb->resolve_initial_references ("NameService"
-                                     ACE_ENV_ARG_PARAMETER);
+    orb->resolve_initial_references ("NameService");
 
   CosNaming::NamingContext_var nc =
-    CosNaming::NamingContext::_narrow (ns_object.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+    CosNaming::NamingContext::_narrow (ns_object.in ());
 
   CosNaming::Name name (1);
   name.length (1);
@@ -94,12 +91,11 @@ join_object_group (CORBA::ORB_ptr orb,
 
   CORBA::Object_var group;
 
-  ACE_TRY
+  try
     {
-      group = nc->resolve (name
-                           ACE_ENV_ARG_PARAMETER);
+      group = nc->resolve (name);
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+  catch (const CosNaming::NamingContext::NotFound& )
     {
       // Object group not created.  Create one.
       const char repository_id[] = "IDL:Test/Roundtrip:1.0";
@@ -121,15 +117,12 @@ join_object_group (CORBA::ORB_ptr orb,
 
       group = lm->create_object (repository_id,
                                  criteria,
-                                 fcid.out ()
-                                 ACE_ENV_ARG_PARAMETER);
+                                 fcid.out ());
 
-      ACE_TRY_EX (foo)
+      try
         {
           nc->bind (name,
-                    group.in ()
-                    ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (foo);
+                    group.in ());
 
           PortableGroup::Properties props (1);
           props.length (1);
@@ -191,24 +184,17 @@ join_object_group (CORBA::ORB_ptr orb,
 
           props[0].val <<= strategy_info;
 
-          lm->set_default_properties (props
-                                      ACE_ENV_ARG_PARAMETER);
+          lm->set_default_properties (props);
         }
-      ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
+      catch (const CosNaming::NamingContext::AlreadyBound& )
         {
           // Somebody beat us to creating the object group.  Clean up
           // the one we created.
-          lm->delete_object (fcid.in ()
-                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (foo);
+          lm->delete_object (fcid.in ());
 
-          group = nc->resolve (name
-                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (foo);
+          group = nc->resolve (name);
         }
-      ACE_ENDTRY;
     }
-  ACE_ENDTRY;
 
   Roundtrip * roundtrip_impl;
   ACE_NEW_THROW_EX (roundtrip_impl,
@@ -222,8 +208,7 @@ join_object_group (CORBA::ORB_ptr orb,
 
   group = lm->add_member (group.in (),
                           location,
-                          roundtrip.in ()
-                          ACE_ENV_ARG_PARAMETER);
+                          roundtrip.in ());
 
   return group._retn ();
 }
@@ -253,7 +238,7 @@ main (int argc, char *argv[])
                     "server (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       ORBInitializer *initializer = 0;
       ACE_NEW_RETURN (initializer,
@@ -262,16 +247,14 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -279,8 +262,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -291,12 +273,10 @@ main (int argc, char *argv[])
       poa_manager->activate ();
 
       CORBA::Object_var lm_object =
-        orb->resolve_initial_references ("LoadManager"
-                                         ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("LoadManager");
 
       CosLoadBalancing::LoadManager_var load_manager =
-        CosLoadBalancing::LoadManager::_narrow (lm_object.in ()
-                                                ACE_ENV_ARG_PARAMETER);
+        CosLoadBalancing::LoadManager::_narrow (lm_object.in ());
 
       RPS_Monitor * monitor_servant;
       ACE_NEW_THROW_EX (monitor_servant,
@@ -314,8 +294,7 @@ main (int argc, char *argv[])
       CORBA::Object_var roundtrip =
         ::join_object_group (orb.in (),
                              load_manager.in (),
-                             location.in ()
-                             ACE_ENV_ARG_PARAMETER);
+                             location.in ());
 
       TAO_LB_LoadAlert & alert_servant = initializer->load_alert ();
 
@@ -324,7 +303,7 @@ main (int argc, char *argv[])
 
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (roundtrip.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -337,27 +316,24 @@ main (int argc, char *argv[])
       ACE_OS::fclose (output_file);
 
       load_manager->register_load_monitor (location.in (),
-                                           load_monitor.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+                                           load_monitor.in ());
 
       load_manager->register_load_alert (location.in (),
-                                         load_alert.in ()
-                                         ACE_ENV_ARG_PARAMETER);
+                                         load_alert.in ());
 
       orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1);
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp
index cd50b2cd388..0712a57e703 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp
@@ -41,10 +41,9 @@ int main (int argc, char *argv[])
   /// Move the test to the real-time class if it is possible.
   RT_Class rt_class;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      ORB_Holder orb (argc, argv, ""
-                      ACE_ENV_ARG_PARAMETER);
+      ORB_Holder orb (argc, argv, "");
 
       Client_Options options (argc, argv);
       if (argc != 1)
@@ -69,12 +68,11 @@ int main (int argc, char *argv[])
                                      orb,
                                      rt_class,
                                      1 // options.nthreads
-                                     ACE_ENV_ARG_PARAMETER);
+                                     );
 
       PortableServer::POA_var root_poa =
         RIR_Narrow<PortableServer::POA>::resolve (orb,
-                                                  "RootPOA"
-                                                  ACE_ENV_ARG_PARAMETER);
+                                                  "RootPOA");
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -97,22 +95,18 @@ int main (int argc, char *argv[])
       Servant_var<TAO_EC_Event_Channel> ec_impl (
               RTEC_Initializer::create (ec_poa.in (),
                                         ec_poa.in (),
-                                        rtserver_setup.rtcorba_setup ()
-                                        ACE_ENV_ARG_PARAMETER)
+                                        rtserver_setup.rtcorba_setup ())
               );
 
       ec_impl->activate ();
 
       PortableServer::ObjectId_var ec_id =
-        ec_poa->activate_object (ec_impl.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+        ec_poa->activate_object (ec_impl.in ());
       CORBA::Object_var ec_object =
-        ec_poa->id_to_reference (ec_id.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+        ec_poa->id_to_reference (ec_id.in ());
 
       RtecEventChannelAdmin::EventChannel_var ec =
-        RtecEventChannelAdmin::EventChannel::_narrow (ec_object.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
+        RtecEventChannelAdmin::EventChannel::_narrow (ec_object.in ());
 
       EC_Destroyer ec_destroyer (ec.in ());
 
@@ -151,8 +145,7 @@ int main (int argc, char *argv[])
 
       if (!options.high_priority_is_last)
         {
-          high_priority_group.connect (ec.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+          high_priority_group.connect (ec.in ());
           high_priority_disconnect = &high_priority_group;
         }
 
@@ -175,13 +168,11 @@ int main (int argc, char *argv[])
           ec_poa.in (),
           ec_poa.in (),
           ec.in (),
-          &the_barrier
-          ACE_ENV_ARG_PARAMETER);
+          &the_barrier);
 
       if (options.high_priority_is_last)
         {
-          high_priority_group.connect (ec.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+          high_priority_group.connect (ec.in ());
           high_priority_disconnect = &high_priority_group;
         }
       Send_Task high_priority_task;
@@ -224,13 +215,11 @@ int main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - starting cleanup\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp
index 2c2c4b42538..8fc6824ff85 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp
@@ -44,10 +44,8 @@ class Roundtrip_Peer : public Peer_Base
 public:
   Roundtrip_Peer (CORBA::ORB_ptr orb,
                   RTServer_Setup &rtserver_setup,
-                  RT_Class &rt_class
-                  ACE_ENV_ARG_DECL)
-    : Peer_Base (orb, rtserver_setup
-                 ACE_ENV_ARG_PARAMETER)
+                  RT_Class &rt_class)
+    : Peer_Base (orb, rtserver_setup)
     , rt_class_ (&rt_class)
   {
   }
@@ -57,8 +55,7 @@ public:
    */
   virtual Federated_Test::Experiment_Results *
       run_experiment (CORBA::Long experiment_id,
-                      CORBA::Long iterations
-                      ACE_ENV_ARG_DECL)
+                      CORBA::Long iterations)
         ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
@@ -133,10 +130,9 @@ int main (int argc, char *argv[])
   TAO_EC_Default_Factory::init_svcs();
   RT_Class rt_class;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      ORB_Holder orb (argc, argv, ""
-                      ACE_ENV_ARG_PARAMETER);
+      ORB_Holder orb (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -144,13 +140,11 @@ int main (int argc, char *argv[])
       RTServer_Setup rtserver_setup (use_rt_corba,
                                      orb,
                                      rt_class,
-                                     nthreads
-                                     ACE_ENV_ARG_PARAMETER);
+                                     nthreads);
 
       PortableServer::POA_var root_poa =
         RIR_Narrow<PortableServer::POA>::resolve (orb,
-                                                  "RootPOA"
-                                                  ACE_ENV_ARG_PARAMETER);
+                                                  "RootPOA");
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -162,8 +156,7 @@ int main (int argc, char *argv[])
       Servant_var<Roundtrip_Peer> peer_impl (
           new Roundtrip_Peer (orb,
                               rtserver_setup,
-                              rt_class
-                              ACE_ENV_ARG_PARAMETER)
+                              rt_class)
           );
 
       Federated_Test::Peer_var peer =
@@ -172,32 +165,27 @@ int main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG, "Finished peer configuration and activation\n"));
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior);
 
       Federated_Test::Control_var control =
-        Federated_Test::Control::_narrow (object.in ()
-                                          ACE_ENV_ARG_PARAMETER);
+        Federated_Test::Control::_narrow (object.in ());
 
-      control->join (peer.in ()
-                     ACE_ENV_ARG_PARAMETER);
+      control->join (peer.in ());
 
       orb->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
 
 Federated_Test::Experiment_Results *
 Roundtrip_Peer::run_experiment (CORBA::Long experiment_id,
-                                CORBA::Long iterations
-                                ACE_ENV_ARG_DECL)
+                                CORBA::Long iterations)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int thread_count = 1;
@@ -230,8 +218,7 @@ Roundtrip_Peer::run_experiment (CORBA::Long experiment_id,
           this->poa_.in (),
           this->poa_.in (),
           this->event_channel_.in (),
-          &the_barrier
-          ACE_ENV_ARG_PARAMETER);
+          &the_barrier);
 #endif
 
   Client_Pair high_priority_group;
@@ -242,8 +229,7 @@ Roundtrip_Peer::run_experiment (CORBA::Long experiment_id,
                             gsf,
                             this->poa_.in (),
                             this->poa_.in ());
-  high_priority_group.connect (this->event_channel_.in ()
-                               ACE_ENV_ARG_PARAMETER);
+  high_priority_group.connect (this->event_channel_.in ());
   Auto_Disconnect<Client_Pair> high_priority_disconnect (&high_priority_group);
 
   Send_Task high_priority_task;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp
index 5e8e6e8f462..f6194ba73dd 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp
@@ -80,10 +80,9 @@ int main (int argc, char *argv[])
 {
   RT_Class rt_class;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      ORB_Holder orb (argc, argv, ""
-                      ACE_ENV_ARG_PARAMETER);
+      ORB_Holder orb (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -91,13 +90,11 @@ int main (int argc, char *argv[])
       RTServer_Setup rtserver_setup (use_rt_corba,
                                      orb,
                                      rt_class,
-                                     nthreads
-                                     ACE_ENV_ARG_PARAMETER);
+                                     nthreads);
 
       PortableServer::POA_var root_poa =
         RIR_Narrow<PortableServer::POA>::resolve (orb,
-                                                  "RootPOA"
-                                                  ACE_ENV_ARG_PARAMETER);
+                                                  "RootPOA");
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -117,7 +114,7 @@ int main (int argc, char *argv[])
         control_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (control.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (control.in ());
 
       // Output the ior to the <ior_output_file>
       FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
@@ -135,13 +132,11 @@ int main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp
index 0a3e935184a..5e859b50e45 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp
@@ -16,8 +16,7 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 
 Test::Timestamp
 Roundtrip::test_method (Test::Timestamp send_time,
-                        CORBA::Long workload_in_usecs
-                        ACE_ENV_ARG_DECL_NOT_USED)
+                        CORBA::Long workload_in_usecs)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t start = ACE_OS::gethrtime ();
@@ -38,5 +37,5 @@ void
 Roundtrip::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h
index 9f6947e047e..9a67072a43b 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h
@@ -18,8 +18,7 @@ public:
 
   // = The skeleton methods
   virtual Test::Timestamp test_method (Test::Timestamp send_time,
-                                       CORBA::Long workload_in_usecs
-                                       ACE_ENV_ARG_DECL)
+                                       CORBA::Long workload_in_usecs)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void shutdown (void)
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp
index 8a6664016af..99a720b71f7 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp
@@ -39,15 +39,13 @@ public:
   virtual int svc (void)
   {
     this->barrier_->wait ();
-    ACE_DECLARE_NEW_CORBA_ENV;
-    ACE_TRY
+    try
       {
         this->run_test ();
       }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
       {
       }
-    ACE_ENDTRY;
 
     ACE_DEBUG ((LM_DEBUG, "(%P|%t) done...\n"));
     return 0;
@@ -82,17 +80,16 @@ public:
         ACE_Time_Value period (0, this->period_in_usecs_);
         ACE_OS::sleep (period);
 
-        ACE_TRY {
+        try{
           ACE_hrtime_t start = ACE_OS::gethrtime ();
           (void) this->roundtrip_->test_method (start,
-                                                this->workload_
-                                                ACE_ENV_ARG_PARAMETER);
+                                                this->workload_);
           ACE_hrtime_t elapsed = ACE_OS::gethrtime () - start;
 
           this->sample_history.sample (elapsed);
 
-        } ACE_CATCHANY {
-        } ACE_ENDTRY;
+        } catch (const CORBA::Exception&) {
+        }
       }
   }
 
@@ -139,14 +136,13 @@ public:
             return;
         }
 
-        ACE_TRY {
+        try{
           CORBA::ULongLong dummy = 0;
           (void) this->roundtrip_->test_method (dummy,
-                                                this->workload_
-                                                ACE_ENV_ARG_PARAMETER);
+                                                this->workload_);
 
-        } ACE_CATCHANY {
-        } ACE_ENDTRY;
+        } catch (const CORBA::Exception&) {
+        }
       }
   }
 
@@ -164,10 +160,9 @@ int main (int argc, char *argv[])
 {
   RT_Class rt_class;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      ORB_Holder orb (argc, argv, ""
-                      ACE_ENV_ARG_PARAMETER);
+      ORB_Holder orb (argc, argv, "");
 
       Client_Options options (argc, argv);
       if (argc != 1)
@@ -191,21 +186,18 @@ int main (int argc, char *argv[])
       RTClient_Setup rtclient_setup (options.use_rt_corba,
                                      orb,
                                      rt_class,
-                                     options.nthreads
-                                     ACE_ENV_ARG_PARAMETER);
+                                     options.nthreads);
 
       ACE_DEBUG ((LM_DEBUG, "Finished ORB and POA configuration\n"));
 
       CORBA::Object_var object =
-        orb->string_to_object (options.ior ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object (options.ior);
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+        Test::Roundtrip::_narrow (object.in ());
 
       CORBA::PolicyList_var inconsistent_policies;
-      (void) roundtrip->_validate_connection (inconsistent_policies
-                                              ACE_ENV_ARG_PARAMETER);
+      (void) roundtrip->_validate_connection (inconsistent_policies);
 
       int thread_count = 1 + options.nthreads;
       ACE_Barrier the_barrier (thread_count);
@@ -259,13 +251,11 @@ int main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - starting cleanup\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp
index 01059c47fcc..aaf0be0d9be 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp
@@ -63,10 +63,9 @@ int main (int argc, char *argv[])
   /// Move the test to the real-time class if it is possible.
   RT_Class rt_class;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      ORB_Holder orb (argc, argv, ""
-                      ACE_ENV_ARG_PARAMETER);
+      ORB_Holder orb (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -74,13 +73,11 @@ int main (int argc, char *argv[])
       RTServer_Setup rtserver_setup (use_rt_corba,
                                      orb,
                                      rt_class,
-                                     nthreads
-                                     ACE_ENV_ARG_PARAMETER);
+                                     nthreads);
 
       PortableServer::POA_var root_poa =
         RIR_Narrow<PortableServer::POA>::resolve (orb,
-                                                  "RootPOA"
-                                                  ACE_ENV_ARG_PARAMETER);
+                                                  "RootPOA");
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -92,15 +89,13 @@ int main (int argc, char *argv[])
       Servant_var<Roundtrip> roundtrip (new Roundtrip (orb));
 
       PortableServer::ObjectId_var id =
-        the_poa->activate_object (roundtrip.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+        the_poa->activate_object (roundtrip.in ());
 
       CORBA::Object_var object =
-        the_poa->id_to_reference (id.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+        the_poa->id_to_reference (id.in ());
 
       CORBA::String_var ior =
-        orb->object_to_string (object.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (object.in ());
 
       // Output the ior to the <ior_output_file>
       FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
@@ -116,13 +111,11 @@ int main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp
index 4a4350c98c0..dda1ee587a1 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp
@@ -23,8 +23,7 @@ Callback::sample_history (void)
 }
 
 void
-Callback::sample (Test::Timestamp the_timestamp
-                  ACE_ENV_ARG_DECL_NOT_USED)
+Callback::sample (Test::Timestamp the_timestamp)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t elapsed = ACE_OS::gethrtime () - the_timestamp;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h
index 6e1e0a33af5..93f716e0b51 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h
@@ -36,8 +36,7 @@ public:
   //@{
   /** @name The RtecEventComm::PushCallback methods
    */
-  virtual void sample (Test::Timestamp the_timestamp
-                       ACE_ENV_ARG_DECL)
+  virtual void sample (Test::Timestamp the_timestamp)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   PortableServer::POA_ptr _default_POA (void)
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp
index 7e320974dcb..30beb42f72b 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp
@@ -16,20 +16,17 @@ Session::Session (Test::Callback_ptr cb,
 }
 
 void
-Session::sample (Test::Timestamp the_timestamp
-                 ACE_ENV_ARG_DECL)
+Session::sample (Test::Timestamp the_timestamp)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->cb_->sample (the_timestamp
-                     ACE_ENV_ARG_PARAMETER);
+  this->cb_->sample (the_timestamp);
 }
 
 void
 Session::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  Implicit_Deactivator deactivator (this
-                                    ACE_ENV_ARG_PARAMETER);
+  Implicit_Deactivator deactivator (this);
 }
 
 PortableServer::POA_ptr
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h
index 2b00c6ce028..8786b3f89ca 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h
@@ -18,8 +18,7 @@ public:
            PortableServer::POA_ptr poa);
 
   // = The skeleton methods
-  virtual void sample (Test::Timestamp the_timestamp
-                       ACE_ENV_ARG_DECL)
+  virtual void sample (Test::Timestamp the_timestamp)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void shutdown (void)
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp
index 02df9d17977..eebb4855cc9 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp
@@ -17,8 +17,7 @@ Session_Factory::Session_Factory (CORBA::ORB_ptr orb,
 }
 
 Test::Session_ptr
-Session_Factory::create_new_session (Test::Callback_ptr cb
-                                     ACE_ENV_ARG_DECL)
+Session_Factory::create_new_session (Test::Callback_ptr cb)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Servant_var<Session> session_impl (new Session (cb,
@@ -31,7 +30,7 @@ void
 Session_Factory::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 PortableServer::POA_ptr
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h
index 336f28af5e2..829afb63323 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h
@@ -18,8 +18,7 @@ public:
                    PortableServer::POA_ptr poa);
 
   // = The skeleton methods
-  virtual Test::Session_ptr create_new_session (Test::Callback_ptr cb
-                                                ACE_ENV_ARG_DECL)
+  virtual Test::Session_ptr create_new_session (Test::Callback_ptr cb)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void shutdown (void)
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp
index 053b5a3fb0b..a14144e0ac2 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp
@@ -45,15 +45,13 @@ public:
   virtual int svc (void)
   {
     this->the_barrier_->wait ();
-    ACE_DECLARE_NEW_CORBA_ENV;
-    ACE_TRY
+    try
       {
         this->run_test ();
       }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
       {
       }
-    ACE_ENDTRY;
 
     ACE_DEBUG ((LM_DEBUG, "(%P|%t) done...\n"));
     return 0;
@@ -88,8 +86,7 @@ public:
     Implicit_Deactivator deactivator (callback);
 
     Test::Session_var session =
-      this->session_factory_->create_new_session (cb.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
+      this->session_factory_->create_new_session (cb.in ());
 
     ACE_Utils::Auto_Functor<Test::Session,Shutdown<Test::Session> > auto_shutdown (session.in ());
 
@@ -105,12 +102,11 @@ public:
         ACE_Time_Value period (0, this->period_in_usecs_);
         ACE_OS::sleep (period);
 
-        ACE_TRY {
+        try{
           ACE_hrtime_t start = ACE_OS::gethrtime ();
-          (void) session->sample (start
-                                  ACE_ENV_ARG_PARAMETER);
-        } ACE_CATCHANY {
-        } ACE_ENDTRY;
+          (void) session->sample (start);
+        } catch (const CORBA::Exception&) {
+        }
       }
   }
 
@@ -150,8 +146,7 @@ public:
     Implicit_Deactivator deactivator (callback);
 
     Test::Session_var session =
-      this->session_factory_->create_new_session (cb.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
+      this->session_factory_->create_new_session (cb.in ());
 
     ACE_Utils::Auto_Functor<Test::Session,Shutdown<Test::Session> > auto_shutdown (session.in ());
 
@@ -166,13 +161,12 @@ public:
             return;
         }
 
-        ACE_TRY {
+        try{
           CORBA::ULongLong dummy = 0;
-          (void) session->sample (dummy
-                                  ACE_ENV_ARG_PARAMETER);
+          (void) session->sample (dummy);
 
-        } ACE_CATCHANY {
-        } ACE_ENDTRY;
+        } catch (const CORBA::Exception&) {
+        }
       }
   }
 
@@ -191,10 +185,9 @@ int main (int argc, char *argv[])
   /// Move the test to the real-time class if it is possible.
   RT_Class rt_class;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      ORB_Holder orb (argc, argv, ""
-                      ACE_ENV_ARG_PARAMETER);
+      ORB_Holder orb (argc, argv, "");
 
       Client_Options options (argc, argv);
       if (argc != 1)
@@ -218,13 +211,11 @@ int main (int argc, char *argv[])
       RTServer_Setup rtserver_setup (options.use_rt_corba,
                                      orb,
                                      rt_class,
-                                     options.nthreads
-                                     ACE_ENV_ARG_PARAMETER);
+                                     options.nthreads);
 
       PortableServer::POA_var root_poa =
         RIR_Narrow<PortableServer::POA>::resolve (orb,
-                                                  "RootPOA"
-                                                  ACE_ENV_ARG_PARAMETER);
+                                                  "RootPOA");
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -242,15 +233,13 @@ int main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG, "Finished ORB and POA configuration\n"));
 
       CORBA::Object_var object =
-        orb->string_to_object (options.ior ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object (options.ior);
 
       Test::Session_Factory_var session_factory =
-        Test::Session_Factory::_narrow (object.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+        Test::Session_Factory::_narrow (object.in ());
 
       CORBA::PolicyList_var inconsistent_policies;
-      (void) session_factory->_validate_connection (inconsistent_policies
-                                                    ACE_ENV_ARG_PARAMETER);
+      (void) session_factory->_validate_connection (inconsistent_policies);
 
       int thread_count = 1 + options.nthreads;
       ACE_Barrier the_barrier (thread_count);
@@ -307,13 +296,11 @@ int main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - starting cleanup\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp
index c4c38a88f3c..81143039133 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp
@@ -66,10 +66,9 @@ int main (int argc, char *argv[])
   /// Move the test to the real-time class if it is possible.
   RT_Class rt_class;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      ORB_Holder orb (argc, argv, ""
-                      ACE_ENV_ARG_PARAMETER);
+      ORB_Holder orb (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -77,13 +76,11 @@ int main (int argc, char *argv[])
       RTServer_Setup rtserver_setup (use_rt_corba,
                                      orb,
                                      rt_class,
-                                     nthreads
-                                     ACE_ENV_ARG_PARAMETER);
+                                     nthreads);
 
       PortableServer::POA_var root_poa =
         RIR_Narrow<PortableServer::POA>::resolve (orb,
-                                                  "RootPOA"
-                                                  ACE_ENV_ARG_PARAMETER);
+                                                  "RootPOA");
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -109,7 +106,7 @@ int main (int argc, char *argv[])
         session_factory->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (object.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (object.in ());
 
       // Output the ior to the <ior_output_file>
       FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
@@ -125,13 +122,11 @@ int main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp
index 5a585876a19..bd774077776 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp
@@ -35,10 +35,9 @@ int main (int argc, char *argv[])
 
   RT_Class rt_class;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      ORB_Holder orb (argc, argv, ""
-                      ACE_ENV_ARG_PARAMETER);
+      ORB_Holder orb (argc, argv, "");
 
       Client_Options options (argc, argv);
       if (argc != 1)
@@ -63,12 +62,11 @@ int main (int argc, char *argv[])
                                      orb,
                                      rt_class,
                                      1 // options.nthreads
-                                     ACE_ENV_ARG_PARAMETER);
+                                     );
 
       PortableServer::POA_var root_poa =
         RIR_Narrow<PortableServer::POA>::resolve (orb,
-                                                  "RootPOA"
-                                                  ACE_ENV_ARG_PARAMETER);
+                                                  "RootPOA");
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -89,17 +87,15 @@ int main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG, "Finished ORB and POA configuration\n"));
 
       CORBA::Object_var object =
-        orb->string_to_object (options.ior ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object (options.ior);
 
       RtecEventChannelAdmin::EventChannel_var ec =
-        RtecEventChannelAdmin::EventChannel::_narrow (object.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
+        RtecEventChannelAdmin::EventChannel::_narrow (object.in ());
 
       EC_Destroyer ec_destroyer (ec.in ());
 
       CORBA::PolicyList_var inconsistent_policies;
-      (void) ec->_validate_connection (inconsistent_policies
-                                       ACE_ENV_ARG_PARAMETER);
+      (void) ec->_validate_connection (inconsistent_policies);
 
       ACE_DEBUG ((LM_DEBUG, "Found EC, validated connection\n"));
 
@@ -136,8 +132,7 @@ int main (int argc, char *argv[])
 
       if (!options.high_priority_is_last)
         {
-          high_priority_group.connect (ec.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+          high_priority_group.connect (ec.in ());
           high_priority_disconnect = &high_priority_group;
         }
 
@@ -160,13 +155,11 @@ int main (int argc, char *argv[])
           the_poa.in (),
           the_poa.in (),
           ec.in (),
-          &the_barrier
-          ACE_ENV_ARG_PARAMETER);
+          &the_barrier);
 
       if (options.high_priority_is_last)
         {
-          high_priority_group.connect (ec.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+          high_priority_group.connect (ec.in ());
           high_priority_disconnect = &high_priority_group;
         }
       Send_Task high_priority_task;
@@ -209,13 +202,11 @@ int main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - starting cleanup\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp
index 77e4f6f2d5c..86f6fc8fe95 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp
@@ -70,10 +70,9 @@ int main (int argc, char *argv[])
   /// Move the test to the real-time class if it is possible.
   RT_Class rt_class;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      ORB_Holder orb (argc, argv, ""
-                      ACE_ENV_ARG_PARAMETER);
+      ORB_Holder orb (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -81,13 +80,11 @@ int main (int argc, char *argv[])
       RTServer_Setup rtserver_setup (use_rt_corba,
                                      orb,
                                      rt_class,
-                                     nthreads
-                                     ACE_ENV_ARG_PARAMETER);
+                                     nthreads);
 
       PortableServer::POA_var root_poa =
         RIR_Narrow<PortableServer::POA>::resolve (orb,
-                                                  "RootPOA"
-                                                  ACE_ENV_ARG_PARAMETER);
+                                                  "RootPOA");
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -107,25 +104,21 @@ int main (int argc, char *argv[])
       Servant_var<TAO_EC_Event_Channel> ec_impl (
               RTEC_Initializer::create (ec_poa.in (),
                                         ec_poa.in (),
-                                        rtserver_setup.rtcorba_setup ()
-                                        ACE_ENV_ARG_PARAMETER)
+                                        rtserver_setup.rtcorba_setup ())
               );
 
       ec_impl->activate ();
 
       PortableServer::ObjectId_var ec_id =
-        ec_poa->activate_object (ec_impl.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+        ec_poa->activate_object (ec_impl.in ());
       CORBA::Object_var ec_object =
-        ec_poa->id_to_reference (ec_id.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+        ec_poa->id_to_reference (ec_id.in ());
 
       RtecEventChannelAdmin::EventChannel_var ec =
-        RtecEventChannelAdmin::EventChannel::_narrow (ec_object.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
+        RtecEventChannelAdmin::EventChannel::_narrow (ec_object.in ());
 
       CORBA::String_var ior =
-        orb->object_to_string (ec.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (ec.in ());
 
       // Output the ior to the <ior_output_file>
       FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
@@ -139,18 +132,16 @@ int main (int argc, char *argv[])
 
       do {
         ACE_Time_Value tv (1, 0);
-        orb->run (tv ACE_ENV_ARG_PARAMETER);
+        orb->run (tv);
       } while (ec_impl->destroyed () == 0);
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.inl
index e6da5c6d119..d45069fdf3d 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.inl
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.inl
@@ -10,13 +10,11 @@
 template<class Client> ACE_INLINE void
 Disconnect<Client>::operator () (Client *client)
 {
-  ACE_DECLARE_NEW_ENV;
-  ACE_TRY
+  try
     {
       client->disconnect ();
     }
-  ACE_CATCHANY { };
-  ACE_ENDTRY;
+  catch (const CORBA::Exception& ex){ };
 }
 
 template<class Client> ACE_INLINE
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp
index 5e7d3cfa0ac..402c9187779 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp
@@ -54,13 +54,12 @@ Client_Group::init (CORBA::Long experiment_id,
 }
 
 void
-Client_Group::connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                       ACE_ENV_ARG_DECL)
+Client_Group::connect (RtecEventChannelAdmin::EventChannel_ptr ec)
 {
-  this->client_pair_.connect (ec ACE_ENV_ARG_PARAMETER);
+  this->client_pair_.connect (ec);
   Auto_Disconnect<Client_Pair> client_pair_disconnect (&this->client_pair_);
 
-  this->loopback_pair_.connect (ec ACE_ENV_ARG_PARAMETER);
+  this->loopback_pair_.connect (ec);
   Auto_Disconnect<Loopback_Pair> loopback_pair_disconnect (&this->loopback_pair_);
 
   loopback_pair_disconnect.release ();
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.h
index 4b0dbb68bba..0f50a4bbc5a 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.h
@@ -71,8 +71,7 @@ public:
              PortableServer::POA_ptr consumer_poa);
 
   /// Connect to the event channel
-  void connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                ACE_ENV_ARG_DECL);
+  void connect (RtecEventChannelAdmin::EventChannel_ptr ec);
 
   /// Disconnect from the event channel
   void disconnect (void);
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp
index 8b1439975b2..d2c71bd2cb9 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp
@@ -59,13 +59,12 @@ Client_Pair::init (CORBA::Long experiment_id,
 }
 
 void
-Client_Pair::connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                       ACE_ENV_ARG_DECL)
+Client_Pair::connect (RtecEventChannelAdmin::EventChannel_ptr ec)
 {
-  this->supplier_->connect (ec ACE_ENV_ARG_PARAMETER);
+  this->supplier_->connect (ec);
   Auto_Disconnect<Supplier> supplier_disconnect (this->supplier_);
 
-  this->consumer_->connect (ec ACE_ENV_ARG_PARAMETER);
+  this->consumer_->connect (ec);
   Auto_Disconnect<Consumer> consumer_disconnect (this->consumer_);
 
   consumer_disconnect.release ();
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.h
index e0bc5e5f195..d88d5fbff53 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.h
@@ -74,8 +74,7 @@ public:
              PortableServer::POA_ptr consumer_poa);
 
   /// Connect to the event channel
-  void connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                ACE_ENV_ARG_DECL);
+  void connect (RtecEventChannelAdmin::EventChannel_ptr ec);
 
   /// Disconnect from the event channel
   void disconnect (void);
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp
index 20c01a4f80b..a89beb5367b 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp
@@ -31,8 +31,7 @@ Consumer::Consumer (CORBA::Long experiment_id,
 }
 
 void
-Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                   ACE_ENV_ARG_DECL)
+Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
     ec->for_consumers ();
@@ -63,8 +62,7 @@ Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec
   h1.source = this->experiment_id_;
 
   this->proxy_supplier_->connect_push_consumer (consumer.in (),
-                                                consumer_qos
-                                                ACE_ENV_ARG_PARAMETER);
+                                                consumer_qos);
 }
 
 void
@@ -78,13 +76,12 @@ Consumer::disconnect (void)
     proxy = this->proxy_supplier_._retn ();
   }
 
-  Implicit_Deactivator deactivator (this
-                                    ACE_ENV_ARG_PARAMETER);
+  Implicit_Deactivator deactivator (this);
 
-  ACE_TRY {
+  try{
     proxy->disconnect_push_supplier ();
-  } ACE_CATCHANY {
-  } ACE_ENDTRY;
+  } catch (const CORBA::Exception&) {
+  }
 }
 
 ACE_Sample_History &
@@ -94,8 +91,7 @@ Consumer::sample_history (void)
 }
 
 void
-Consumer::push (const RtecEventComm::EventSet &events
-                ACE_ENV_ARG_DECL_NOT_USED)
+Consumer::push (const RtecEventComm::EventSet &events)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t now = ACE_OS::gethrtime ();
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h
index 516936d79dc..4718601a084 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h
@@ -38,8 +38,7 @@ public:
             PortableServer::POA_ptr poa);
 
   /// Connect to the event channel
-  void connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                ACE_ENV_ARG_DECL);
+  void connect (RtecEventChannelAdmin::EventChannel_ptr ec);
 
   /// Disconnect from the event channel
   void disconnect (void);
@@ -50,8 +49,7 @@ public:
   //@{
   /** @name The RtecEventComm::PushConsumer methods
    */
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp
index c52cf21cd5b..89c0ed4b450 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp
@@ -43,8 +43,7 @@ Control::~Control (void)
 }
 
 void
-Control::join (Federated_Test::Peer_ptr peer
-               ACE_ENV_ARG_DECL)
+Control::join (Federated_Test::Peer_ptr peer)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   {
@@ -84,8 +83,7 @@ Control::join (Federated_Test::Peer_ptr peer
         {
           if (i != j)
             {
-              this->peers_[j]->connect (this->peers_[i].in ()
-                                        ACE_ENV_ARG_PARAMETER);
+              this->peers_[j]->connect (this->peers_[i].in ());
             }
         }
     }
@@ -119,8 +117,7 @@ Control::join (Federated_Test::Peer_ptr peer
             {
               loopbacks[lcount] =
                 this->peers_[j]->setup_loopback (experiment_id,
-                                                 base_event_type
-                                                 ACE_ENV_ARG_PARAMETER);
+                                                 base_event_type);
 
               ACE_AUTO_PTR_RESET (disconnects[lcount],
                                   new Loopback_Disconnect (
@@ -131,8 +128,7 @@ Control::join (Federated_Test::Peer_ptr peer
 
               loopbacks[lcount] =
                 this->peers_[j]->setup_loopback (experiment_id,
-                                                 base_event_type + 2
-                                                 ACE_ENV_ARG_PARAMETER);
+                                                 base_event_type + 2);
 
               ACE_AUTO_PTR_RESET (disconnects[lcount],
                                   new Loopback_Disconnect (
@@ -145,8 +141,7 @@ Control::join (Federated_Test::Peer_ptr peer
 
       Federated_Test::Experiment_Results_var results =
         this->peers_[i]->run_experiment (experiment_id,
-                                         this->iterations_
-                                         ACE_ENV_ARG_PARAMETER);
+                                         this->iterations_);
 
       ACE_Sample_History history (results->length ());
       for (CORBA::ULong k = 0; k != results->length (); ++k)
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h
index 4b1428e802c..e5bc4eb52df 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h
@@ -38,8 +38,7 @@ public:
   //@{
   /** @name The Federated_Test::Control methods
    */
-  virtual void join (Federated_Test::Peer_ptr peer
-                     ACE_ENV_ARG_DECL)
+  virtual void join (Federated_Test::Peer_ptr peer)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual PortableServer::POA_ptr _default_POA (void)
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp
index 1142519068c..6657f5294fd 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp
@@ -23,11 +23,10 @@ EC_Destroyer::EC_Destroyer (RtecEventChannelAdmin::EventChannel_ptr ec)
 
 EC_Destroyer::~EC_Destroyer (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY {
+  try{
     this->ec_->destroy ();
-  } ACE_CATCH (CORBA::Exception, ex) {
+  } catch (const CORBA::Exception&) {
     // @@ TODO Log this event, check the Servant_var.cpp comments for
     // details.
-  } ACE_ENDTRY;
+  }
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.cpp
index b559160c34a..eede6b8f2fe 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.cpp
@@ -15,14 +15,13 @@
 #include "Implicit_Deactivator.inl"
 #endif /* __ACE_INLINE__ */
 
-Implicit_Deactivator::Implicit_Deactivator (PortableServer::Servant servant
-                                            ACE_ENV_ARG_DECL)
+Implicit_Deactivator::Implicit_Deactivator (PortableServer::Servant servant)
 {
   this->poa_ =
     servant->_default_POA ();
 
   this->id_ =
-    this->poa_->servant_to_id (servant ACE_ENV_ARG_PARAMETER);
+    this->poa_->servant_to_id (servant);
 }
 
 Implicit_Deactivator::Implicit_Deactivator (Implicit_Deactivator &rhs)
@@ -48,15 +47,13 @@ Implicit_Deactivator::~Implicit_Deactivator ()
   if (this->id_.ptr () == 0)
     return;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY {
-    this->poa_->deactivate_object (this->id_.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-  } ACE_CATCHANY {
+  try{
+    this->poa_->deactivate_object (this->id_.in ());
+  } catch (const CORBA::Exception&) {
     // @@ TODO This event should be logged. Cannot throw because that
     //    would make it impossible to use this class effectively.
     //    Read Servant_var.cpp for more details.
-  } ACE_ENDTRY;
+  }
 }
 
 Implicit_Deactivator&
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.h
index d7140a3275c..90fcc23b08e 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.h
@@ -23,8 +23,7 @@ public:
   /**
    * @param client The client
    */
-  explicit Implicit_Deactivator (PortableServer::Servant servant = 0
-                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  explicit Implicit_Deactivator (PortableServer::Servant servant = 0);
   Implicit_Deactivator (Implicit_Deactivator& rhs);
   Implicit_Deactivator& operator= (Implicit_Deactivator& rhs);
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp
index 04c666bc7c5..3039480f1f8 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp
@@ -18,15 +18,14 @@ Loopback::Loopback (CORBA::Long experiment_id,
                     CORBA::Long base_event_type,
                     PortableServer::POA_ptr supplier_poa,
                     PortableServer::POA_ptr consumer_poa,
-                    RtecEventChannelAdmin::EventChannel_ptr ec
-                    ACE_ENV_ARG_DECL)
+                    RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   this->loopback_pair_.init (experiment_id,
                              base_event_type,
                              supplier_poa,
                              consumer_poa);
 
-  this->loopback_pair_.connect (ec ACE_ENV_ARG_PARAMETER);
+  this->loopback_pair_.connect (ec);
 }
 
 void
@@ -35,5 +34,5 @@ Loopback::disconnect (void)
 {
   Auto_Disconnect<Loopback_Pair> disconnect (&this->loopback_pair_);
 
-  Implicit_Deactivator deactivator (this ACE_ENV_ARG_PARAMETER);
+  Implicit_Deactivator deactivator (this);
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h
index 05919f2145d..5b21092466f 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h
@@ -30,8 +30,7 @@ public:
             CORBA::Long base_event_type,
             PortableServer::POA_ptr supplier_poa,
             PortableServer::POA_ptr consumer_poa,
-            RtecEventChannelAdmin::EventChannel_ptr ec
-            ACE_ENV_ARG_DECL);
+            RtecEventChannelAdmin::EventChannel_ptr ec);
 
   //@{
   /** @name The Federated_Test::Loopback methods
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp
index c5ec117f31f..abb7b7b3b2c 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp
@@ -27,8 +27,7 @@ Loopback_Consumer (CORBA::Long experiment_id,
 }
 
 void
-Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                            ACE_ENV_ARG_DECL)
+Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
     ec->for_consumers ();
@@ -59,8 +58,7 @@ Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec
   h1.type   = this->event_type_;
 
   this->proxy_supplier_->connect_push_consumer (consumer.in (),
-                                                consumer_qos
-                                                ACE_ENV_ARG_PARAMETER);
+                                                consumer_qos);
 }
 
 void
@@ -74,23 +72,21 @@ Loopback_Consumer::disconnect (void)
     proxy = this->proxy_supplier_._retn ();
   }
 
-  Implicit_Deactivator deactivator (this
-                                    ACE_ENV_ARG_PARAMETER);
+  Implicit_Deactivator deactivator (this);
 
-  ACE_TRY
+  try
     {
       proxy->disconnect_push_supplier ();
     }
-  ACE_CATCHANY {} ACE_ENDTRY;
+  catch (const CORBA::Exception& ex){}
 }
 
 void
-Loopback_Consumer::push (const RtecEventComm::EventSet &events
-                              ACE_ENV_ARG_DECL)
+Loopback_Consumer::push (const RtecEventComm::EventSet &events)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Loopback_Consumer::push (%P|%t)\n"));
-  this->supplier_->push (events ACE_ENV_ARG_PARAMETER);
+  this->supplier_->push (events);
 }
 
 void
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h
index d35c8e79453..00295b762b7 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h
@@ -35,8 +35,7 @@ public:
                      PortableServer::POA_ptr poa);
 
   /// Connect to the event channel
-  void connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                ACE_ENV_ARG_DECL);
+  void connect (RtecEventChannelAdmin::EventChannel_ptr ec);
 
   /// Disconnect from the event channel
   void disconnect (void);
@@ -44,8 +43,7 @@ public:
   //@{
   /** @name The RtecEventComm::PushConsumer methods
    */
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp
index a68ac6883ce..cde25535480 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp
@@ -33,13 +33,12 @@ Loopback_Pair::init (CORBA::Long experiment_id,
 }
 
 void
-Loopback_Pair::connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                       ACE_ENV_ARG_DECL)
+Loopback_Pair::connect (RtecEventChannelAdmin::EventChannel_ptr ec)
 {
-  this->loopback_supplier_->connect (ec ACE_ENV_ARG_PARAMETER);
+  this->loopback_supplier_->connect (ec);
   Auto_Disconnect<Loopback_Supplier> loopback_supplier_disconnect (this->loopback_supplier_);
 
-  this->loopback_consumer_->connect (ec ACE_ENV_ARG_PARAMETER);
+  this->loopback_consumer_->connect (ec);
   Auto_Disconnect<Loopback_Consumer> loopback_consumer_disconnect (this->loopback_consumer_);
 
   loopback_consumer_disconnect.release ();
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.h
index ba586aa44c9..cb59f6178ba 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.h
@@ -53,8 +53,7 @@ public:
              PortableServer::POA_ptr consumer_poa);
 
   /// Connect to the event channel
-  void connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                ACE_ENV_ARG_DECL);
+  void connect (RtecEventChannelAdmin::EventChannel_ptr ec);
 
   /// Disconnect from the event channel
   void disconnect (void);
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp
index b16ae72c2a5..a1750d26f21 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp
@@ -24,8 +24,7 @@ Loopback_Supplier::Loopback_Supplier (CORBA::Long experiment_id,
 }
 
 void
-Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                            ACE_ENV_ARG_DECL)
+Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
     ec->for_suppliers ();
@@ -51,8 +50,7 @@ Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec
   sh0.source = this->experiment_id_;
 
   this->proxy_consumer_->connect_push_supplier (supplier.in (),
-                                                supplier_qos
-                                                ACE_ENV_ARG_PARAMETER);
+                                                supplier_qos);
 }
 
 void
@@ -66,18 +64,16 @@ Loopback_Supplier::disconnect (void)
     proxy = this->proxy_consumer_._retn ();
   }
 
-  Implicit_Deactivator deactivator (this
-                                    ACE_ENV_ARG_PARAMETER);
+  Implicit_Deactivator deactivator (this);
 
-  ACE_TRY {
+  try{
     proxy->disconnect_push_consumer ();
-  } ACE_CATCHANY {
-  } ACE_ENDTRY;
+  } catch (const CORBA::Exception&) {
+  }
 }
 
 void
-Loopback_Supplier::push (const RtecEventComm::EventSet &source
-                         ACE_ENV_ARG_DECL)
+Loopback_Supplier::push (const RtecEventComm::EventSet &source)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Loopback_Supplier pushing\n"));
@@ -108,7 +104,7 @@ Loopback_Supplier::push (const RtecEventComm::EventSet &source
       events[i].header.source = this->experiment_id_;
     }
 
-  proxy->push (events ACE_ENV_ARG_PARAMETER);
+  proxy->push (events);
 }
 
 void
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h
index 3611bf805ba..6c58a9d55f7 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h
@@ -37,14 +37,12 @@ public:
                      PortableServer::POA_ptr poa);
 
   /// Connect to the event channel
-  void connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                ACE_ENV_ARG_DECL);
+  void connect (RtecEventChannelAdmin::EventChannel_ptr ec);
 
   /// Disconnect from the event channel
   void disconnect (void);
 
-  void push (const RtecEventComm::EventSet &events
-             ACE_ENV_ARG_DECL_NOT_USED)
+  void push (const RtecEventComm::EventSet &events)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@{
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.cpp
index 234764d7780..4ca093c4c0d 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.cpp
@@ -29,8 +29,7 @@ Low_Priority_Setup (int consumer_count,
                     PortableServer::POA_ptr supplier_poa,
                     PortableServer::POA_ptr consumer_poa,
                     RtecEventChannelAdmin::EventChannel_ptr ec,
-                    ACE_Barrier *barrier
-                    ACE_ENV_ARG_DECL)
+                    ACE_Barrier *barrier)
   : consumer_count_ (consumer_count)
   , clients_ (consumer_count ? new Client_Type[consumer_count] : 0)
   , disconnect_ (consumer_count ? new Client_Auto_Disconnect[consumer_count] : 0)
@@ -57,8 +56,7 @@ Low_Priority_Setup (int consumer_count,
                               gsf,
                               supplier_poa,
                               consumer_poa);
-      this->clients_[i].connect (ec
-                                 ACE_ENV_ARG_PARAMETER);
+      this->clients_[i].connect (ec);
       // Automatically disconnect the group if the connection was
       // successful
       this->disconnect_[i] = &this->clients_[i];
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h
index e6f5315abd0..eed759944c3 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h
@@ -49,8 +49,7 @@ public:
                       PortableServer::POA_ptr supplier_poa,
                       PortableServer::POA_ptr consumer_poa,
                       RtecEventChannelAdmin::EventChannel_ptr ec,
-                      ACE_Barrier *barrier
-                      ACE_ENV_ARG_DECL);
+                      ACE_Barrier *barrier);
 
   /// Stop all running threads
   void stop_all_threads (void);
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp
index 1c546280710..65c80374a6b 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp
@@ -17,20 +17,17 @@ ACE_RCSID (TAO_PERF_RTEC,
            "$Id$")
 
 ORB_Holder::ORB_Holder (int &argc, char *argv[],
-                        const char *orb_id
-                        ACE_ENV_ARG_DECL)
-  :  orb_ (CORBA::ORB_init (argc, argv, orb_id
-                            ACE_ENV_ARG_PARAMETER))
+                        const char *orb_id)
+  :  orb_ (CORBA::ORB_init (argc, argv, orb_id))
 {
 }
 
 ORB_Holder::~ORB_Holder (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY {
+  try{
     this->orb_->destroy ();
-  } ACE_CATCH (CORBA::Exception, ex) {
+  } catch (const CORBA::Exception&) {
     // @@ TODO Log this event, check the Servant_var.cpp comments for
     // details.
-  } ACE_ENDTRY;
+  }
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.h
index a600f780980..fd3fc10c0f4 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.h
@@ -27,8 +27,7 @@ class TAO_RTEC_Perf_Export ORB_Holder
 public:
   /// Constructor
   ORB_Holder (int &argc, char *argv[],
-              const char *orb_id = 0
-              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+              const char *orb_id = 0);
 
   /// Destructor
   /**
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.inl
index 50b1d374110..ebdebfbd61a 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.inl
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.inl
@@ -11,12 +11,9 @@
 ACE_INLINE void
 ORB_Shutdown::operator () (CORBA::ORB_ptr orb)
 {
-  ACE_DECLARE_NEW_ENV;
-  ACE_TRY
+  try
     {
-      orb->shutdown (0
-                     ACE_ENV_ARG_PARAMETER);
+      orb->shutdown (0);
     }
-  ACE_CATCHANY { };
-  ACE_ENDTRY;
+  catch (const CORBA::Exception& ex){ };
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp
index ce73357a916..85fcf3b641e 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp
@@ -24,15 +24,13 @@ ORB_Task::ORB_Task (CORBA::ORB_ptr orb)
 int
 ORB_Task::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       this->orb_->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp
index 5eb74cd2775..d4e996064cd 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp
@@ -20,9 +20,8 @@ ORB_Task_Activator::~ORB_Task_Activator (void)
 {
   if (this->task_ == 0)
     return;
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY {
-    (*this->task_)->shutdown (0 ACE_ENV_ARG_PARAMETER);
-  } ACE_CATCHANY {
-  } ACE_ENDTRY;
+  try{
+    (*this->task_)->shutdown (0);
+  } catch (const CORBA::Exception&) {
+  }
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp
index aa7265da3ff..c4bb55f0347 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp
@@ -23,30 +23,25 @@ ACE_RCSID (TAO_RTEC_Perf,
            "$Id$")
 
 Peer_Base::Peer_Base (CORBA::ORB_ptr orb,
-                      RTServer_Setup &rtserver_setup
-                      ACE_ENV_ARG_DECL)
+                      RTServer_Setup &rtserver_setup)
   : orb_ (CORBA::ORB::_duplicate (orb))
   , poa_ (rtserver_setup.poa ())
 {
   Servant_var<TAO_EC_Event_Channel> ec_impl (
       RTEC_Initializer::create (this->poa_.in (),
                                 this->poa_.in (),
-                                rtserver_setup.rtcorba_setup ()
-                                ACE_ENV_ARG_PARAMETER)
+                                rtserver_setup.rtcorba_setup ())
       );
 
   ec_impl->activate ();
 
   PortableServer::ObjectId_var ec_id =
-    this->poa_->activate_object (ec_impl.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+    this->poa_->activate_object (ec_impl.in ());
   CORBA::Object_var ec_object =
-    this->poa_->id_to_reference (ec_id.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+    this->poa_->id_to_reference (ec_id.in ());
 
   this->event_channel_ =
-    RtecEventChannelAdmin::EventChannel::_narrow (ec_object.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
+    RtecEventChannelAdmin::EventChannel::_narrow (ec_object.in ());
 }
 
 Peer_Base::~Peer_Base (void)
@@ -63,7 +58,7 @@ Peer_Base::shutdown (void)
       RtecEventChannelAdmin::EventChannel::_nil ();
   }
 
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 CORBA::Object_ptr
@@ -74,8 +69,7 @@ Peer_Base::channel (void)
 }
 
 void
-Peer_Base::connect (Federated_Test::Peer_ptr remote_peer
-                    ACE_ENV_ARG_DECL)
+Peer_Base::connect (Federated_Test::Peer_ptr remote_peer)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Connecting....\n"));
@@ -83,28 +77,24 @@ Peer_Base::connect (Federated_Test::Peer_ptr remote_peer
     remote_peer->channel ();
 
   RtecEventChannelAdmin::EventChannel_var remote_ec =
-    RtecEventChannelAdmin::EventChannel::_narrow (remote_ec_object.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
+    RtecEventChannelAdmin::EventChannel::_narrow (remote_ec_object.in ());
 
   Servant_var<TAO_EC_Gateway_IIOP> gateway (new TAO_EC_Gateway_IIOP);
   gateway->init (remote_ec.in (),
-                 this->event_channel_.in ()
-                 ACE_ENV_ARG_PARAMETER);
+                 this->event_channel_.in ());
 
   RtecEventChannelAdmin::Observer_var observer =
     gateway->_this ();
 
   RtecEventChannelAdmin::Observer_Handle h =
-    this->event_channel_->append_observer (observer.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+    this->event_channel_->append_observer (observer.in ());
 
   gateway->observer_handle (h);
 }
 
 Federated_Test::Loopback_ptr
 Peer_Base::setup_loopback (CORBA::Long experiment_id,
-                           CORBA::Long base_event_type
-                           ACE_ENV_ARG_DECL)
+                           CORBA::Long base_event_type)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Servant_var<Loopback> loopback (
@@ -112,8 +102,7 @@ Peer_Base::setup_loopback (CORBA::Long experiment_id,
                     base_event_type,
                     this->poa_.in (),
                     this->poa_.in (),
-                    this->event_channel_.in ()
-                    ACE_ENV_ARG_PARAMETER));
+                    this->event_channel_.in ()));
 
   Auto_Disconnect<Loopback> disconnect (loopback);
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h
index bc81d6c255a..caecbbfefa9 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h
@@ -32,8 +32,7 @@ class TAO_RTEC_Perf_Export Peer_Base
 public:
   /// Constructor
   Peer_Base (CORBA::ORB_ptr orb,
-             RTServer_Setup &rtserver_setup
-             ACE_ENV_ARG_DECL);
+             RTServer_Setup &rtserver_setup);
 
   /// Destructor
   virtual ~Peer_Base (void);
@@ -48,13 +47,11 @@ public:
       channel (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void connect (Federated_Test::Peer_ptr remote_peer
-                        ACE_ENV_ARG_DECL_NOT_USED)
+  virtual void connect (Federated_Test::Peer_ptr remote_peer)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   Federated_Test::Loopback_ptr setup_loopback (CORBA::Long experiment_id,
-                                               CORBA::Long base_event_type
-                                               ACE_ENV_ARG_DECL_NOT_USED)
+                                               CORBA::Long base_event_type)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   PortableServer::POA_ptr _default_POA (void)
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp
index 196ab2d93ac..a6c00e9751d 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp
@@ -19,18 +19,15 @@ ACE_RCSID (TAO_PERF_RTEC,
            "$Id$")
 
 PriorityBand_Setup::PriorityBand_Setup (CORBA::ORB_ptr orb,
-                                        const RTCORBA_Setup &rtcorba_setup
-                                        ACE_ENV_ARG_DECL)
+                                        const RTCORBA_Setup &rtcorba_setup)
 {
   CORBA::PolicyManager_var policy_manager =
     RIR_Narrow<CORBA::PolicyManager>::resolve (orb,
-                                               "ORBPolicyManager"
-                                               ACE_ENV_ARG_PARAMETER);
+                                               "ORBPolicyManager");
 
   RTCORBA::RTORB_var rtorb =
     RIR_Narrow<RTCORBA::RTORB>::resolve (orb,
-                                         "RTORB"
-                                         ACE_ENV_ARG_PARAMETER);
+                                         "RTORB");
 
   const RTCORBA::ThreadpoolLanes &lanes = rtcorba_setup.lanes ();
 
@@ -44,11 +41,9 @@ PriorityBand_Setup::PriorityBand_Setup (CORBA::ORB_ptr orb,
   CORBA::PolicyList policy_list (1); policy_list.length (1);
 
   policy_list[0] =
-    rtorb->create_priority_banded_connection_policy (priority_bands
-                                                     ACE_ENV_ARG_PARAMETER);
+    rtorb->create_priority_banded_connection_policy (priority_bands);
   policy_manager->set_policy_overrides (policy_list,
-                                        CORBA::ADD_OVERRIDE
-                                        ACE_ENV_ARG_PARAMETER);
+                                        CORBA::ADD_OVERRIDE);
 
   policy_list[0]->destroy ();
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.h
index 33cebd601cf..30b7b0dac84 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.h
@@ -29,8 +29,7 @@ class TAO_RTEC_Perf_Export PriorityBand_Setup
 public:
   /// Constructor
   PriorityBand_Setup (CORBA::ORB_ptr orb,
-                      const RTCORBA_Setup &rtcorba_setup
-                      ACE_ENV_ARG_DECL);
+                      const RTCORBA_Setup &rtcorba_setup);
 
   /// Destructor
   /**
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp
index 57a0f32e6ff..165b1b1dc5d 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp
@@ -17,18 +17,16 @@
 
 template<class Interface> ACE_TYPENAME RIR_Narrow<Interface>::Interface_ptr
 RIR_Narrow<Interface>::resolve (CORBA::ORB_ptr orb,
-                                const char *object_id
-                                ACE_ENV_ARG_DECL)
+                                const char *object_id)
 {
   Interface_var interface;
 
-  ACE_TRY
+  try
     {
       CORBA::Object_var object =
-        orb->resolve_initial_references (object_id
-                                         ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references (object_id);
 
-      interface = Interface::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+      interface = Interface::_narrow (object.in ());
 
       if (CORBA::is_nil (interface.in ()))
         {
@@ -37,10 +35,9 @@ RIR_Narrow<Interface>::resolve (CORBA::ORB_ptr orb,
                       object_id));
           ACE_OS::exit (1);
         }
-    }ACE_CATCHANY{
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Caught an exception \n");
+    } catch (const CORBA::Exception& ex) {
+      ex._tao_print_exception ("Caught an exception \n");
     }
-  ACE_ENDTRY;
   return interface._retn ();
 }
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.h
index ae3d9351f7b..2e22caccb82 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.h
@@ -28,8 +28,7 @@ public:
   typedef typename Interface::_var_type Interface_var;
 
   static Interface_ptr resolve (CORBA::ORB_ptr orb,
-                                const char *object_id
-                                ACE_ENV_ARG_DECL);
+                                const char *object_id);
 };
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.cpp
index 4b08ed77d4c..6c49ea4b684 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.cpp
@@ -22,41 +22,34 @@ ACE_RCSID (TAO_PERF_RTEC,
 
 RTCORBA_Setup::RTCORBA_Setup (CORBA::ORB_ptr orb,
                               const RT_Class &rtclass,
-                              int nthreads
-                              ACE_ENV_ARG_DECL)
+                              int nthreads)
   :  lanes_ (3)
 {
   this->priority_mapping_manager_ =
     RIR_Narrow<RTCORBA::PriorityMappingManager>::resolve (orb,
-                                                          "PriorityMappingManager"
-                                                          ACE_ENV_ARG_PARAMETER);
+                                                          "PriorityMappingManager");
 
   this->priority_mapping_ =
     this->priority_mapping_manager_->mapping ();
 
   RTCORBA::Current_var current =
     RIR_Narrow<RTCORBA::Current>::resolve (orb,
-                                           "RTCurrent"
-                                           ACE_ENV_ARG_PARAMETER);
+                                           "RTCurrent");
 
   RTCORBA::Priority corba_prc_priority;
   this->priority_mapping_->to_CORBA (rtclass.priority_process (),
                                      corba_prc_priority);
 
-  current->the_priority (corba_prc_priority
-                         ACE_ENV_ARG_PARAMETER);
+  current->the_priority (corba_prc_priority);
 
   this->lanes_.length (3);
 
   this->setup_lane (rtclass.priority_high (),
-                    this->lanes_[0]
-                    ACE_ENV_ARG_PARAMETER);
+                    this->lanes_[0]);
   this->setup_lane (rtclass.priority_process (),
-                    this->lanes_[1]
-                    ACE_ENV_ARG_PARAMETER);
+                    this->lanes_[1]);
   this->setup_lane (rtclass.priority_low (),
-                    this->lanes_[2]
-                    ACE_ENV_ARG_PARAMETER);
+                    this->lanes_[2]);
   this->lanes_[2].static_threads = nthreads;
 
   this->process_priority_ = this->lanes_[1].lane_priority;
@@ -64,12 +57,11 @@ RTCORBA_Setup::RTCORBA_Setup (CORBA::ORB_ptr orb,
 
 void
 RTCORBA_Setup::setup_lane (int priority,
-                           RTCORBA::ThreadpoolLane &lane
-			   ACE_ENV_ARG_DECL)
+                           RTCORBA::ThreadpoolLane &lane)
 {
   if (!this->priority_mapping_->to_CORBA (priority,
                                           lane.lane_priority))
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   lane.static_threads  = 1;
   lane.dynamic_threads = 0;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.h
index 96f7c487daf..b2d1744ea09 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.h
@@ -32,8 +32,7 @@ public:
   /// Constructor
   RTCORBA_Setup (CORBA::ORB_ptr orb,
                  const RT_Class &rtclass,
-                 int nthreads
-                 ACE_ENV_ARG_DECL);
+                 int nthreads);
 
   /// Return the thread pool lanes appropriate for the benchamrks
   const RTCORBA::ThreadpoolLanes & lanes (void) const;
@@ -43,7 +42,7 @@ public:
 
 private:
   void setup_lane (int priority, RTCORBA::ThreadpoolLane &lane
-		  ACE_ENV_ARG_DECL_WITH_DEFAULTS );
+ );
 
 private:
   RTCORBA::PriorityMappingManager_var priority_mapping_manager_;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp
index e67964e0482..a9bc97712f4 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp
@@ -23,10 +23,9 @@ ACE_RCSID (TAO_PERF_RTEC,
 RTClient_Setup::RTClient_Setup (int use_rt_corba,
                                 CORBA::ORB_ptr orb,
                                 const RT_Class &rt_class,
-                                int nthreads
-                                ACE_ENV_ARG_DECL)
+                                int nthreads)
   : use_rt_corba_ (use_rt_corba)
-  , syncscope_setup_ (orb ACE_ENV_ARG_PARAMETER)
+  , syncscope_setup_ (orb)
 {
 
   if (use_rt_corba)
@@ -34,16 +33,14 @@ RTClient_Setup::RTClient_Setup (int use_rt_corba,
       ACE_AUTO_PTR_RESET (this->rtcorba_setup_,
                           new RTCORBA_Setup (orb,
                                              rt_class,
-                                             nthreads
-                                             ACE_ENV_ARG_PARAMETER),
+                                             nthreads),
                           RTCORBA_Setup
                          );
 
 #if 0
       ACE_AUTO_PTR_RESET (this->priorityband_setup_,
                           new PriorityBand_Setup (orb,
-                                                  *this->rtcorba_setup_
-                                                  ACE_ENV_ARG_PARAMETER),
+                                                  *this->rtcorba_setup_),
                           PriorityBand_Setup
                          );
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h
index 8bea1503961..8a979ba7641 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h
@@ -34,8 +34,7 @@ public:
   RTClient_Setup (int use_rt_corba,
                   CORBA::ORB_ptr orb,
                   const RT_Class &rt_class,
-                  int nthreads
-                  ACE_ENV_ARG_DECL);
+                  int nthreads);
 
   /// Return non-zero if RTCORBA is enabled
   int use_rt_corba (void) const;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp
index 408b52b3557..6b843e524bf 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp
@@ -15,15 +15,14 @@
 
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID (TAO_PERF_RTEC, 
-           RTEC_Initializer, 
+ACE_RCSID (TAO_PERF_RTEC,
+           RTEC_Initializer,
            "$Id$")
 
 TAO_EC_Event_Channel *
 RTEC_Initializer::create (PortableServer::POA_ptr consumer_poa,
                           PortableServer::POA_ptr supplier_poa,
-                          RTCORBA_Setup * rtcorba_setup
-                          ACE_ENV_ARG_DECL_NOT_USED)
+                          RTCORBA_Setup * rtcorba_setup)
 {
   TAO_EC_Event_Channel_Attributes attr (consumer_poa,
                                         supplier_poa);
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.h
index 64645bcbf18..e4cea937e39 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.h
@@ -37,8 +37,7 @@ public:
   /// Return a new event channel
   static TAO_EC_Event_Channel *create (PortableServer::POA_ptr consumer_poa,
                                        PortableServer::POA_ptr supplier_poa,
-                                       RTCORBA_Setup *rtcorba_setup
-                                       ACE_ENV_ARG_DECL);
+                                       RTCORBA_Setup *rtcorba_setup);
 };
 
 #endif /* TAO_PERF_RTEC_RTEC_INITIALIZER_H */
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp
index da8163160b6..985b07682cf 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp
@@ -22,18 +22,15 @@ ACE_RCSID (TAO_PERF_RTEC,
            "$Id$")
 
 RTPOA_Setup::RTPOA_Setup (CORBA::ORB_ptr orb,
-                          const RTCORBA_Setup &rtcorba_setup
-                          ACE_ENV_ARG_DECL)
+                          const RTCORBA_Setup &rtcorba_setup)
 {
   RTPortableServer::POA_var root_poa =
     RIR_Narrow<RTPortableServer::POA>::resolve (orb,
-                                                "RootPOA"
-                                                ACE_ENV_ARG_PARAMETER);
+                                                "RootPOA");
 
   RTCORBA::RTORB_var rtorb =
     RIR_Narrow<RTCORBA::RTORB>::resolve (orb,
-                                         "RTORB"
-                                         ACE_ENV_ARG_PARAMETER);
+                                         "RTORB");
 
   const CORBA::ULong stacksize = 1024 * 1024; // 1 Mb
   const RTCORBA::ThreadpoolLanes &lanes = rtcorba_setup.lanes ();
@@ -48,30 +45,25 @@ RTPOA_Setup::RTPOA_Setup (CORBA::ORB_ptr orb,
                                          allow_borrowing,
                                          allow_request_buffering,
                                          max_buffered_requests,
-                                         max_request_buffer_size
-                                         ACE_ENV_ARG_PARAMETER);
+                                         max_request_buffer_size);
 
   // @@ We need an 'auto_ptr for thread pools' here!
   CORBA::PolicyList policies (4); policies.length (4);
   policies[0] =
     rtorb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
-                                         rtcorba_setup.process_priority ()
-                                         ACE_ENV_ARG_PARAMETER);
+                                         rtcorba_setup.process_priority ());
 
   policies[1] =
-    root_poa->create_id_assignment_policy (PortableServer::SYSTEM_ID
-                                           ACE_ENV_ARG_PARAMETER);
+    root_poa->create_id_assignment_policy (PortableServer::SYSTEM_ID);
 
   policies[2] =
-    root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
-                                                 ACE_ENV_ARG_PARAMETER);
+    root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION);
 
 #if 0
   policies.length (3);
 #else
   policies[3] =
-    rtorb->create_threadpool_policy (pool_id
-                                     ACE_ENV_ARG_PARAMETER);
+    rtorb->create_threadpool_policy (pool_id);
 #endif /* 0 */
 
   PortableServer::POAManager_var poa_manager =
@@ -80,8 +72,7 @@ RTPOA_Setup::RTPOA_Setup (CORBA::ORB_ptr orb,
   this->poa_ =
     root_poa->create_POA ("RTEC_Perf",
                           poa_manager.in (),
-                          policies
-                          ACE_ENV_ARG_PARAMETER);
+                          policies);
 
   for (CORBA::ULong i = 0; i != policies.length (); ++i)
     {
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.h
index dc3d19f0054..c69fd19dd0f 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.h
@@ -29,8 +29,7 @@ class TAO_RTEC_Perf_Export RTPOA_Setup
 public:
   /// Constructor
   RTPOA_Setup (CORBA::ORB_ptr orb,
-               const RTCORBA_Setup &rtcorba_setup
-               ACE_ENV_ARG_DECL);
+               const RTCORBA_Setup &rtcorba_setup);
 
   PortableServer::POA_ptr poa (void);
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp
index 0bd232c2feb..1ea7d0eee78 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp
@@ -23,21 +23,18 @@ ACE_RCSID (TAO_PERF_RTEC,
 RTServer_Setup::RTServer_Setup (int use_rt_corba,
                                 CORBA::ORB_ptr orb,
                                 const RT_Class &rt_class,
-                                int nthreads
-                                ACE_ENV_ARG_DECL)
+                                int nthreads)
   : RTClient_Setup (use_rt_corba,
                     orb,
                     rt_class,
-                    nthreads
-                    ACE_ENV_ARG_PARAMETER)
+                    nthreads)
 {
 
   if (use_rt_corba)
     {
       ACE_AUTO_PTR_RESET (this->rtpoa_setup_,
                           new RTPOA_Setup (orb,
-                                           *this->rtcorba_setup ()
-                                           ACE_ENV_ARG_PARAMETER),
+                                           *this->rtcorba_setup ()),
                           RTPOA_Setup
                          );
 
@@ -48,7 +45,6 @@ RTServer_Setup::RTServer_Setup (int use_rt_corba,
     {
       this->poa_ =
         RIR_Narrow<RTPortableServer::POA>::resolve (orb,
-                                                    "RootPOA"
-                                                    ACE_ENV_ARG_PARAMETER);
+                                                    "RootPOA");
     }
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.h
index eecc21ec6f8..2974d97d4eb 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.h
@@ -30,8 +30,7 @@ public:
   RTServer_Setup (int use_rt_corba,
                   CORBA::ORB_ptr orb,
                   const RT_Class &rt_class,
-                  int nthreads
-                  ACE_ENV_ARG_DECL);
+                  int nthreads);
 
   /// Return the POA configured by the RTPOA_Setup
   PortableServer::POA_ptr poa (void);
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp
index 5c294a3bdb7..ef58db60e53 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp
@@ -87,7 +87,6 @@ Send_Task::svc (void)
   event[0].header.source = this->event_source_;
   event[0].header.ttl    = 1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
   for (int i = start_i; i != this->iterations_; ++i)
     {
       if ((i + 1) % 1000 == 0)
@@ -111,17 +110,15 @@ Send_Task::svc (void)
       ACE_hrtime_t creation = ACE_OS::gethrtime ();
       ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time,
                                      creation);
-      ACE_TRY
+      try
         {
           // push one event...
-          this->supplier_->push (event ACE_ENV_ARG_PARAMETER);
+          this->supplier_->push (event);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Caught exception:");
+          ex._tao_print_exception ("Caught exception:");
         }
-      ACE_ENDTRY;
     }
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) - Thread finished\n"));
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Servant_var.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Servant_var.cpp
index 0f5f58f6cd6..9bdb1f6391f 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Servant_var.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Servant_var.cpp
@@ -22,10 +22,9 @@ Servant_var<SERVANT>::~Servant_var ()
   if (this->ptr_ == 0)
     return;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY {
+  try{
     this->ptr_->_remove_ref ();
-  } ACE_CATCHANY {
+  } catch (const CORBA::Exception&) {
     // @@ TODO This event should be logged. Cannot throw because that
     //    would make it impossible to use this class effectively.
     //
@@ -51,7 +50,7 @@ Servant_var<SERVANT>::~Servant_var ()
     // particular implementation, and provides a light-weight,
     // high-performance solution for applications that want to avoid
     // logging.
-  } ACE_ENDTRY;
+  }
 }
 
 #endif /* TAO_PERF_RTEC_SERVANT_VAR_CPP */
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Shutdown.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/Shutdown.inl
index 45b3b310c67..0674d4d85c3 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Shutdown.inl
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Shutdown.inl
@@ -9,11 +9,9 @@
 template<class Client> ACE_INLINE void
 Shutdown<Client>::operator () (Client *client)
 {
-  ACE_DECLARE_NEW_ENV;
-  ACE_TRY
+  try
     {
       client->shutdown ();
     }
-  ACE_CATCHANY { };
-  ACE_ENDTRY;
+  catch (const CORBA::Exception& ex){ };
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp
index 1964145efac..a88127b62bb 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp
@@ -25,8 +25,7 @@ Supplier::Supplier (CORBA::Long experiment_id,
 }
 
 void
-Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                   ACE_ENV_ARG_DECL)
+Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
     ec->for_suppliers ();
@@ -55,8 +54,7 @@ Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec
     }
 
   this->proxy_consumer_->connect_push_supplier (supplier.in (),
-                                                supplier_qos
-                                                ACE_ENV_ARG_PARAMETER);
+                                                supplier_qos);
 }
 
 void
@@ -70,19 +68,17 @@ Supplier::disconnect (void)
     proxy = this->proxy_consumer_._retn ();
   }
 
-  Implicit_Deactivator deactivator (this
-                                    ACE_ENV_ARG_PARAMETER);
+  Implicit_Deactivator deactivator (this);
 
-  ACE_TRY
+  try
     {
       proxy->disconnect_push_consumer ();
     }
-  ACE_CATCHANY {} ACE_ENDTRY;
+  catch (const CORBA::Exception& ex){}
 }
 
 void
-Supplier::push (const RtecEventComm::EventSet &events
-                     ACE_ENV_ARG_DECL)
+Supplier::push (const RtecEventComm::EventSet &events)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Supplier pushing (%d,%d)\n",
@@ -95,7 +91,7 @@ Supplier::push (const RtecEventComm::EventSet &events
     proxy = this->proxy_consumer_;
   }
 
-  proxy->push (events ACE_ENV_ARG_PARAMETER);
+  proxy->push (events);
 }
 
 void
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h
index 3dc90af4fc0..b164fd51e46 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h
@@ -38,14 +38,12 @@ public:
             PortableServer::POA_ptr poa);
 
   /// Connect to the event channel
-  void connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                ACE_ENV_ARG_DECL);
+  void connect (RtecEventChannelAdmin::EventChannel_ptr ec);
 
   /// Disconnect from the event channel
   void disconnect (void);
 
-  void push (const RtecEventComm::EventSet &events
-             ACE_ENV_ARG_DECL_NOT_USED)
+  void push (const RtecEventComm::EventSet &events)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@{
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp
index ef94e88f1b4..7ef6f47af0b 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp
@@ -19,29 +19,23 @@ ACE_RCSID (TAO_PERF_RTEC,
            "$Id$")
 
 SyncScope_Setup::SyncScope_Setup (CORBA::ORB_ptr orb,
-                                  Messaging::SyncScope value
-                                  ACE_ENV_ARG_DECL)
+                                  Messaging::SyncScope value)
 {
-  this->init (orb, value
-              ACE_ENV_ARG_PARAMETER);
+  this->init (orb, value);
 }
 
-SyncScope_Setup::SyncScope_Setup (CORBA::ORB_ptr orb
-                                  ACE_ENV_ARG_DECL)
+SyncScope_Setup::SyncScope_Setup (CORBA::ORB_ptr orb)
 {
-  this->init (orb, Messaging::SYNC_WITH_TARGET
-              ACE_ENV_ARG_PARAMETER);
+  this->init (orb, Messaging::SYNC_WITH_TARGET);
 }
 
 void
 SyncScope_Setup::init (CORBA::ORB_ptr orb,
-                       Messaging::SyncScope value
-                       ACE_ENV_ARG_DECL)
+                       Messaging::SyncScope value)
 {
   CORBA::PolicyManager_var policy_manager =
     RIR_Narrow<CORBA::PolicyManager>::resolve (orb,
-                                               "ORBPolicyManager"
-                                               ACE_ENV_ARG_PARAMETER);
+                                               "ORBPolicyManager");
 
   CORBA::PolicyList policy_list (1);
   policy_list.length (1);
@@ -53,11 +47,9 @@ SyncScope_Setup::init (CORBA::ORB_ptr orb,
   //    destroy() method on each policy...
   policy_list[0] =
     orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                        sync_scope
-                        ACE_ENV_ARG_PARAMETER);
+                        sync_scope);
   policy_manager->set_policy_overrides (policy_list,
-                                        CORBA::ADD_OVERRIDE
-                                        ACE_ENV_ARG_PARAMETER);
+                                        CORBA::ADD_OVERRIDE);
 
   policy_list[0]->destroy ();
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.h
index 9de943cc419..8904acd140e 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.h
@@ -26,12 +26,10 @@ class TAO_RTEC_Perf_Export SyncScope_Setup
 {
 public:
   /// Constructor
-  SyncScope_Setup (CORBA::ORB_ptr orb
-                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  SyncScope_Setup (CORBA::ORB_ptr orb);
 
   SyncScope_Setup (CORBA::ORB_ptr orb,
-                   Messaging::SyncScope value
-                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                   Messaging::SyncScope value);
 
   /// Destructor
   /**
@@ -42,8 +40,7 @@ public:
 private:
   /// Implement the shared code between both constructors
   void init (CORBA::ORB_ptr orb,
-             Messaging::SyncScope value
-             ACE_ENV_ARG_DECL);
+             Messaging::SyncScope value);
 };
 
 #if defined(__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
index c82b13dfd65..89493ff49ee 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
@@ -143,8 +143,7 @@ Connection_Manager::init (CORBA::ORB_ptr orb)
 
 void
 Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
-                                       AVStreams::MMDevice_ptr sender
-                                       ACE_ENV_ARG_DECL)
+                                       AVStreams::MMDevice_ptr sender)
 {
   this->sender_name_ =
     sender_name;
@@ -157,15 +156,14 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
   CosNaming::Name name (1);
   name.length (1);
 
-  ACE_TRY
+  try
     {
       // Try binding the sender context in the NS
       name [0].id =
         CORBA::string_dup (this->sender_name_.c_str ());
 
       this->sender_context_ =
-        this->naming_client_->bind_new_context (name
-                                                ACE_ENV_ARG_PARAMETER);
+        this->naming_client_->bind_new_context (name);
 
       //
       // We reach here if there was no exception raised in
@@ -178,10 +176,9 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
 
       // Try binding the receivers context under the sender context.
       this->receiver_context_ =
-        this->sender_context_->bind_new_context (name
-                                                 ACE_ENV_ARG_PARAMETER);
+        this->sender_context_->bind_new_context (name);
     }
-  ACE_CATCH (CosNaming::NamingContext::AlreadyBound, al_ex)
+  catch (const CosNaming::NamingContext::AlreadyBound& al_ex)
     {
       //
       // The sender context already exists, probably created by the
@@ -193,8 +190,7 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
         CORBA::string_dup (this->sender_name_.c_str ());
 
       CORBA::Object_var object =
-        this->naming_client_->resolve (name
-                                       ACE_ENV_ARG_PARAMETER);
+        this->naming_client_->resolve (name);
 
       this->sender_context_ =
         CosNaming::NamingContext::_narrow (object.in ());
@@ -204,23 +200,20 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
         CORBA::string_dup ("Receivers");
 
       object =
-        this->sender_context_->resolve (name
-                                        ACE_ENV_ARG_PARAMETER);
+        this->sender_context_->resolve (name);
 
       this->receiver_context_ =
         CosNaming::NamingContext::_narrow (object.in ());
 
       this->find_receivers ();
     }
-  ACE_ENDTRY;
 
   name [0].id =
     CORBA::string_dup (this->sender_name_.c_str ());
 
   // Register the sender object with the sender context.
   this->sender_context_->rebind (name,
-                                 sender
-                                 ACE_ENV_ARG_PARAMETER);
+                                 sender);
 }
 
 void
@@ -233,12 +226,10 @@ Connection_Manager::find_receivers (void)
   // Get the list of receivers registered for this sender.
   this->receiver_context_->list (chunk,
                                  binding_list,
-                                 iterator
-                                 ACE_ENV_ARG_PARAMETER);
+                                 iterator);
 
   // Add the receivers found in the bindinglist to the <receivers>.
-  this->add_to_receivers (binding_list
-                          ACE_ENV_ARG_PARAMETER);
+  this->add_to_receivers (binding_list);
 
   if (!CORBA::is_nil (iterator.in ()))
     {
@@ -248,18 +239,15 @@ Connection_Manager::find_receivers (void)
       while (more)
         {
           more = iterator->next_n (chunk,
-                                   binding_list
-                                   ACE_ENV_ARG_PARAMETER);
+                                   binding_list);
 
-          this->add_to_receivers (binding_list
-                                  ACE_ENV_ARG_PARAMETER);
+          this->add_to_receivers (binding_list);
         }
     }
 }
 
 void
-Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list
-                                      ACE_ENV_ARG_DECL)
+Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list)
 {
   for (CORBA::ULong i = 0;
        i < binding_list.length ();
@@ -277,8 +265,7 @@ Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list
       // Resolve the reference of the receiver from the receiver
       // context.
       CORBA::Object_var obj =
-        this->receiver_context_->resolve (name
-                                          ACE_ENV_ARG_PARAMETER);
+        this->receiver_context_->resolve (name);
 
       AVStreams::MMDevice_var receiver_device =
         AVStreams::MMDevice::_narrow (obj.in ());
@@ -294,8 +281,7 @@ Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list
 }
 
 void
-Connection_Manager::connect_to_receivers (AVStreams::MMDevice_ptr sender
-					  ACE_ENV_ARG_DECL)
+Connection_Manager::connect_to_receivers (AVStreams::MMDevice_ptr sender)
 {
   // Connect to all receivers that we know about.
   for (Receivers::iterator iterator = this->receivers_.begin ();
@@ -376,16 +362,14 @@ Connection_Manager::connect_to_receivers (AVStreams::MMDevice_ptr sender
       (void) streamctrl->bind_devs (sender,
                                     (*iterator).int_id_.in (),
                                     the_qos.inout (),
-                                    flow_spec
-                                    ACE_ENV_ARG_PARAMETER);
+                                    flow_spec);
     }
 }
 
 void
 Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
                                     const ACE_CString &receiver_name,
-                                    AVStreams::MMDevice_ptr receiver
-                                    ACE_ENV_ARG_DECL)
+                                    AVStreams::MMDevice_ptr receiver)
 {
   this->sender_name_ =
     sender_name;
@@ -401,15 +385,14 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
 
   int sender_context_exists = 0;
 
-  ACE_TRY
+  try
     {
       // Try binding the sender context in the NS
       name [0].id =
         CORBA::string_dup (this->sender_name_.c_str ());
 
       CORBA::Object_var object =
-        this->naming_client_->resolve (name
-                                       ACE_ENV_ARG_PARAMETER);
+        this->naming_client_->resolve (name);
 
       //
       // We reach here if there was no exception raised in <resolve>.
@@ -425,31 +408,27 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
 
       // Find the receivers context under the sender's context
       object =
-        this->sender_context_->resolve (name
-                                        ACE_ENV_ARG_PARAMETER);
+        this->sender_context_->resolve (name);
 
       this->receiver_context_ =
         CosNaming::NamingContext::_narrow (object.in ());
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, al_ex)
+  catch (const CosNaming::NamingContext::NotFound& al_ex)
     {
       name [0].id =
         CORBA::string_dup (this->sender_name_.c_str ());
 
       // Create the sender context
       this->sender_context_ =
-        this->naming_client_->bind_new_context (name
-                                                ACE_ENV_ARG_PARAMETER);
+        this->naming_client_->bind_new_context (name);
 
       name [0].id =
         CORBA::string_dup ("Receivers");
 
       // Create the receivers context under the sender's context
       this->receiver_context_ =
-        this->sender_context_->bind_new_context (name
-                                                 ACE_ENV_ARG_PARAMETER);
+        this->sender_context_->bind_new_context (name);
     }
-  ACE_ENDTRY;
 
   //
   // At this point we either have resolved the receiver context or we
@@ -460,8 +439,7 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
 
   // Register this receiver object under the receiver context.
   this->receiver_context_->rebind (name,
-                                   receiver
-                                   ACE_ENV_ARG_PARAMETER);
+                                   receiver);
 
   //
   // Check if the sender was registered.  Note that if we created the
@@ -469,26 +447,22 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
   //
   if (sender_context_exists)
     {
-      ACE_TRY_EX(SENDER_CONTEXT_EXISTS)
+      try
         {
           // Try binding the sender under the sender context
           name [0].id =
             CORBA::string_dup (this->sender_name_.c_str ());
 
           CORBA::Object_var object =
-            this->sender_context_->resolve (name
-                                            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX(SENDER_CONTEXT_EXISTS);
+            this->sender_context_->resolve (name);
 
           this->sender_ =
-            AVStreams::MMDevice::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX(SENDER_CONTEXT_EXISTS);
+            AVStreams::MMDevice::_narrow (object.in ());
         }
-      ACE_CATCH (CosNaming::NamingContext::NotFound, al_ex)
+      catch (const CosNaming::NamingContext::NotFound& al_ex)
         {
           // No problem if the sender was not there.
         }
-      ACE_ENDTRY;
     }
 }
 
@@ -575,8 +549,7 @@ Connection_Manager::connect_to_sender (void)
     streamctrl->bind_devs (this->sender_.in (),
                            this->receiver_.in (),
                            the_qos.inout (),
-                           flow_spec
-                           ACE_ENV_ARG_PARAMETER);
+                           flow_spec);
 
   if (result == 0)
     ACE_ERROR ((LM_ERROR,
@@ -584,19 +557,16 @@ Connection_Manager::connect_to_sender (void)
 
   // Start the data sending.
   AVStreams::flowSpec start_spec;
-  streamctrl->start (start_spec
-                     ACE_ENV_ARG_PARAMETER);
+  streamctrl->start (start_spec);
 }
 
 void
 Connection_Manager::add_streamctrl (const ACE_CString &flowname,
-                                    TAO_StreamEndPoint *endpoint
-                                    ACE_ENV_ARG_DECL)
+                                    TAO_StreamEndPoint *endpoint)
 {
   // Get the stream controller for this endpoint.
   CORBA::Any_var streamctrl_any =
-    endpoint->get_property_value ("Related_StreamCtrl"
-                                  ACE_ENV_ARG_PARAMETER);
+    endpoint->get_property_value ("Related_StreamCtrl");
 
   AVStreams::StreamCtrl_ptr streamctrl;
 
@@ -610,8 +580,7 @@ Connection_Manager::add_streamctrl (const ACE_CString &flowname,
 }
 
 void
-Connection_Manager::destroy (const ACE_CString &flowname
-                             ACE_ENV_ARG_DECL_NOT_USED)
+Connection_Manager::destroy (const ACE_CString &flowname)
 {
   this->protocol_objects_.unbind (flowname);
   this->receivers_.unbind (flowname);
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h
index f78741c6acb..c0e7641448b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h
@@ -51,19 +51,16 @@ public:
   // Initialize this class.
 
   void bind_to_receivers (const ACE_CString &sender_name,
-                          AVStreams::MMDevice_ptr sender
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                          AVStreams::MMDevice_ptr sender);
   // Method that binds the sender to the Naming Service and retreives
   // the references of any registered receivers.
 
-  void connect_to_receivers (AVStreams::MMDevice_ptr sender
-			     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  void connect_to_receivers (AVStreams::MMDevice_ptr sender);
   // Connect to the receivers that we found.
 
   void bind_to_sender (const ACE_CString &sender_name,
                        const ACE_CString &receiver_name,
-                       AVStreams::MMDevice_ptr receiver
-                       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                       AVStreams::MMDevice_ptr receiver);
   // Bind receiver to the sender.
 
   void connect_to_sender (void);
@@ -72,13 +69,11 @@ public:
   void destroy (void);
   // Destroy all streams.
 
-  void destroy (const ACE_CString &flowname
-                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  void destroy (const ACE_CString &flowname);
   // Destroy streams associated with <flowname>.
 
   void add_streamctrl (const ACE_CString &flowname,
-                       TAO_StreamEndPoint *endpoint
-                       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                       TAO_StreamEndPoint *endpoint);
   // Add new streamctrl.
 
   // Map of receivers.
@@ -120,8 +115,7 @@ protected:
 
   void find_receivers (void);
 
-  void add_to_receivers (CosNaming::BindingList &binding_list
-                         ACE_ENV_ARG_DECL);
+  void add_to_receivers (CosNaming::BindingList &binding_list);
 
   TAO_Naming_Client naming_client_;
   // The Naming Service client.
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
index 3f868652ea3..c817675b6ff 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
@@ -143,8 +143,7 @@ Distributer::parse_args (int argc,
 
 int
 Distributer::init (int argc,
-                   char ** argv
-                   ACE_ENV_ARG_DECL)
+                   char ** argv)
 {
   // Initialize the connection class.
   int result =
@@ -195,18 +194,15 @@ Distributer::init (int argc,
 
   // Bind to receivers.
   this->connection_manager_.bind_to_receivers (this->distributer_name_,
-                                               distributer_sender_mmdevice.in ()
-                                               ACE_ENV_ARG_PARAMETER);
+                                               distributer_sender_mmdevice.in ());
 
   // Connect to receivers
-  this->connection_manager_.connect_to_receivers (distributer_sender_mmdevice.in ()
-												ACE_ENV_ARG_PARAMETER);
+  this->connection_manager_.connect_to_receivers (distributer_sender_mmdevice.in ());
 
   // Bind to sender.
   this->connection_manager_.bind_to_sender (this->sender_name_,
                                             this->distributer_name_,
-                                            distributer_receiver_mmdevice.in ()
-                                            ACE_ENV_ARG_PARAMETER);
+                                            distributer_receiver_mmdevice.in ());
 
   // Connect to sender.
   this->connection_manager_.connect_to_sender ();
@@ -230,24 +226,20 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
+                         0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
+        = orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
         = root_poa->the_POAManager ();
@@ -256,14 +248,12 @@ main (int argc,
 
       // Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+                                      root_poa.in ());
 
       // Initialize the Distributer
       int result =
         DISTRIBUTER::instance ()->init (argc,
-                                        argv
-                                        ACE_ENV_ARG_PARAMETER);
+                                        argv);
 
       if (result != 0)
         return result;
@@ -276,12 +266,11 @@ main (int argc,
       // Hack for now....
       ACE_OS::sleep (1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"main");
+      ex._tao_print_exception ("main");
       return -1;
     }
-  ACE_ENDTRY;
 
   DISTRIBUTER::close ();  // Explicitly finalize the Unmanaged_Singleton.
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h
index 319f6287193..3430229f382 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h
@@ -115,8 +115,7 @@ public:
   // Destructor.
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   // Initialize data components.
 
   int parse_args (int argc,
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
index dcba1c310d4..509cde31e47 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
@@ -64,18 +64,16 @@ Receiver_Callback::handle_destroy (void)
   ACE_DEBUG ((LM_DEBUG,
               "Receiver_Callback::end_stream\n"));
 
-  ACE_TRY_NEW_ENV
+  try
     {
       done=1;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Receiver_Callback::handle_destroy Failed\n");
+      ex._tao_print_exception ("Receiver_Callback::handle_destroy Failed\n");
       return -1;
 
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -95,8 +93,7 @@ Receiver::~Receiver (void)
 
 int
 Receiver::init (int,
-                char **
-                ACE_ENV_ARG_DECL)
+                char **)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -128,8 +125,7 @@ Receiver::init (int,
   // Bind to sender.
   this->connection_manager_.bind_to_sender (this->sender_name_,
                                             this->receiver_name_,
-                                            mmdevice.in ()
-                                            ACE_ENV_ARG_PARAMETER);
+                                            mmdevice.in ());
 
   // Connect to the sender.
   this->connection_manager_.connect_to_sender ();
@@ -183,24 +179,20 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
+                         0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
+        = orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
         = root_poa->the_POAManager ();
@@ -209,8 +201,7 @@ main (int argc,
 
       // Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+                                      root_poa.in ());
 
       Receiver receiver;
       int result =
@@ -235,8 +226,7 @@ main (int argc,
 
       result =
         receiver.init (argc,
-                       argv
-                       ACE_ENV_ARG_PARAMETER);
+                       argv);
 
       if (result != 0)
         return result;
@@ -244,19 +234,18 @@ main (int argc,
       ACE_Time_Value tv(0, 10000);
       while(!done)
       {
-         orb->run (tv ACE_ENV_ARG_PARAMETER);
+         orb->run (tv);
       }
 
       // Hack for now....
       ACE_OS::sleep (1);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"receiver::init");
+      ex._tao_print_exception ("receiver::init");
       return -1;
     }
-  ACE_ENDTRY;
 
   ACE_OS::fclose (output_file);
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h
index 8d9638f4d2e..6d51db00170 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h
@@ -83,8 +83,7 @@ public:
   // Destructor.
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   // Initialize data components.
 
   int parse_args (int argc,
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
index 3ee3d9b895b..36d1fcab944 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
@@ -89,8 +89,7 @@ Sender::parse_args (int argc,
 
 int
 Sender::init (int argc,
-              char **argv
-              ACE_ENV_ARG_DECL)
+              char **argv)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -145,12 +144,10 @@ Sender::init (int argc,
   // Register the object reference with the Naming Service and bind to
   // the receivers
   this->connection_manager_.bind_to_receivers (this->sender_name_,
-                                               mmdevice.in ()
-                                               ACE_ENV_ARG_PARAMETER);
+                                               mmdevice.in ());
 
   // Connect to the receivers
-  this->connection_manager_.connect_to_receivers (mmdevice.in ()
-								ACE_ENV_ARG_PARAMETER);
+  this->connection_manager_.connect_to_receivers (mmdevice.in ());
 
   return 0;
 }
@@ -172,7 +169,7 @@ Sender::pace_data (void)
                 this->frame_rate_,
                 inter_frame_time.msec ()));
 
-  ACE_TRY
+  try
     {
       // The time taken for sending a frame and preparing for the next frame
       ACE_High_Res_Timer elapsed_timer;
@@ -234,8 +231,7 @@ Sender::pace_data (void)
 
                   // Run the orb for the wait time so the sender can
                   // continue other orb requests.
-                  TAO_AV_CORE::instance ()->orb ()->run (wait_time
-                                                         ACE_ENV_ARG_PARAMETER);
+                  TAO_AV_CORE::instance ()->orb ()->run (wait_time);
                 }
             }
 
@@ -269,13 +265,11 @@ Sender::pace_data (void)
 
         } // end while
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Sender::pace_data Failed\n");
+      ex._tao_print_exception ("Sender::pace_data Failed\n");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -289,22 +283,18 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0
-                                            ACE_ENV_ARG_PARAMETER);
+                                            0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
+        = orb->resolve_initial_references ("RootPOA");
 
       //Get the POA_var object from Object_var
       PortableServer::POA_var root_poa
-        = PortableServer::POA::_narrow (obj.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+        = PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
         = root_poa->the_POAManager ();
@@ -313,14 +303,12 @@ main (int argc,
 
       // Initialize the AV Stream components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+                                      root_poa.in ());
 
       // Initialize the Client.
       int result = 0;
       result = SENDER::instance ()->init (argc,
-                                          argv
-                                          ACE_ENV_ARG_PARAMETER);
+                                          argv);
 
       if (result < 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -329,12 +317,11 @@ main (int argc,
       SENDER::instance ()->pace_data ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Sender Failed\n");
+      ex._tao_print_exception ("Sender Failed\n");
       return -1;
     }
-  ACE_ENDTRY;
 
   SENDER::close ();  // Explicitly finalize the Unmanaged_Singleton.
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h
index d76f69bcf85..895057ea055 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h
@@ -62,8 +62,7 @@ public:
   // Constructor
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   // Method to initialize the various data components.
 
   int pace_data (void);
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
index 9756c58ad40..e9f0cf29f1c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
@@ -116,20 +116,18 @@ Receiver_Callback::handle_destroy (void)
 
   if (count < 2)
     {
-      ACE_TRY_NEW_ENV
+      try
         {
-          TAO_AV_CORE::instance ()->orb ()->shutdown (0
-                                                      ACE_ENV_ARG_PARAMETER);
+          TAO_AV_CORE::instance ()->orb ()->shutdown (0);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Receiver_Callback::handle_destroy Failed\n");
+          ex._tao_print_exception (
+            "Receiver_Callback::handle_destroy Failed\n");
       return -1;
 
         }
 
-      ACE_ENDTRY;
     }
 
   return 0;
@@ -188,8 +186,7 @@ Receiver::parse_args (int argc,
 
 int
 Receiver::init (int argc,
-                char ** argv
-                ACE_ENV_ARG_DECL)
+                char ** argv)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -246,8 +243,7 @@ Receiver::init (int argc,
 
   // Register the receiver object with the naming server.
   this->naming_client_->rebind (name,
-                                mmdevice.in ()
-                                ACE_ENV_ARG_PARAMETER);
+                                mmdevice.in ());
 
   return 0;
 }
@@ -268,24 +264,20 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
+                         0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
+        = orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
         = root_poa->the_POAManager ();
@@ -293,7 +285,7 @@ main (int argc,
       mgr->activate ();
 
       // Initialize the AVStreams components.
-      TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () ACE_ENV_ARG_PARAMETER);
+      TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in ());
 
       // Make sure we have a valid <output_file>
       output_file = ACE_OS::fopen (output_file_name,
@@ -310,8 +302,7 @@ main (int argc,
 
       int result =
         RECEIVER::instance ()->init (argc,
-                                     argv
-                                     ACE_ENV_ARG_PARAMETER);
+                                     argv);
 
       //        // Start sending data.
       //        result = SENDER::instance ()->pace_data ();
@@ -326,12 +317,11 @@ main (int argc,
 
       //orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"receiver::init");
+      ex._tao_print_exception ("receiver::init");
       return -1;
     }
-  ACE_ENDTRY;
 
   ACE_OS::fclose (output_file);
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h
index 539f43b8b43..6fa4b596897 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h
@@ -93,8 +93,7 @@ public:
   // Destructor.
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   // Initialize data components.
 
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
index 226e438300b..078c2937ea8 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
@@ -105,23 +105,19 @@ Sender::eof (void)
 void
 Sender::shutdown (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
     // File reading is complete, destroy the stream.
     AVStreams::flowSpec stop_spec;
-    this->streamctrl_->destroy (stop_spec
-                                ACE_ENV_ARG_PARAMETER);
+    this->streamctrl_->destroy (stop_spec);
 
       // Shut the orb down.
-    TAO_AV_CORE::instance ()->orb ()->shutdown (0
-                                                ACE_ENV_ARG_PARAMETER);
+    TAO_AV_CORE::instance ()->orb ()->shutdown (0);
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "shutdown\n");
+      ex._tao_print_exception ("shutdown\n");
     }
-  ACE_ENDTRY;
 }
 
 int
@@ -167,12 +163,10 @@ Sender::bind_to_receiver (void)
 
   // Resolve the receiver object reference from the Naming Service
   CORBA::Object_var receiver_mmdevice_obj =
-    this->naming_client_->resolve (name
-                                   ACE_ENV_ARG_PARAMETER);
+    this->naming_client_->resolve (name);
 
   this->receiver_mmdevice_ =
-    AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+    AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in ());
 
   if (CORBA::is_nil (this->receiver_mmdevice_.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -184,8 +178,7 @@ Sender::bind_to_receiver (void)
 
 int
 Sender::init (int argc,
-              char **argv
-              ACE_ENV_ARG_DECL)
+              char **argv)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -279,8 +272,7 @@ Sender::init (int argc,
     this->streamctrl_->bind_devs (mmdevice.in (),
                                   this->receiver_mmdevice_.in (),
                                   the_qos.inout (),
-                                  flow_spec
-                                  ACE_ENV_ARG_PARAMETER);
+                                  flow_spec);
 
   if (bind_result == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -307,7 +299,7 @@ Sender::pace_data (void)
                 this->frame_rate_,
                 inter_frame_time.msec ()));
 
-  ACE_TRY
+  try
     {
       // The time taken for sending a frame and preparing for the next frame
       ACE_High_Res_Timer elapsed_timer;
@@ -369,8 +361,7 @@ Sender::pace_data (void)
 
                   // Run the orb for the wait time so the sender can
                   // continue other orb requests.
-                  TAO_AV_CORE::instance ()->orb ()->run (wait_time
-                                                         ACE_ENV_ARG_PARAMETER);
+                  TAO_AV_CORE::instance ()->orb ()->run (wait_time);
                 }
             }
 
@@ -398,20 +389,18 @@ Sender::pace_data (void)
 
          // File reading is complete, destroy the stream.
         AVStreams::flowSpec stop_spec;
-        this->streamctrl_->destroy (stop_spec
-                                    ACE_ENV_ARG_PARAMETER);
+        this->streamctrl_->destroy (stop_spec);
 
         // Shut the orb down.
         //TAO_AV_CORE::instance ()->orb ()->shutdown (1,
-        //                                            ACE_ENV_SINGLE_ARG_PARAMETER);
+        //);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      //ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      //ACE_PRINT_EXCEPTION (ex,
        //                    "Sender::pace_data Failed\n");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -419,23 +408,19 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
+                         0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
+        = orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var
       PortableServer::POA_var root_poa
-        = PortableServer::POA::_narrow (obj.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+        = PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
         = root_poa->the_POAManager ();
@@ -444,17 +429,15 @@ main (int argc,
 
       // Initialize the AV Stream components.
 /*      TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER); */
+                                      root_poa.in ()); */
 
       // Initialize the AVStreams components.
-      TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () ACE_ENV_ARG_PARAMETER);
+      TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in ());
 
       // Initialize the Sender.
       int result = 0;
       result = SENDER::instance ()->init (argc,
-                                          argv
-                                          ACE_ENV_ARG_PARAMETER);
+                                          argv);
 
       if (result < 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -479,13 +462,11 @@ main (int argc,
       ACE_Time_Value tv(3,0);
       orb->run (tv);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Sender Failed\n");
+      ex._tao_print_exception ("Sender Failed\n");
       return -1;
     }
-  ACE_ENDTRY;
 
   SENDER::close ();  // Explicitly finalize the Unmanaged_Singleton.
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h
index 6e3f0835713..3d1169ca464 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h
@@ -89,8 +89,7 @@ public:
   // Constructor
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   // Method to initialize the various data components.
 
   int pace_data (void);
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
index 857de365dc0..1f5bc050ae2 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
@@ -25,8 +25,7 @@ Connection_Manager::init (CORBA::ORB_ptr orb)
 
 void
 Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
-                                       AVStreams::MMDevice_ptr sender
-                                       ACE_ENV_ARG_DECL)
+                                       AVStreams::MMDevice_ptr sender)
 {
   this->sender_name_ =
     sender_name;
@@ -37,15 +36,14 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
   CosNaming::Name name (1);
   name.length (1);
 
-  ACE_TRY
+  try
     {
       // Try binding the sender context in the NS
       name [0].id =
         CORBA::string_dup (this->sender_name_.c_str ());
 
       this->sender_context_ =
-        this->naming_client_->bind_new_context (name
-                                                ACE_ENV_ARG_PARAMETER);
+        this->naming_client_->bind_new_context (name);
 
       //
       // We reach here if there was no exception raised in
@@ -58,10 +56,9 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
 
       // Try binding the receivers context under the sender context.
       this->receiver_context_ =
-        this->sender_context_->bind_new_context (name
-                                                 ACE_ENV_ARG_PARAMETER);
+        this->sender_context_->bind_new_context (name);
     }
-  ACE_CATCH (CosNaming::NamingContext::AlreadyBound, al_ex)
+  catch (const CosNaming::NamingContext::AlreadyBound& al_ex)
     {
       //
       // The sender context already exists, probably created by the
@@ -73,8 +70,7 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
         CORBA::string_dup (this->sender_name_.c_str ());
 
       CORBA::Object_var object =
-        this->naming_client_->resolve (name
-                                       ACE_ENV_ARG_PARAMETER);
+        this->naming_client_->resolve (name);
 
       this->sender_context_ =
         CosNaming::NamingContext::_narrow (object.in ());
@@ -84,23 +80,20 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
         CORBA::string_dup ("Receivers");
 
       object =
-        this->sender_context_->resolve (name
-                                        ACE_ENV_ARG_PARAMETER);
+        this->sender_context_->resolve (name);
 
       this->receiver_context_ =
         CosNaming::NamingContext::_narrow (object.in ());
 
       this->find_receivers ();
     }
-  ACE_ENDTRY;
 
   name [0].id =
     CORBA::string_dup (this->sender_name_.c_str ());
 
   // Register the sender object with the sender context.
   this->sender_context_->rebind (name,
-                                 sender
-                                 ACE_ENV_ARG_PARAMETER);
+                                 sender);
 }
 
 void
@@ -113,12 +106,10 @@ Connection_Manager::find_receivers (void)
   // Get the list of receivers registered for this sender.
   this->receiver_context_->list (chunk,
                                  binding_list,
-                                 iterator
-                                 ACE_ENV_ARG_PARAMETER);
+                                 iterator);
 
   // Add the receivers found in the bindinglist to the <receivers>.
-  this->add_to_receivers (binding_list
-                          ACE_ENV_ARG_PARAMETER);
+  this->add_to_receivers (binding_list);
 
   if (!CORBA::is_nil (iterator.in ()))
     {
@@ -128,18 +119,15 @@ Connection_Manager::find_receivers (void)
       while (more)
         {
           more = iterator->next_n (chunk,
-                                   binding_list
-                                   ACE_ENV_ARG_PARAMETER);
+                                   binding_list);
 
-          this->add_to_receivers (binding_list
-                                  ACE_ENV_ARG_PARAMETER);
+          this->add_to_receivers (binding_list);
         }
     }
 }
 
 void
-Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list
-                                      ACE_ENV_ARG_DECL)
+Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list)
 {
   for (CORBA::ULong i = 0;
        i < binding_list.length ();
@@ -157,8 +145,7 @@ Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list
       // Resolve the reference of the receiver from the receiver
       // context.
       CORBA::Object_var obj =
-        this->receiver_context_->resolve (name
-                                          ACE_ENV_ARG_PARAMETER);
+        this->receiver_context_->resolve (name);
 
       AVStreams::MMDevice_var receiver_device =
         AVStreams::MMDevice::_narrow (obj.in ());
@@ -224,16 +211,14 @@ Connection_Manager::connect_to_receivers (void)
       (void) streamctrl->bind_devs (this->sender_.in (),
                                     (*iterator).int_id_.in (),
                                     the_qos.inout (),
-                                    flow_spec
-                                    ACE_ENV_ARG_PARAMETER);
+                                    flow_spec);
     }
 }
 
 void
 Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
                                     const ACE_CString &receiver_name,
-                                    AVStreams::MMDevice_ptr receiver
-                                    ACE_ENV_ARG_DECL)
+                                    AVStreams::MMDevice_ptr receiver)
 {
   this->sender_name_ =
     sender_name;
@@ -251,15 +236,14 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
 
   int sender_context_exists = 0;
 
-  ACE_TRY
+  try
     {
       // Try binding the sender context in the NS
       name [0].id =
         CORBA::string_dup (this->sender_name_.c_str ());
 
       CORBA::Object_var object =
-        this->naming_client_->resolve (name
-                                       ACE_ENV_ARG_PARAMETER);
+        this->naming_client_->resolve (name);
 
       //
       // We reach here if there was no exception raised in <resolve>.
@@ -275,31 +259,27 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
 
       // Find the receivers context under the sender's context
       object =
-        this->sender_context_->resolve (name
-                                        ACE_ENV_ARG_PARAMETER);
+        this->sender_context_->resolve (name);
 
       this->receiver_context_ =
         CosNaming::NamingContext::_narrow (object.in ());
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, al_ex)
+  catch (const CosNaming::NamingContext::NotFound& al_ex)
     {
       name [0].id =
         CORBA::string_dup (this->sender_name_.c_str ());
 
       // Create the sender context
       this->sender_context_ =
-        this->naming_client_->bind_new_context (name
-                                                ACE_ENV_ARG_PARAMETER);
+        this->naming_client_->bind_new_context (name);
 
       name [0].id =
         CORBA::string_dup ("Receivers");
 
       // Create the receivers context under the sender's context
       this->receiver_context_ =
-        this->sender_context_->bind_new_context (name
-                                                 ACE_ENV_ARG_PARAMETER);
+        this->sender_context_->bind_new_context (name);
     }
-  ACE_ENDTRY;
 
   //
   // At this point we either have resolved the receiver context or we
@@ -310,8 +290,7 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
 
   // Register this receiver object under the receiver context.
   this->receiver_context_->rebind (name,
-                                   receiver
-                                   ACE_ENV_ARG_PARAMETER);
+                                   receiver);
 
   //
   // Check if the sender was registered.  Note that if we created the
@@ -319,26 +298,22 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
   //
   if (sender_context_exists)
     {
-      ACE_TRY_EX(SENDER_CONTEXT_EXISTS)
+      try
         {
           // Try binding the sender under the sender context
           name [0].id =
             CORBA::string_dup (this->sender_name_.c_str ());
 
           CORBA::Object_var object =
-            this->sender_context_->resolve (name
-                                            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX(SENDER_CONTEXT_EXISTS);
+            this->sender_context_->resolve (name);
 
           this->sender_ =
-            AVStreams::MMDevice::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX(SENDER_CONTEXT_EXISTS);
+            AVStreams::MMDevice::_narrow (object.in ());
         }
-      ACE_CATCH (CosNaming::NamingContext::NotFound, al_ex)
+      catch (const CosNaming::NamingContext::NotFound& al_ex)
         {
           // No problem if the sender was not there.
         }
-      ACE_ENDTRY;
     }
 }
 
@@ -396,8 +371,7 @@ Connection_Manager::connect_to_sender (void)
     streamctrl->bind_devs (this->sender_.in (),
                            this->receiver_.in (),
                            the_qos.inout (),
-                           flow_spec
-                           ACE_ENV_ARG_PARAMETER);
+                           flow_spec);
 
   if (result == 0)
     ACE_ERROR ((LM_ERROR,
@@ -405,19 +379,16 @@ Connection_Manager::connect_to_sender (void)
 
   // Start the data sending.
   AVStreams::flowSpec start_spec;
-  streamctrl->start (start_spec
-                     ACE_ENV_ARG_PARAMETER);
+  streamctrl->start (start_spec);
 }
 
 void
 Connection_Manager::add_streamctrl (const ACE_CString &flowname,
-                                    TAO_StreamEndPoint *endpoint
-                                    ACE_ENV_ARG_DECL)
+                                    TAO_StreamEndPoint *endpoint)
 {
   // Get the stream controller for this endpoint.
   CORBA::Any_var streamctrl_any =
-    endpoint->get_property_value ("Related_StreamCtrl"
-                                  ACE_ENV_ARG_PARAMETER);
+    endpoint->get_property_value ("Related_StreamCtrl");
 
   AVStreams::StreamCtrl_ptr streamctrl;
 
@@ -434,8 +405,7 @@ Connection_Manager::add_streamctrl (const ACE_CString &flowname,
 
 
 void
-Connection_Manager::destroy (const ACE_CString &flowname
-                             ACE_ENV_ARG_DECL)
+Connection_Manager::destroy (const ACE_CString &flowname)
 {
   this->protocol_objects_.unbind (flowname);
   this->receivers_.unbind (flowname);
@@ -445,8 +415,7 @@ Connection_Manager::destroy (const ACE_CString &flowname
 
 void
 Connection_Manager::unbind_sender (const ACE_CString &sender_name,
-                                   AVStreams::MMDevice_ptr sender_mmdevice_obj
-                                   ACE_ENV_ARG_DECL)
+                                   AVStreams::MMDevice_ptr sender_mmdevice_obj)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -459,11 +428,10 @@ Connection_Manager::unbind_sender (const ACE_CString &sender_name,
   name [0].id =
     CORBA::string_dup (sender_name.c_str ());
 
-  ACE_TRY
+  try
     {
       CORBA::Object_var object =
-        this->naming_client_->resolve (name
-                                       ACE_ENV_ARG_PARAMETER);
+        this->naming_client_->resolve (name);
 
       CosNaming::NamingContext_var sender_context =
         CosNaming::NamingContext::_narrow (object.in ());
@@ -472,43 +440,37 @@ Connection_Manager::unbind_sender (const ACE_CString &sender_name,
         ACE_DEBUG ((LM_DEBUG,
                     "Sender Context Found\n"));
 
-      ACE_TRY_EX (Resolve_Sender)
+      try
         {
           object =
-            sender_context->resolve (name
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (Resolve_Sender);
+            sender_context->resolve (name);
 
           AVStreams::MMDevice_var mmdevice =
             AVStreams::MMDevice::_narrow (object.in ());
 
           if (mmdevice->_is_equivalent (sender_mmdevice_obj))
           {
-            sender_context->unbind (name
-                                    ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK_EX (Resolve_Sender);
+            sender_context->unbind (name);
 
             if (TAO_debug_level > 0)
               ACE_DEBUG ((LM_DEBUG,
                           "Sender Unbound\n"));
           }
         }
-      ACE_CATCH (CosNaming::NamingContext::NotFound, al_ex)
+      catch (const CosNaming::NamingContext::NotFound& al_ex)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "Sender object not found\n"));
           // Do not have to unbind.
         }
-      ACE_ENDTRY;
 
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, al_ex)
+  catch (const CosNaming::NamingContext::NotFound& al_ex)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Sender Context Not Found\n"));
       // Do not have to unbind.
     }
-  ACE_ENDTRY;
 
 }
 
@@ -528,11 +490,10 @@ Connection_Manager::unbind_receiver (const ACE_CString &sender_name,
   name [0].id =
     CORBA::string_dup (sender_name.c_str ());
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var object =
-        this->naming_client_->resolve (name
-                                       ACE_ENV_ARG_PARAMETER);
+        this->naming_client_->resolve (name);
 
       CosNaming::NamingContext_var sender_context =
         CosNaming::NamingContext::_narrow (object.in ());
@@ -541,15 +502,13 @@ Connection_Manager::unbind_receiver (const ACE_CString &sender_name,
         ACE_DEBUG ((LM_DEBUG,
                     "Sender Context Found\n"));
 
-      ACE_TRY_EX (Resolve_Receiver)
+      try
         {
           name [0].id =
             CORBA::string_dup ("Receivers");
 
           object =
-            sender_context->resolve (name
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (Resolve_Receiver);
+            sender_context->resolve (name);
 
           if (TAO_debug_level > 0)
             ACE_DEBUG ((LM_DEBUG,
@@ -562,40 +521,34 @@ Connection_Manager::unbind_receiver (const ACE_CString &sender_name,
             CORBA::string_dup (receiver_name.c_str ());
 
           object =
-            receivers_context->resolve (name
-                                        ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (Resolve_Receiver);
+            receivers_context->resolve (name);
 
           AVStreams::MMDevice_var  mmdevice =
             AVStreams::MMDevice::_narrow (object.in ());
 
           if (mmdevice->_is_equivalent (receiver_mmdevice))
           {
-            receivers_context->unbind (name
-                                       ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK_EX (Resolve_Receiver);
+            receivers_context->unbind (name);
 
             if (TAO_debug_level > 0)
               ACE_DEBUG ((LM_DEBUG,
                           "Receiver Unbound\n"));
           }
         }
-      ACE_CATCH (CosNaming::NamingContext::NotFound, al_ex)
+      catch (const CosNaming::NamingContext::NotFound& al_ex)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "Receiver Not found\n"));
           // Do not have to unbind.
         }
-      ACE_ENDTRY;
 
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, al_ex)
+  catch (const CosNaming::NamingContext::NotFound& al_ex)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Sender Context Not Found\n"));
       // Do not have to unbind.
     }
-  ACE_ENDTRY;
 
 }
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h
index 54f04b4ec81..0e0547a14b4 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h
@@ -47,8 +47,7 @@ public:
   // Initialize this class.
 
   void bind_to_receivers (const ACE_CString &sender_name,
-                          AVStreams::MMDevice_ptr sender
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                          AVStreams::MMDevice_ptr sender);
   // Method that binds the sender to the Naming Service and retreives
   // the references of any registered receivers.
 
@@ -57,20 +56,17 @@ public:
 
   void bind_to_sender (const ACE_CString &sender_name,
                        const ACE_CString &receiver_name,
-                       AVStreams::MMDevice_ptr receiver
-                       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                       AVStreams::MMDevice_ptr receiver);
   // Bind receiver to the sender.
 
   void connect_to_sender (void);
   // Connect to the sender that we found.
 
-  void destroy (const ACE_CString &flowname
-                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  void destroy (const ACE_CString &flowname);
   // Destroy streams associated with <flowname>.
 
   void unbind_sender (const ACE_CString &sender_name,
-                      AVStreams::MMDevice_ptr sender_mmdevice
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS) ;
+                      AVStreams::MMDevice_ptr sender_mmdevice) ;
   // Unbind the sender from the Naming Service
 
   void unbind_receiver (const ACE_CString &sender_name,
@@ -79,8 +75,7 @@ public:
   // Unbind the Receiver from the Naming Service
 
   void add_streamctrl (const ACE_CString &flowname,
-                       TAO_StreamEndPoint *endpoint
-                       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                       TAO_StreamEndPoint *endpoint);
   // Add new streamctrl.
 
   // Map of receivers.
@@ -110,8 +105,7 @@ protected:
 
   void find_receivers (void);
 
-  void add_to_receivers (CosNaming::BindingList &binding_list
-                         ACE_ENV_ARG_DECL);
+  void add_to_receivers (CosNaming::BindingList &binding_list);
 
   TAO_Naming_Client naming_client_;
   // The Naming Service client.
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
index d4276837c31..bd402aa6754 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
@@ -88,8 +88,7 @@ Distributer_Receiver_StreamEndPoint::set_protocol_object (const char *,
 }
 
 CORBA::Boolean
-Distributer_Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &flowspec
-                                                                  ACE_ENV_ARG_DECL_NOT_USED)
+Distributer_Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &flowspec)
 {
   //if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -295,8 +294,7 @@ Distributer::parse_args (int argc,
 
 int
 Distributer::init (int argc,
-                   char ** argv
-                   ACE_ENV_ARG_DECL)
+                   char ** argv)
 {
   /// Initialize the connection class.
   int result =
@@ -360,16 +358,14 @@ Distributer::init (int argc,
   /// Bind to sender.
   this->connection_manager_.bind_to_sender (this->sender_name_,
                                             this->distributer_name_,
-                                            distributer_receiver_mmdevice.in ()
-                                            ACE_ENV_ARG_PARAMETER);
+                                            distributer_receiver_mmdevice.in ());
 
   /// Connect to sender.
   this->connection_manager_.connect_to_sender ();
 
   /// Bind to receivers.
   this->connection_manager_.bind_to_receivers (this->distributer_name_,
-                                               distributer_sender_mmdevice.in ()
-                                               ACE_ENV_ARG_PARAMETER);
+                                               distributer_sender_mmdevice.in ());
 
   /// Connect to receivers
   this->connection_manager_.connect_to_receivers ();
@@ -386,7 +382,7 @@ Distributer::done (void) const
 void
 Distributer::shut_down (void)
 {
-  ACE_TRY
+  try
     {
       AVStreams::MMDevice_var receiver_mmdevice =
         this->distributer_receiver_mmdevice_->_this ();
@@ -403,11 +399,10 @@ Distributer::shut_down (void)
     //  DISTRIBUTER::instance ()->connection_manager ().destroy ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Distributer::shut_down");
+      ex._tao_print_exception ("Distributer::shut_down");
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -420,24 +415,20 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       /// Initialize the ORB first.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
+                         0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
+        = orb->resolve_initial_references ("RootPOA");
 
       /// Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
         = root_poa->the_POAManager ();
@@ -446,14 +437,12 @@ main (int argc,
 
       /// Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+                                      root_poa.in ());
 
       /// Initialize the Distributer
       int result =
         DISTRIBUTER::instance ()->init (argc,
-                                        argv
-                                        ACE_ENV_ARG_PARAMETER);
+                                        argv);
 
       if (result != 0)
         return result;
@@ -471,15 +460,14 @@ main (int argc,
 
       DISTRIBUTER::instance ()->shut_down ();
 
-//      orb->shutdown(1 ACE_ENV_ARG_PARAMETER);
+//      orb->shutdown(1);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"main");
+      ex._tao_print_exception ("main");
       return -1;
     }
-  ACE_ENDTRY;
 
   DISTRIBUTER::close ();  // Explicitly finalize the Unmanaged_Singleton.
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h
index 8fd3a3fb14a..f6698e5f3d1 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h
@@ -116,8 +116,7 @@ public:
   /// Store the reference to the protocol object corresponding
   /// to the transport
 
-  virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec
-                                                      ACE_ENV_ARG_DECL_NOT_USED);
+  virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec);
   /// Called when a sender makes a connection request.
 
 private:
@@ -173,8 +172,7 @@ public:
   /// Destructor.
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   /// Initialize data components.
 
   int parse_args (int argc,
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
index 71666340404..469bb69d7d2 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
@@ -48,8 +48,7 @@ Receiver_StreamEndPoint::get_callback (const char *flow_name,
 }
 
 CORBA::Boolean
-Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &flowspec
-                                                      ACE_ENV_ARG_DECL_NOT_USED)
+Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &flowspec)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -166,8 +165,7 @@ Receiver::receiver_name (void)
 
 int
 Receiver::init (int,
-                char **
-                ACE_ENV_ARG_DECL)
+                char **)
 {
   /// Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -209,8 +207,7 @@ Receiver::init (int,
   /// Bind to sender.
   this->connection_manager_.bind_to_sender (this->sender_name_,
                                             this->receiver_name_,
-                                            mmdevice.in ()
-                                            ACE_ENV_ARG_PARAMETER);
+                                            mmdevice.in ());
 
   /// Connect to the sender.
   this->connection_manager_.connect_to_sender ();
@@ -260,7 +257,7 @@ Receiver::output_file_name (void)
 void
 Receiver::shut_down (void)
 {
-  ACE_TRY
+  try
     {
       AVStreams::MMDevice_var mmdevice_obj =
         this->mmdevice_->_this ();
@@ -272,11 +269,10 @@ Receiver::shut_down (void)
 
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Receiver::shut_down");
+      ex._tao_print_exception ("Receiver::shut_down");
     }
-  ACE_ENDTRY;
 
 }
 
@@ -284,24 +280,20 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       /// Initialize the ORB first.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
+                         0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
+        = orb->resolve_initial_references ("RootPOA");
 
       /// Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
         = root_poa->the_POAManager ();
@@ -310,8 +302,7 @@ main (int argc,
 
       /// Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+                                      root_poa.in ());
 
       Receiver receiver;
       int result =
@@ -336,8 +327,7 @@ main (int argc,
 
       result =
         receiver.init (argc,
-                       argv
-                       ACE_ENV_ARG_PARAMETER);
+                       argv);
 
       if (result != 0)
         return result;
@@ -351,12 +341,11 @@ main (int argc,
 
       ACE_OS::fclose (output_file);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"receiver::init");
+      ex._tao_print_exception ("receiver::init");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h
index 4f5ed8938e7..48a8b9b0210 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h
@@ -82,8 +82,7 @@ public:
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
 
-  virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec
-                                                      ACE_ENV_ARG_DECL_NOT_USED);
+  virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec);
   /// Called when a distributor tries to connect to the receiver
 
 private:
@@ -107,8 +106,7 @@ public:
   /// Destructor.
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   /// Initialize data components.
 
   int parse_args (int argc,
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
index 6fb186dc19c..d6b8b855a50 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
@@ -152,22 +152,19 @@ Sender::~Sender (void)
 void
 Sender::shut_down (void)
 {
-  ACE_TRY
+  try
     {
       AVStreams::MMDevice_var mmdevice =
         this->sender_mmdevice_->_this ();
 
       SENDER::instance ()->connection_manager ().unbind_sender (this->sender_name_,
-                                                                mmdevice.in ()
-                                                                ACE_ENV_ARG_PARAMETER);
+                                                                mmdevice.in ());
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Sender::shut_down Failed\n");
+      ex._tao_print_exception ("Sender::shut_down Failed\n");
     }
-  ACE_ENDTRY;
 }
 
 int
@@ -204,8 +201,7 @@ Sender::parse_args (int argc,
 
 int
 Sender::init (int argc,
-              char **argv
-              ACE_ENV_ARG_DECL)
+              char **argv)
 {
   /// Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -269,8 +265,7 @@ Sender::init (int argc,
   /// Register the object reference with the Naming Service and bind to
   /// the receivers
   this->connection_manager_.bind_to_receivers (this->sender_name_,
-                                               mmdevice.in ()
-                                               ACE_ENV_ARG_PARAMETER);
+                                               mmdevice.in ());
 
   /// Connect to the receivers
   this->connection_manager_.connect_to_receivers ();
@@ -295,7 +290,7 @@ Sender::pace_data (void)
                 this->frame_rate_,
                 inter_frame_time.msec ()));
 
-  ACE_TRY
+  try
     {
       /// The time taken for sending a frame and preparing for the next frame
       ACE_High_Res_Timer elapsed_timer;
@@ -372,8 +367,7 @@ Sender::pace_data (void)
 
                   /// Run the orb for the wait time so the sender can
                   /// continue other orb requests.
-                  TAO_AV_CORE::instance ()->orb ()->run (wait_time
-                                                         ACE_ENV_ARG_PARAMETER);
+                  TAO_AV_CORE::instance ()->orb ()->run (wait_time);
 
                 }
             }
@@ -409,13 +403,11 @@ Sender::pace_data (void)
         } /// end while
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Sender::pace_data Failed\n");
+      ex._tao_print_exception ("Sender::pace_data Failed\n");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -447,22 +439,18 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0
-                                            ACE_ENV_ARG_PARAMETER);
+                                            0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
+        = orb->resolve_initial_references ("RootPOA");
 
       ///Get the POA_var object from Object_var
       PortableServer::POA_var root_poa
-        = PortableServer::POA::_narrow (obj.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+        = PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
         = root_poa->the_POAManager ();
@@ -471,14 +459,12 @@ main (int argc,
 
       /// Initialize the AV Stream components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+                                      root_poa.in ());
 
       /// Initialize the Client.
       int result = 0;
       result = SENDER::instance ()->init (argc,
-                                          argv
-                                          ACE_ENV_ARG_PARAMETER);
+                                          argv);
 
       if (result < 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -488,12 +474,11 @@ main (int argc,
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Sender Failed\n");
+      ex._tao_print_exception ("Sender Failed\n");
       return -1;
     }
-  ACE_ENDTRY;
 
   SENDER::close (); // Explicitly finalize the Unmanaged_Singleton.
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h
index 4fdf3f1d7de..ed66e878f34 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h
@@ -112,8 +112,7 @@ public:
   void shut_down (void);
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   /// Method to initialize the various data components.
 
   int pace_data (void);
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
index 0231f24b995..8bb9e81a97b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
@@ -28,7 +28,7 @@ FTP_Client_Callback::get_timeout (ACE_Time_Value *&tv,
 int
 FTP_Client_Callback::handle_timeout (void *)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       ACE_Message_Block mb (BUFSIZ);
       ACE_DEBUG ((LM_DEBUG,"FTP_Client_Callback::handle_timeout\n"));
@@ -49,8 +49,8 @@ FTP_Client_Callback::handle_timeout (void *)
                 {
                   ACE_DEBUG ((LM_DEBUG,"handle_timeout:End of file\n"));
                   AVStreams::flowSpec stop_spec (1);
-                  CLIENT::instance ()->streamctrl ()->stop (stop_spec ACE_ENV_ARG_PARAMETER);
-                  //CLIENT::instance ()->streamctrl ()->destroy (stop_spec ACE_ENV_ARG_PARAMETER);
+                  CLIENT::instance ()->streamctrl ()->stop (stop_spec);
+                  //CLIENT::instance ()->streamctrl ()->destroy (stop_spec);
                   TAO_AV_CORE::instance ()->orb ()->shutdown (0);
                   return 0;
                 }
@@ -66,12 +66,12 @@ FTP_Client_Callback::handle_timeout (void *)
         ACE_ERROR_RETURN ((LM_ERROR,"send failed:%p","FTP_Client_Flow_Handler::send \n"),-1);
       ACE_DEBUG ((LM_DEBUG,"handle_timeout::buffer sent succesfully\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"FTP_Client_Callback::handle_timeout Failed");
+      ex._tao_print_exception (
+        "FTP_Client_Callback::handle_timeout Failed");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -216,8 +216,7 @@ Client::init (int argc,char **argv)
   this->argv_ = argv;
 
   CORBA::String_var ior;
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
 
       PortableServer::POAManager_var mgr
@@ -233,11 +232,11 @@ Client::init (int argc,char **argv)
       ACE_NEW_RETURN (this->fep_a_, FTP_Client_Producer, -1 );
       this->flowname_ = "Data";
 
-      sep_a_ = this->streamendpoint_a_->_this( ACE_ENV_SINGLE_ARG_PARAMETER);
+      sep_a_ = this->streamendpoint_a_->_this();
 
       fep_a_obj_ = this->fep_a_->_this ();
 
-      CORBA::String_var s1 = sep_a_->add_fep( fep_a_obj_.in() ACE_ENV_ARG_PARAMETER);
+      CORBA::String_var s1 = sep_a_->add_fep( fep_a_obj_.in());
 
       ACE_DEBUG ((LM_DEBUG, "(%N,%l) Added flowendpoint named: %s\n", s1.in() ));
 
@@ -253,20 +252,18 @@ Client::init (int argc,char **argv)
                                        this->filename_), -1);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Client::init\n");
+      ex._tao_print_exception ("Client::init\n");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 int
 Client::run (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       char flow_protocol_str [BUFSIZ];
       if (this->use_sfp_)
@@ -304,7 +301,7 @@ Client::run (void)
 				sep_b.in(),
 				the_qos.inout(),
 				flow_spec
-				ACE_ENV_ARG_PARAMETER );
+ );
 
       timer.stop ();
       timer.elapsed_time (elapsed);
@@ -313,21 +310,20 @@ Client::run (void)
         ACE_ERROR_RETURN ((LM_ERROR,"streamctrl::bind failed\n"),-1);
 
       AVStreams::flowSpec start_spec (1);
-      this->streamctrl_.start (start_spec ACE_ENV_ARG_PARAMETER);
+      this->streamctrl_.start (start_spec);
 
       // Schedule a timer for the for the flow handler.
       ACE_Time_Value tv (10000,0);
-      this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
+      this->orb_->run (tv);
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Client::run\n");
+      ex._tao_print_exception ("Client::run\n");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -335,20 +331,18 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv);
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        = orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa
         = PortableServer::POA::_narrow (obj.in ());
 
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+                                      poa.in ());
 
 
       int result = 0;
@@ -357,7 +351,7 @@ main (int argc,
         ACE_ERROR_RETURN ((LM_ERROR,"client::init failed\n"),1);
       result = CLIENT::instance ()->run ();
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1);
 
       orb->destroy ();
 
@@ -365,13 +359,12 @@ main (int argc,
         ACE_ERROR_RETURN ((LM_ERROR,"client::run failed\n"),1);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
 
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Client Failed\n");
+    ex._tao_print_exception ("Client Failed\n");
     return -1;
   }
-  ACE_ENDTRY;
 
   CLIENT::close ();  // Explicitly finalize the Unmanaged_Singleton.
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
index 2b7d82f3161..6445b4905fa 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
@@ -10,17 +10,15 @@ FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint (void)
   protocols [0] = CORBA::string_dup ("TCP");
   protocols [1] = CORBA::string_dup ("UDP");
   protocols [2] = CORBA::string_dup ("RTP/UDP");
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->set_protocol_restriction (protocols
-                                      ACE_ENV_ARG_PARAMETER);
+      this->set_protocol_restriction (protocols);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint\n");
+      ex._tao_print_exception (
+        "FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint\n");
     }
-  ACE_ENDTRY;
 }
 
 int
@@ -101,8 +99,7 @@ int
 Server::init (int argc,
               char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       PortableServer::POAManager_var mgr
         = this->poa_->the_POAManager ();
@@ -128,7 +125,7 @@ Server::init (int argc,
 
       fep_b_obj_ = this->fep_b_->_this ();
 
-      CORBA::String_var s1 = sep_b_->add_fep( fep_b_obj_.in() ACE_ENV_ARG_PARAMETER );
+      CORBA::String_var s1 = sep_b_->add_fep( fep_b_obj_.in() );
 
      ACE_DEBUG ((LM_DEBUG, "(%N,%l) Added flowendpoint named: %s\n", s1.in() ));
 
@@ -140,34 +137,30 @@ Server::init (int argc,
 
       // Register the video control object with the naming server.
       this->my_naming_client_->rebind (server_sep_b_name,
-                                       sep_b_.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+                                       sep_b_.in ());
 
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"server::init");
+      ex._tao_print_exception ("server::init");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 int
 Server::run (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       this->orb_->run ();
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"server::run\n");
+      ex._tao_print_exception ("server::run\n");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -215,28 +208,25 @@ main (int argc,
       char **argv)
 {
   int result = 0;
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                         argv);
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        = orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa
         = PortableServer::POA::_narrow (obj.in ());
 
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+                                      poa.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"server::init");
+      ex._tao_print_exception ("server::init");
       return -1;
     }
-  ACE_ENDTRY;
 
   result = FTP_SERVER::instance ()->init (argc,argv);
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
index 456c03ca610..02f39b2b8f0 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
@@ -79,7 +79,7 @@ parse_args (int argc, char *argv[])
 
 int main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
 
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
@@ -87,7 +87,7 @@ int main (int argc, char *argv[])
       parse_args (argc, argv);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        = orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa
         = PortableServer::POA::_narrow (obj.in ());
@@ -98,8 +98,7 @@ int main (int argc, char *argv[])
       mgr->activate ();
 
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+                                      poa.in ());
 
       // Connect the two streams and run them...
       AVStreams::flowSpec flow_spec (2);
@@ -130,13 +129,13 @@ int main (int argc, char *argv[])
       AVStreams::StreamCtrl_var stream_control =
         stream_control_impl._this ();
 
-      obj = orb->string_to_object (ping_ior ACE_ENV_ARG_PARAMETER);
+      obj = orb->string_to_object (ping_ior);
       AVStreams::MMDevice_var ping_sender =
-        AVStreams::MMDevice::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+        AVStreams::MMDevice::_narrow (obj.in ());
 
-      obj = orb->string_to_object (pong_ior ACE_ENV_ARG_PARAMETER);
+      obj = orb->string_to_object (pong_ior);
       AVStreams::MMDevice_var pong_sender =
-        AVStreams::MMDevice::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+        AVStreams::MMDevice::_narrow (obj.in ());
 
       AVStreams::streamQoS_var the_qos =
         new AVStreams::streamQoS;
@@ -144,29 +143,26 @@ int main (int argc, char *argv[])
       stream_control->bind_devs (pong_sender.in (),
                                  ping_sender.in (),
                                  the_qos.inout (),
-                                 flow_spec
-                                 ACE_ENV_ARG_PARAMETER);
+                                 flow_spec);
 
       flow_spec.length (0);
-      stream_control->start (flow_spec ACE_ENV_ARG_PARAMETER);
+      stream_control->start (flow_spec);
 
       ACE_Time_Value tv (100, 0);
-      orb->run (tv ACE_ENV_ARG_PARAMETER);
+      orb->run (tv);
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
-      orb->shutdown (1 ACE_ENV_ARG_PARAMETER);
+      orb->shutdown (1);
 
      // flow_spec.length (0);
-     // stream_control->stop (flow_spec ACE_ENV_ARG_PARAMETER);
+     // stream_control->stop (flow_spec);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
index d8473f3d267..4b51044600b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
@@ -95,7 +95,7 @@ parse_args (int argc, char *argv[])
 
 int main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
 
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
@@ -104,7 +104,7 @@ int main (int argc, char *argv[])
       parse_args (argc, argv);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        = orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa
         = PortableServer::POA::_narrow (obj.in ());
@@ -115,8 +115,7 @@ int main (int argc, char *argv[])
       mgr->activate ();
 
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+                                      poa.in ());
 
       // Register the video mmdevice object with the ORB
       Reactive_Strategy *reactive_strategy;
@@ -133,7 +132,7 @@ int main (int argc, char *argv[])
         mmdevice_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (mmdevice.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (mmdevice.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -164,11 +163,11 @@ int main (int argc, char *argv[])
       AVStreams::FDev_var pong_fdev =
         pong_fdev_impl->_this ();
 
-      mmdevice->add_fdev (ping_fdev.in () ACE_ENV_ARG_PARAMETER);
+      mmdevice->add_fdev (ping_fdev.in ());
 
       if (respond == 1)
         {
-          mmdevice->add_fdev (pong_fdev.in () ACE_ENV_ARG_PARAMETER);
+          mmdevice->add_fdev (pong_fdev.in ());
         }
 
       orb->run ();
@@ -181,13 +180,11 @@ int main (int argc, char *argv[])
       recv_latency.dump_results ("Receive", gsf);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
index 897a82e4d39..5b176e2aba8 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
@@ -111,7 +111,7 @@ parse_args (int argc, char *argv[])
 
 int main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
 
 
@@ -121,7 +121,7 @@ int main (int argc, char *argv[])
       parse_args (argc, argv);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        = orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa
         = PortableServer::POA::_narrow (obj.in ());
@@ -132,8 +132,7 @@ int main (int argc, char *argv[])
       mgr->activate ();
 
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+                                      poa.in ());
 
       Reactive_Strategy *reactive_strategy;
       ACE_NEW_RETURN (reactive_strategy,
@@ -149,7 +148,7 @@ int main (int argc, char *argv[])
         mmdevice_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (mmdevice.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (mmdevice.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -180,13 +179,13 @@ int main (int argc, char *argv[])
       AVStreams::FDev_var pong_fdev =
         pong_fdev_impl->_this ();
 
-      mmdevice->add_fdev (ping_fdev.in () ACE_ENV_ARG_PARAMETER);
+      mmdevice->add_fdev (ping_fdev.in ());
       if (respond == 1)
         {
-          mmdevice->add_fdev (pong_fdev.in () ACE_ENV_ARG_PARAMETER);
+          mmdevice->add_fdev (pong_fdev.in ());
         }
 
-      orb->run ( ACE_ENV_SINGLE_ARG_PARAMETER );
+      orb->run ( );
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
@@ -199,13 +198,11 @@ int main (int argc, char *argv[])
       send_latency.dump_results ("Send", gsf);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
index df1bc0d2543..719b55dbc0c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
@@ -19,11 +19,10 @@ Receiver_StreamEndPoint::get_callback (const char *,
 
 
   // Get the stream controller for this stream.
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Any_ptr streamctrl_any =
-        this->get_property_value ("Related_StreamCtrl"
-                                  ACE_ENV_ARG_PARAMETER);
+        this->get_property_value ("Related_StreamCtrl");
 
       AVStreams::StreamCtrl_ptr streamctrl;
       *streamctrl_any >>= streamctrl;
@@ -31,14 +30,12 @@ Receiver_StreamEndPoint::get_callback (const char *,
       // Store the stream control for the stream with the callback.
       this->callback_.streamctrl (streamctrl);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Sender_StreamEndPoint::get_callback failed");
+      ex._tao_print_exception ("Sender_StreamEndPoint::get_callback failed");
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -99,10 +96,9 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame,
           qos [0].QoSParams [0].property_name = CORBA::string_dup ("video_frame_rate");
           qos [0].QoSParams [0].property_value <<= (CORBA::Short) 30;
 
-          ACE_DECLARE_NEW_CORBA_ENV;
 
           // Initiate the modifying of the qos for the flows.
-          this->streamctrl_->modify_QoS (qos, flow_spec ACE_ENV_ARG_PARAMETER);
+          this->streamctrl_->modify_QoS (qos, flow_spec);
 
           ACE_DEBUG ((LM_DEBUG,
                       "Stream Ctrl available....Modify QoS called\n"));
@@ -138,19 +134,16 @@ Receiver_Callback::handle_destroy (void)
   ACE_DEBUG ((LM_DEBUG,
               "Receiver_Callback::end_stream\n"));
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      TAO_AV_CORE::instance ()->orb ()->shutdown (0
-                                                  ACE_ENV_ARG_PARAMETER);
+      TAO_AV_CORE::instance ()->orb ()->shutdown (0);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Receiver_Callback::handle_destroy Failed\n");
+      ex._tao_print_exception ("Receiver_Callback::handle_destroy Failed\n");
       return -1;
 
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -168,8 +161,7 @@ Receiver::~Receiver (void)
 
 int
 Receiver::init (int,
-                char **
-                ACE_ENV_ARG_DECL)
+                char **)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -205,8 +197,7 @@ Receiver::init (int,
 
   // Register the receiver object with the naming server.
   this->naming_client_->rebind (name,
-                                mmdevice.in ()
-                                ACE_ENV_ARG_PARAMETER);
+                                mmdevice.in ());
 
   return 0;
 }
@@ -242,24 +233,20 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
+                         0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
+        = orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
         = root_poa->the_POAManager ();
@@ -268,8 +255,7 @@ main (int argc,
 
       // Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+                                      root_poa.in ());
 
       int result =
         parse_args (argc,
@@ -294,8 +280,7 @@ main (int argc,
       Receiver receiver;
       result =
         receiver.init (argc,
-                       argv
-                       ACE_ENV_ARG_PARAMETER);
+                       argv);
 
       if (result != 0)
         return result;
@@ -307,12 +292,11 @@ main (int argc,
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"receiver::init");
+      ex._tao_print_exception ("receiver::init");
       return -1;
     }
-  ACE_ENDTRY;
 
   ACE_OS::fclose (output_file);
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h
index 66ba33d02ed..48b0eca6bee 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h
@@ -71,8 +71,7 @@ public:
   /// Destructor.
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   /// Initialize data components.
 
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
index 5d70b218b74..7244d8dcdf0 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
@@ -38,7 +38,7 @@ Sender_StreamEndPoint::set_protocol_object (const char *,
 CORBA::Boolean
 Sender_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos,
                                    const AVStreams::flowSpec &/* the_flows */
-                                   ACE_ENV_ARG_DECL_NOT_USED)
+                                   )
                             ACE_THROW_SPEC((CORBA::SystemException,
                                             AVStreams::noSuchFlow,
                                             AVStreams::QoSRequestFailed ))
@@ -132,12 +132,10 @@ Sender::bind_to_receiver (void)
 
   // Resolve the receiver object reference from the Naming Service
   CORBA::Object_var receiver_mmdevice_obj =
-    this->naming_client_->resolve (name
-                                   ACE_ENV_ARG_PARAMETER);
+    this->naming_client_->resolve (name);
 
   this->receiver_mmdevice_ =
-    AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+    AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in ());
 
   if (CORBA::is_nil (this->receiver_mmdevice_.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -149,8 +147,7 @@ Sender::bind_to_receiver (void)
 
 int
 Sender::init (int argc,
-              char **argv
-              ACE_ENV_ARG_DECL)
+              char **argv)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -234,8 +231,7 @@ Sender::init (int argc,
     this->streamctrl_->bind_devs (mmdevice.in (),
                                   this->receiver_mmdevice_.in (),
                                   the_qos.inout (),
-                                  flow_spec
-                                  ACE_ENV_ARG_PARAMETER);
+                                  flow_spec);
 
   if (bind_result == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -261,7 +257,7 @@ Sender::pace_data (void)
                 this->frame_rate_,
                 inter_frame_time.msec ()));
 
-  ACE_TRY
+  try
     {
       // The time taken for sending a frame and preparing for the next frame
       ACE_High_Res_Timer elapsed_timer;
@@ -318,8 +314,7 @@ Sender::pace_data (void)
 
                   // Run the orb for the wait time so the sender can
                   // continue other orb requests.
-                  TAO_AV_CORE::instance ()->orb ()->run (wait_time
-                                                         ACE_ENV_ARG_PARAMETER);
+                  TAO_AV_CORE::instance ()->orb ()->run (wait_time);
                 }
             }
 
@@ -347,18 +342,16 @@ Sender::pace_data (void)
 
       // File reading is complete, destroy the stream.
       AVStreams::flowSpec stop_spec;
-      this->streamctrl_->destroy (stop_spec ACE_ENV_ARG_PARAMETER);
+      this->streamctrl_->destroy (stop_spec);
 
         // Shut the orb down.
-        TAO_AV_CORE::instance ()->orb ()->shutdown (1 ACE_ENV_ARG_PARAMETER);
+        TAO_AV_CORE::instance ()->orb ()->shutdown (1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Sender::pace_data Failed\n");
+      ex._tao_print_exception ("Sender::pace_data Failed\n");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -366,23 +359,19 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
+                         0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
+        = orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var
       PortableServer::POA_var root_poa
-        = PortableServer::POA::_narrow (obj.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+        = PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
         = root_poa->the_POAManager ();
@@ -391,14 +380,12 @@ main (int argc,
 
       // Initialize the AV Stream components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+                                      root_poa.in ());
 
       // Initialize the Sender.
       int result = 0;
       result = SENDER::instance ()->init (argc,
-                                          argv
-                                          ACE_ENV_ARG_PARAMETER);
+                                          argv);
 
       if (result < 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -409,13 +396,11 @@ main (int argc,
       result = SENDER::instance ()->pace_data ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Sender Failed\n");
+      ex._tao_print_exception ("Sender Failed\n");
       return -1;
     }
-  ACE_ENDTRY;
 
   SENDER::close ();  // Explicitly finalize the Unmanaged_Singleton.
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h
index fffabe98d41..78ca9dc022f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h
@@ -30,8 +30,7 @@ class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint
   /// chosen.
 
   CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos,
-                             const AVStreams::flowSpec &flow_spec
-                             ACE_ENV_ARG_DECL)
+                             const AVStreams::flowSpec &flow_spec)
                             ACE_THROW_SPEC((CORBA::SystemException,
                                             AVStreams::noSuchFlow,
                                             AVStreams::QoSRequestFailed ));
@@ -64,8 +63,7 @@ public:
   /// Constructor
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   /// Method to initialize the various data components.
 
   int pace_data (void);
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
index 7288a85600f..c827562b411 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
@@ -49,22 +49,22 @@ FTP_Client_Callback::handle_timeout (void *)
           this->count_++;
           if (this->count_ == 2)
             {
-              ACE_TRY_NEW_ENV
+              try
                 {
                   ACE_DEBUG ((LM_DEBUG,"handle_timeout:End of file\n"));
                   AVStreams::flowSpec stop_spec (1);
                   //ACE_DECLARE_NEW_CORBA_ENV;
-                  CLIENT::instance ()->streamctrl ()->stop (stop_spec ACE_ENV_ARG_PARAMETER);
-//                    CLIENT::instance ()->streamctrl ()->destroy (stop_spec ACE_ENV_ARG_PARAMETER);
+                  CLIENT::instance ()->streamctrl ()->stop (stop_spec);
+//                    CLIENT::instance ()->streamctrl ()->destroy (stop_spec);
                   TAO_AV_CORE::instance ()->orb ()->shutdown (0);
                   return 0;
                 }
-              ACE_CATCHANY
+              catch (const CORBA::Exception& ex)
                 {
-                  ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"FTP_Client_Callback::handle_timeout\n");
+                  ex._tao_print_exception (
+                    "FTP_Client_Callback::handle_timeout\n");
                   return -1;
                 }
-              ACE_ENDTRY;
             }
           else
             return 0;
@@ -183,33 +183,29 @@ Client::Client (void)
 int
 Client::bind_to_server (const char *name)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Initialize the naming services
       CosNaming::Name server_mmdevice_name (1);
       server_mmdevice_name.length (1);
       server_mmdevice_name [0].id = name;
       CORBA::Object_var server_mmdevice_obj =
-        my_naming_client_->resolve (server_mmdevice_name
-                                    ACE_ENV_ARG_PARAMETER);
+        my_naming_client_->resolve (server_mmdevice_name);
 
       this->server_mmdevice_ =
-        AVStreams::MMDevice::_narrow (server_mmdevice_obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        AVStreams::MMDevice::_narrow (server_mmdevice_obj.in ());
 
       if (CORBA::is_nil (this->server_mmdevice_.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " could not resolve Server_Mmdevice in Naming service <%s>\n"),
                           -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Client::bind_to_server\n");
+      ex._tao_print_exception ("Client::bind_to_server\n");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -251,8 +247,7 @@ Client::init (int argc,char **argv)
 int
 Client::run (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       char flow_protocol_str [BUFSIZ];
       if (this->use_sfp_)
@@ -286,8 +281,7 @@ Client::run (void)
         this->streamctrl_.bind_devs (client_mmdevice.in (),
                                      AVStreams::MMDevice::_nil (),
                                      the_qos.inout (),
-                                     flow_spec
-                                     ACE_ENV_ARG_PARAMETER);
+                                     flow_spec);
       if (this->bind_to_server ("Server_MMDevice1") == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%P|%t) Error binding to the naming service\n"),
@@ -295,8 +289,7 @@ Client::run (void)
       result = this->streamctrl_.bind_devs (AVStreams::MMDevice::_nil (),
                                             this->server_mmdevice_.in (),
                                             the_qos.inout (),
-                                            flow_spec
-                                            ACE_ENV_ARG_PARAMETER);
+                                            flow_spec);
       if (this->bind_to_server ("Server_MMDevice2") == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%P|%t) Error binding to the naming service\n"),
@@ -304,31 +297,29 @@ Client::run (void)
       result = this->streamctrl_.bind_devs (AVStreams::MMDevice::_nil (),
                                             this->server_mmdevice_.in (),
                                             the_qos.inout (),
-                                            flow_spec
-                                            ACE_ENV_ARG_PARAMETER);
+                                            flow_spec);
 
       if (result == 0)
         ACE_ERROR_RETURN ((LM_ERROR,"streamctrl::bind_devs failed\n"),-1);
       AVStreams::flowSpec start_spec (1);
       start_spec.length (1);
       start_spec [0] = CORBA::string_dup (this->flowname_);
-      this->streamctrl_.start (start_spec ACE_ENV_ARG_PARAMETER);
+      this->streamctrl_.start (start_spec);
       // Schedule a timer for the for the flow handler.
       //TAO_AV_CORE::instance ()->run ();
       ACE_Time_Value tv (10000,0);
 
-      TAO_AV_CORE::instance ()->orb ()->run (tv ACE_ENV_ARG_PARAMETER);
+      TAO_AV_CORE::instance ()->orb ()->run (tv);
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       ACE_DEBUG ((LM_DEBUG, "Exited the TAO_AV_Core::run\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Client::run");
+      ex._tao_print_exception ("Client::run");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -336,20 +327,18 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv);
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        = orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa
         = PortableServer::POA::_narrow (obj.in ());
 
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+                                      poa.in ());
 
       int result = 0;
       result = CLIENT::instance ()->init (argc,argv);
@@ -359,13 +348,12 @@ main (int argc,
       if (result < 0)
         ACE_ERROR_RETURN ((LM_ERROR,"client::run failed\n"),1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
 
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Client Failed\n");
+      ex._tao_print_exception ("Client Failed\n");
       return -1;
     }
-  ACE_ENDTRY;
 
   CLIENT::close ();  // Explicitly finalize the Unmanaged_Singleton.
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
index f04fe3c5150..eb49f48dbc3 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
@@ -66,8 +66,7 @@ int
 Server::init (int argc,
               char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
 
       PortableServer::POAManager_var mgr
@@ -97,29 +96,24 @@ Server::init (int argc,
       server_mmdevice_name [0].id = CORBA::string_dup ("Server_MMDevice1");
       AVStreams::MMDevice_var mmdevice = this->mmdevice_->_this ();
 
-      ACE_TRY_EX (bind)
+      try
         {
           // Register the video control object with the naming server.
           this->my_naming_client_->bind (server_mmdevice_name,
-                                         mmdevice.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (bind);
+                                         mmdevice.in ());
         }
-      ACE_CATCH (CosNaming::NamingContext::AlreadyBound,al_ex)
+      catch (const CosNaming::NamingContext::AlreadyBound& al_ex)
         {
           server_mmdevice_name [0].id = CORBA::string_dup ("Server_MMDevice2");
           this->my_naming_client_->bind (server_mmdevice_name,
-                                         mmdevice.in ()
-                                         ACE_ENV_ARG_PARAMETER);
+                                         mmdevice.in ());
         }
-      ACE_ENDTRY;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"server::init");
+      ex._tao_print_exception ("server::init");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -127,8 +121,7 @@ int
 Server::run (void)
 {
   CORBA::ORB_ptr orb = TAO_AV_CORE::instance ()->orb();
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
 
       while( !done )
@@ -136,18 +129,17 @@ Server::run (void)
         CORBA::Boolean wp = orb->work_pending ();
         if (wp)
          {
-              orb->perform_work( ACE_ENV_SINGLE_ARG_PARAMETER );
+              orb->perform_work( );
          }
       }
 
-      orb->shutdown( 1 ACE_ENV_ARG_PARAMETER );
+      orb->shutdown( 1 );
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"server::init");
+      ex._tao_print_exception ("server::init");
       return -1;
     }
-  ACE_ENDTRY;
 
 
   return 0;
@@ -194,26 +186,23 @@ main (int argc,
   CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                         argv);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        = orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa
         = PortableServer::POA::_narrow (obj.in ());
 
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+                                      poa.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"server::init");
+      ex._tao_print_exception ("server::init");
       return -1;
     }
-  ACE_ENDTRY;
 
   result = FTP_SERVER::instance ()->init (argc,argv);
   if (result < 0)
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
index 5acc7722599..e646ffe3698 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
@@ -45,7 +45,7 @@ FTP_Client_Callback::handle_timeout (void *)
           this->count_++;
           if (this->count_ == 2)
             {
-              ACE_TRY_NEW_ENV
+              try
                 {
                   ACE_DEBUG ((LM_DEBUG,"handle_timeout:End of file\n"));
                   AVStreams::flowSpec stop_spec (1);
@@ -53,12 +53,12 @@ FTP_Client_Callback::handle_timeout (void *)
                   TAO_AV_CORE::instance ()->orb ()->shutdown (0);
                   return 0;
                 }
-              ACE_CATCHANY
+              catch (const CORBA::Exception& ex)
                 {
-                  ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"FTP_Client_Callback::handle_timeout\n");
+                  ex._tao_print_exception (
+                    "FTP_Client_Callback::handle_timeout\n");
                   return -1;
                 }
-              ACE_ENDTRY;
             }
           else
             return 0;
@@ -191,9 +191,8 @@ Client::Client (void)
 int
 Client::bind_to_server (const char *name)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Initialize the naming services
       if (my_naming_client_.init (TAO_AV_CORE::instance ()->orb ()) != 0)
@@ -206,24 +205,22 @@ Client::bind_to_server (const char *name)
       server_mmdevice_name.length (1);
       server_mmdevice_name [0].id = name;
       CORBA::Object_var server_mmdevice_obj =
-        my_naming_client_->resolve (server_mmdevice_name
-                                  ACE_ENV_ARG_PARAMETER);
+        my_naming_client_->resolve (server_mmdevice_name);
 
       this->server_mmdevice_ =
-        AVStreams::MMDevice::_narrow (server_mmdevice_obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        AVStreams::MMDevice::_narrow (server_mmdevice_obj.in ());
 
       if (CORBA::is_nil (this->server_mmdevice_.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " could not resolve Server_Mmdevice in Naming service <%s>\n"),
                           -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Command_Handler::resolve_reference");
+      ex._tao_print_exception (
+        "Command_Handler::resolve_reference");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -233,8 +230,7 @@ Client::init (int argc,char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       PortableServer::POAManager_var mgr
         = TAO_AV_CORE::instance ()->poa ()->the_POAManager ();
@@ -257,8 +253,7 @@ Client::init (int argc,char **argv)
       this->fdev_->flowname (this->flowname ());
       AVStreams::MMDevice_var mmdevice = this->client_mmdevice_._this ();
       AVStreams::FDev_var fdev = this->fdev_->_this ();
-      mmdevice->add_fdev (fdev.in ()
-                          ACE_ENV_ARG_PARAMETER);
+      mmdevice->add_fdev (fdev.in ());
 
       if (this->my_naming_client_.init (TAO_AV_CORE::instance ()->orb ()) != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -272,20 +267,18 @@ Client::init (int argc,char **argv)
           ACE_DEBUG ((LM_DEBUG,"file opened successfully\n"));
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Client::init");
+      ex._tao_print_exception ("Client::init");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 int
 Client::run (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       char flow_protocol_str [BUFSIZ];
       if (this->use_sfp_)
@@ -314,8 +307,7 @@ Client::run (void)
         this->streamctrl_.bind_devs (client_mmdevice.in (),
                                      AVStreams::MMDevice::_nil (),
                                      the_qos.inout (),
-                                     flow_spec
-                                     ACE_ENV_ARG_PARAMETER);
+                                     flow_spec);
 
       if (result == 0)
         ACE_ERROR_RETURN ((LM_ERROR,"streamctrl::bind_devs for client_mmdevice failed\n"),-1);
@@ -326,8 +318,7 @@ Client::run (void)
       result = this->streamctrl_.bind_devs (AVStreams::MMDevice::_nil (),
                                             this->server_mmdevice_.in (),
                                             the_qos.inout (),
-                                            flow_spec
-                                            ACE_ENV_ARG_PARAMETER);
+                                            flow_spec);
 
       if (result == 0)
         ACE_ERROR_RETURN ((LM_ERROR,"(%N,%l) streamctrl::bind_devs for mmdevice 1 failed\n"),-1);
@@ -338,31 +329,29 @@ Client::run (void)
       result = this->streamctrl_.bind_devs (AVStreams::MMDevice::_nil (),
                                             this->server_mmdevice_.in (),
                                             the_qos.inout (),
-                                            flow_spec
-                                            ACE_ENV_ARG_PARAMETER);
+                                            flow_spec);
 
       if (result == 0)
         ACE_ERROR_RETURN ((LM_ERROR,"(%N,%l) streamctrl::bind_devs for mmdevice 2 failed\n"),-1);
       AVStreams::flowSpec start_spec (1);
       start_spec.length (1);
       start_spec [0] = CORBA::string_dup (this->flowname_);
-      this->streamctrl_.start (start_spec ACE_ENV_ARG_PARAMETER);
+      this->streamctrl_.start (start_spec);
       // Schedule a timer for the for the flow handler.
       //TAO_AV_CORE::instance ()->run ();
 
       ACE_Time_Value tv (10000,0);
-      TAO_AV_CORE::instance ()->orb ()->run (tv ACE_ENV_ARG_PARAMETER);
+      TAO_AV_CORE::instance ()->orb ()->run (tv);
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       ACE_DEBUG ((LM_DEBUG, "Exited the TAO_AV_Core::run\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Client::run");
+      ex._tao_print_exception ("Client::run");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -374,26 +363,23 @@ main (int argc,
   CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                         argv);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        = orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa
         = PortableServer::POA::_narrow (obj.in ());
 
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+                                      poa.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"server::init");
+      ex._tao_print_exception ("server::init");
       return -1;
     }
-  ACE_ENDTRY;
 
   int result = 0;
   result = CLIENT::instance ()->init (argc,argv);
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
index 635ee864624..7dd139f43d5 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
@@ -9,17 +9,15 @@ FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint (void)
   protocols.length (2);
   protocols [0] = CORBA::string_dup ("TCP");
   protocols [1] = CORBA::string_dup ("UDP");
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->set_protocol_restriction (protocols
-                                      ACE_ENV_ARG_PARAMETER);
+      this->set_protocol_restriction (protocols);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint");
+      ex._tao_print_exception (
+        "FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint");
     }
-  ACE_ENDTRY;
 }
 
 int
@@ -80,7 +78,7 @@ FTP_Server_Callback::handle_end_stream (void)
 //                                 AVStreams::QoS & the_qos,
 //                                 CORBA::Boolean_out met_qos,
 //                                 char *& named_fdev,
-//                                 ACE_ENV_SINGLE_ARG_DECL)
+//)
 // {
 //   ACE_DEBUG ((LM_DEBUG,"FTP_Server_FDev::make_consumer"));
 //   FTP_Server_FlowEndPoint *endpoint;
@@ -116,8 +114,7 @@ int
 Server::init (int argc,
               char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
 
       PortableServer::POAManager_var mgr
@@ -147,53 +144,45 @@ Server::init (int argc,
       this->fdev_->flowname ("Data");
       AVStreams::MMDevice_var mmdevice = this->mmdevice_->_this ();
       AVStreams::FDev_var fdev = this->fdev_->_this ();
-      mmdevice->add_fdev (fdev.in ()
-                          ACE_ENV_ARG_PARAMETER);
+      mmdevice->add_fdev (fdev.in ());
 
       // Register the mmdevice with the naming service.
       CosNaming::Name server_mmdevice_name (1);
       server_mmdevice_name.length (1);
       server_mmdevice_name [0].id = CORBA::string_dup ("Server_MMDevice1");
-      ACE_TRY_EX (bind)
+      try
         {
           // Register the video control object with the naming server.
           this->my_naming_client_->bind (server_mmdevice_name,
-                                         mmdevice.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (bind);
+                                         mmdevice.in ());
         }
-      ACE_CATCH (CosNaming::NamingContext::AlreadyBound,al_ex)
+      catch (const CosNaming::NamingContext::AlreadyBound& al_ex)
         {
           server_mmdevice_name [0].id = CORBA::string_dup ("Server_MMDevice2");
           this->my_naming_client_->bind (server_mmdevice_name,
-                                         mmdevice.in ()
-                                         ACE_ENV_ARG_PARAMETER);
+                                         mmdevice.in ());
         }
-      ACE_ENDTRY;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"server::init");
+      ex._tao_print_exception ("server::init");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 int
 Server::run (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       TAO_AV_CORE::instance ()->orb ()->run ();
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"server::init");
+      ex._tao_print_exception ("server::init");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -238,26 +227,23 @@ main (int argc,
 
   CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                         argv);
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        = orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa
         = PortableServer::POA::_narrow (obj.in ());
 
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+                                      poa.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"server::init");
+      ex._tao_print_exception ("server::init");
       return -1;
     }
-  ACE_ENDTRY;
 
   int result = 0;
   result = FTP_SERVER::instance ()->init (argc,argv);
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h
index bdd2957c2ec..af8b7b55f76 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h
@@ -39,7 +39,7 @@ public:
 //                                                        AVStreams::QoS & the_qos,
 //                                                        CORBA::Boolean_out met_qos,
 //                                                        char *& named_fdev,
-//                                                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+//);
 //   // bridge method for the application to override the consumer object
 //   // creation. Default implementation creates a TAO_FlowConsumer.
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
index b059768db7f..d0d61feb0f5 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
@@ -169,8 +169,7 @@ Receiver::parse_args (int argc,
 
 int
 Receiver::init (int argc,
-                char ** argv
-                ACE_ENV_ARG_DECL)
+                char ** argv)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -214,8 +213,7 @@ Receiver::init (int argc,
 
   // Register the receiver object with the naming server.
   this->naming_client_->rebind (name,
-                                mmdevice.in ()
-                                ACE_ENV_ARG_PARAMETER);
+                                mmdevice.in ());
 
   return 0;
 }
@@ -230,24 +228,20 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
+                         0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
+        = orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
         = root_poa->the_POAManager ();
@@ -256,13 +250,11 @@ main (int argc,
 
       // Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+                                      root_poa.in ());
 
       int result =
         RECEIVER::instance ()->init (argc,
-                                     argv
-                                     ACE_ENV_ARG_PARAMETER);
+                                     argv);
 
       if (result != 0)
         return result;
@@ -277,12 +269,11 @@ main (int argc,
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"receiver::init");
+      ex._tao_print_exception ("receiver::init");
       return -1;
     }
-  ACE_ENDTRY;
 
   RECEIVER::close ();  // Explicitly finalize the Unmanaged_Singleton.
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h
index f5fb5efa767..d650c3dbe5d 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h
@@ -96,8 +96,7 @@ public:
   // Destructor.
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   // Initialize data components.
 
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
index e0383cd2677..5ba3528f2f6 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
@@ -58,12 +58,10 @@ Sender::shutdown (void)
 {
   // File reading is complete, destroy the stream.
   AVStreams::flowSpec stop_spec;
-  this->streamctrl_->destroy (stop_spec
-                              ACE_ENV_ARG_PARAMETER);
+  this->streamctrl_->destroy (stop_spec);
 
       // Shut the orb down.
-  TAO_AV_CORE::instance ()->orb ()->shutdown (0
-                                              ACE_ENV_ARG_PARAMETER);
+  TAO_AV_CORE::instance ()->orb ()->shutdown (0);
 
 }
 
@@ -110,12 +108,10 @@ Sender::bind_to_receiver (void)
 
   // Resolve the receiver object reference from the Naming Service
   CORBA::Object_var receiver_mmdevice_obj =
-    this->naming_client_->resolve (name
-                                   ACE_ENV_ARG_PARAMETER);
+    this->naming_client_->resolve (name);
 
   this->receiver_mmdevice_ =
-    AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+    AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in ());
 
   if (CORBA::is_nil (this->receiver_mmdevice_.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -127,8 +123,7 @@ Sender::bind_to_receiver (void)
 
 int
 Sender::init (int argc,
-              char **argv
-              ACE_ENV_ARG_DECL)
+              char **argv)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -222,8 +217,7 @@ Sender::init (int argc,
     this->streamctrl_->bind_devs (mmdevice.in (),
                                   this->receiver_mmdevice_.in (),
                                   the_qos.inout (),
-                                  flow_spec
-                                  ACE_ENV_ARG_PARAMETER);
+                                  flow_spec);
 
   if (bind_result == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -250,7 +244,7 @@ Sender::pace_data (void)
                 this->frame_rate_,
                 inter_frame_time.msec ()));
 
-  ACE_TRY
+  try
     {
       // The time taken for sending a frame and preparing for the next frame
       ACE_High_Res_Timer elapsed_timer;
@@ -312,8 +306,7 @@ Sender::pace_data (void)
 
                   // Run the orb for the wait time so the sender can
                   // continue other orb requests.
-                  TAO_AV_CORE::instance ()->orb ()->run (wait_time
-                                                         ACE_ENV_ARG_PARAMETER);
+                  TAO_AV_CORE::instance ()->orb ()->run (wait_time);
                 }
             }
 
@@ -347,13 +340,11 @@ Sender::pace_data (void)
 
       this->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Sender::pace_data Failed\n");
+      ex._tao_print_exception ("Sender::pace_data Failed\n");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -361,23 +352,19 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
+                         0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
+        = orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var
       PortableServer::POA_var root_poa
-        = PortableServer::POA::_narrow (obj.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+        = PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
         = root_poa->the_POAManager ();
@@ -386,14 +373,12 @@ main (int argc,
 
       // Initialize the AV Stream components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+                                      root_poa.in ());
 
       // Initialize the Sender.
       int result = 0;
       result = SENDER::instance ()->init (argc,
-                                          argv
-                                          ACE_ENV_ARG_PARAMETER);
+                                          argv);
 
       if (result < 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -403,13 +388,11 @@ main (int argc,
       // Start sending data.
       result = SENDER::instance ()->pace_data ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Sender Failed\n");
+      ex._tao_print_exception ("Sender Failed\n");
       return -1;
     }
-  ACE_ENDTRY;
 
   SENDER::close ();  // Explicitly finalize the Unmanaged_Singleton.
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h
index aeae3cd03bd..72bd9067341 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h
@@ -65,8 +65,7 @@ public:
   // Constructor
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   // Method to initialize the various data components.
 
   int pace_data (void);
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
index df81a527c38..7cca1701be9 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
@@ -143,12 +143,10 @@ Client::bind_to_server (void)
 
   // Resolve the server object reference from the Naming Service
   CORBA::Object_var server_mmdevice_obj =
-    my_naming_client_->resolve (server_mmdevice_name
-                                ACE_ENV_ARG_PARAMETER);
+    my_naming_client_->resolve (server_mmdevice_name);
 
   this->server_mmdevice_ =
-    AVStreams::MMDevice::_narrow (server_mmdevice_obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+    AVStreams::MMDevice::_narrow (server_mmdevice_obj.in ());
 
   if (CORBA::is_nil (this->server_mmdevice_.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -160,8 +158,7 @@ Client::bind_to_server (void)
 
 int
 Client::init (int argc,
-              char **argv
-              ACE_ENV_ARG_DECL)
+              char **argv)
 {
   this->argc_ = argc;
   this->argv_ = argv;
@@ -273,8 +270,7 @@ Client::init (int argc,
     this->streamctrl_.bind_devs (client_mmdevice.in (),
                                  this->server_mmdevice_.in (),
                                  the_qos.inout (),
-                                 flow_spec
-                                 ACE_ENV_ARG_PARAMETER);
+                                 flow_spec);
 
   if (bind_result == 0)
     ACE_ERROR_RETURN ((LM_ERROR,"streamctrl::bind_devs failed\n"),-1);
@@ -307,7 +303,7 @@ Client::pace_data (void)
                 "Inter Frame Time = %d\n",
                 inter_frame_time.msec ()));
 
-  ACE_TRY
+  try
     {
 
       // Continue to send data till the file is read to the end.
@@ -366,8 +362,7 @@ Client::pace_data (void)
                                 wait_time.msec ()));
 
                   // run the orb for the wait time so the client can continue other orb requests.
-                  TAO_AV_CORE::instance ()->orb ()->run (wait_time
-                                                         ACE_ENV_ARG_PARAMETER);
+                  TAO_AV_CORE::instance ()->orb ()->run (wait_time);
                 }
             }
 
@@ -389,20 +384,17 @@ Client::pace_data (void)
 
       // Since the file is read stop the stream.
       AVStreams::flowSpec stop_spec (1);
-      CLIENT::instance ()->streamctrl ()->destroy (stop_spec
-                                                   ACE_ENV_ARG_PARAMETER);
+      CLIENT::instance ()->streamctrl ()->destroy (stop_spec);
 
       // Shut the orb down.
       TAO_AV_CORE::instance ()->orb ()->shutdown (0);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Client::pace_data Failed");
+      ex._tao_print_exception ("Client::pace_data Failed");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -410,23 +402,19 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0
-                                            ACE_ENV_ARG_PARAMETER);
+                                            0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
+        = orb->resolve_initial_references ("RootPOA");
 
 
       //Get the POA_var object from Object_var
       PortableServer::POA_var root_poa
-        = PortableServer::POA::_narrow (obj.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+        = PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
         = root_poa->the_POAManager ();
@@ -435,14 +423,12 @@ main (int argc,
 
       // Initialize the AV STream components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+                                      root_poa.in ());
 
       // INitialize the Client.
       int result = 0;
       result = CLIENT::instance ()->init (argc,
-                                          argv
-                                          ACE_ENV_ARG_PARAMETER);
+                                          argv);
 
       if (result < 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -453,13 +439,12 @@ main (int argc,
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
 
     {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Client Failed\n");
+    ex._tao_print_exception ("Client Failed\n");
     return -1;
     }
-  ACE_ENDTRY;
 
   CLIENT::close ();
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
index 9bb270d1059..76f79679002 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
@@ -88,8 +88,7 @@ public:
   // Constructor
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   // Method to initialize the various data components.
 
   void set_protocol_object (TAO_AV_Protocol_Object *protocol_object);
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
index 57a9e378949..bd3aa1f3a80 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
@@ -74,8 +74,7 @@ Server::~Server (void)
 
 int
 Server::init (int,
-              char **
-              ACE_ENV_ARG_DECL)
+              char **)
 {
   int result =
     this->reactive_strategy_.init (TAO_AV_CORE::instance ()->orb (),
@@ -105,8 +104,7 @@ Server::init (int,
 
   // Register the server object with the naming server.
   this->my_naming_client_->rebind (server_mmdevice_name,
-                                   mmdevice.in ()
-                                   ACE_ENV_ARG_PARAMETER);
+                                   mmdevice.in ());
 
   return 0;
 }
@@ -141,14 +139,12 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0
-                                            ACE_ENV_ARG_PARAMETER);
+                                            0);
 
       int result =
         parse_args (argc,
@@ -170,13 +166,11 @@ main (int argc,
                        "File Opened Successfully\n"));
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
+        = orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
         = root_poa->the_POAManager ();
@@ -185,34 +179,31 @@ main (int argc,
 
       // Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+                                      root_poa.in ());
 
       Server server;
       result =
         server.init (argc,
-                     argv
-                     ACE_ENV_ARG_PARAMETER);
+                     argv);
 
       if (result != 0)
         return result;
 
       while ( !done )
       {
-        if ( orb->work_pending( ACE_ENV_SINGLE_ARG_PARAMETER ) )
+        if ( orb->work_pending( ) )
 	{
           orb->perform_work ();
 	}
       }
 
-      orb->shutdown( 1 ACE_ENV_ARG_PARAMETER );
+      orb->shutdown( 1 );
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"server::init");
+      ex._tao_print_exception ("server::init");
       return -1;
     }
-  ACE_ENDTRY;
 
   ACE_OS::fclose (output_file);
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h
index c1c6776efe2..e9040e1f39f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h
@@ -77,8 +77,7 @@ public:
   // Deestructor.
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   // Initialize data components.
 
 protected:
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
index cf7bf293187..de3a2ec9066 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
@@ -92,8 +92,7 @@ Receiver::~Receiver (void)
 
 int
 Receiver::init (int,
-                char **
-                ACE_ENV_ARG_DECL)
+                char **)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -129,8 +128,7 @@ Receiver::init (int,
 
   // Register the receiver object with the naming server.
   this->naming_client_->rebind (name,
-                                mmdevice.in ()
-                                ACE_ENV_ARG_PARAMETER);
+                                mmdevice.in ());
 
   return 0;
 }
@@ -166,8 +164,7 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       ACE_High_Res_Timer::global_scale_factor ();
 
@@ -175,17 +172,14 @@ main (int argc,
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
+                         0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
+        = orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
         = root_poa->the_POAManager ();
@@ -194,8 +188,7 @@ main (int argc,
 
       // Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+                                      root_poa.in ());
 
       int result =
         parse_args (argc,
@@ -220,8 +213,7 @@ main (int argc,
       Receiver receiver;
       result =
         receiver.init (argc,
-                       argv
-                       ACE_ENV_ARG_PARAMETER);
+                       argv);
 
       if (result != 0)
         return result;
@@ -236,12 +228,11 @@ main (int argc,
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"receiver::init");
+      ex._tao_print_exception ("receiver::init");
       return -1;
     }
-  ACE_ENDTRY;
 
   ACE_OS::fclose (output_file);
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h
index 39c4ac3b39e..02e0d800987 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h
@@ -83,8 +83,7 @@ public:
   // Destructor.
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL);
+            char **argv);
   // Initialize data components.
 
 protected:
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
index 47a09d91a75..695c05cb6b3 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
@@ -96,12 +96,10 @@ Sender::bind_to_receiver (void)
 
   // Resolve the receiver object reference from the Naming Service
   CORBA::Object_var receiver_mmdevice_obj =
-    this->naming_client_->resolve (name
-                                   ACE_ENV_ARG_PARAMETER);
+    this->naming_client_->resolve (name);
 
   this->receiver_mmdevice_ =
-    AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+    AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in ());
 
   if (CORBA::is_nil (this->receiver_mmdevice_.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -113,8 +111,7 @@ Sender::bind_to_receiver (void)
 
 int
 Sender::init (int argc,
-              char **argv
-              ACE_ENV_ARG_DECL)
+              char **argv)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -198,8 +195,7 @@ Sender::init (int argc,
     this->streamctrl_->bind_devs (mmdevice.in (),
                                   this->receiver_mmdevice_.in (),
                                   the_qos.inout (),
-                                  flow_spec
-                                  ACE_ENV_ARG_PARAMETER);
+                                  flow_spec);
 
   if (bind_result == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -226,7 +222,7 @@ Sender::pace_data (void)
                 this->frame_rate_,
                 inter_frame_time.msec ()));
 
-  ACE_TRY
+  try
     {
       // The time taken for sending a frame and preparing for the next frame
       ACE_High_Res_Timer elapsed_timer;
@@ -288,8 +284,7 @@ Sender::pace_data (void)
 
                   // Run the orb for the wait time so the sender can
                   // continue other orb requests.
-                  TAO_AV_CORE::instance ()->orb ()->run (wait_time
-                                                         ACE_ENV_ARG_PARAMETER);
+                  TAO_AV_CORE::instance ()->orb ()->run (wait_time);
                 }
             }
 
@@ -317,20 +312,16 @@ Sender::pace_data (void)
 
       // File reading is complete, destroy the stream.
       AVStreams::flowSpec stop_spec;
-      this->streamctrl_->destroy (stop_spec
-                                  ACE_ENV_ARG_PARAMETER);
+      this->streamctrl_->destroy (stop_spec);
 
       // Shut the orb down.
-      TAO_AV_CORE::instance ()->orb ()->shutdown (0
-                                                  ACE_ENV_ARG_PARAMETER);
+      TAO_AV_CORE::instance ()->orb ()->shutdown (0);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Sender::pace_data Failed\n");
+      ex._tao_print_exception ("Sender::pace_data Failed\n");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -338,8 +329,7 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
 
       ACE_High_Res_Timer::global_scale_factor ();
@@ -347,17 +337,14 @@ main (int argc,
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
+                         0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
+        = orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var
       PortableServer::POA_var root_poa
-        = PortableServer::POA::_narrow (obj.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+        = PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
         = root_poa->the_POAManager ();
@@ -366,14 +353,12 @@ main (int argc,
 
       // Initialize the AV Stream components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+                                      root_poa.in ());
 
       // Initialize the Sender.
       int result = 0;
       result = SENDER::instance ()->init (argc,
-                                          argv
-                                          ACE_ENV_ARG_PARAMETER);
+                                          argv);
 
       if (result < 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -383,13 +368,11 @@ main (int argc,
       // Start sending data.
       result = SENDER::instance ()->pace_data ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Sender Failed\n");
+      ex._tao_print_exception ("Sender Failed\n");
       return -1;
     }
-  ACE_ENDTRY;
 
   SENDER::close ();  // Explicitly finalize the Unmanaged_Singleton.
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h
index 116e369e801..014c827d70a 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h
@@ -62,8 +62,7 @@ public:
   // Constructor
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL);
+            char **argv);
   // Method to initialize the various data components.
 
   int pace_data (void);
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
index f2c7cc50544..8410345517c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
@@ -74,26 +74,24 @@ int
 Distributer_Receiver_Callback::handle_destroy (void)
 {
   // Called when the sender requests the stream to be shutdown.
-  ACE_TRY_NEW_ENV
+  try
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Distributer_Callback::end_stream\n"));
 
       // Destroy the receiver stream
       AVStreams::flowSpec stop_spec;
-      DISTRIBUTER::instance ()->receiver_streamctrl ()->destroy (stop_spec
-                                                                 ACE_ENV_ARG_PARAMETER);
+      DISTRIBUTER::instance ()->receiver_streamctrl ()->destroy (stop_spec);
 
       // We can close down now.
       DISTRIBUTER::instance ()->done (1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Distributer_Callback::handle_destroy Failed\n");
+      ex._tao_print_exception (
+        "Distributer_Callback::handle_destroy Failed\n");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -129,8 +127,7 @@ Distributer::~Distributer (void)
 
 void
 Distributer::bind_to_mmdevice (AVStreams::MMDevice_ptr &mmdevice,
-                               const ACE_CString &mmdevice_name
-                               ACE_ENV_ARG_DECL)
+                               const ACE_CString &mmdevice_name)
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -139,18 +136,16 @@ Distributer::bind_to_mmdevice (AVStreams::MMDevice_ptr &mmdevice,
 
   // Resolve the mmdevice object reference from the Naming Service
   CORBA::Object_var mmdevice_obj =
-    this->naming_client_->resolve (name
-                                   ACE_ENV_ARG_PARAMETER);
+    this->naming_client_->resolve (name);
 
   mmdevice =
-    AVStreams::MMDevice::_narrow (mmdevice_obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+    AVStreams::MMDevice::_narrow (mmdevice_obj.in ());
 }
 
 int
 Distributer::init (int /*argc*/,
                    char *[] /*argv*/
-                   ACE_ENV_ARG_DECL)
+                   )
 {
   // Initialize the naming services
   int result =
@@ -174,14 +169,12 @@ Distributer::init (int /*argc*/,
   // Bind to the receiver mmdevice
   ACE_CString mmdevice_name ("Receiver");
   this->bind_to_mmdevice (this->receiver_mmdevice_.out (),
-                          mmdevice_name
-                          ACE_ENV_ARG_PARAMETER);
+                          mmdevice_name);
 
   // Bind to the sender mmdevice
   mmdevice_name = "Sender";
   this->bind_to_mmdevice (this->sender_mmdevice_.out (),
-                          mmdevice_name
-                          ACE_ENV_ARG_PARAMETER);
+                          mmdevice_name);
 
   // Initialize the  QoS
   AVStreams::streamQoS_var the_qos (new AVStreams::streamQoS);
@@ -235,8 +228,7 @@ Distributer::init (int /*argc*/,
     this->receiver_streamctrl_->bind_devs (distributer_sender_mmdevice.in (),
                                            this->receiver_mmdevice_.in (),
                                            the_qos.inout (),
-                                           flow_spec
-                                           ACE_ENV_ARG_PARAMETER);
+                                           flow_spec);
 
   // Create the forward flow specification to describe the flow.
   TAO_Forward_FlowSpec_Entry sender_entry ("Data_Sender",
@@ -265,8 +257,7 @@ Distributer::init (int /*argc*/,
     sender_streamctrl->bind_devs (sender_mmdevice_.in (),
                                   distributer_receiver_mmdevice.in (),
                                   the_qos.inout (),
-                                  flow_spec
-                                  ACE_ENV_ARG_PARAMETER);
+                                  flow_spec);
 
   if (res == 0)
     ACE_ERROR_RETURN ((LM_ERROR,"Streamctrl::bind_devs failed\n"),-1);
@@ -296,24 +287,20 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
+                         0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
+        = orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
         = root_poa->the_POAManager ();
@@ -322,14 +309,12 @@ main (int argc,
 
       // Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+                                      root_poa.in ());
 
       // Initialize the Distributer
       int result =
         DISTRIBUTER::instance ()->init (argc,
-                                        argv
-                                        ACE_ENV_ARG_PARAMETER);
+                                        argv);
 
       if (result != 0)
         return result;
@@ -342,12 +327,11 @@ main (int argc,
       // Hack for now....
       ACE_OS::sleep (1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"main");
+      ex._tao_print_exception ("main");
       return -1;
     }
-  ACE_ENDTRY;
 
   DISTRIBUTER::close ();  // Explicitly finalize the Unmanaged_Singleton.
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h
index 8b9f74cdf07..67244ff68c9 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h
@@ -115,13 +115,11 @@ public:
   // Destructor.
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   // Initialize data components.
 
   void bind_to_mmdevice (AVStreams::MMDevice_ptr &mmdevice,
-                         const ACE_CString &mmdevice_name
-                         ACE_ENV_ARG_DECL);
+                         const ACE_CString &mmdevice_name);
   // Resolve the reference of the mmdevice from the naming service.
 
   TAO_StreamCtrl *receiver_streamctrl (void);
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
index af74f75cf6f..c91db5e09c4 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
@@ -64,19 +64,16 @@ Receiver_Callback::handle_destroy (void)
   ACE_DEBUG ((LM_DEBUG,
               "Receiver_Callback::end_stream\n"));
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      TAO_AV_CORE::instance ()->orb ()->shutdown (0
-                                                  ACE_ENV_ARG_PARAMETER);
+      TAO_AV_CORE::instance ()->orb ()->shutdown (0);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Receiver_Callback::handle_destroy Failed\n");
+      ex._tao_print_exception ("Receiver_Callback::handle_destroy Failed\n");
       return -1;
 
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -92,8 +89,7 @@ Receiver::~Receiver (void)
 
 int
 Receiver::init (int,
-                char **
-                ACE_ENV_ARG_DECL)
+                char **)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -129,8 +125,7 @@ Receiver::init (int,
 
   // Register the receiver object with the naming server.
   this->naming_client_->rebind (name,
-                                mmdevice.in ()
-                                ACE_ENV_ARG_PARAMETER);
+                                mmdevice.in ());
 
   return 0;
 }
@@ -166,24 +161,20 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
+                         0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
+        = orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
         = root_poa->the_POAManager ();
@@ -192,8 +183,7 @@ main (int argc,
 
       // Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+                                      root_poa.in ());
 
       int result =
         parse_args (argc,
@@ -218,8 +208,7 @@ main (int argc,
       Receiver receiver;
       result =
         receiver.init (argc,
-                       argv
-                       ACE_ENV_ARG_PARAMETER);
+                       argv);
 
       if (result != 0)
         return result;
@@ -231,12 +220,11 @@ main (int argc,
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"receiver::init");
+      ex._tao_print_exception ("receiver::init");
       return -1;
     }
-  ACE_ENDTRY;
 
   ACE_OS::fclose (output_file);
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h
index a08f222d24d..df4daa0dcc9 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h
@@ -83,8 +83,7 @@ public:
   // Destructor.
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   // Initialize data components.
 
 protected:
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
index 2121f1ead25..b2bc0bd06ab 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
@@ -21,11 +21,10 @@ Sender_StreamEndPoint::get_callback (const char *,
   callback = &this->callback_;
 
   // Get the stream controller for this stream.
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Any_ptr streamctrl_any =
-        this->get_property_value ("Related_StreamCtrl"
-                                  ACE_ENV_ARG_PARAMETER);
+        this->get_property_value ("Related_StreamCtrl");
 
       AVStreams::StreamCtrl_ptr streamctrl;
       *streamctrl_any >>= streamctrl;
@@ -33,14 +32,12 @@ Sender_StreamEndPoint::get_callback (const char *,
       // Store reference to the streamctrl
       SENDER::instance ()->streamctrl (streamctrl);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Sender_StreamEndPoint::get_callback failed");
+      ex._tao_print_exception ("Sender_StreamEndPoint::get_callback failed");
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -114,8 +111,7 @@ Sender::parse_args (int argc,
 
 int
 Sender::init (int argc,
-              char **argv
-              ACE_ENV_ARG_DECL)
+              char **argv)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -170,8 +166,7 @@ Sender::init (int argc,
 
   // Register the sender object with the naming server.
   this->naming_client_->rebind (name,
-                                mmdevice.in ()
-                                ACE_ENV_ARG_PARAMETER);
+                                mmdevice.in ());
 
   return 0;
 }
@@ -193,7 +188,7 @@ Sender::pace_data (void)
                 this->frame_rate_,
                 inter_frame_time.msec ()));
 
-  ACE_TRY
+  try
     {
       // The time taken for sending a frame and preparing for the next frame
       ACE_High_Res_Timer elapsed_timer;
@@ -204,8 +199,7 @@ Sender::pace_data (void)
           // Run the orb for the wait time so the sender can
           // continue other orb requests.
           ACE_Time_Value wait_time (5);
-          TAO_AV_CORE::instance ()->orb ()->run (wait_time
-                                                 ACE_ENV_ARG_PARAMETER);
+          TAO_AV_CORE::instance ()->orb ()->run (wait_time);
         }
 
       // Continue to send data till the file is read to the end.
@@ -265,8 +259,7 @@ Sender::pace_data (void)
 
                   // Run the orb for the wait time so the sender can
                   // continue other orb requests.
-                  TAO_AV_CORE::instance ()->orb ()->run (wait_time
-                                                         ACE_ENV_ARG_PARAMETER);
+                  TAO_AV_CORE::instance ()->orb ()->run (wait_time);
                 }
             }
 
@@ -297,17 +290,14 @@ Sender::pace_data (void)
         {
           // File reading is complete, destroy the stream.
           AVStreams::flowSpec stop_spec;
-          this->streamctrl_->destroy (stop_spec
-                                      ACE_ENV_ARG_PARAMETER);
+          this->streamctrl_->destroy (stop_spec);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Sender::pace_data Failed\n");
+      ex._tao_print_exception ("Sender::pace_data Failed\n");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -315,23 +305,19 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
+                         0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
+        = orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var
       PortableServer::POA_var root_poa
-        = PortableServer::POA::_narrow (obj.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+        = PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
         = root_poa->the_POAManager ();
@@ -340,14 +326,12 @@ main (int argc,
 
       // Initialize the AV Stream components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+                                      root_poa.in ());
 
       // Initialize the Sender.
       int result = 0;
       result = SENDER::instance ()->init (argc,
-                                          argv
-                                          ACE_ENV_ARG_PARAMETER);
+                                          argv);
 
       if (result < 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -361,13 +345,11 @@ main (int argc,
       // Hack for now....
       ACE_OS::sleep (1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Sender Failed\n");
+      ex._tao_print_exception ("Sender Failed\n");
       return -1;
     }
-  ACE_ENDTRY;
 
   SENDER::close ();  // Explicitly finalize the Unmanaged_Singleton.
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h
index ead95dc625d..18b14b3d3bb 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h
@@ -62,8 +62,7 @@ public:
   // Constructor
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   // Method to initialize the various data components.
 
   int pace_data (void);
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
index f82dfc0a159..2bdc00c0bb7 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
@@ -127,19 +127,16 @@ Receiver_Callback::handle_destroy (void)
 
   dump_samples (stats_file_name);
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      TAO_AV_CORE::instance ()->orb ()->shutdown (0
-                                                  ACE_ENV_ARG_PARAMETER);
+      TAO_AV_CORE::instance ()->orb ()->shutdown (0);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Receiver_Callback::handle_destroy Failed\n");
+      ex._tao_print_exception ("Receiver_Callback::handle_destroy Failed\n");
       return -1;
 
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -155,8 +152,7 @@ Receiver::~Receiver (void)
 
 int
 Receiver::init (int,
-                char **
-                ACE_ENV_ARG_DECL)
+                char **)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -192,8 +188,7 @@ Receiver::init (int,
 
   // Register the receiver object with the naming server.
   this->naming_client_->rebind (name,
-                                mmdevice.in ()
-                                ACE_ENV_ARG_PARAMETER);
+                                mmdevice.in ());
 
   return 0;
 }
@@ -233,24 +228,20 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
+                         0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
+        = orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
         = root_poa->the_POAManager ();
@@ -259,8 +250,7 @@ main (int argc,
 
       // Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+                                      root_poa.in ());
 
       int result =
         parse_args (argc,
@@ -285,8 +275,7 @@ main (int argc,
       Receiver receiver;
       result =
         receiver.init (argc,
-                       argv
-                       ACE_ENV_ARG_PARAMETER);
+                       argv);
 
       if (result != 0)
         return result;
@@ -300,12 +289,11 @@ main (int argc,
 
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"receiver::init");
+      ex._tao_print_exception ("receiver::init");
       return -1;
     }
-  ACE_ENDTRY;
 
   ACE_OS::fclose (output_file);
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
index 718b2deac25..1023828a24e 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
@@ -90,8 +90,7 @@ public:
   // Destructor.
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   // Initialize data components.
 
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
index 9cbfec084ab..740b549a1e6 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
@@ -150,12 +150,10 @@ Sender::bind_to_receiver (void)
 
   // Resolve the receiver object reference from the Naming Service
   CORBA::Object_var receiver_mmdevice_obj =
-    this->naming_client_->resolve (name
-                                   ACE_ENV_ARG_PARAMETER);
+    this->naming_client_->resolve (name);
 
   this->receiver_mmdevice_ =
-    AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+    AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in ());
 
   if (CORBA::is_nil (this->receiver_mmdevice_.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -167,8 +165,7 @@ Sender::bind_to_receiver (void)
 
 int
 Sender::init (int argc,
-              char **argv
-              ACE_ENV_ARG_DECL)
+              char **argv)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -283,8 +280,7 @@ Sender::init (int argc,
     this->streamctrl_->bind_devs (mmdevice.in (),
                                   this->receiver_mmdevice_.in (),
                                   the_qos.inout (),
-                                  flow_spec
-                                  ACE_ENV_ARG_PARAMETER);
+                                  flow_spec);
 
   if (bind_result == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -311,7 +307,7 @@ Sender::pace_data (void)
                 this->frame_rate_,
                 inter_frame_time.msec ()));
 
-  ACE_TRY
+  try
     {
       // The time taken for sending a frame and preparing for the next frame
       ACE_High_Res_Timer elapsed_timer;
@@ -376,8 +372,7 @@ Sender::pace_data (void)
 
                   // Run the orb for the wait time so the sender can
                   // continue other orb requests.
-                  TAO_AV_CORE::instance ()->orb ()->run (wait_time
-                                                         ACE_ENV_ARG_PARAMETER);
+                  TAO_AV_CORE::instance ()->orb ()->run (wait_time);
                 }
             }
 
@@ -408,20 +403,16 @@ Sender::pace_data (void)
 
       // File reading is complete, destroy the stream.
       AVStreams::flowSpec stop_spec;
-      this->streamctrl_->destroy (stop_spec
-                                  ACE_ENV_ARG_PARAMETER);
+      this->streamctrl_->destroy (stop_spec);
 
       // Shut the orb down.
-      TAO_AV_CORE::instance ()->orb ()->shutdown (0
-                                                  ACE_ENV_ARG_PARAMETER);
+      TAO_AV_CORE::instance ()->orb ()->shutdown (0);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Sender::pace_data Failed\n");
+      ex._tao_print_exception ("Sender::pace_data Failed\n");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -429,23 +420,19 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
+                         0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
+        = orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var
       PortableServer::POA_var root_poa
-        = PortableServer::POA::_narrow (obj.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+        = PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
         = root_poa->the_POAManager ();
@@ -454,14 +441,12 @@ main (int argc,
 
       // Initialize the AV Stream components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+                                      root_poa.in ());
 
       // Initialize the Sender.
       int result = 0;
       result = SENDER::instance ()->init (argc,
-                                          argv
-                                          ACE_ENV_ARG_PARAMETER);
+                                          argv);
 
       if (result < 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -471,13 +456,11 @@ main (int argc,
       // Start sending data.
       result = SENDER::instance ()->pace_data ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Sender Failed\n");
+      ex._tao_print_exception ("Sender Failed\n");
       return -1;
     }
-  ACE_ENDTRY;
 
   SENDER::close ();  // Explicitly finalize the Unmanaged_Singleton.
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h
index f6efd750075..7bdeb7d7b21 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h
@@ -62,8 +62,7 @@ public:
   // Constructor
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   // Method to initialize the various data components.
 
   int pace_data (void);
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp
index 8286f776dd8..3e23a25cdb9 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp
@@ -65,19 +65,16 @@ Receiver_Callback::handle_destroy (void)
   ACE_DEBUG ((LM_DEBUG,
               "Receiver_Callback::end_stream\n"));
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      TAO_AV_CORE::instance ()->orb ()->shutdown (0
-                                                  ACE_ENV_ARG_PARAMETER);
+      TAO_AV_CORE::instance ()->orb ()->shutdown (0);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Receiver_Callback::handle_destroy Failed\n");
+      ex._tao_print_exception ("Receiver_Callback::handle_destroy Failed\n");
       return -1;
 
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -95,8 +92,7 @@ Receiver::~Receiver (void)
 
 int
 Receiver::init (int,
-                char **
-                ACE_ENV_ARG_DECL)
+                char **)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -132,8 +128,7 @@ Receiver::init (int,
 
   // Register the receiver object with the naming server.
   this->naming_client_->rebind (name,
-                                mmdevice.in ()
-                                ACE_ENV_ARG_PARAMETER);
+                                mmdevice.in ());
 
   return 0;
 }
@@ -169,24 +164,20 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
+                         0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
+        = orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
         = root_poa->the_POAManager ();
@@ -195,8 +186,7 @@ main (int argc,
 
       // Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+                                      root_poa.in ());
 
       int result =
         parse_args (argc,
@@ -221,8 +211,7 @@ main (int argc,
       Receiver receiver;
       result =
         receiver.init (argc,
-                       argv
-                       ACE_ENV_ARG_PARAMETER);
+                       argv);
 
       if (result != 0)
         return result;
@@ -234,12 +223,11 @@ main (int argc,
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"receiver::init");
+      ex._tao_print_exception ("receiver::init");
       return -1;
     }
-  ACE_ENDTRY;
 
   ACE_OS::fclose (output_file);
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h
index 91af15eaa33..7e4d84d0c5e 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h
@@ -84,8 +84,7 @@ public:
   // Destructor.
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   // Initialize data components.
 
 protected:
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
index 995fcf04e94..07d6f6b2294 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
@@ -15,8 +15,7 @@ ACE_Time_Value inter_frame_time;
 
 CORBA::Boolean
 Sender_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos,
-                                   const AVStreams::flowSpec &the_flows
-                                   ACE_ENV_ARG_DECL)
+                                   const AVStreams::flowSpec &the_flows)
                                    ACE_THROW_SPEC (( CORBA::SystemException,
                                                      AVStreams::noSuchFlow,
                                                      AVStreams::QoSRequestFailed ))
@@ -24,7 +23,7 @@ Sender_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos,
   ACE_DEBUG ((LM_DEBUG,
               "Sender_StreamEndPoint::modify_QoS\n"));
 
-  int result =  this->change_qos (new_qos, the_flows ACE_ENV_ARG_PARAMETER);
+  int result =  this->change_qos (new_qos, the_flows);
 
   if (result != 0)
     return 0;
@@ -36,7 +35,6 @@ int
 Sender_StreamEndPoint::get_callback (const char *,
                                      TAO_AV_Callback *&callback)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
   // Create and return the sender application callback to AVStreams
   // for further upcalls.
   callback = &this->callback_;
@@ -199,12 +197,10 @@ Sender::bind_to_receiver (void)
 
   // Resolve the receiver object reference from the Naming Service
   CORBA::Object_var receiver_mmdevice_obj =
-    this->naming_client_->resolve (name
-                                   ACE_ENV_ARG_PARAMETER);
+    this->naming_client_->resolve (name);
 
   this->receiver_mmdevice_ =
-    AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+    AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in ());
 
   if (CORBA::is_nil (this->receiver_mmdevice_.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -216,8 +212,7 @@ Sender::bind_to_receiver (void)
 
 int
 Sender::init (int argc,
-              char **argv
-              ACE_ENV_ARG_DECL)
+              char **argv)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -338,8 +333,7 @@ Sender::init (int argc,
     this->streamctrl_->bind_devs (mmdevice.in (),
                                   this->receiver_mmdevice_.in (),
                                   qos,
-                                  flow_spec
-                                  ACE_ENV_ARG_PARAMETER);
+                                  flow_spec);
 
   if (bind_result == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -365,7 +359,7 @@ Sender::pace_data (void)
                 this->frame_rate_,
                 inter_frame_time.msec ()));
 
-  ACE_TRY
+  try
     {
       // The time taken for sending a frame and preparing for the next frame
       ACE_High_Res_Timer elapsed_timer;
@@ -427,8 +421,7 @@ Sender::pace_data (void)
 
                   // Run the orb for the wait time so the sender can
                   // continue other orb requests.
-                  TAO_AV_CORE::instance ()->orb ()->run (wait_time
-                                                         ACE_ENV_ARG_PARAMETER);
+                  TAO_AV_CORE::instance ()->orb ()->run (wait_time);
                 }
             }
 
@@ -467,29 +460,24 @@ Sender::pace_data (void)
               AVStreams::streamQoS qos;
               this->fill_qos (qos);
               this->streamctrl_->modify_QoS (qos,
-                                             flow_spec
-                                             ACE_ENV_ARG_PARAMETER);
+                                             flow_spec);
             }
 
         } // end while
 
       // File reading is complete, destroy the stream.
       AVStreams::flowSpec stop_spec;
-      this->streamctrl_->destroy (stop_spec
-                                  ACE_ENV_ARG_PARAMETER);
+      this->streamctrl_->destroy (stop_spec);
 
       // Shut the orb down.
-      TAO_AV_CORE::instance ()->orb ()->shutdown (0
-                                                  ACE_ENV_ARG_PARAMETER);
+      TAO_AV_CORE::instance ()->orb ()->shutdown (0);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Sender::pace_data Failed\n");
+      ex._tao_print_exception ("Sender::pace_data Failed\n");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -497,23 +485,19 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
+                         0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
+        = orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var
       PortableServer::POA_var root_poa
-        = PortableServer::POA::_narrow (obj.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+        = PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
         = root_poa->the_POAManager ();
@@ -522,14 +506,12 @@ main (int argc,
 
       // Initialize the AV Stream components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+                                      root_poa.in ());
 
       // Initialize the Sender.
       int result = 0;
       result = SENDER::instance ()->init (argc,
-                                          argv
-                                          ACE_ENV_ARG_PARAMETER);
+                                          argv);
 
       if (result < 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -539,13 +521,11 @@ main (int argc,
       // Start sending data.
       result = SENDER::instance ()->pace_data ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Sender Failed\n");
+      ex._tao_print_exception ("Sender Failed\n");
       return -1;
     }
-  ACE_ENDTRY;
 
   SENDER::close (); // Explicitly finalize the Unmanaged_Singleton.
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h
index 6325ee5aa15..46676fd5579 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h
@@ -40,7 +40,7 @@ public:
 
   CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos,
                              const AVStreams::flowSpec &/* the_flows */
-                             ACE_ENV_ARG_DECL)
+                             )
                             ACE_THROW_SPEC(( CORBA::SystemException,
                                              AVStreams::noSuchFlow,
                                              AVStreams::QoSRequestFailed ));
@@ -68,8 +68,7 @@ public:
   // Constructor
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   // Method to initialize the various data components.
 
   int pace_data (void);
diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp
index 0cac4721d4b..8551e20c058 100644
--- a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp
+++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp
@@ -45,21 +45,18 @@ Time_impl::Shutdown (void)
 int
 main(int argc, char * argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Initialize orb
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
+                         "");
 
       // Get reference to Root POA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var rootpoa =
         PortableServer::POA::_narrow (obj.in ());
@@ -76,12 +73,10 @@ main(int argc, char * argv[])
       PolicyList.length (3);
 
       PolicyList [0] =
-        rootpoa->create_lifespan_policy (PortableServer::PERSISTENT
-                                         ACE_ENV_ARG_PARAMETER);
+        rootpoa->create_lifespan_policy (PortableServer::PERSISTENT);
 
       PolicyList [1] =
-        rootpoa->create_id_assignment_policy (PortableServer::USER_ID
-                                              ACE_ENV_ARG_PARAMETER);
+        rootpoa->create_id_assignment_policy (PortableServer::USER_ID);
 
       CORBA::Any CallbackPolicy;
       CallbackPolicy <<= BiDirPolicy::BOTH;
@@ -89,13 +84,11 @@ main(int argc, char * argv[])
 
       PolicyList [2] =
         orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
-                            CallbackPolicy
-                            ACE_ENV_ARG_PARAMETER);
+                            CallbackPolicy);
 
       poa = rootpoa->create_POA (sServerPoaName,
                                  mgr.in(),
-                                 PolicyList
-                                 ACE_ENV_ARG_PARAMETER);
+                                 PolicyList);
 
 
       PortableServer::ObjectId_var ServerId =
@@ -106,16 +99,14 @@ main(int argc, char * argv[])
       PortableServer::ServantBase_var self_manage (time_servant);
 
       poa->activate_object_with_id (ServerId.in (),
-                                    time_servant
-                                    ACE_ENV_ARG_PARAMETER);
+                                    time_servant);
 
       // Get a reference after activating the object
       TimeModule::Time_var tm = time_servant->_this();
 
       // Get reference to initial naming context
       CORBA::Object_var name_obj =
-        orb->resolve_initial_references ("NameService"
-                                         ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("NameService");
 
       CosNaming::NamingContext_var inc =
         CosNaming::NamingContext::_narrow (name_obj.in ());
@@ -132,28 +123,24 @@ main(int argc, char * argv[])
         CORBA::string_dup ("Time");
 
       inc->rebind (service_name,
-                   tm.in ()
-                   ACE_ENV_ARG_PARAMETER);
+                   tm.in ());
 
       // Run the event loop for fun
       ACE_Time_Value tv (3, 0);
 
       // Accept requests
-      orb->run (&tv
-                ACE_ENV_ARG_PARAMETER);
+      orb->run (&tv);
 
-      rootpoa->destroy (0 , 0 ACE_ENV_ARG_PARAMETER);
+      rootpoa->destroy (0 , 0);
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught an exception\n");
+      ex._tao_print_exception ("Caught an exception\n");
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp
index bda834f18fb..0ece672154c 100644
--- a/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp
@@ -11,33 +11,30 @@
 //
 int main( int argc, char *argv[] )
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      CORBA::ORB_var orb = CORBA::ORB_init( argc, argv, 0 ACE_ENV_ARG_PARAMETER ) ;
+      CORBA::ORB_var orb = CORBA::ORB_init( argc, argv, 0 ) ;
 
-      ACE_TRY_EX (nested)
+      try
         {
            CORBA::Object_var naming =
-              orb->resolve_initial_references( "NameService" ACE_ENV_ARG_PARAMETER) ;
-           ACE_TRY_CHECK_EX (nested);
+              orb->resolve_initial_references( "NameService") ;
            if( CORBA::is_nil( naming.in() ) )
              {
                 return 1 ;
              }
         }
-      ACE_CATCH (CORBA::Exception, ex)
+      catch (const CORBA::Exception& ex)
         {
           ACE_UNUSED_ARG (ex);
           return 1 ;
         }
-      ACE_ENDTRY;
     }
-  ACE_CATCH ( CORBA::Exception, ex )
+  catch (const CORBA::Exception& ex)
     {
        ACE_UNUSED_ARG (ex);
        return 2 ;
     }
-  ACE_ENDTRY;
 
   return 0 ;
 }
diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp
index 965bdda1adb..3aa7dcf576f 100644
--- a/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp
@@ -7,21 +7,20 @@
 
 int main(int argc, char** argv)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      CORBA::ORB_var orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
+      CORBA::ORB_var orb_ = CORBA::ORB_init (argc, argv, 0);
 
       CORBA::Object_var object =
-        orb_->resolve_initial_references ("InterfaceRepository" ACE_ENV_ARG_PARAMETER);
+        orb_->resolve_initial_references ("InterfaceRepository");
 
-      CORBA::Repository_var repo_ = CORBA::Repository::_narrow (object.in ()
-                                    ACE_ENV_ARG_PARAMETER);
+      CORBA::Repository_var repo_ = CORBA::Repository::_narrow (object.in ());
 
 
       CORBA::ContainedSeq_var interfaces =
                   repo_->contents (CORBA::dk_Interface,    // Any type of contained object.
                                    1                       // Exclude parents of interfaces.
-                                   ACE_ENV_ARG_PARAMETER);
+                                   );
 
       CORBA::ULong length = interfaces->length ();
 
@@ -34,8 +33,7 @@ int main(int argc, char** argv)
       CORBA::ULong first_one = 0;
 
       CORBA::InterfaceDef_var the_interface =
-            CORBA::InterfaceDef::_narrow (interfaces[first_one]
-                                          ACE_ENV_ARG_PARAMETER);
+            CORBA::InterfaceDef::_narrow (interfaces[first_one]);
 
       CORBA::String_var name = the_interface->name();
 
@@ -48,12 +46,10 @@ int main(int argc, char** argv)
 
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception ...");
+      ex._tao_print_exception ("Exception ...");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp
index 87944856506..103af8d6117 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp
@@ -10,30 +10,24 @@ Test_i::Test_i (CORBA::ORB_ptr orb) :
   orb_ (CORBA::ORB::_duplicate(orb)),
    policies_ (1)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::Object_var obj =
-        orb_->resolve_initial_references ("RootPOA"
-                                          ACE_ENV_ARG_PARAMETER);
+        orb_->resolve_initial_references ("RootPOA");
       this->root_poa_ =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in ());
       policies_.length(1);
       policies_[0] =
-        root_poa_->create_lifespan_policy (PortableServer::PERSISTENT
-                                           ACE_ENV_ARG_PARAMETER);
+        root_poa_->create_lifespan_policy (PortableServer::PERSISTENT);
       this->poa_mgr_ =
         this->root_poa_->the_POAManager ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception");
+      ex._tao_print_exception ("Caught exception");
 
       ACE_ASSERT (0);  // Force termination!
     }
-  ACE_ENDTRY;
 }
 
 Test_i::~Test_i (void)
@@ -45,15 +39,14 @@ int
 Test_i::try_and_create_POA (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       PortableServer::POA_var persistent_poa =
         root_poa_->create_POA ("MyPoa",
                                poa_mgr_.in (),
-                               this->policies_
-                               ACE_ENV_ARG_PARAMETER);
+                               this->policies_);
     }
-  ACE_CATCH (CORBA::TRANSIENT, ex)
+  catch (const CORBA::TRANSIENT& ex)
     {
       // A transient exception exception may be expected,
       // so we won't print out the word exception but we
@@ -62,13 +55,11 @@ Test_i::try_and_create_POA (void)
                   "CORBA::TRANSIENT in Test_i::try_and_create_POA\n"));
       return 1;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "try_and_create_POA Exception ...");
+      ex._tao_print_exception ("try_and_create_POA Exception ...");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -77,5 +68,5 @@ void
 Test_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-   orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+   orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp
index a33f0a4c648..6c96143e2e6 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp
@@ -38,19 +38,19 @@ int
 main (int argc, char *argv[])
 {
   int result = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object(ior);
 
       Test_var server =
-        Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
+        Test::_narrow(tmp.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -71,13 +71,11 @@ main (int argc, char *argv[])
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       result =1;
     }
-  ACE_ENDTRY;
 
   return result;
 }
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp
index e13495b805c..e7984b80ea0 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp
@@ -34,15 +34,14 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -50,7 +49,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -60,14 +59,13 @@ main (int argc, char *argv[])
 
       Test_i server_impl (orb.in ());
 
-      root_poa->activate_object (&server_impl
-                                       ACE_ENV_ARG_PARAMETER);
+      root_poa->activate_object (&server_impl);
 
 
       CORBA::Object_var server = server_impl._this();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (server.in ());
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
@@ -97,15 +95,13 @@ main (int argc, char *argv[])
 
       orb->run ();
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "SERVER (%P): Caught exception:");
+      ex._tao_print_exception ("SERVER (%P): Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp
index ab463ae6c08..2344a2f0dfb 100644
--- a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp
+++ b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp
@@ -10,23 +10,22 @@
 
 int main (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY_NEW_ENV
+  try
    {
       int failed = 0;
 
       ACE_DEBUG((LM_DEBUG, "Start of Client\n"));
       // Initialise ORB.
       //
-      CORBA::ORB_var orb = CORBA::ORB_init( argc, argv, "" ACE_ENV_ARG_PARAMETER);
+      CORBA::ORB_var orb = CORBA::ORB_init( argc, argv, "");
 
       // Find the Interface Repository.
       //
       ACE_DEBUG((LM_DEBUG, ". Find IFR\n"));
-      CORBA::Object_var ifr_obj = orb->resolve_initial_references( "InterfaceRepository" ACE_ENV_ARG_PARAMETER);
+      CORBA::Object_var ifr_obj = orb->resolve_initial_references( "InterfaceRepository");
 
       ACE_DEBUG((LM_DEBUG, ". Narrow IFR\n"));
-      CORBA::Repository_var ifr = CORBA::Repository::_narrow( ifr_obj.in() ACE_ENV_ARG_PARAMETER);
+      CORBA::Repository_var ifr = CORBA::Repository::_narrow( ifr_obj.in());
 
       if( CORBA::is_nil( ifr.in() ) )
       {
@@ -43,23 +42,23 @@ int main (int argc, char* argv[])
          ifr->create_interface( "IDL:interface865:1.0",
                                 "interface865",
                                 "1.0",
-                                baseInterfaces  ACE_ENV_ARG_PARAMETER) ;
+                                baseInterfaces) ;
 
       // Add an operation to the interface.
       // First get some useful things.
       //
       ACE_DEBUG((LM_DEBUG, ". Get primitive (void)\n"));
       CORBA::PrimitiveDef_var voidPrimitive =
-         ifr->get_primitive( CORBA::pk_void ACE_ENV_ARG_PARAMETER) ;
+         ifr->get_primitive( CORBA::pk_void) ;
       ACE_DEBUG((LM_DEBUG, ". Get primitive (char)\n"));
       CORBA::PrimitiveDef_var charPrimitive =
-         ifr->get_primitive( CORBA::pk_char ACE_ENV_ARG_PARAMETER) ;
+         ifr->get_primitive( CORBA::pk_char) ;
       ACE_DEBUG((LM_DEBUG, ". Get primitive (long)\n"));
       CORBA::PrimitiveDef_var longPrimitive =
-         ifr->get_primitive( CORBA::pk_long ACE_ENV_ARG_PARAMETER) ;
+         ifr->get_primitive( CORBA::pk_long) ;
       ACE_DEBUG((LM_DEBUG, ". Get primitive (short)\n"));
       CORBA::PrimitiveDef_var shortPrimitive =
-         ifr->get_primitive( CORBA::pk_short ACE_ENV_ARG_PARAMETER) ;
+         ifr->get_primitive( CORBA::pk_short) ;
 
       ACE_DEBUG((LM_DEBUG, ". create 3 parameters\n"));
       // The operation has three parameters...
@@ -115,7 +114,7 @@ int main (int argc, char* argv[])
                                       CORBA::OP_NORMAL,
                                       parameters,
                                       exceptions,
-                                      contextIds ACE_ENV_ARG_PARAMETER) ;
+                                      contextIds) ;
 
 
 
@@ -125,8 +124,7 @@ int main (int argc, char* argv[])
 
       ACE_DEBUG((LM_DEBUG, "About to call create_operation_list\n"));
       orb->create_operation_list(operation.in (),
-		                 opList.out()
-				 ACE_ENV_ARG_PARAMETER) ;
+		                 opList.out()) ;
 
       ACE_DEBUG((LM_DEBUG, "Call to create_operation_list succeeded\n"));
       CORBA::ULong count = opList->count() ;
@@ -145,8 +143,7 @@ int main (int argc, char* argv[])
       }
 
       CORBA::Boolean const eq_char =
-        nv->value()->type()->equal (CORBA::_tc_char
-                                    ACE_ENV_ARG_PARAMETER);
+        nv->value()->type()->equal (CORBA::_tc_char);
 
       if( !eq_char  )
       {
@@ -167,8 +164,7 @@ int main (int argc, char* argv[])
       }
 
       CORBA::Boolean const eq_long =
-        nv->value()->type()->equal (CORBA::_tc_long
-                                   ACE_ENV_ARG_PARAMETER);
+        nv->value()->type()->equal (CORBA::_tc_long);
 
       if( !eq_long  )
       {
@@ -189,8 +185,7 @@ int main (int argc, char* argv[])
       }
 
       CORBA::Boolean const eq_short =
-        nv->value()->type()->equal (CORBA::_tc_short
-                                    ACE_ENV_ARG_PARAMETER);
+        nv->value()->type()->equal (CORBA::_tc_short);
 
       if( !eq_short  )
       {
@@ -218,17 +213,16 @@ int main (int argc, char* argv[])
       }
       ACE_DEBUG((LM_DEBUG, ". seems OK\n"));
    }
-   ACE_CATCHANY
+   catch (const CORBA::Exception& ex)
    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception - test failed:\n");
+      ex._tao_print_exception ("Exception - test failed:\n");
       return 1;
    }
-   ACE_CATCHALL
+   catch (...)
    {
      ACE_DEBUG((LM_DEBUG, "An unknown exception occured - test failed\n"));
      return 1;
    }
-   ACE_ENDTRY;
 
 
    return 0 ;
diff --git a/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp b/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp
index 41e64a4dd51..8b28339da93 100644
--- a/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp
+++ b/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp
@@ -57,7 +57,7 @@ ORB_Task::svc (void)
   }
   catch ( const CORBA::Exception& e )
   {
-      ACE_PRINT_EXCEPTION (e, "Exception caught");
+      e._tao_print_exception ("Exception caught");
   }
 
   return 0;
diff --git a/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp
index a4eee121d2f..eab4bc5f74b 100644
--- a/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp
@@ -35,13 +35,13 @@ CORBA::Boolean
 check_is_equivalent (const char* ior1, const char * ior2, CORBA::Boolean expected_result)
 {
   CORBA::Boolean result = 1;
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var object1 =
-        orb->string_to_object(ior1 ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object(ior1);
 
       CORBA::Object_var object2 =
-        orb->string_to_object (ior2 ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior2);
 
       const char* expected_result_string = (expected_result ? "true" : "false");
 
@@ -59,14 +59,12 @@ check_is_equivalent (const char* ior1, const char * ior2, CORBA::Boolean expecte
           result = 0;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG ((LM_ERROR, "Vastly unexpected exception comparing %s and %s:\n", ior1, ior2));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception:");
+      ex._tao_print_exception ("Exception:");
       result = 0;
     }
-  ACE_ENDTRY;
   return result;
 }
 
@@ -74,10 +72,10 @@ int
 main (int argc, char *argv[])
 {
   CORBA::Boolean result = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
       orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -296,13 +294,11 @@ main (int argc, char *argv[])
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return result;
 }
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
index fa225ac047b..3bc9fdc4215 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
@@ -78,16 +78,14 @@ int
 main (int argc,
       char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   Manager manager;
 
-  ACE_TRY
+  try
     {
       // Initilaize the ORB, POA etc.
       manager.init (argc,
-                    argv
-                    ACE_ENV_ARG_PARAMETER);
+                    argv);
 
       // the command line arguments
       if (parse_args (argc, argv) == -1)
@@ -111,13 +109,11 @@ main (int argc,
       Client_i client_imp (manager.orb ());
       return client_imp.init ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught");
+      ex._tao_print_exception ("Caught");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -131,22 +127,19 @@ Manager::Manager (void)
 
 void
 Manager::init (int argc,
-               char *argv[]
-               ACE_ENV_ARG_DECL)
+               char *argv[])
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                0
-                                ACE_ENV_ARG_PARAMETER);
+                                0);
 
   // Obtain the RootPOA.
   CORBA::Object_var obj_var =
-    this->orb_->resolve_initial_references ("RootPOA"
-                                            ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references ("RootPOA");
 
   // Get the POA_var object from Object_var.
   PortableServer::POA_var root_poa_var =
-    PortableServer::POA::_narrow (obj_var.in () ACE_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (obj_var.in ());
 
   // Get the POAManager of the RootPOA.
   PortableServer::POAManager_var poa_manager_var =
@@ -160,24 +153,21 @@ Manager::make_merged_iors (void)
 {
   // First  server
   object_primary =
-    this->orb_->string_to_object (first_ior
-                                  ACE_ENV_ARG_PARAMETER);
+    this->orb_->string_to_object (first_ior);
 
   if (merged_test)
     {
       //Second server
       object_secondary =
-        this->orb_->string_to_object (second_ior
-                                      ACE_ENV_ARG_PARAMETER);
+        this->orb_->string_to_object (second_ior);
 
       // Get an object reference for the ORBs IORManipultion object!
       CORBA::Object_var IORM =
         this->orb_->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-                                              0
-                                              ACE_ENV_ARG_PARAMETER);
+                                              0);
 
       iorm =
-        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in() ACE_ENV_ARG_PARAMETER);
+        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in());
 
 
       // Create the list
@@ -188,7 +178,7 @@ Manager::make_merged_iors (void)
 
       // Create a merged set 1;
       merged_set_ =
-        iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
+        iorm->merge_iors (iors);
     }
   else
     {
@@ -227,16 +217,14 @@ Manager::set_properties (void)
   // Set the property
       CORBA::Boolean retval = iorm->set_primary (&iogr_prop,
                                   object_secondary.in (),
-                                  this->merged_set_.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+                                  this->merged_set_.in ());
 
   // Set the primary
   // See we are setting the second ior as the primary
   if (retval != 0)
     {
       retval = iorm->set_property (&iogr_prop,
-                           this->merged_set_.in ()
-                       ACE_ENV_ARG_PARAMETER);
+                           this->merged_set_.in ());
     }
 
   return 0;
@@ -245,17 +233,16 @@ Manager::set_properties (void)
 int
 Manager::run (void)
 {
-  ACE_TRY
+  try
     {
       this->orb_->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_ERROR_RETURN ((LM_DEBUG,
                          "Error in run \n"),
                         -1);
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -310,7 +297,7 @@ int run_remote_test (Simple_Server_ptr server, const char* execute_key)
       ACE_OS::strcpy (expected, "CORBA::TRANSIENT");
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       // Make a remote call
       CORBA::String_var s =
@@ -325,15 +312,14 @@ int run_remote_test (Simple_Server_ptr server, const char* execute_key)
           ACE_OS::strcpy (received, s.in());
         }
     }
-  ACE_CATCH (CORBA::TRANSIENT, et)
+  catch (const CORBA::TRANSIENT& et)
     {
       ACE_OS::strcpy (received, "CORBA::TRANSIENT");
     }
-  ACE_CATCH (CORBA::COMM_FAILURE, ec)
+  catch (const CORBA::COMM_FAILURE& ec)
     {
       ACE_OS::strcpy (received, "CORBA::COMM_FAILURE");
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
           ACE_TEXT("CLIENT> REMOTE   expected: '%s'"),
@@ -371,7 +357,7 @@ int run_abort_test (Simple_Server_ptr server,
       ACE_OS::strcpy (expected, "CORBA::COMM_FAILURE");
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::String_var s = server->abort (request_key);
 
@@ -384,15 +370,14 @@ int run_abort_test (Simple_Server_ptr server,
           ACE_OS::strcpy (received, s.in());
         }
     }
-  ACE_CATCH (CORBA::TRANSIENT, et)
+  catch (const CORBA::TRANSIENT& et)
     {
       ACE_OS::strcpy (received, "CORBA::TRANSIENT");
     }
-  ACE_CATCH (CORBA::COMM_FAILURE, ec)
+  catch (const CORBA::COMM_FAILURE& ec)
     {
       ACE_OS::strcpy (received, "CORBA::COMM_FAILURE");
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
           ACE_TEXT("CLIENT> ABORT    expected: '%s'"),
@@ -425,7 +410,7 @@ int run_shutdown_test (Simple_Server_ptr server,
       ACE_OS::strcpy (expected, "CORBA::TRANSIENT");
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::String_var s = server->shutdown (request_key);
 
@@ -438,11 +423,10 @@ int run_shutdown_test (Simple_Server_ptr server,
           ACE_OS::strcpy (received, s.in());
         }
     }
-  ACE_CATCH (CORBA::TRANSIENT, ex)
+  catch (const CORBA::TRANSIENT& ex)
     {
       ACE_OS::strcpy (received, "CORBA::TRANSIENT");
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
           ACE_TEXT("CLIENT> SHUTDOWN expected: '%s'"),
@@ -555,17 +539,14 @@ Client_i::init (void)
   char **argv = 0;
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                0
-                                ACE_ENV_ARG_PARAMETER);
+                                0);
 
   CORBA::Object_var object =
-    this->orb_->string_to_object (data
-                                  ACE_ENV_ARG_PARAMETER);
+    this->orb_->string_to_object (data);
 
   // Combined IOR stuff
   Simple_Server_var server =
-    Simple_Server::_narrow (object.in ()
-                            ACE_ENV_ARG_PARAMETER);
+    Simple_Server::_narrow (object.in ());
 
   if (CORBA::is_nil (server.in ()))
     {
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h
index 7ef5b5a12b3..ca3bcae2b41 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h
@@ -20,8 +20,7 @@ public:
   // Ctor
 
   void init (int argc,
-             char *argv[]
-             ACE_ENV_ARG_DECL);
+             char *argv[]);
 
   // Initialize the ORB, POA etc.
 
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp
index 6d57e37de64..bfac29d6031 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp
@@ -39,17 +39,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       // We do the command line parsing first
       if (parse_args (argc, argv) != 0)
         return 1;
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -57,7 +56,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -65,14 +64,14 @@ main (int argc, char *argv[])
       CORBA::PolicyList policies;
       policies.length (3);
       policies[0] = root_poa->create_id_assignment_policy (
-          PortableServer::USER_ID ACE_ENV_ARG_PARAMETER);
+          PortableServer::USER_ID);
       policies[1] = root_poa->create_implicit_activation_policy (
-          PortableServer::NO_IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER);
+          PortableServer::NO_IMPLICIT_ACTIVATION);
       policies[2] = root_poa->create_lifespan_policy (
-          PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER);
+          PortableServer::PERSISTENT);
 
       PortableServer::POA_var poa = root_poa->create_POA (
-          "PERS_POA", poa_manager.in (), policies ACE_ENV_ARG_PARAMETER);
+          "PERS_POA", poa_manager.in (), policies);
 
       for (CORBA::ULong i = 0; i < policies.length (); ++i)
         {
@@ -84,13 +83,13 @@ main (int argc, char *argv[])
       PortableServer::ObjectId_var id =
           PortableServer::string_to_ObjectId ("IOGR_OID");
 
-      poa->activate_object_with_id (id.in(), &display_impl ACE_ENV_ARG_PARAMETER);
+      poa->activate_object_with_id (id.in(), &display_impl);
 
       CORBA::Object_var server =
-          poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER);
+          poa->id_to_reference (id.in ());
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -112,12 +111,10 @@ main (int argc, char *argv[])
       orb->run ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp
index 6264149b61e..2e9a087808f 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp
@@ -18,7 +18,7 @@ Simple_Server_i::Simple_Server_i (void)
 }
 
 char*
-Simple_Server_i::remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+Simple_Server_i::remote_call ( /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "SERVER(%s)> executing remote_call()\n", _key.in()));
@@ -32,7 +32,7 @@ Simple_Server_i::remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_
 
 
 char*
-Simple_Server_i::shutdown (const char* key ACE_ENV_ARG_DECL_NOT_USED)
+Simple_Server_i::shutdown (const char* key)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "SERVER(%s)> executing shutdown()\n", _key.in()));
@@ -52,7 +52,7 @@ Simple_Server_i::shutdown (const char* key ACE_ENV_ARG_DECL_NOT_USED)
 }
 
 char*
-Simple_Server_i::abort (const char* key ACE_ENV_ARG_DECL_NOT_USED)
+Simple_Server_i::abort (const char* key)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "SERVER(%s)> executing abort()\n", _key.in()));
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h
index bf9c96de492..be5b3ba7a95 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h
@@ -24,10 +24,10 @@ public:
   char* remote_call (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  char* shutdown (const char* key ACE_ENV_ARG_DECL_NOT_USED)
+  char* shutdown (const char* key)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  char* abort (const char* key ACE_ENV_ARG_DECL_NOT_USED)
+  char* abort (const char* key)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp
index f7f17dc240d..604643f3f4a 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp
@@ -15,16 +15,14 @@ Server_ORBInitializer::Server_ORBInitializer (void)
 
 void
 Server_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ServerRequestInterceptor_ptr interceptor;
@@ -39,8 +37,7 @@ Server_ORBInitializer::post_init (
 
   this->server_interceptor_ = interceptor;
 
-  info->add_server_request_interceptor (interceptor
-                                        ACE_ENV_ARG_PARAMETER);
+  info->add_server_request_interceptor (interceptor);
 }
 
 PortableInterceptor::ServerRequestInterceptor_ptr
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h
index 5c8103cd14f..4400e6235cb 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h
@@ -45,12 +45,10 @@ public:
   /// Constructor.
   Server_ORBInitializer (void);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the created server request interceptor.  Only valid after
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp
index e826810af1d..8ae869dc2d0 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp
@@ -19,8 +19,7 @@ Server_Request_Interceptor::~Server_Request_Interceptor (void)
 
 void
 Server_Request_Interceptor::forward_reference (
-  const char* iorstr
-  ACE_ENV_ARG_DECL_NOT_USED)
+  const char* iorstr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->iorstr_ = CORBA::string_dup (iorstr);
@@ -42,7 +41,7 @@ Server_Request_Interceptor::destroy (void)
 void
 Server_Request_Interceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr //
-    ACE_ENV_ARG_DECL_NOT_USED)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -51,14 +50,12 @@ Server_Request_Interceptor::receive_request_service_contexts (
 
 void
 Server_Request_Interceptor::receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
   IOP::ServiceContext_var svc =
-    ri->get_request_service_context (IOP::FT_GROUP_VERSION
-                                     ACE_ENV_ARG_PARAMETER);
+    ri->get_request_service_context (IOP::FT_GROUP_VERSION);
 
   // extract the group component
   TAO_InputCDR cdr (reinterpret_cast<const char*> (svc->context_data.get_buffer ()),
@@ -83,9 +80,9 @@ Server_Request_Interceptor::receive_request (
         {
           int argc = 0;
           char** argv = 0;
-          CORBA::ORB_var orb = CORBA::ORB_init(argc,argv,ri->orb_id() ACE_ENV_ARG_PARAMETER);
+          CORBA::ORB_var orb = CORBA::ORB_init(argc,argv,ri->orb_id());
 
-          CORBA::Object_var obj = orb->string_to_object (iorstr_.in() ACE_ENV_ARG_PARAMETER);
+          CORBA::Object_var obj = orb->string_to_object (iorstr_.in());
 
           ACE_DEBUG ((LM_DEBUG,
                     "SERVER (%P|%t) Request will be forwarded "
@@ -94,7 +91,7 @@ Server_Request_Interceptor::receive_request (
                     "receive_request_service_contexts().\n"));
           request_forwarded_ = 1;
           // Throw forward exception
-          ACE_THROW (PortableInterceptor::ForwardRequest (obj.in()));
+          throw PortableInterceptor::ForwardRequest (obj.in());
         }
       else
         {
@@ -108,16 +105,14 @@ Server_Request_Interceptor::receive_request (
 
 void
 Server_Request_Interceptor::send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_Request_Interceptor::send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -125,8 +120,7 @@ Server_Request_Interceptor::send_exception (
 
 void
 Server_Request_Interceptor::send_other (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h
index bfb2aa3c567..1c7e62a26d4 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h
@@ -46,7 +46,7 @@ public:
   ~Server_Request_Interceptor (void);
 
   /// Set the references to which requests will be forwarded.
-  virtual void forward_reference (const char* iorstr ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void forward_reference (const char* iorstr)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -66,31 +66,26 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_request_service_contexts (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_request (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_reply (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_exception (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_other (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
   //@}
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
index 6ef4eaf601a..2dc93f72765 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
@@ -72,16 +72,14 @@ int
 main (int argc,
       char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   Manager manager;
 
-  ACE_TRY
+  try
     {
       // Initilaize the ORB, POA etc.
       manager.init (argc,
-                    argv
-                    ACE_ENV_ARG_PARAMETER);
+                    argv);
 
       // the command line arguments
       if (parse_args (argc, argv) == -1)
@@ -99,13 +97,11 @@ main (int argc,
       Client_i client_imp (manager.orb ());
       return client_imp.init ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught");
+      ex._tao_print_exception ("Caught");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -117,22 +113,19 @@ Manager::Manager (void)
 
 void
 Manager::init (int& argc,
-               char**& argv
-               ACE_ENV_ARG_DECL)
+               char**& argv)
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                0
-                                ACE_ENV_ARG_PARAMETER);
+                                0);
 
   // Obtain the RootPOA.
   CORBA::Object_var obj_var =
-    this->orb_->resolve_initial_references ("RootPOA"
-                                            ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references ("RootPOA");
 
   // Get the POA_var object from Object_var.
   PortableServer::POA_var root_poa_var =
-    PortableServer::POA::_narrow (obj_var.in () ACE_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (obj_var.in ());
 
   // Get the POAManager of the RootPOA.
   PortableServer::POAManager_var poa_manager_var =
@@ -147,18 +140,18 @@ Manager::make_merged_iors (void)
   // Get an object reference for the ORBs IORManipultion object!
   CORBA::Object_var IORM =
 	  this->orb_->resolve_initial_references (
-		  TAO_OBJID_IORMANIPULATION, 0 ACE_ENV_ARG_PARAMETER);
+		  TAO_OBJID_IORMANIPULATION, 0);
 
   if (CORBA::is_nil (IORM.in()))
 	  return -1;
 
   TAO_IOP::TAO_IOR_Manipulation_var iorm =
-	  TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in() ACE_ENV_ARG_PARAMETER);
+	  TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in());
 
   if (CORBA::is_nil (iorm.in()))
 	  return -1;
 
-  CORBA::Object_var first = orb_->string_to_object (first_ior ACE_ENV_ARG_PARAMETER);
+  CORBA::Object_var first = orb_->string_to_object (first_ior);
 
   if (CORBA::is_nil (first.in()))
 	  return -1;
@@ -168,7 +161,7 @@ Manager::make_merged_iors (void)
   iors.length(1);
   iors [0] = first;
 
-  merged_set_10_ = iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
+  merged_set_10_ = iorm->merge_iors (iors);
 
   if (CORBA::is_nil (merged_set_10_.in()))
     {
@@ -176,7 +169,7 @@ Manager::make_merged_iors (void)
     }
 
   int result = set_properties (iorm.in(), merged_set_10_.in(),
-			    first.in(), 10 ACE_ENV_ARG_PARAMETER);
+			    first.in(), 10);
 
   if (-1 == result)
     {
@@ -202,7 +195,7 @@ Manager::make_merged_iors (void)
   iors [0] = first;
   iors [1] = second;
 
-  merged_set_11_ = iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
+  merged_set_11_ = iorm->merge_iors (iors);
 
   if (CORBA::is_nil (merged_set_11_.in()))
     {
@@ -210,7 +203,7 @@ Manager::make_merged_iors (void)
     }
 
   result = set_properties (iorm.in(), merged_set_11_.in(),
-			    first.in(), 11 ACE_ENV_ARG_PARAMETER);
+			    first.in(), 11);
 
   if (-1 == result)
     {
@@ -224,8 +217,7 @@ int
 Manager::set_properties (TAO_IOP::TAO_IOR_Manipulation_ptr iorm,
 			 CORBA::Object_ptr merged_set,
 			 CORBA::Object_ptr primary,
-			 CORBA::ULong version
-                         ACE_ENV_ARG_DECL)
+			 CORBA::ULong version)
 {
   FT::TagFTGroupTaggedComponent ft_tag_component;
 
@@ -251,16 +243,14 @@ Manager::set_properties (TAO_IOP::TAO_IOR_Manipulation_ptr iorm,
   // Set the property
   CORBA::Boolean retval = iorm->set_primary (&iogr_prop,
                                              primary,
-					     merged_set
-                                             ACE_ENV_ARG_PARAMETER);
+					     merged_set);
 
   // Set the primary
   // See we are setting the second ior as the primary
   if (retval != 0)
     {
       retval = iorm->set_property (&iogr_prop,
-                                    merged_set
-                                    ACE_ENV_ARG_PARAMETER);
+                                    merged_set);
     }
 
   return 0;
@@ -269,17 +259,16 @@ Manager::set_properties (TAO_IOP::TAO_IOR_Manipulation_ptr iorm,
 int
 Manager::run (void)
 {
-  ACE_TRY
+  try
     {
       this->orb_->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_ERROR_RETURN ((LM_DEBUG,
                          "Error in run \n"),
                         -1);
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -326,7 +315,7 @@ Client_i::Client_i (CORBA::ORB_ptr orb)
 {
 }
 
-int run_remote_test (Simple_Server_ptr server, const char* execute_key ACE_ENV_ARG_DECL)
+int run_remote_test (Simple_Server_ptr server, const char* execute_key)
 {
   char expected[1024], received[1024];
   if (execute_key)
@@ -339,7 +328,7 @@ int run_remote_test (Simple_Server_ptr server, const char* execute_key ACE_ENV_A
       ACE_OS::strcpy (expected, "CORBA::TRANSIENT");
     }
 
-  ACE_TRY
+  try
     {
       // Make a remote call
       CORBA::String_var s =
@@ -354,15 +343,14 @@ int run_remote_test (Simple_Server_ptr server, const char* execute_key ACE_ENV_A
 	  ACE_OS::strcpy (received, s.in());
         }
     }
-  ACE_CATCH (CORBA::TRANSIENT, te)
+  catch (const CORBA::TRANSIENT& te)
     {
       ACE_OS::strcpy (received, "CORBA::TRANSIENT");
     }
-  ACE_CATCH (CORBA::COMM_FAILURE, cf)
+  catch (const CORBA::COMM_FAILURE& cf)
     {
       ACE_OS::strcpy (received, "CORBA::COMM_FAILURE");
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
 	      ACE_TEXT("CLIENT> REMOTE   expected: '%s'"),
@@ -381,7 +369,7 @@ int run_remote_test (Simple_Server_ptr server, const char* execute_key ACE_ENV_A
 }
 
 int run_abort_test (Simple_Server_ptr server,
-		    const char* request_key, const char* execute_key ACE_ENV_ARG_DECL)
+		    const char* request_key, const char* execute_key)
 {
   char expected[1024], received[1024];
   if (execute_key)
@@ -395,7 +383,7 @@ int run_abort_test (Simple_Server_ptr server,
       ACE_OS::strcpy (expected, "CORBA::TRANSIENT");
     }
 
-  ACE_TRY
+  try
     {
       CORBA::String_var s = server->abort (request_key);
 
@@ -408,15 +396,14 @@ int run_abort_test (Simple_Server_ptr server,
 	  ACE_OS::strcpy (received, s.in());
         }
     }
-  ACE_CATCH (CORBA::TRANSIENT, te)
+  catch (const CORBA::TRANSIENT& te)
     {
       ACE_OS::strcpy (received, "CORBA::TRANSIENT");
     }
-  ACE_CATCH (CORBA::COMM_FAILURE, cf)
+  catch (const CORBA::COMM_FAILURE& cf)
     {
       ACE_OS::strcpy (received, "CORBA::COMM_FAILURE");
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
 	      ACE_TEXT("CLIENT> ABORT    expected: '%s'"),
@@ -435,23 +422,23 @@ int run_abort_test (Simple_Server_ptr server,
   return 0;
 }
 
-int run_test (Simple_Server_ptr server ACE_ENV_ARG_DECL)
+int run_test (Simple_Server_ptr server)
 {
-  int rv = run_abort_test (server, first_key, second_key ACE_ENV_ARG_PARAMETER);
+  int rv = run_abort_test (server, first_key, second_key);
 
   if (rv)
     {
       return rv;
     }
 
-  rv = run_remote_test (server, second_key ACE_ENV_ARG_PARAMETER);
+  rv = run_remote_test (server, second_key);
 
   if (rv)
     {
       return rv;
     }
 
-  rv = run_abort_test (server, second_key, 0 ACE_ENV_ARG_PARAMETER);
+  rv = run_abort_test (server, second_key, 0);
 
   return rv;
 }
@@ -466,18 +453,15 @@ Client_i::init (void)
   char **argv = 0;
   this->orb_ = CORBA::ORB_init (argc,
 			        argv,
-			        0
-			        ACE_ENV_ARG_PARAMETER);
+			        0);
 
   CORBA::Object_var object =
-	  this->orb_->string_to_object (iogrstr
-				        ACE_ENV_ARG_PARAMETER);
+	  this->orb_->string_to_object (iogrstr);
 
 
   // Combined IOR stuff
   Simple_Server_var server =
-	  Simple_Server::_narrow (object.in ()
-				  ACE_ENV_ARG_PARAMETER);
+	  Simple_Server::_narrow (object.in ());
 
   if (CORBA::is_nil (server.in ()))
   {
@@ -487,7 +471,7 @@ Client_i::init (void)
   }
 
   // run tests
-  int result = run_test (server.in() ACE_ENV_ARG_PARAMETER);
+  int result = run_test (server.in());
 
   return result;
 }
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/client.h b/TAO/orbsvcs/tests/Bug_2248_Regression/client.h
index 0c915fed9e0..90d02920675 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/client.h
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/client.h
@@ -19,8 +19,7 @@ public:
   // Ctor
 
   void init (int& argc,
-             char**& argv
-             ACE_ENV_ARG_DECL);
+             char**& argv);
 
   // Initialize the ORB, POA etc.
 
@@ -44,7 +43,7 @@ private:
   /// Sets the properties for the profiles
   int set_properties (TAO_IOP::TAO_IOR_Manipulation_ptr iorm,
 		      CORBA::Object_ptr merged_set,
-		      CORBA::Object_ptr primary, CORBA::ULong version ACE_ENV_ARG_DECL);
+		      CORBA::Object_ptr primary, CORBA::ULong version);
 
   /// Our ORB
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp
index 5ea9749a7f2..634a5abd597 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp
@@ -51,8 +51,7 @@ main (int argc, char *argv[])
 {
 
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       Server_ORBInitializer *temp_initializer = 0;
       ACE_NEW_RETURN (temp_initializer,
@@ -61,17 +60,16 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       // We do the command line parsing first
       if (parse_args (argc, argv) != 0)
         return 1;
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -79,7 +77,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -87,14 +85,14 @@ main (int argc, char *argv[])
       CORBA::PolicyList policies;
       policies.length (3);
       policies[0] = root_poa->create_id_assignment_policy (
-          PortableServer::USER_ID ACE_ENV_ARG_PARAMETER);
+          PortableServer::USER_ID);
       policies[1] = root_poa->create_implicit_activation_policy (
-          PortableServer::NO_IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER);
+          PortableServer::NO_IMPLICIT_ACTIVATION);
       policies[2] = root_poa->create_lifespan_policy (
-          PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER);
+          PortableServer::PERSISTENT);
 
       PortableServer::POA_var poa = root_poa->create_POA (
-          "PERS_POA", poa_manager.in (), policies ACE_ENV_ARG_PARAMETER);
+          "PERS_POA", poa_manager.in (), policies);
 
       for (CORBA::ULong i = 0; i < policies.length (); ++i)
         {
@@ -106,13 +104,13 @@ main (int argc, char *argv[])
       PortableServer::ObjectId_var id =
 	      PortableServer::string_to_ObjectId ("IOGR_OID");
 
-      poa->activate_object_with_id (id.in(), &display_impl ACE_ENV_ARG_PARAMETER);
+      poa->activate_object_with_id (id.in(), &display_impl);
 
       CORBA::Object_var server =
-          poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER);
+          poa->id_to_reference (id.in ());
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -135,7 +133,7 @@ main (int argc, char *argv[])
 
       Simple_ServerRequestInterceptor_var interceptor =
         Simple_ServerRequestInterceptor::_narrow (
-           server_interceptor.in () ACE_ENV_ARG_PARAMETER);
+           server_interceptor.in ());
 
       if (CORBA::is_nil (interceptor.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -143,19 +141,16 @@ main (int argc, char *argv[])
                            "server request interceptor.\n"),
                           -1);
 
-      interceptor->forward_reference (merged_iorstr
-				      ACE_ENV_ARG_PARAMETER);
+      interceptor->forward_reference (merged_iorstr);
 
       poa_manager->activate ();
 
       orb->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp
index 71e6b8c5801..a83f72c028a 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp
@@ -32,7 +32,7 @@ Simple_Server_i::remote_call (void)
 
 
 char*
-Simple_Server_i::shutdown (const char* key ACE_ENV_ARG_DECL_NOT_USED)
+Simple_Server_i::shutdown (const char* key)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "SERVER(%s)> executing shutdown()\n", _key.in()));
@@ -52,7 +52,7 @@ Simple_Server_i::shutdown (const char* key ACE_ENV_ARG_DECL_NOT_USED)
 }
 
 char*
-Simple_Server_i::abort (const char* key ACE_ENV_ARG_DECL_NOT_USED)
+Simple_Server_i::abort (const char* key)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "SERVER(%s)> executing abort()\n", _key.in()));
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h
index 0affad3c77b..29009ba799e 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h
@@ -24,10 +24,10 @@ public:
   char* remote_call (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  char* shutdown (const char* key ACE_ENV_ARG_DECL_NOT_USED)
+  char* shutdown (const char* key)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  char* abort (const char* key ACE_ENV_ARG_DECL_NOT_USED)
+  char* abort (const char* key)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
index 87d1eaf4c28..e0b003a58bb 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
@@ -26,22 +26,22 @@ void
 Hello::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 void
 Hello::throw_exception (void)
   ACE_THROW_SPEC ((CORBA::SystemException, Test::MyException))
 {
-  ACE_THROW (Test::MyException ());
+  throw Test::MyException ();
 }
 
 // Nested sequence step 1 - This op called by the client on the server
 CORBA::Boolean
-Hello::call_me_back (Test::Hello_ptr me ACE_ENV_ARG_DECL)
+Hello::call_me_back (Test::Hello_ptr me)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Boolean result = me->call_back (ACE_ENV_ARG_PARAMETER);
+  CORBA::Boolean result = me->call_back ();
   return result;
 }
 
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h
index b5baaba20d3..a4cd341189b 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h
@@ -31,7 +31,7 @@ public:
   virtual void throw_exception (void)
     ACE_THROW_SPEC ((CORBA::SystemException, Test::MyException));
 
-  virtual CORBA::Boolean call_me_back (Test::Hello_ptr me ACE_ENV_ARG_DECL)
+  virtual CORBA::Boolean call_me_back (Test::Hello_ptr me)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean call_back (void)
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp
index 0488fe02fd0..3f59631356a 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp
@@ -10,8 +10,7 @@
 
 void
 Server_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -19,18 +18,15 @@ Server_ORBInitializer::pre_init (
 
 void
 Server_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->register_server_request_interceptors (info
-                                              ACE_ENV_ARG_PARAMETER);
+  this->register_server_request_interceptors (info);
 }
 
 void
 Server_ORBInitializer::register_server_request_interceptors (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ServerRequestInterceptor_ptr sri =
@@ -43,8 +39,7 @@ Server_ORBInitializer::register_server_request_interceptors (
   PortableInterceptor::ServerRequestInterceptor_var
     server_interceptor = sri;
 
-  info->add_server_request_interceptor (server_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+  info->add_server_request_interceptor (server_interceptor.in ());
 }
 
 
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h
index d7ca298b858..a512252892d 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h
@@ -27,20 +27,17 @@ class Server_ORBInitializer :
 {
 public:
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
 
   /// Register the necessary interceptors.
   void register_server_request_interceptors (
-         PortableInterceptor::ORBInitInfo_ptr info
-         ACE_ENV_ARG_DECL)
+         PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 };
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp
index 33e57738b74..5d11612ae90 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp
@@ -10,8 +10,7 @@
 
 void
 Server_ORBInitializer2::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -19,18 +18,15 @@ Server_ORBInitializer2::pre_init (
 
 void
 Server_ORBInitializer2::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->register_server_request_interceptors (info
-                                              ACE_ENV_ARG_PARAMETER);
+  this->register_server_request_interceptors (info);
 }
 
 void
 Server_ORBInitializer2::register_server_request_interceptors (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ServerRequestInterceptor_ptr sri =
@@ -43,8 +39,7 @@ Server_ORBInitializer2::register_server_request_interceptors (
   PortableInterceptor::ServerRequestInterceptor_var
     server_interceptor = sri;
 
-  info->add_server_request_interceptor (server_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+  info->add_server_request_interceptor (server_interceptor.in ());
 }
 
 
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h
index a98a94523be..f2608319bee 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h
@@ -27,20 +27,17 @@ class Server_ORBInitializer2 :
 {
 public:
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
 
   /// Register the necessary interceptors.
   void register_server_request_interceptors (
-         PortableInterceptor::ORBInitInfo_ptr info
-         ACE_ENV_ARG_DECL)
+         PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 };
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp
index d956bb9a2cf..f088e5984ff 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp
@@ -41,8 +41,7 @@ ACE_THROW_SPEC ((CORBA::SystemException))
 
 void
 TAO249_ServerRequest_Interceptor::receive_request_service_contexts (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ServerRequestInfo_ptr)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest))
 {
@@ -50,17 +49,15 @@ ACE_THROW_SPEC ((CORBA::SystemException,
 
 void
 TAO249_ServerRequest_Interceptor::receive_request (
-  PortableInterceptor::ServerRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ServerRequestInfo_ptr ri)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest))
 {
   CORBA::String_var op = ri->operation ();
-  ACE_TRY
+  try
   {
     IOP::ServiceContext_var sc =
-      ri->get_request_service_context (IOP::FT_REQUEST
-                                       ACE_ENV_ARG_PARAMETER);
+      ri->get_request_service_context (IOP::FT_REQUEST);
 
     TAO_InputCDR cdr (reinterpret_cast <const char*>
                      (sc->context_data.get_buffer ()),
@@ -70,8 +67,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
 
     if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
       {
-        ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28,
-                               CORBA::COMPLETED_NO));
+        throw CORBA::BAD_PARAM (CORBA::OMGVMCID | 28, CORBA::COMPLETED_NO);
       }
 
     cdr.reset_byte_order (static_cast <int> (byte_order));
@@ -79,8 +75,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
     FT::FTRequestServiceContext ftrsc;
 
     if ((cdr >> ftrsc) == 0)
-      ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28,
-                               CORBA::COMPLETED_NO));
+      throw CORBA::BAD_PARAM (CORBA::OMGVMCID | 28, CORBA::COMPLETED_NO);
 
     ACE_DEBUG ((LM_DEBUG, "TAO249_ServerRequest_Interceptor::receive_request (%P|%t) called for method: %s ... client retention id is: %d\n", op.in (), ftrsc.retention_id ));
 
@@ -101,29 +96,26 @@ ACE_THROW_SPEC ((CORBA::SystemException,
           }
       }
   }
-ACE_CATCHANY
+catch (const CORBA::Exception& ex)
   {
     ACE_DEBUG ((LM_ERROR, "Unexpected (non regression) error - test failed\n"));
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Exception in TAO249_ServerRequest_Interceptor::receive_request \n");
-    ACE_RE_THROW;
+    ex._tao_print_exception (
+      "Exception in TAO249_ServerRequest_Interceptor::receive_request \n");
+    throw;
   }
-ACE_ENDTRY;
 
 }
 
 void
 TAO249_ServerRequest_Interceptor::send_reply (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ServerRequestInfo_ptr)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO249_ServerRequest_Interceptor::send_exception (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ServerRequestInfo_ptr)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest))
 {
@@ -131,8 +123,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
 
 void
 TAO249_ServerRequest_Interceptor::send_other (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ServerRequestInfo_ptr)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h
index 1800e5431f3..ec1f1eadf75 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h
@@ -52,31 +52,26 @@ virtual void destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException));
 
 virtual void receive_request_service_contexts (
-  PortableInterceptor::ServerRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ServerRequestInfo_ptr ri)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest));
 
 virtual void receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest));
 
 virtual void send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException));
 
 virtual void send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest));
 
 virtual void send_other (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest));
 //@}
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp
index fd55b0fc0cb..89f07d67686 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp
@@ -44,8 +44,7 @@ ACE_THROW_SPEC ((CORBA::SystemException))
 
 void
 TAO249_ServerRequest_Interceptor2::receive_request_service_contexts (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ServerRequestInfo_ptr)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest))
 {
@@ -53,8 +52,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
 
 void
 TAO249_ServerRequest_Interceptor2::receive_request (
-  PortableInterceptor::ServerRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ServerRequestInfo_ptr ri)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest))
 {
@@ -67,11 +65,10 @@ ACE_THROW_SPEC ((CORBA::SystemException,
     return;
   }
 
-  ACE_TRY
+  try
   {
     IOP::ServiceContext_var sc =
-      ri->get_request_service_context (IOP::FT_REQUEST
-                                       ACE_ENV_ARG_PARAMETER);
+      ri->get_request_service_context (IOP::FT_REQUEST);
 
     TAO_InputCDR cdr (reinterpret_cast <const char*>
                                        (sc->context_data.get_buffer ()
@@ -82,8 +79,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
 
     if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
       {
-        ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28,
-                               CORBA::COMPLETED_NO));
+        throw CORBA::BAD_PARAM (CORBA::OMGVMCID | 28, CORBA::COMPLETED_NO);
       }
 
     cdr.reset_byte_order (static_cast <int>(byte_order));
@@ -91,8 +87,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
     FT::FTRequestServiceContext ftrsc;
 
     if ((cdr >> ftrsc) == 0)
-      ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28,
-                               CORBA::COMPLETED_NO));
+      throw CORBA::BAD_PARAM (CORBA::OMGVMCID | 28, CORBA::COMPLETED_NO);
 
     FILE* last_exp_time_file = ACE_OS::fopen ("last_expiration_time", "r+");
     TimeBase::TimeT last_exp_time = 0;
@@ -180,14 +175,13 @@ ACE_THROW_SPEC ((CORBA::SystemException,
     // Goodbye cruel world !!
     ACE_OS::abort ();
   }
-ACE_CATCHANY
+catch (const CORBA::Exception& ex)
   {
     ACE_DEBUG ((LM_ERROR, "Unexpected (non regression problem) error - test failed\n"));
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                         "Exception in TAO249_ServerRequest_Interceptor2::receive_request \n");
-    ACE_RE_THROW;
+    ex._tao_print_exception (
+      "Exception in TAO249_ServerRequest_Interceptor2::receive_request \n");
+    throw;
   }
-ACE_ENDTRY;
 
 }
 
@@ -209,16 +203,14 @@ TAO249_ServerRequest_Interceptor2::get_now (void)
 
 void
 TAO249_ServerRequest_Interceptor2::send_reply (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ServerRequestInfo_ptr)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO249_ServerRequest_Interceptor2::send_exception (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ServerRequestInfo_ptr)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest))
 {
@@ -226,8 +218,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
 
 void
 TAO249_ServerRequest_Interceptor2::send_other (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ServerRequestInfo_ptr)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h
index 96e13482d73..546d4c52d3d 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h
@@ -53,31 +53,26 @@ virtual void destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException));
 
 virtual void receive_request_service_contexts (
-  PortableInterceptor::ServerRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ServerRequestInfo_ptr ri)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest));
 
 virtual void receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest));
 
 virtual void send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException));
 
 virtual void send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest));
 
 virtual void send_other (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest));
 //@}
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp
index c5996a69fb1..e8c10b9ec27 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp
@@ -39,19 +39,19 @@ int
 main (int argc, char *argv[])
 {
   CORBA::Boolean result = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object(ior);
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
@@ -62,10 +62,10 @@ main (int argc, char *argv[])
         }
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -89,30 +89,28 @@ main (int argc, char *argv[])
 
       poa_manager->activate ();
 
-      ACE_TRY
+      try
         {
           hello->throw_exception ();
         }
-      ACE_CATCH (Test::MyException, my_ex)
+      catch (const Test::MyException& my_ex)
         {
           ACE_UNUSED_ARG (my_ex);
           ACE_DEBUG ((LM_DEBUG, "Client catches a MyException, as expected. No problem !\n"));
         }
-      ACE_ENDTRY;
 
-      result = ! hello->call_me_back (me.in () ACE_ENV_ARG_PARAMETER);
+      result = ! hello->call_me_back (me.in ());
 
       hello->shutdown ();
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test failed (Not regression) because unexpected exception caught:");
+      ex._tao_print_exception (
+        "Test failed (Not regression) because unexpected exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   if (result)
     {
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp
index 25417c2c041..55d5b3d7b4d 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp
@@ -40,7 +40,7 @@ parse_args (int argc, char *argv[])
 }
 
 CORBA::Object_ptr
-make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_version, Test::Hello_ptr* refs ACE_ENV_ARG_DECL)
+make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_version, Test::Hello_ptr* refs)
 {
   FT::TagFTGroupTaggedComponent ft_tag_component;
   // Create the list
@@ -52,7 +52,7 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
     }
 
   CORBA::Object_var new_ref =
-    iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
+    iorm->merge_iors (iors);
 
   // Property values
 
@@ -75,8 +75,7 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
 
   // Set the property
   CORBA::Boolean retval = iorm->set_property (&iogr_prop,
-                                              new_ref.in ()
-                                              ACE_ENV_ARG_PARAMETER);
+                                              new_ref.in ());
 
   // Set the primary
   // See we are setting the second ior as the primary
@@ -84,8 +83,7 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
     {
       retval = iorm->set_primary (&iogr_prop,
                                   refs[0],
-                                  new_ref.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+                                  new_ref.in ());
     }
 
   return new_ref._retn ();
@@ -95,10 +93,10 @@ int
 main (int argc, char *argv[])
 {
   CORBA::Boolean result = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -106,12 +104,11 @@ main (int argc, char *argv[])
       // Get a ref to the IORManipulation object
       CORBA::Object_var IORM =
         orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-                                         0
-                                         ACE_ENV_ARG_PARAMETER);
+                                         0);
 
       // Narrow
       iorm =
-        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in() ACE_ENV_ARG_PARAMETER);
+        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in());
 
       Test::Hello_ptr *servers = new Test::Hello_ptr [number_of_servers];
 
@@ -123,10 +120,10 @@ main (int argc, char *argv[])
           const char *ior = ((ior_file += number) += ".ior").c_str ();
 
           CORBA::Object_var tmp =
-            orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
+            orb->string_to_object(ior);
 
           servers[i] =
-            Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
+            Test::Hello::_narrow(tmp.in ());
 
           if (CORBA::is_nil (servers[i]))
             {
@@ -137,20 +134,20 @@ main (int argc, char *argv[])
             }
         }
 
-      CORBA::Object_var iogr = make_iogr ("Domain_1", 1, 1, servers  ACE_ENV_ARG_PARAMETER);
+      CORBA::Object_var iogr = make_iogr ("Domain_1", 1, 1, servers);
 
-      Test::Hello_var hello_iogr = Test::Hello::_narrow(iogr.in () ACE_ENV_ARG_PARAMETER);
+      Test::Hello_var hello_iogr = Test::Hello::_narrow(iogr.in ());
 
       CORBA::ULong last_server = 0;
 
-      ACE_TRY
+      try
         {
           last_server = hello_iogr->drop_down_dead ();
           // If the call 'succeeds' the server has identified a regression.
           result = 1;
           ACE_DEBUG ((LM_ERROR, "Error: REGRESSION identified by server %u. Test Failed !!\n", last_server));
         }
-      ACE_CATCH (CORBA::COMM_FAILURE, my_ex)
+      catch (const CORBA::COMM_FAILURE& my_ex)
         {
           ACE_UNUSED_ARG (my_ex);
           // We can't use the word exception for fear of upsetting the build log parser
@@ -158,19 +155,17 @@ main (int argc, char *argv[])
                       "although it doesn't in this case) and which we cannot name because the autobuild "
                       "script will think we have a problem if we do mention the word. No problem !\n"));
         }
-      ACE_ENDTRY;
 
       for (CORBA::ULong j = last_server; j < number_of_servers; ++j)
         {
-          ACE_TRY
+          try
             {
               servers[j]->shutdown ();
             }
-          ACE_CATCHALL
+          catch (...)
             {
               // Well we tried...
             }
-          ACE_ENDTRY;
 
           CORBA::release (servers [j]);
         }
@@ -184,13 +179,12 @@ main (int argc, char *argv[])
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test failed (Not regression) because unexpected exception caught:");
+      ex._tao_print_exception (
+        "Test failed (Not regression) because unexpected exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   if (result)
     {
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp
index 7cf8f501442..47b626b7723 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp
@@ -45,7 +45,7 @@ parse_args (int argc, char *argv[])
 }
 
 CORBA::Object_ptr
-make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_version, CORBA::Object_ptr ref ACE_ENV_ARG_DECL)
+make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_version, CORBA::Object_ptr ref)
 {
   FT::TagFTGroupTaggedComponent ft_tag_component;
   // Create the list
@@ -54,7 +54,7 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
   iors [0] = CORBA::Object::_duplicate (ref);
 
   CORBA::Object_var new_ref =
-    iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
+    iorm->merge_iors (iors);
 
   // Property values
 
@@ -77,8 +77,7 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
 
   // Set the property
   CORBA::Boolean retval = iorm->set_property (&iogr_prop,
-                                              new_ref.in ()
-                                              ACE_ENV_ARG_PARAMETER);
+                                              new_ref.in ());
 
   // Set the primary
   // See we are setting the second ior as the primary
@@ -86,8 +85,7 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
     {
       retval = iorm->set_primary (&iogr_prop,
                                   new_ref.in (),
-                                  new_ref.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+                                  new_ref.in ());
     }
 
   return new_ref._retn ();
@@ -96,7 +94,7 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       Server_ORBInitializer *temp_initializer = 0;
       ACE_NEW_RETURN (temp_initializer,
@@ -105,17 +103,16 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -129,19 +126,15 @@ main (int argc, char *argv[])
       policies.length (2);
 
       policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID);
 
       policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                          ACE_ENV_ARG_PARAMETER);
+        root_poa->create_lifespan_policy (PortableServer::PERSISTENT);
 
       PortableServer::POA_var my_poa =
         root_poa->create_POA ("my_poa",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
+                              policies);
 
       // Creation of the new POA is over, so destroy the Policy_ptr's.
       for (CORBA::ULong i = 0; i < policies.length (); ++i)
@@ -163,29 +156,27 @@ main (int argc, char *argv[])
         PortableServer::string_to_ObjectId ("server_id");
 
       my_poa->activate_object_with_id (server_id.in (),
-                                       hello_impl
-                                       ACE_ENV_ARG_PARAMETER);
+                                       hello_impl);
 
       CORBA::Object_var hello =
-        my_poa->id_to_reference (server_id.in () ACE_ENV_ARG_PARAMETER);
+        my_poa->id_to_reference (server_id.in ());
 
       CORBA::String_var ior =
-        orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (hello.in ());
 
       // Get a ref to the IORManipulation object
       CORBA::Object_var IORM =
         orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-                                         0
-                                         ACE_ENV_ARG_PARAMETER);
+                                         0);
 
       // Narrow
       iorm =
-        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in() ACE_ENV_ARG_PARAMETER);
+        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in());
 
-      CORBA::Object_var iogr = make_iogr ("Domain_1", 1, 1, orb->string_to_object (ior.in ())  ACE_ENV_ARG_PARAMETER);
+      CORBA::Object_var iogr = make_iogr ("Domain_1", 1, 1, orb->string_to_object (ior.in ()));
 
       CORBA::String_var iorgr_string =
-        orb->object_to_string (iogr.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (iogr.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -203,17 +194,15 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1);
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp
index 026d111275d..c7d677d6035 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp
@@ -54,7 +54,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       Server_ORBInitializer2 *temp_initializer = 0;
       ACE_NEW_RETURN (temp_initializer,
@@ -63,17 +63,16 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -87,19 +86,15 @@ main (int argc, char *argv[])
       policies.length (2);
 
       policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID);
 
       policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                          ACE_ENV_ARG_PARAMETER);
+        root_poa->create_lifespan_policy (PortableServer::PERSISTENT);
 
       PortableServer::POA_var my_poa =
         root_poa->create_POA ("my_poa",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
+                              policies);
 
       // Creation of the new POA is over, so destroy the Policy_ptr's.
       for (CORBA::ULong i = 0; i < policies.length (); ++i)
@@ -121,14 +116,13 @@ main (int argc, char *argv[])
         PortableServer::string_to_ObjectId ("server_id");
 
       my_poa->activate_object_with_id (server_id.in (),
-                                       hello_impl
-                                       ACE_ENV_ARG_PARAMETER);
+                                       hello_impl);
 
       CORBA::Object_var hello =
-        my_poa->id_to_reference (server_id.in () ACE_ENV_ARG_PARAMETER);
+        my_poa->id_to_reference (server_id.in ());
 
       CORBA::String_var ior =
-        orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (hello.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -144,17 +138,15 @@ main (int argc, char *argv[])
 
       orb->run ();
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1);
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp
index fc0e31497b0..e6b390c5f2b 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp
@@ -14,7 +14,7 @@ void
 Hello::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp
index 33e57738b74..5d11612ae90 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp
@@ -10,8 +10,7 @@
 
 void
 Server_ORBInitializer2::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -19,18 +18,15 @@ Server_ORBInitializer2::pre_init (
 
 void
 Server_ORBInitializer2::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->register_server_request_interceptors (info
-                                              ACE_ENV_ARG_PARAMETER);
+  this->register_server_request_interceptors (info);
 }
 
 void
 Server_ORBInitializer2::register_server_request_interceptors (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ServerRequestInterceptor_ptr sri =
@@ -43,8 +39,7 @@ Server_ORBInitializer2::register_server_request_interceptors (
   PortableInterceptor::ServerRequestInterceptor_var
     server_interceptor = sri;
 
-  info->add_server_request_interceptor (server_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+  info->add_server_request_interceptor (server_interceptor.in ());
 }
 
 
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h
index a98a94523be..f2608319bee 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h
@@ -27,20 +27,17 @@ class Server_ORBInitializer2 :
 {
 public:
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
 
   /// Register the necessary interceptors.
   void register_server_request_interceptors (
-         PortableInterceptor::ORBInitInfo_ptr info
-         ACE_ENV_ARG_DECL)
+         PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 };
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp
index b30e66e2e90..e18c2e67d9f 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp
@@ -47,8 +47,7 @@ ACE_THROW_SPEC ((CORBA::SystemException))
 
 void
 TAO249_ServerRequest_Interceptor2::receive_request_service_contexts (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ServerRequestInfo_ptr)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest))
 {
@@ -56,8 +55,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
 
 void
 TAO249_ServerRequest_Interceptor2::receive_request (
-  PortableInterceptor::ServerRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ServerRequestInfo_ptr ri)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest))
 {
@@ -72,8 +70,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
 
 
   IOP::ServiceContext_var sc =
-    ri->get_request_service_context (IOP::FT_REQUEST
-                                   ACE_ENV_ARG_PARAMETER);
+    ri->get_request_service_context (IOP::FT_REQUEST);
 
   TAO_InputCDR cdr (reinterpret_cast <const char*>
                                      (sc->context_data.get_buffer ()
@@ -84,8 +81,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
 
   if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
     {
-      ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28,
-                           CORBA::COMPLETED_NO));
+      throw CORBA::BAD_PARAM (CORBA::OMGVMCID | 28, CORBA::COMPLETED_NO);
     }
 
   cdr.reset_byte_order (static_cast <int>(byte_order));
@@ -93,8 +89,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
   FT::FTRequestServiceContext ftrsc;
 
   if ((cdr >> ftrsc) == 0)
-    ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28,
-                             CORBA::COMPLETED_NO));
+    throw CORBA::BAD_PARAM (CORBA::OMGVMCID | 28, CORBA::COMPLETED_NO);
 
   TimeBase::TimeT now = get_now ();
 
@@ -126,7 +121,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
   // Let's forward the client back to us again. I would like to be able to make this a PERM
   // but there's no such animal in the PortableInterceptor module. Plus as we (currently) transform
   // and marshal *all* forward requests as vanilla LOCATION_FORWARD it doesn't really matter.
-  ACE_THROW (PortableInterceptor::ForwardRequest (server_iogr_.in ()));
+  throw PortableInterceptor::ForwardRequest (server_iogr_.in ());
 }
 
 TimeBase::TimeT
@@ -147,16 +142,14 @@ TAO249_ServerRequest_Interceptor2::get_now (void)
 
 void
 TAO249_ServerRequest_Interceptor2::send_reply (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ServerRequestInfo_ptr)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO249_ServerRequest_Interceptor2::send_exception (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ServerRequestInfo_ptr)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest))
 {
@@ -164,8 +157,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
 
 void
 TAO249_ServerRequest_Interceptor2::send_other (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ServerRequestInfo_ptr)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h
index 9a14b9819e9..5f537001b96 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h
@@ -53,31 +53,26 @@ virtual void destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException));
 
 virtual void receive_request_service_contexts (
-  PortableInterceptor::ServerRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ServerRequestInfo_ptr ri)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest));
 
 virtual void receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest));
 
 virtual void send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException));
 
 virtual void send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest));
 
 virtual void send_other (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest));
 //@}
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp
index 2b6af000518..f5ca16cd2dd 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp
@@ -39,19 +39,19 @@ int
 main (int argc, char *argv[])
 {
   CORBA::Boolean result = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object(ior);
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
@@ -65,31 +65,29 @@ main (int argc, char *argv[])
       hello->ping ();
 
 
-      ACE_TRY
+      try
         {
           hello->throw_location_forward ();
 
           ACE_DEBUG ((LM_ERROR, "REGRESSION - Test has failed !!!\n"));
           result = 1;
         }
-      ACE_CATCH (CORBA::TRANSIENT, my_ex)
+      catch (const CORBA::TRANSIENT& my_ex)
         {
           ACE_UNUSED_ARG (my_ex);
           ACE_DEBUG ((LM_DEBUG, "Client catches a TRANSIENT, as expected. No problem !\n"));
         }
-      ACE_ENDTRY;
 
       hello->shutdown ();
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test failed (Not regression) because unexpected exception caught:");
+      ex._tao_print_exception (
+        "Test failed (Not regression) because unexpected exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   if (result)
     {
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp
index 33418851873..bb339d83c73 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp
@@ -45,7 +45,7 @@ parse_args (int argc, char *argv[])
 }
 
 CORBA::Object_ptr
-make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_version, CORBA::Object_ptr ref ACE_ENV_ARG_DECL)
+make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_version, CORBA::Object_ptr ref)
 {
   FT::TagFTGroupTaggedComponent ft_tag_component;
   // Create the list
@@ -54,7 +54,7 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
   iors [0] = CORBA::Object::_duplicate (ref);
 
   CORBA::Object_var new_ref =
-    iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
+    iorm->merge_iors (iors);
 
   // Property values
 
@@ -77,8 +77,7 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
 
   // Set the property
   CORBA::Boolean retval = iorm->set_property (&iogr_prop,
-                                              new_ref.in ()
-                                              ACE_ENV_ARG_PARAMETER);
+                                              new_ref.in ());
 
   // Set the primary
   // See we are setting the second ior as the primary
@@ -86,8 +85,7 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
     {
       retval = iorm->set_primary (&iogr_prop,
                                   new_ref.in (),
-                                  new_ref.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+                                  new_ref.in ());
     }
 
   return new_ref._retn ();
@@ -96,7 +94,7 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       Server_ORBInitializer2 *temp_initializer = 0;
       ACE_NEW_RETURN (temp_initializer,
@@ -105,17 +103,16 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -129,19 +126,15 @@ main (int argc, char *argv[])
       policies.length (2);
 
       policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID);
 
       policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                          ACE_ENV_ARG_PARAMETER);
+        root_poa->create_lifespan_policy (PortableServer::PERSISTENT);
 
       PortableServer::POA_var my_poa =
         root_poa->create_POA ("my_poa",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
+                              policies);
 
       // Creation of the new POA is over, so destroy the Policy_ptr's.
       for (CORBA::ULong i = 0; i < policies.length (); ++i)
@@ -163,29 +156,27 @@ main (int argc, char *argv[])
         PortableServer::string_to_ObjectId ("server_id");
 
       my_poa->activate_object_with_id (server_id.in (),
-                                       hello_impl
-                                       ACE_ENV_ARG_PARAMETER);
+                                       hello_impl);
 
       CORBA::Object_var hello =
-        my_poa->id_to_reference (server_id.in () ACE_ENV_ARG_PARAMETER);
+        my_poa->id_to_reference (server_id.in ());
 
       CORBA::String_var ior =
-        orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (hello.in ());
 
       // Get a ref to the IORManipulation object
       CORBA::Object_var IORM =
         orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-                                         0
-                                         ACE_ENV_ARG_PARAMETER);
+                                         0);
 
       // Narrow
       iorm =
-        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in() ACE_ENV_ARG_PARAMETER);
+        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in());
 
-      CORBA::Object_var iogr = make_iogr ("Domain_1", 1, 1, orb->string_to_object (ior.in ())  ACE_ENV_ARG_PARAMETER);
+      CORBA::Object_var iogr = make_iogr ("Domain_1", 1, 1, orb->string_to_object (ior.in ()));
 
       CORBA::String_var iorgr_string =
-        orb->object_to_string (iogr.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (iogr.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -205,17 +196,15 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1);
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2316_Regression/client.cpp
index 183bc338fd4..176a7d7dc14 100644
--- a/TAO/orbsvcs/tests/Bug_2316_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2316_Regression/client.cpp
@@ -19,37 +19,37 @@ main (int argc, char *argv[])
 
       PortableServer::POA_var root_poa =
       PortableServer::POA::_narrow (poa_object.in ());
-    
+
       PortableServer::POAManager_var poa_manager =
       root_poa->the_POAManager ();
       poa_manager->activate ();
-    
+
       const char* uipmc_ior = "corbaloc:miop:1.0@1.0-domain-1/127.0.0.1:23232";
       CORBA::Object_var obj =orb->string_to_object (uipmc_ior);
-    
+
       CORBA::Object_var tmp = orb->string_to_object (ior_server);
       server_var server = server::_narrow (tmp.in ());
-      
+
       try
         {
           server->method (obj.in());
-          
+
           ACE_DEBUG ((LM_DEBUG, "Test passed !!\n"));
         }
       catch (const CORBA::SystemException& marshal)
         {
           ACE_DEBUG ((LM_ERROR, "Test Failed - Regression. "
                       "Sending UIPMC object ref to server failed with:\n"));
-          ACE_PRINT_EXCEPTION (marshal, "Exception : \n");
+          marshal._tao_print_exception ("Exception : \n");
           result = 1;
         }
-        
-      server->shutdown ();          
+
+      server->shutdown ();
     }
   catch(const CORBA::SystemException& e)
     {
-        ACE_PRINT_EXCEPTION (e, "Unexpected exception - not a regression.\n");
+        e._tao_print_exception ("Unexpected exception - not a regression.\n");
         result = 1;
-    }    
+    }
     return result;
 }
diff --git a/TAO/orbsvcs/tests/Bug_2377_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2377_Regression/Hello.cpp
index 03cb59b88e1..43759b059cf 100644
--- a/TAO/orbsvcs/tests/Bug_2377_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_2377_Regression/Hello.cpp
@@ -153,7 +153,7 @@ class HelloClientThread
     {
         while (m_count < NB_HELLO_CALLS)
         {
-            ACE_TRY_NEW_ENV
+            try
             {
                 int count;
                 {
@@ -175,12 +175,12 @@ class HelloClientThread
                 }
                 sleep(CLIENT_SLEEP_TIME);
             }
-            ACE_CATCHANY
+            catch (const CORBA::Exception& ex)
             {
-                ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                     ACE_TEXT ("Exception thrown during say_hello()\n"));
+                ex._tao_print_exception (
+                  ACE_TEXT (
+                    "Exception thrown during say_hello()\n"));
             }
-            ACE_ENDTRY;
         }
         return 1;
     }
@@ -203,7 +203,7 @@ main(int argc, char *argv[])
 
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("<<< %s Started - \"s\" = message sent \"R\" = message received >>>\n"), argv[0]));
 
-    ACE_TRY_NEW_ENV
+    try
     {
         /*** in svc.conf
 dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() ""
@@ -292,13 +292,13 @@ static Client_Strategy_Factory "-ORBProfileLock thread -ORBClientConnectionHandl
         helloThread->wait();
         delete helloThread;
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             ACE_TEXT ("Exception thrown during main()\n"));
+        ex._tao_print_exception (
+          ACE_TEXT (
+            "Exception thrown during main()\n"));
         exit_code = 1;
     }
-    ACE_ENDTRY;
 
     ACE_DEBUG ((LM_DEBUG,
             ACE_TEXT ("\n--------------------------------------------------\n")));
@@ -323,17 +323,17 @@ static Client_Strategy_Factory "-ORBProfileLock thread -ORBClientConnectionHandl
     }
     if (!CORBA::is_nil(orb.in()))
     {
-        ACE_TRY_NEW_ENV
+        try
         {
             orb->destroy();
         }
-        ACE_CATCHANY
+        catch (const CORBA::Exception& ex)
         {
-            ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                         ACE_TEXT ("Exception thrown during orb check\n"));
+            ex._tao_print_exception (
+              ACE_TEXT (
+                "Exception thrown during orb check\n"));
             exit_code = 1;
         }
-        ACE_ENDTRY;
     }
     exit(exit_code);
     return 0;
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp
index ee558cc3923..d7bd3093cb2 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp
@@ -16,7 +16,7 @@ void
 Hello::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp
index 177b1e0a697..2f25ad62893 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp
@@ -10,8 +10,7 @@
 
 void
 Server_ORBInitializer2::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -19,18 +18,15 @@ Server_ORBInitializer2::pre_init (
 
 void
 Server_ORBInitializer2::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->register_server_request_interceptors (info
-                                              ACE_ENV_ARG_PARAMETER);
+  this->register_server_request_interceptors (info);
 }
 
 void
 Server_ORBInitializer2::register_server_request_interceptors (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ServerRequestInterceptor_ptr sri =
@@ -43,8 +39,7 @@ Server_ORBInitializer2::register_server_request_interceptors (
   PortableInterceptor::ServerRequestInterceptor_var
     server_interceptor = sri;
 
-  info->add_server_request_interceptor (server_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+  info->add_server_request_interceptor (server_interceptor.in ());
 }
 
 
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h
index a98a94523be..f2608319bee 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h
@@ -27,20 +27,17 @@ class Server_ORBInitializer2 :
 {
 public:
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
 
   /// Register the necessary interceptors.
   void register_server_request_interceptors (
-         PortableInterceptor::ORBInitInfo_ptr info
-         ACE_ENV_ARG_DECL)
+         PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 };
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp
index 14e723c7bda..a2cf7a54282 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp
@@ -46,8 +46,7 @@ ACE_THROW_SPEC ((CORBA::SystemException))
 
 void
 ServerRequest_Interceptor2::receive_request_service_contexts (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ServerRequestInfo_ptr)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest))
 {
@@ -55,8 +54,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
 
 void
 ServerRequest_Interceptor2::receive_request (
-  PortableInterceptor::ServerRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ServerRequestInfo_ptr ri)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest))
 {
@@ -69,40 +67,36 @@ ACE_THROW_SPEC ((CORBA::SystemException,
     return;
   }
 
-  ACE_TRY
+  try
     {
       IOP::ServiceContext_var sc =
-        ri->get_request_service_context (IOP::FT_REQUEST
-                                         ACE_ENV_ARG_PARAMETER);
+        ri->get_request_service_context (IOP::FT_REQUEST);
 
       // No exception therefore there was a context
       has_ft_request_sc_ = true;
     }
-  ACE_CATCH (CORBA::BAD_PARAM, ex)
+  catch (const CORBA::BAD_PARAM& ex)
     {
       ACE_UNUSED_ARG (ex);
       // No group version context
       has_ft_request_sc_ = false;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 void
 ServerRequest_Interceptor2::send_reply (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ServerRequestInfo_ptr)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ServerRequest_Interceptor2::send_exception (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ServerRequestInfo_ptr)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest))
 {
@@ -110,8 +104,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
 
 void
 ServerRequest_Interceptor2::send_other (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ServerRequestInfo_ptr)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h
index 2d766c66d99..ac8917d5d8b 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h
@@ -52,31 +52,26 @@ virtual void destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException));
 
 virtual void receive_request_service_contexts (
-  PortableInterceptor::ServerRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ServerRequestInfo_ptr ri)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest));
 
 virtual void receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest));
 
 virtual void send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException));
 
 virtual void send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest));
 
 virtual void send_other (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest));
 //@}
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp
index 287e479a1c1..3416740c407 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp
@@ -42,20 +42,20 @@ int
 main (int argc, char *argv[])
 {
   CORBA::Boolean result = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       // First perform the test with an IOR
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object(ior);
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
@@ -80,10 +80,10 @@ main (int argc, char *argv[])
 
       // Now repeat the test (for the converse result) with an IOGR
       tmp =
-        orb->string_to_object(iogr ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object(iogr);
 
       hello =
-        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
@@ -110,13 +110,12 @@ main (int argc, char *argv[])
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test failed (Not regression) because unexpected exception caught:");
+      ex._tao_print_exception (
+        "Test failed (Not regression) because unexpected exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   if (result)
     {
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp
index 88a5a9dbab5..b7f52de4793 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp
@@ -48,7 +48,7 @@ parse_args (int argc, char *argv[])
 }
 
 CORBA::Object_ptr
-make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_version, CORBA::Object_ptr ref ACE_ENV_ARG_DECL)
+make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_version, CORBA::Object_ptr ref)
 {
   FT::TagFTGroupTaggedComponent ft_tag_component;
   // Create the list
@@ -57,7 +57,7 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
   iors [0] = CORBA::Object::_duplicate (ref);
 
   CORBA::Object_var new_ref =
-    iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
+    iorm->merge_iors (iors);
 
   // Property values
 
@@ -80,8 +80,7 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
 
   // Set the property
   CORBA::Boolean retval = iorm->set_property (&iogr_prop,
-                                              new_ref.in ()
-                                              ACE_ENV_ARG_PARAMETER);
+                                              new_ref.in ());
 
   // Set the primary
   // See we are setting the second ior as the primary
@@ -89,8 +88,7 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
     {
       retval = iorm->set_primary (&iogr_prop,
                                   new_ref.in (),
-                                  new_ref.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+                                  new_ref.in ());
     }
 
   return new_ref._retn ();
@@ -99,7 +97,7 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       Server_ORBInitializer2 *temp_initializer = 0;
       ACE_NEW_RETURN (temp_initializer,
@@ -108,17 +106,16 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -132,19 +129,15 @@ main (int argc, char *argv[])
       policies.length (2);
 
       policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID);
 
       policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                          ACE_ENV_ARG_PARAMETER);
+        root_poa->create_lifespan_policy (PortableServer::PERSISTENT);
 
       PortableServer::POA_var my_poa =
         root_poa->create_POA ("my_poa",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
+                              policies);
 
       // Creation of the new POA is over, so destroy the Policy_ptr's.
       for (CORBA::ULong i = 0; i < policies.length (); ++i)
@@ -166,14 +159,13 @@ main (int argc, char *argv[])
         PortableServer::string_to_ObjectId ("server_id");
 
       my_poa->activate_object_with_id (server_id.in (),
-                                       hello_impl
-                                       ACE_ENV_ARG_PARAMETER);
+                                       hello_impl);
 
       CORBA::Object_var hello =
-        my_poa->id_to_reference (server_id.in () ACE_ENV_ARG_PARAMETER);
+        my_poa->id_to_reference (server_id.in ());
 
       CORBA::String_var ior =
-        orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (hello.in ());
 
       FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
       if (output_file == 0)
@@ -188,17 +180,16 @@ main (int argc, char *argv[])
       // Get a ref to the IORManipulation object
       CORBA::Object_var IORM =
         orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-                                         0
-                                         ACE_ENV_ARG_PARAMETER);
+                                         0);
 
       // Narrow
       iorm =
-        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in() ACE_ENV_ARG_PARAMETER);
+        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in());
 
-      CORBA::Object_var iogr = make_iogr ("Domain_1", 1, 1, orb->string_to_object (ior.in ())  ACE_ENV_ARG_PARAMETER);
+      CORBA::Object_var iogr = make_iogr ("Domain_1", 1, 1, orb->string_to_object (ior.in ()));
 
       CORBA::String_var iorgr_string =
-        orb->object_to_string (iogr.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (iogr.in ());
 
       // Output the IOR to the <iogr_output_file>
       output_file = ACE_OS::fopen (iogr_output_file, "w");
@@ -216,17 +207,15 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1);
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp
index 53e94cc0db5..7e3d61bcb1b 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp
@@ -21,7 +21,7 @@ Client_Task::Client_Task (CORBA::ORB_ptr corb,
 }
 
 CORBA::Object_ptr
-Client_Task::make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_version ACE_ENV_ARG_DECL)
+Client_Task::make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_version)
 {
   CORBA::Object_var remote_server(
     corb_->string_to_object (ACE_CString(file_prefix + this->server_ior_file_).c_str()));
@@ -29,7 +29,7 @@ Client_Task::make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA:
   if (CORBA::is_nil (remote_server.in ()))
     {
       ACE_ERROR ((LM_ERROR, "Error: Remote server is not started.\n"));
-      ACE_TRY_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   CORBA::Object_var collocated_server(
@@ -38,7 +38,7 @@ Client_Task::make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA:
   if (CORBA::is_nil (collocated_server.in ()))
     {
       ACE_ERROR ((LM_ERROR, "Error: Collocated server is not started.\n"));
-      ACE_TRY_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   FT::TagFTGroupTaggedComponent ft_tag_component;
@@ -50,7 +50,7 @@ Client_Task::make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA:
   iors [1] = CORBA::Object::_duplicate (collocated_server.ptr());
 
   CORBA::Object_var new_ref =
-    this->iorm_->merge_iors (iors ACE_ENV_ARG_PARAMETER);
+    this->iorm_->merge_iors (iors);
 
   // Property values
 
@@ -72,15 +72,13 @@ Client_Task::make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA:
 
   // Set the property
   CORBA::Boolean retval = this->iorm_->set_property (&iogr_prop,
-                                              new_ref.in ()
-                                              ACE_ENV_ARG_PARAMETER);
+                                              new_ref.in ());
 
   // Set the primary
   // See we are setting the second ior as the primary
   retval = this->iorm_->set_primary (&iogr_prop,
                               remote_server.in (),
-                              new_ref.in ()
-                              ACE_ENV_ARG_PARAMETER);
+                              new_ref.in ());
 
   return new_ref._retn ();
 }
@@ -88,28 +86,27 @@ Client_Task::make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA:
 /// Thread entry point
 int Client_Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Get a ref to the IORManipulation object
       CORBA::Object_var IORM =
         corb_->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-        0
-        ACE_ENV_ARG_PARAMETER);
+        0);
 
       // Narrow
       this->iorm_ =
-        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in() ACE_ENV_ARG_PARAMETER);
+        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in());
 
-      CORBA::Object_var iogr = make_iogr ("Domain_1", 1, 1 ACE_ENV_ARG_PARAMETER);
+      CORBA::Object_var iogr = make_iogr ("Domain_1", 1, 1);
 
       CORBA::String_var iorgr_string =
-        corb_->object_to_string (iogr.in () ACE_ENV_ARG_PARAMETER);
+        corb_->object_to_string (iogr.in ());
 
       CORBA::Object_var object =
-        corb_->string_to_object (iorgr_string.in () ACE_ENV_ARG_PARAMETER);
+        corb_->string_to_object (iorgr_string.in ());
 
       Test_var server =
-        Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        Test::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -121,13 +118,13 @@ int Client_Task::svc (void)
         corb_->string_to_object (ACE_CString(file_prefix + this->server_ior_file_).c_str()));
 
       Test_var remote_server_as_test =
-        Test::_narrow (remote_server.in () ACE_ENV_ARG_PARAMETER);
+        Test::_narrow (remote_server.in ());
 
       CORBA::Object_var collocated_server(
         corb_->string_to_object (ACE_CString(file_prefix + this->collocated_ior_file_).c_str()));
 
       Test_var collocated_server_as_test =
-        Test::_narrow (collocated_server.in () ACE_ENV_ARG_PARAMETER);
+        Test::_narrow (collocated_server.in ());
 
       if (!collocated_server->_is_collocated())
         { // Collocation is disabled, just skip the test - it has no sense.
@@ -135,7 +132,7 @@ int Client_Task::svc (void)
         }
       else
         {
-          ACE_TRY_NEW_ENV
+          try
           {
             // Following call will fail if the problem is not fixed.
 
@@ -144,25 +141,21 @@ int Client_Task::svc (void)
             // This wouldn't work with 'direct' collocation strategy but the default is 'through poa'.
             server->myMethod ();
           }
-          ACE_CATCHANY
+          catch (const CORBA::Exception& ex)
           {
-            ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-              "Exception caught in client task:");
+            ex._tao_print_exception ("Exception caught in client task:");
           }
-          ACE_ENDTRY;
         }
 
       remote_server_as_test->shutdown();
 
       collocated_server_as_test->shutdown();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-        "Exception caught in client task:");
+      ex._tao_print_exception ("Exception caught in client task:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.h b/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.h
index 30c2a82fe49..21652b83757 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.h
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.h
@@ -17,9 +17,9 @@ public:
     const ACE_CString& server_ior_file);
 
   CORBA::Object_ptr make_iogr (
-     const char* domain_id, 
-     CORBA::ULongLong group_id, 
-     CORBA::ULong group_version ACE_ENV_ARG_DECL);
+     const char* domain_id,
+     CORBA::ULongLong group_id,
+     CORBA::ULong group_version);
 
   /// Thread entry point
   int svc (void);
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp
index 07b0cf172c3..c86941f3e92 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp
@@ -20,16 +20,16 @@ Server_Task::Server_Task (const char *output,
 int
 Server_Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var poa_object =
-        sorb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        sorb_->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the POA.\n"), 1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -40,15 +40,15 @@ Server_Task::svc (void)
       ACE_NEW_RETURN (server_impl, TestImpl (sorb_.in ()), 1);
 
       PortableServer::ObjectId_var id =
-        root_poa->activate_object (server_impl ACE_ENV_ARG_PARAMETER);
+        root_poa->activate_object (server_impl);
 
       CORBA::Object_var test_obj =
-        root_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER);
+        root_poa->id_to_reference (id.in ());
 
-      Test_var server = Test::_narrow (test_obj.in () ACE_ENV_ARG_PARAMETER);
+      Test_var server = Test::_narrow (test_obj.in ());
 
       CORBA::String_var ior =
-        sorb_->object_to_string (test_obj.in () ACE_ENV_ARG_PARAMETER);
+        sorb_->object_to_string (test_obj.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (output_, "w");
@@ -67,15 +67,13 @@ Server_Task::svc (void)
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                          "Exception caught in server task:");
+      ex._tao_print_exception ("Exception caught in server task:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp
index 5f93bbbe971..10f560a64b6 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp
@@ -57,7 +57,7 @@ main (int argc, char * argv [])
   ACE_CString client_orb;
   client_orb.set ("client_orb");
 
-  ACE_TRY_NEW_ENV
+  try
     {
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -66,15 +66,13 @@ main (int argc, char * argv [])
       CORBA::ORB_var sorb =
         CORBA::ORB_init (satc.get_argc (),
                          satc.get_TCHAR_argv (),
-                         server_orb.c_str ()
-                         ACE_ENV_ARG_PARAMETER);
+                         server_orb.c_str ());
 
       ACE_Argv_Type_Converter catc (argc, argv);
       CORBA::ORB_var corb =
         CORBA::ORB_init (catc.get_argc (),
                          catc.get_TCHAR_argv (),
-                         client_orb.c_str ()
-                         ACE_ENV_ARG_PARAMETER);
+                         client_orb.c_str ());
 
       {
         ACE_Manual_Event me;
@@ -110,13 +108,11 @@ main (int argc, char * argv [])
 
       sorb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   if (failed)
     {
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/server.cpp
index 7b35bc002ee..b0ffadbf641 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/server.cpp
@@ -44,7 +44,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -52,8 +52,7 @@ main (int argc, char *argv[])
       ACE_Argv_Type_Converter satc (argc, argv);
       CORBA::ORB_var sorb =
         CORBA::ORB_init (satc.get_argc (),
-                         satc.get_TCHAR_argv ()
-                         ACE_ENV_ARG_PARAMETER);
+                         satc.get_TCHAR_argv ());
 
       {
         ACE_Manual_Event me;
@@ -78,13 +77,11 @@ main (int argc, char *argv[])
 
       sorb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
index 3cd10a0b62b..5a9c928ccd9 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
@@ -362,20 +362,18 @@ CC_Client::print_usage (void)
 int
 CC_Client::init_naming_service (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       ACE_NEW_RETURN (naming_service_,
                       CC_naming_service,
                       -1);
 
-      this->naming_service_->Init (this->orb_ ACE_ENV_ARG_PARAMETER);
+      this->naming_service_->Init (this->orb_);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -386,14 +384,12 @@ CC_Client::init (int argc, char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
-                                    "internet"
-                                    ACE_ENV_ARG_PARAMETER);
+                                    "internet");
 
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
@@ -415,14 +411,13 @@ CC_Client::init (int argc, char **argv)
 
 
           CORBA::Object_var factory_object =
-            this->orb_->string_to_object (this->cc_factory_key_
-                                          ACE_ENV_ARG_PARAMETER);
+            this->orb_->string_to_object (this->cc_factory_key_);
 
 #if 0
           // The test cannot currently run without the naming service.
           this->factory_ =
             CosConcurrencyControl::LockSetFactory::_narrow
-            (factory_object.in () ACE_ENV_ARG_PARAMETER);
+            (factory_object.in ());
 
           if (CORBA::is_nil (this->factory_.in ()))
             ACE_ERROR_RETURN ((LM_ERROR,
@@ -436,12 +431,11 @@ CC_Client::init (int argc, char **argv)
                   "Factory received OK\n"));
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "CC_Client::init");
+      ex._tao_print_exception ("CC_Client::init");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
index 0975b4b985a..03025560a15 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
@@ -46,23 +46,20 @@ CC_Command::CC_Command(void)
 }
 
 CosConcurrencyControl::LockSet_var
-CC_Command::GetLockSet (const char *lock_set_name
-                        ACE_ENV_ARG_DECL)
+CC_Command::GetLockSet (const char *lock_set_name)
 {
   CosConcurrencyControl::LockSet_var ccls_ret;
 
-  ACE_TRY
+  try
     {
       if(ACE_OS::strcmp(lock_set_name, "")!=0)
         {
           CORBA::Object_var ccls_obj =
             CC_naming_service::Instance()->get_obj_from_name ("",
-                                                              lock_set_name
-                                                              ACE_ENV_ARG_PARAMETER);
+                                                              lock_set_name);
 
           ccls_ret =
-            CosConcurrencyControl::LockSet::_narrow (ccls_obj.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+            CosConcurrencyControl::LockSet::_narrow (ccls_obj.in ());
         }
       else
         {
@@ -75,11 +72,10 @@ CC_Command::GetLockSet (const char *lock_set_name
             ccls_ret = cc_lockset_.in ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
 
   return ccls_ret;
 }
@@ -164,15 +160,14 @@ int CC_CreateLockSet_Cmd::execute(void)
 
   printf("Executing create command (lock set: %s)\n", name_);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CosConcurrencyControl::LockSet_ptr lock_set =
         CC_TestUtils::create_lock_set();
       if(ACE_OS::strcmp(name_,"")!=0)// Do not bind an empty name
         {
           CC_naming_service::Instance()->bind_name(name_,
-                                                   lock_set ACE_ENV_ARG_PARAMETER);
+                                                   lock_set);
         }
       else
         {
@@ -180,12 +175,10 @@ int CC_CreateLockSet_Cmd::execute(void)
           cc_lockset_ = lock_set;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CC_CreateLockSet_Cmd::execute(void)");
+      ex._tao_print_exception ("CC_CreateLockSet_Cmd::execute(void)");
     }
-  ACE_ENDTRY;
 
   return 1; // CC_SUCCESS
 }
@@ -217,21 +210,17 @@ int CC_Lock_Cmd::execute(void)
   printf("Executing lock command (lock set: %s, mode: %s)\n",
          name_, CC_TestUtils::get_lock_mode_name(mode_));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CosConcurrencyControl::LockSet_var ccls =
-        GetLockSet(name_ ACE_ENV_ARG_PARAMETER);
-      ccls->lock (mode_
-                  ACE_ENV_ARG_PARAMETER);
+        GetLockSet(name_);
+      ccls->lock (mode_);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CC_Lock_Cmd::execute(void)");
+      ex._tao_print_exception ("CC_Lock_Cmd::execute(void)");
       return 0;
     }
-  ACE_ENDTRY;
   return 1; // CC_SUCCESS
 }
 
@@ -262,22 +251,18 @@ int CC_UnLock_Cmd::execute(void)
   printf("Executing unlock command (lock set: %s, mode: %s)\n",
          name_, CC_TestUtils::get_lock_mode_name(mode_));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_ ACE_ENV_ARG_PARAMETER);
+      CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_);
 
-      ccls->unlock (mode_
-                    ACE_ENV_ARG_PARAMETER);
+      ccls->unlock (mode_);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CC_UnLock_Cmd::execute(void)");
+      ex._tao_print_exception ("CC_UnLock_Cmd::execute(void)");
       return 0;
     }
-  ACE_ENDTRY;
   return 1; // CC_SUCCESS
 }
 
@@ -310,13 +295,11 @@ int CC_TryLock_Cmd::execute(void)
 
   CORBA::Boolean lock_not_held;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_ ACE_ENV_ARG_PARAMETER);
+      CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_);
 
-      lock_not_held = ccls->try_lock (mode_
-                                      ACE_ENV_ARG_PARAMETER);
+      lock_not_held = ccls->try_lock (mode_);
 
       if (lock_not_held)
         {
@@ -329,13 +312,11 @@ int CC_TryLock_Cmd::execute(void)
                     "%s lock held\n",
                     CC_TestUtils::get_lock_mode_name (mode_)));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CC_TryLock_Cmd::execute(void)");
+      ex._tao_print_exception ("CC_TryLock_Cmd::execute(void)");
       return 0;
     }
-  ACE_ENDTRY;
 
   return 1; // CC_SUCCESS
 }
@@ -373,21 +354,17 @@ int CC_ChangeMode_Cmd::execute(void)
          name_, CC_TestUtils::get_lock_mode_name(held_mode_),
          CC_TestUtils::get_lock_mode_name(new_mode_));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_ ACE_ENV_ARG_PARAMETER);
+      CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_);
 
-      ccls->change_mode (held_mode_, new_mode_
-                    ACE_ENV_ARG_PARAMETER);
+      ccls->change_mode (held_mode_, new_mode_);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CC_ChangeMode_Cmd::execute(void)");
+      ex._tao_print_exception ("CC_ChangeMode_Cmd::execute(void)");
     }
-  ACE_ENDTRY;
   return 1; // CC_SUCCESS
 }
 
@@ -565,27 +542,22 @@ CC_Lookup_Cmd::execute(void)
   // Do the lookup if we haven't done it before
   if(cc_lockset_.in() == 0)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
+      try
         {
           CORBA::Object_var ccls_obj =
             CC_naming_service::Instance()->get_obj_from_name ("",
-                                                              name_
-                                                              ACE_ENV_ARG_PARAMETER);
+                                                              name_);
 
           CosConcurrencyControl::LockSet_var ccls =
-            CosConcurrencyControl::LockSet::_narrow (ccls_obj.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+            CosConcurrencyControl::LockSet::_narrow (ccls_obj.in ());
 
           cc_lockset_ = ccls;
 
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "CC_UnLock_Cmd::execute(void)");
+          ex._tao_print_exception ("CC_UnLock_Cmd::execute(void)");
         }
-      ACE_ENDTRY;
     }
   return 1; // CC_SUCCESS
 }
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.h b/TAO/orbsvcs/tests/Concurrency/CC_command.h
index 735d38d7c21..dbd70e7ac12 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_command.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_command.h
@@ -44,8 +44,7 @@ class CC_Command
 
  protected:
   CosConcurrencyControl::LockSet_var
-    GetLockSet (const char *lock_set_name
-                ACE_ENV_ARG_DECL);
+    GetLockSet (const char *lock_set_name);
   // Function to look up the lock set we are operating on, or if the
   // name is "" return the global lock set variable
 
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
index 79825ac4384..c23a0046c76 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
@@ -23,13 +23,12 @@
 
 ACE_RCSID(Concurrency, CC_naming_service, "$Id$")
 
-CC_naming_service::CC_naming_service (CORBA::ORB_var orb
-                                      ACE_ENV_ARG_DECL)
+CC_naming_service::CC_naming_service (CORBA::ORB_var orb)
   : cc_factory_key_ (0),
     orb_ (0),
     factory_ (0)
 {
-  this->Init(orb ACE_ENV_ARG_PARAMETER);
+  this->Init(orb);
 
   instance_ = this;
 }
@@ -42,14 +41,13 @@ CC_naming_service::CC_naming_service(void)
 }
 
 void
-CC_naming_service::Init(CORBA::ORB_var orb
-                        ACE_ENV_ARG_DECL)
+CC_naming_service::Init(CORBA::ORB_var orb)
 {
   this->orb_ = orb;
 
   int success = init_naming_service ();
   if (success < 0)
-    ACE_THROW (CORBA::INTERNAL ());
+    throw CORBA::INTERNAL ();
 }
 
 CC_naming_service::~CC_naming_service (void)
@@ -71,20 +69,19 @@ CC_naming_service::Instance(void)
 
 CORBA::Object_var
 CC_naming_service::get_obj_from_name (const char *c_name,
-                                      const char *name
-                                      ACE_ENV_ARG_DECL)
+                                      const char *name)
 {
   ACE_DEBUG ((LM_DEBUG, "C: %s, N: %s\n", c_name, name));
   CORBA::Object_var obj;
 
-  ACE_TRY
+  try
     {
       if (ACE_OS::strlen (c_name) == 0)
         {
           CosNaming::Name ns_name (1);
           ns_name.length (1);
           ns_name[0].id = CORBA::string_dup (name);
-          obj = my_name_client_->resolve (ns_name ACE_ENV_ARG_PARAMETER);
+          obj = my_name_client_->resolve (ns_name);
         }
       else
         {
@@ -92,45 +89,39 @@ CC_naming_service::get_obj_from_name (const char *c_name,
           ns_name.length (2);
           ns_name[0].id = CORBA::string_dup (c_name);
           ns_name[1].id = CORBA::string_dup (name);
-          obj = my_name_client_->resolve (ns_name ACE_ENV_ARG_PARAMETER);
+          obj = my_name_client_->resolve (ns_name);
         }
       if (CORBA::is_nil (obj.in ()) )
         ACE_DEBUG((LM_DEBUG,
                    "OBJ was nill (aieee)\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CC_Client::get_obj_from_name (...)");
+      ex._tao_print_exception ("CC_Client::get_obj_from_name (...)");
       return obj;
     }
-  ACE_ENDTRY;
 
   return obj;
 }
 
 void
 CC_naming_service::bind_name (const char *n,
-                              CORBA::Object_ptr obj
-                              ACE_ENV_ARG_DECL)
+                              CORBA::Object_ptr obj)
 {
   ACE_DEBUG ((LM_DEBUG, "CC_Client::bind_name\n"));
 
-  ACE_TRY
+  try
     {
       CosNaming::Name ns_name (1);
       ns_name.length (1);
       ns_name[0].id = CORBA::string_dup (n);
       my_name_client_->bind (ns_name,
-                             obj
-                             ACE_ENV_ARG_PARAMETER);
+                             obj);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CC_Client::bind_name (...)");
+      ex._tao_print_exception ("CC_Client::bind_name (...)");
     }
-  ACE_ENDTRY;
 }
 
 CosConcurrencyControl::LockSetFactory_var
@@ -142,8 +133,7 @@ CC_naming_service::get_lock_set_factory (void)
 int
 CC_naming_service::init_naming_service (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the naming services
       if (my_name_client_.init (orb_.in ()) != 0)
@@ -153,25 +143,22 @@ CC_naming_service::init_naming_service (void)
                           -1);
 
       CORBA::Object_var factory_obj = get_obj_from_name ("CosConcurrency",
-                                                         "LockSetFactory"
-                                                         ACE_ENV_ARG_PARAMETER);
+                                                         "LockSetFactory");
 
       this->factory_ =
         CosConcurrencyControl::LockSetFactory::_narrow
-        (factory_obj.in () ACE_ENV_ARG_PARAMETER);
+        (factory_obj.in ());
 
       if (CORBA::is_nil (this->factory_.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " could not resolve lock set factory in Naming service\n"),
                           -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CC_Client::init_naming_service");
+      ex._tao_print_exception ("CC_Client::init_naming_service");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h
index 597a9696840..9a992338ee2 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h
@@ -38,24 +38,22 @@ public:
   CC_naming_service ();
   // Default constructor
 
-  CC_naming_service (CORBA::ORB_var orb_ ACE_ENV_ARG_DECL);
+  CC_naming_service (CORBA::ORB_var orb_);
   // Constructor
 
   ~CC_naming_service (void);
   // Default destructor.
 
-  void Init (CORBA::ORB_var orb_ ACE_ENV_ARG_DECL);
+  void Init (CORBA::ORB_var orb_);
   // Initialization method must be called after first call of Instance()
   // in order to initialize the object correctly
 
   CORBA::Object_var get_obj_from_name (const char *c_name,
-                                       const char *name
-                                       ACE_ENV_ARG_DECL);
+                                       const char *name);
   // Lookup a name in the naming service (context, name)
 
   void bind_name (const char *n,
-                  CORBA::Object_ptr obj
-                  ACE_ENV_ARG_DECL);
+                  CORBA::Object_ptr obj);
   // Bind a name in the concurrency context.
 
   CosConcurrencyControl::LockSetFactory_var get_lock_set_factory (void);
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
index 23fdb762071..4080b9e369f 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
@@ -50,8 +50,7 @@ CC_TestUtils::create_lock_set (void)
   // Create the lock set and return an obj ref corresponding to the
   // key.
   CosConcurrencyControl::LockSet_ptr lock_set(0);
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       lock_set =
         CC_naming_service::Instance()->get_lock_set_factory ()->create ();
@@ -61,12 +60,10 @@ CC_TestUtils::create_lock_set (void)
                            "null lock set objref returned by factory\n"),
                           0);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CC_Client::create_lock_set");
+      ex._tao_print_exception ("CC_Client::create_lock_set");
       return 0;
     }
-  ACE_ENDTRY;
   return lock_set;
 }
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
index 6b7fb36dc56..cda1e777953 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
@@ -39,8 +39,7 @@ CC_Test::create_lock_set (void)
   // Create the lock set and return an obj ref corresponding to the
   // key.
   CosConcurrencyControl::LockSet_ptr lock_set(0);
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       lock_set =
         this->naming_service_->get_lock_set_factory ()->create ();
@@ -50,13 +49,11 @@ CC_Test::create_lock_set (void)
                            "null lock set objref returned by factory\n"),
                           0);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CC_Client::create_lock_set");
+      ex._tao_print_exception ("CC_Client::create_lock_set");
       return 0;
     }
-  ACE_ENDTRY;
   return lock_set;
 }
 
@@ -102,17 +99,15 @@ Test_Single_Lock_With_Mode::run (int /* times_to_run */)
 
   CosConcurrencyControl::LockSet_ptr cc_lock_set_ = create_lock_set ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      cc_lock_set_->lock (mode_ ACE_ENV_ARG_PARAMETER);
+      cc_lock_set_->lock (mode_);
 
       ACE_DEBUG ((LM_DEBUG,
                   "%s lock set\n",
                   get_lock_mode_name (mode_)));
 
-      lock_not_held = cc_lock_set_->try_lock (mode_
-                                              ACE_ENV_ARG_PARAMETER);
+      lock_not_held = cc_lock_set_->try_lock (mode_);
 
       if (lock_not_held)
         {
@@ -126,14 +121,12 @@ Test_Single_Lock_With_Mode::run (int /* times_to_run */)
                     "%s lock held\n",
                     get_lock_mode_name (mode_)));
 
-      cc_lock_set_->unlock (mode_
-                            ACE_ENV_ARG_PARAMETER);
+      cc_lock_set_->unlock (mode_);
       ACE_DEBUG ((LM_DEBUG,
                   "%s lock released\n",
                   get_lock_mode_name (mode_)));
 
-      lock_not_held = cc_lock_set_->try_lock (mode_
-                                              ACE_ENV_ARG_PARAMETER);
+      lock_not_held = cc_lock_set_->try_lock (mode_);
 
       if (lock_not_held)
         ACE_DEBUG ((LM_DEBUG,
@@ -148,13 +141,11 @@ Test_Single_Lock_With_Mode::run (int /* times_to_run */)
         }
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Single_Lock_With_Mode::run");
+      ex._tao_print_exception ("Test_Single_Lock_With_Mode::run");
       return CC_FAIL;
     }
-  ACE_ENDTRY;
 
   CORBA::release (cc_lock_set_);
 
@@ -177,30 +168,25 @@ Test_Setup_LockSet::~Test_Setup_LockSet (void)
 int
 Test_Setup_LockSet::run (int /* times_to_run */)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CosConcurrencyControl::LockSet_ptr cc_lock_set_ =
         create_lock_set ();
-      this->naming_service_->bind_name (my_name_, cc_lock_set_
-                                        ACE_ENV_ARG_PARAMETER);
+      this->naming_service_->bind_name (my_name_, cc_lock_set_);
 
       ACE_DEBUG ((LM_DEBUG,
                   "Name bound\n"));
 
-      cc_lock_set_->lock (CosConcurrencyControl::read
-                          ACE_ENV_ARG_PARAMETER);
+      cc_lock_set_->lock (CosConcurrencyControl::read);
 
       ACE_DEBUG ((LM_DEBUG,
                   "Read lock set\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Against_Other_LockSet::run");
+      ex._tao_print_exception ("Test_Against_Other_LockSet::run");
       return CC_FAIL;
     }
-  ACE_ENDTRY;
 
   return CC_SUCCESS;
 }
@@ -222,29 +208,23 @@ Test_Use_Already_Created_LockSet::~Test_Use_Already_Created_LockSet (void)
 int
 Test_Use_Already_Created_LockSet::run (int /* times_to_run */)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::Object_var ccls_obj =
         this->naming_service_->get_obj_from_name (const_cast<char *> (""),
-                                                  my_name_
-                                                  ACE_ENV_ARG_PARAMETER);
+                                                  my_name_);
 
       CosConcurrencyControl::LockSet_var ccls =
-        CosConcurrencyControl::LockSet::_narrow (ccls_obj.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
+        CosConcurrencyControl::LockSet::_narrow (ccls_obj.in ());
 
-      ccls->lock (CosConcurrencyControl::read
-                  ACE_ENV_ARG_PARAMETER);
+      ccls->lock (CosConcurrencyControl::read);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Against_Other_LockSet::run");
+      ex._tao_print_exception ("Test_Against_Other_LockSet::run");
       return CC_FAIL;
     }
-  ACE_ENDTRY;
 
   return CC_SUCCESS;
 }
@@ -266,27 +246,21 @@ Test_Unlock_Already_Created_LockSet::~Test_Unlock_Already_Created_LockSet (void)
 int
 Test_Unlock_Already_Created_LockSet::run (int /* times_to_run */)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::Object_var ccls_obj =
-        this->naming_service_->get_obj_from_name (const_cast<char *> (""), my_name_
-                                                 ACE_ENV_ARG_PARAMETER);
+        this->naming_service_->get_obj_from_name (const_cast<char *> (""), my_name_);
 
       CosConcurrencyControl::LockSet_var ccls =
-        CosConcurrencyControl::LockSet::_narrow (ccls_obj.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
+        CosConcurrencyControl::LockSet::_narrow (ccls_obj.in ());
 
-      ccls->unlock (CosConcurrencyControl::read
-                    ACE_ENV_ARG_PARAMETER);
+      ccls->unlock (CosConcurrencyControl::read);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Unlock_Already_Created_LockSet::run");
+      ex._tao_print_exception ("Test_Unlock_Already_Created_LockSet::run");
       return CC_FAIL;
     }
-  ACE_ENDTRY;
 
   return CC_SUCCESS;
 }
@@ -311,19 +285,17 @@ Test_Release_Not_Held_Lock::run (int /* times_to_run */)
 
   // Create the lock set
   CosConcurrencyControl::LockSet_ptr cc_lock_set_ = create_lock_set ();
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // lock the lock
-      cc_lock_set_->lock (mode_ ACE_ENV_ARG_PARAMETER);
+      cc_lock_set_->lock (mode_);
 
       ACE_DEBUG ((LM_DEBUG,
                   "%s lock set\n",
                   get_lock_mode_name (mode_)));
 
       // check to see if the lock is held
-      lock_not_held = cc_lock_set_->try_lock (mode_
-                                              ACE_ENV_ARG_PARAMETER);
+      lock_not_held = cc_lock_set_->try_lock (mode_);
 
       if (lock_not_held)
         {
@@ -338,22 +310,20 @@ Test_Release_Not_Held_Lock::run (int /* times_to_run */)
                     get_lock_mode_name (mode_)));
 
       // release the lock
-      cc_lock_set_->unlock (mode_
-                            ACE_ENV_ARG_PARAMETER);
+      cc_lock_set_->unlock (mode_);
       ACE_DEBUG ((LM_DEBUG,
                   "%s lock released\n",
                   get_lock_mode_name (mode_)));
 
       // release the lock again. this should raise an exception
-      cc_lock_set_->unlock (mode_
-                            ACE_ENV_ARG_PARAMETER);
+      cc_lock_set_->unlock (mode_);
 
       ACE_DEBUG ((LM_DEBUG,
                   "attemptet to release %s lock\n",
                   get_lock_mode_name (mode_)));
 
     }
-  ACE_CATCH(CosConcurrencyControl::LockNotHeld, userex)
+  catch (const CosConcurrencyControl::LockNotHeld& userex)
     {
       // We should end here
       ACE_UNUSED_ARG (userex);
@@ -361,13 +331,11 @@ Test_Release_Not_Held_Lock::run (int /* times_to_run */)
       return CC_SUCCESS;
     }
 
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Release_Not_Held_Lock::run");
+      ex._tao_print_exception ("Test_Release_Not_Held_Lock::run");
       return CC_FAIL;
     }
-  ACE_ENDTRY;
 
   CORBA::release (cc_lock_set_);
 
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
index 25506efbbc1..657405b4ae7 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
@@ -12,68 +12,63 @@ ACE_RCSID (CEC_Tests,
            "$Id$")
 
 static void run_test (PortableServer::POA_ptr poa,
-                      int use_callbacks
-                      ACE_ENV_ARG_DECL);
+                      int use_callbacks);
 
 int
 main (int argc, char* argv[])
 {
   TAO_CEC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
         poa->the_POAManager ();
       poa_manager->activate ();
 
       // ****************************************************************
 
-      run_test (poa.in (), 0 ACE_ENV_ARG_PARAMETER);
+      run_test (poa.in (), 0);
 
-      run_test (poa.in (), 1 ACE_ENV_ARG_PARAMETER);
+      run_test (poa.in (), 1);
 
       // ****************************************************************
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1);
 
       orb->destroy ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 // ****************************************************************
 
 void
-deactivate_servant (PortableServer::Servant servant
-                    ACE_ENV_ARG_DECL)
+deactivate_servant (PortableServer::Servant servant)
 {
   PortableServer::POA_var poa =
     servant->_default_POA ();
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER);
-  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
+    poa->servant_to_id (servant);
+  poa->deactivate_object (id.in ());
 }
 
 void
 run_test (PortableServer::POA_ptr poa,
-          int use_callbacks
-          ACE_ENV_ARG_DECL)
+          int use_callbacks)
 {
   TAO_CEC_EventChannel_Attributes attributes (poa, poa);
   attributes.disconnect_callbacks = use_callbacks;
@@ -105,16 +100,12 @@ run_test (PortableServer::POA_ptr poa,
 
   for (int i = 0; i != iterations; ++i)
     {
-      supplier_0.connect (supplier_admin.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      consumer_0.connect (consumer_admin.in ()
-                          ACE_ENV_ARG_PARAMETER);
+      supplier_0.connect (supplier_admin.in ());
+      consumer_0.connect (consumer_admin.in ());
       if (i % 2 == 1)
         {
-          supplier_1.connect (supplier_admin.in ()
-                              ACE_ENV_ARG_PARAMETER);
-          consumer_1.connect (consumer_admin.in ()
-                              ACE_ENV_ARG_PARAMETER);
+          supplier_1.connect (supplier_admin.in ());
+          consumer_1.connect (consumer_admin.in ());
         }
       supplier_0.disconnect ();
       consumer_0.disconnect ();
@@ -125,18 +116,16 @@ run_test (PortableServer::POA_ptr poa,
         }
     }
 
-  supplier_0.connect (supplier_admin.in ()
-                      ACE_ENV_ARG_PARAMETER);
-  consumer_0.connect (consumer_admin.in ()
-                      ACE_ENV_ARG_PARAMETER);
+  supplier_0.connect (supplier_admin.in ());
+  consumer_0.connect (consumer_admin.in ());
 
   event_channel->destroy ();
 
-  deactivate_servant (&supplier_0 ACE_ENV_ARG_PARAMETER);
+  deactivate_servant (&supplier_0);
 
-  deactivate_servant (&consumer_0 ACE_ENV_ARG_PARAMETER);
+  deactivate_servant (&consumer_0);
 
-  deactivate_servant (&ec_impl ACE_ENV_ARG_PARAMETER);
+  deactivate_servant (&ec_impl);
 
   CORBA::ULong count_0 = 1;
   CORBA::ULong count_1 = 0;
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
index 7e024dc3b18..4c1fb74ceeb 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
@@ -12,68 +12,63 @@ ACE_RCSID (CEC_Tests,
            "$Id$")
 
 static void run_test (PortableServer::POA_ptr poa,
-                      int use_callbacks
-                      ACE_ENV_ARG_DECL);
+                      int use_callbacks);
 
 int
 main (int argc, char* argv[])
 {
   TAO_CEC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
         poa->the_POAManager ();
       poa_manager->activate ();
 
       // ****************************************************************
 
-      run_test (poa.in (), 0 ACE_ENV_ARG_PARAMETER);
+      run_test (poa.in (), 0);
 
-      run_test (poa.in (), 1 ACE_ENV_ARG_PARAMETER);
+      run_test (poa.in (), 1);
 
       // ****************************************************************
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1);
 
       orb->destroy ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 // ****************************************************************
 
 void
-deactivate_servant (PortableServer::Servant servant
-                    ACE_ENV_ARG_DECL)
+deactivate_servant (PortableServer::Servant servant)
 {
   PortableServer::POA_var poa =
     servant->_default_POA ();
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER);
-  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
+    poa->servant_to_id (servant);
+  poa->deactivate_object (id.in ());
 }
 
 void
 run_test (PortableServer::POA_ptr poa,
-          int use_callbacks
-          ACE_ENV_ARG_DECL)
+          int use_callbacks)
 {
   TAO_CEC_EventChannel_Attributes attributes (poa, poa);
   attributes.disconnect_callbacks = use_callbacks;
@@ -96,7 +91,7 @@ run_test (PortableServer::POA_ptr poa,
 
   event_channel->destroy ();
 
-  deactivate_servant (&ec_impl ACE_ENV_ARG_PARAMETER);
+  deactivate_servant (&ec_impl);
 }
 
 MTD_Task::MTD_Task (CosEventChannelAdmin::EventChannel_ptr ec,
@@ -112,15 +107,14 @@ MTD_Task::svc ()
 {
   for (int i = 0; i < 10; ++i)
     {
-      ACE_TRY_NEW_ENV
+      try
         {
           this->run_iteration ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           return -1;
         }
-      ACE_ENDTRY;
     }
   return 0;
 }
@@ -147,16 +141,12 @@ MTD_Task::run_iteration (void)
 
   for (int i = 0; i != iterations; ++i)
     {
-      supplier_0.connect (supplier_admin.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      consumer_0.connect (consumer_admin.in ()
-                          ACE_ENV_ARG_PARAMETER);
+      supplier_0.connect (supplier_admin.in ());
+      consumer_0.connect (consumer_admin.in ());
       if (i % 2 == 1)
         {
-          supplier_1.connect (supplier_admin.in ()
-                              ACE_ENV_ARG_PARAMETER);
-          consumer_1.connect (consumer_admin.in ()
-                              ACE_ENV_ARG_PARAMETER);
+          supplier_1.connect (supplier_admin.in ());
+          consumer_1.connect (consumer_admin.in ());
         }
       supplier_0.disconnect ();
       consumer_0.disconnect ();
@@ -167,9 +157,9 @@ MTD_Task::run_iteration (void)
         }
     }
 
-  deactivate_servant (&supplier_0 ACE_ENV_ARG_PARAMETER);
+  deactivate_servant (&supplier_0);
 
-  deactivate_servant (&consumer_0 ACE_ENV_ARG_PARAMETER);
+  deactivate_servant (&consumer_0);
 
   CORBA::ULong count_0 = 0;
   CORBA::ULong count_1 = 0;
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
index c3c42b529e7..990d9da478e 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
@@ -15,17 +15,16 @@ main (int argc, char* argv[])
 {
   TAO_CEC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
         poa->the_POAManager ();
       poa_manager->activate ();
@@ -57,49 +56,42 @@ main (int argc, char* argv[])
 
       CEC_Counting_Supplier supplier_00;
 
-      supplier_00.connect (supplier_admin.in ()
-                           ACE_ENV_ARG_PARAMETER);
+      supplier_00.connect (supplier_admin.in ());
 
       // ****************************************************************
 
       CEC_Counting_Supplier supplier_01;
 
-      supplier_01.connect (supplier_admin.in ()
-                           ACE_ENV_ARG_PARAMETER);
+      supplier_01.connect (supplier_admin.in ());
 
       // ****************************************************************
 
       CEC_Pull_Counting_Supplier supplier_10;
 
-      supplier_10.connect (supplier_admin.in ()
-                           ACE_ENV_ARG_PARAMETER);
+      supplier_10.connect (supplier_admin.in ());
 
       // ****************************************************************
 
       CEC_Pull_Counting_Supplier supplier_11;
 
-      supplier_11.connect (supplier_admin.in ()
-                           ACE_ENV_ARG_PARAMETER);
+      supplier_11.connect (supplier_admin.in ());
 
       // ****************************************************************
 
       // Create a consumer, intialize its RT_Info structures, and
       // connnect to the event channel....
       CEC_Counting_Consumer consumer_00 ("Consumer/00");
-      consumer_00.connect (consumer_admin.in ()
-                           ACE_ENV_ARG_PARAMETER);
+      consumer_00.connect (consumer_admin.in ());
 
       // ****************************************************************
 
       CEC_Pull_Counting_Consumer consumer_01 ("Consumer/01");
-      consumer_01.connect (consumer_admin.in ()
-                           ACE_ENV_ARG_PARAMETER);
+      consumer_01.connect (consumer_admin.in ());
 
       // ****************************************************************
 
       CEC_Pull_Counting_Consumer consumer_10 ("Consumer/10");
-      consumer_10.connect (consumer_admin.in ()
-                           ACE_ENV_ARG_PARAMETER);
+      consumer_10.connect (consumer_admin.in ());
 
       // ****************************************************************
 
@@ -175,7 +167,7 @@ main (int argc, char* argv[])
 
       // ****************************************************************
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1);
 
       orb->destroy ();
 
@@ -196,11 +188,10 @@ main (int argc, char* argv[])
         consumer_task_10.pull_count ();
       consumer_10.dump_results (expected, 5);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
index 9535308ef8f..a424f4e6c6e 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
@@ -15,17 +15,16 @@ main (int argc, char* argv[])
 {
   TAO_CEC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
         poa->the_POAManager ();
       poa_manager->activate ();
@@ -57,43 +56,37 @@ main (int argc, char* argv[])
 
       CEC_Counting_Supplier supplier_00;
 
-      supplier_00.connect (supplier_admin.in ()
-                           ACE_ENV_ARG_PARAMETER);
+      supplier_00.connect (supplier_admin.in ());
 
       // ****************************************************************
 
       CEC_Counting_Supplier supplier_01;
 
-      supplier_01.connect (supplier_admin.in ()
-                           ACE_ENV_ARG_PARAMETER);
+      supplier_01.connect (supplier_admin.in ());
 
       // ****************************************************************
 
       CEC_Counting_Supplier supplier_10;
 
-      supplier_10.connect (supplier_admin.in ()
-                           ACE_ENV_ARG_PARAMETER);
+      supplier_10.connect (supplier_admin.in ());
 
       // ****************************************************************
 
       CEC_Counting_Supplier supplier_11;
 
-      supplier_11.connect (supplier_admin.in ()
-                           ACE_ENV_ARG_PARAMETER);
+      supplier_11.connect (supplier_admin.in ());
 
       // ****************************************************************
 
       // Create a consumer, intialize its RT_Info structures, and
       // connnect to the event channel....
       CEC_Counting_Consumer consumer_00 ("Consumer/00");
-      consumer_00.connect (consumer_admin.in ()
-                           ACE_ENV_ARG_PARAMETER);
+      consumer_00.connect (consumer_admin.in ());
 
       // ****************************************************************
 
       CEC_Counting_Consumer consumer_01 ("Consumer/01");
-      consumer_01.connect (consumer_admin.in ()
-                           ACE_ENV_ARG_PARAMETER);
+      consumer_01.connect (consumer_admin.in ());
 
       // ****************************************************************
 
@@ -147,7 +140,7 @@ main (int argc, char* argv[])
 
       // ****************************************************************
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1);
 
       orb->destroy ();
 
@@ -162,11 +155,10 @@ main (int argc, char* argv[])
       consumer_00.dump_results (expected, 5);
       consumer_01.dump_results (expected, 5);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
index b0f24061faa..517ffb87601 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
@@ -21,14 +21,13 @@ main (int argc, char* argv[])
 // ****************************************************************
 
 void
-deactivate_servant (PortableServer::Servant servant
-                    ACE_ENV_ARG_DECL)
+deactivate_servant (PortableServer::Servant servant)
 {
   PortableServer::POA_var poa =
     servant->_default_POA ();
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER);
-  poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
+    poa->servant_to_id (servant);
+  poa->deactivate_object (oid.in ());
 }
 
 
@@ -43,11 +42,10 @@ RND_Driver::RND_Driver (void)
 int
 RND_Driver::run (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       // ****************************************************************
 
@@ -103,9 +101,9 @@ RND_Driver::run (int argc, char *argv[])
       // ****************************************************************
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
         poa->the_POAManager ();
       poa_manager->activate ();
@@ -135,8 +133,7 @@ RND_Driver::run (int argc, char *argv[])
 
       // ****************************************************************
 
-      this->supplier_.connect (this->supplier_admin_.in ()
-                               ACE_ENV_ARG_PARAMETER);
+      this->supplier_.connect (this->supplier_admin_.in ());
 
       // ****************************************************************
 
@@ -185,8 +182,7 @@ RND_Driver::run (int argc, char *argv[])
       {
         for (int k = 0; k != this->nsuppliers_; ++k)
           {
-            deactivate_servant (this->suppliers_[k]
-                                ACE_ENV_ARG_PARAMETER);
+            deactivate_servant (this->suppliers_[k]);
             this->suppliers_[k]->_remove_ref ();
           }
         delete[] this->suppliers_;
@@ -204,8 +200,7 @@ RND_Driver::run (int argc, char *argv[])
       {
         for (int k = 0; k != this->nconsumers_; ++k)
           {
-            deactivate_servant (this->consumers_[k]
-                                ACE_ENV_ARG_PARAMETER);
+            deactivate_servant (this->consumers_[k]);
             this->consumers_[k]->_remove_ref ();
           }
         delete[] this->consumers_;
@@ -214,29 +209,26 @@ RND_Driver::run (int argc, char *argv[])
 
       // ****************************************************************
 
-      deactivate_servant (&ec_impl
-                          ACE_ENV_ARG_PARAMETER);
+      deactivate_servant (&ec_impl);
 
       // ****************************************************************
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1);
 
       // ****************************************************************
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Random");
+      ex._tao_print_exception ("Random");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 void
-RND_Driver::timer (const CORBA::Any &e
-                   ACE_ENV_ARG_DECL)
+RND_Driver::timer (const CORBA::Any &e)
 {
   int r = ACE_OS::rand ();
   if (r < 0)
@@ -257,7 +249,7 @@ RND_Driver::timer (const CORBA::Any &e
             CORBA::Any new_event;
             recursion++;
             new_event <<= recursion;
-            this->supplier_.push (new_event ACE_ENV_ARG_PARAMETER);
+            this->supplier_.push (new_event);
           }
       }
       break;
@@ -276,8 +268,7 @@ RND_Driver::timer (const CORBA::Any &e
 
         // ACE_DEBUG ((LM_DEBUG, "Connecting supplier %d\n", n));
 
-        this->suppliers_[n]->connect (this->supplier_admin_.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        this->suppliers_[n]->connect (this->supplier_admin_.in ());
       }
       break;
 
@@ -287,8 +278,7 @@ RND_Driver::timer (const CORBA::Any &e
 
         // ACE_DEBUG ((LM_DEBUG, "Connecting consumer %d\n", n));
 
-        this->consumers_[n]->connect (this->consumer_admin_.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        this->consumers_[n]->connect (this->consumer_admin_.in ());
       }
       break;
 
@@ -315,17 +305,15 @@ RND_Driver::timer (const CORBA::Any &e
 }
 
 void
-RND_Driver::event (const CORBA::Any &e
-                   ACE_ENV_ARG_DECL)
+RND_Driver::event (const CORBA::Any &e)
 {
-  this->timer (e ACE_ENV_ARG_PARAMETER);
+  this->timer (e);
 }
 
 // ****************************************************************
 
 void
-RND_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr admin
-                       ACE_ENV_ARG_DECL)
+RND_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr admin)
 {
   CosEventChannelAdmin::ProxyPushSupplier_var proxy;
   {
@@ -340,8 +328,7 @@ RND_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr admin
   }
   CosEventComm::PushConsumer_var me =
     this->_this ();
-  proxy->connect_push_consumer (me.in ()
-                                ACE_ENV_ARG_PARAMETER);
+  proxy->connect_push_consumer (me.in ());
 }
 
 void
@@ -357,11 +344,10 @@ RND_Consumer::disconnect (void)
 }
 
 void
-RND_Consumer::push (const CORBA::Any &event
-                    ACE_ENV_ARG_DECL)
+RND_Consumer::push (const CORBA::Any &event)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->driver_->event (event ACE_ENV_ARG_PARAMETER);
+  this->driver_->event (event);
 }
 
 void
@@ -373,8 +359,7 @@ RND_Consumer::disconnect_push_consumer (void)
 // ****************************************************************
 
 void
-RND_Supplier::connect (CosEventChannelAdmin::SupplierAdmin_ptr admin
-                       ACE_ENV_ARG_DECL)
+RND_Supplier::connect (CosEventChannelAdmin::SupplierAdmin_ptr admin)
 {
   CosEventChannelAdmin::ProxyPushConsumer_var proxy;
   {
@@ -395,8 +380,7 @@ RND_Supplier::connect (CosEventChannelAdmin::SupplierAdmin_ptr admin
     {
       me = this->_this ();
     }
-  proxy->connect_push_supplier (me.in ()
-                                ACE_ENV_ARG_PARAMETER);
+  proxy->connect_push_supplier (me.in ());
 }
 
 void
@@ -418,12 +402,11 @@ RND_Supplier::push_new_event (void)
   CORBA::Long recursion = 0;
   event <<= recursion;
 
-  this->push (event ACE_ENV_ARG_PARAMETER);
+  this->push (event);
 }
 
 void
-RND_Supplier::push (CORBA::Any &event
-                    ACE_ENV_ARG_DECL)
+RND_Supplier::push (CORBA::Any &event)
 {
   CosEventChannelAdmin::ProxyPushConsumer_var proxy;
   {
@@ -436,7 +419,7 @@ RND_Supplier::push (CORBA::Any &event
       CosEventChannelAdmin::ProxyPushConsumer::_duplicate(this->proxy_.in ());
   }
 
-  proxy->push (event ACE_ENV_ARG_PARAMETER);
+  proxy->push (event);
 }
 
 void
@@ -453,18 +436,16 @@ RND_Supplier::svc (void)
   int niterations = 5000;
   for (int i = 0; i != niterations; ++i)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
+      try
         {
           ACE_Time_Value tv (0, 10000);
           ACE_OS::sleep (tv);
 
           this->push_new_event ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
         }
-      ACE_ENDTRY;
       if (i * 100 / niterations >= percent)
         {
           ACE_DEBUG ((LM_DEBUG, "Thread %t %d%%\n", percent));
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.h b/TAO/orbsvcs/tests/CosEvent/Basic/Random.h
index 38050b078d3..20dd4130a11 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.h
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.h
@@ -44,14 +44,12 @@ public:
   RND_Consumer (RND_Driver *driver);
   // Constructor
 
-  void push (const CORBA::Any &event
-             ACE_ENV_ARG_DECL)
+  void push (const CORBA::Any &event)
     ACE_THROW_SPEC ((CORBA::SystemException));
   void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void connect (CosEventChannelAdmin::ConsumerAdmin_ptr admin
-                ACE_ENV_ARG_DECL);
+  void connect (CosEventChannelAdmin::ConsumerAdmin_ptr admin);
   void disconnect (void);
 
 protected:
@@ -78,8 +76,7 @@ class RND_Timer : public RND_Consumer
 public:
   RND_Timer (RND_Driver *driver);
 
-  void push (const CORBA::Any &event
-             ACE_ENV_ARG_DECL)
+  void push (const CORBA::Any &event)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
@@ -104,13 +101,11 @@ public:
   RND_Supplier (void);
   // Constructor
 
-  void connect (CosEventChannelAdmin::SupplierAdmin_ptr admin
-                ACE_ENV_ARG_DECL);
+  void connect (CosEventChannelAdmin::SupplierAdmin_ptr admin);
   void disconnect (void);
 
   void push_new_event (void);
-  void push (CORBA::Any &event
-             ACE_ENV_ARG_DECL);
+  void push (CORBA::Any &event);
   // Push a single event...
 
   virtual void disconnect_push_supplier (void)
@@ -142,12 +137,10 @@ public:
   int run (int argc, char *argv[]);
   // Run the test
 
-  void timer (const CORBA::Any &e
-              ACE_ENV_ARG_DECL);
+  void timer (const CORBA::Any &e);
   // The main timer has expired
 
-  void event (const CORBA::Any &e
-              ACE_ENV_ARG_DECL);
+  void event (const CORBA::Any &e);
   // One of the consumers has received an event
 
 private:
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
index eebd951a1cb..dbd64fada44 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
@@ -10,65 +10,60 @@ ACE_RCSID( CEC_Tests_Basic,
            "$Id$")
 
 static void run_test (PortableServer::POA_ptr poa,
-                      int with_callbacks
-                      ACE_ENV_ARG_DECL);
+                      int with_callbacks);
 
 int
 main (int argc, char* argv[])
 {
   TAO_CEC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
         poa->the_POAManager ();
       poa_manager->activate ();
 
       // ****************************************************************
 
-      run_test (poa.in (), 0 ACE_ENV_ARG_PARAMETER);
+      run_test (poa.in (), 0);
 
-      run_test (poa.in (), 1 ACE_ENV_ARG_PARAMETER);
+      run_test (poa.in (), 1);
 
       // ****************************************************************
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1);
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 void
-deactivate_servant (PortableServer::Servant servant
-                    ACE_ENV_ARG_DECL)
+deactivate_servant (PortableServer::Servant servant)
 {
   PortableServer::POA_var poa =
     servant->_default_POA ();
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER);
-  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
+    poa->servant_to_id (servant);
+  poa->deactivate_object (id.in ());
 }
 
 static void
 run_test (PortableServer::POA_ptr poa,
-          int with_callbacks
-          ACE_ENV_ARG_DECL)
+          int with_callbacks)
 {
   TAO_CEC_EventChannel_Attributes attributes (poa,
                                               poa);
@@ -112,9 +107,9 @@ run_test (PortableServer::POA_ptr poa,
 
   for (i = 0; i != n; ++i)
     {
-      consumer[i]->connect (consumer_admin.in () ACE_ENV_ARG_PARAMETER);
+      consumer[i]->connect (consumer_admin.in ());
 
-      supplier[i]->connect (supplier_admin.in () ACE_ENV_ARG_PARAMETER);
+      supplier[i]->connect (supplier_admin.in ());
     }
 
   // ****************************************************************
@@ -146,14 +141,14 @@ run_test (PortableServer::POA_ptr poa,
 
   for (i = 0; i != n; ++i)
     {
-      deactivate_servant (supplier[i] ACE_ENV_ARG_PARAMETER);
+      deactivate_servant (supplier[i]);
       delete supplier[i];
 
-      deactivate_servant (consumer[i] ACE_ENV_ARG_PARAMETER);
+      deactivate_servant (consumer[i]);
       delete consumer[i];
     }
   delete[] supplier;
   delete[] consumer;
 
-  deactivate_servant (&ec_impl ACE_ENV_ARG_PARAMETER);
+  deactivate_servant (&ec_impl);
 }
diff --git a/TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.cpp b/TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.cpp
index d143251cf90..3756ba12c54 100644
--- a/TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.cpp
@@ -33,8 +33,9 @@ TestEventConsumer_i::ORB_task::svc ()
     }
   catch (CORBA::SystemException &e)
     {
-      ACE_PRINT_EXCEPTION (e, ACE_TEXT ("TestEventConsumer_i ORB_task: "
-                                        "Caught CORBA::Exception:"));
+      e._tao_print_exception (
+        ACE_TEXT (
+          "TestEventConsumer_i ORB_task: ""Caught CORBA::Exception:"));
     }
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp b/TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp
index 9b0b4e8f62d..5e207d98720 100644
--- a/TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp
@@ -169,8 +169,9 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     }
   catch (CORBA::Exception &ex)
     {
-      ACE_PRINT_EXCEPTION (ex,
-                           ACE_TEXT ("TimeoutTest: Caught CORBA::Exception:"));
+      ex._tao_print_exception (
+        ACE_TEXT (
+          "TimeoutTest: Caught CORBA::Exception:"));
     }
 
   return 1;
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
index 86e762bea0a..45e51852cd8 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
@@ -13,8 +13,7 @@ CEC_Counting_Consumer::CEC_Counting_Consumer (const char* name)
 }
 
 void
-CEC_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                   ACE_ENV_ARG_DECL)
+CEC_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin)
 {
   // The canonical protocol to connect to the EC
 
@@ -27,8 +26,7 @@ CEC_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer
         consumer_admin->obtain_push_supplier ();
     }
 
-  this->supplier_proxy_->connect_push_consumer (consumer.in ()
-                                                ACE_ENV_ARG_PARAMETER);
+  this->supplier_proxy_->connect_push_consumer (consumer.in ());
 }
 
 void
@@ -42,8 +40,8 @@ CEC_Counting_Consumer::disconnect (void)
   PortableServer::POA_var consumer_poa =
     this->_default_POA ();
   PortableServer::ObjectId_var consumer_id =
-    consumer_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  consumer_poa->deactivate_object (consumer_id.in () ACE_ENV_ARG_PARAMETER);
+    consumer_poa->servant_to_id (this);
+  consumer_poa->deactivate_object (consumer_id.in ());
 
   this->supplier_proxy_ =
     CosEventChannelAdmin::ProxyPushSupplier::_nil ();
@@ -70,8 +68,7 @@ CEC_Counting_Consumer::dump_results (int expected_count, int tolerance)
 }
 
 void
-CEC_Counting_Consumer::push (const CORBA::Any&
-                             ACE_ENV_ARG_DECL_NOT_USED)
+CEC_Counting_Consumer::push (const CORBA::Any&)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->event_count ++;
@@ -105,8 +102,7 @@ CEC_Pull_Counting_Consumer::CEC_Pull_Counting_Consumer (const char* name)
 }
 
 void
-CEC_Pull_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                                     ACE_ENV_ARG_DECL)
+CEC_Pull_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin)
 {
   // The canonical protocol to connect to the EC
 
@@ -119,8 +115,7 @@ CEC_Pull_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr con
         consumer_admin->obtain_pull_supplier ();
     }
 
-  this->supplier_proxy_->connect_pull_consumer (consumer.in ()
-                                                ACE_ENV_ARG_PARAMETER);
+  this->supplier_proxy_->connect_pull_consumer (consumer.in ());
 }
 
 void
@@ -134,8 +129,8 @@ CEC_Pull_Counting_Consumer::disconnect (void)
   PortableServer::POA_var consumer_poa =
     this->_default_POA ();
   PortableServer::ObjectId_var consumer_id =
-    consumer_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  consumer_poa->deactivate_object (consumer_id.in () ACE_ENV_ARG_PARAMETER);
+    consumer_poa->servant_to_id (this);
+  consumer_poa->deactivate_object (consumer_id.in ());
 
   this->supplier_proxy_ =
     CosEventChannelAdmin::ProxyPullSupplier::_nil ();
@@ -153,8 +148,7 @@ CEC_Pull_Counting_Consumer::pull (void)
 }
 
 CORBA::Any*
-CEC_Pull_Counting_Consumer::try_pull (CORBA::Boolean_out has_event
-                                      ACE_ENV_ARG_DECL)
+CEC_Pull_Counting_Consumer::try_pull (CORBA::Boolean_out has_event)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     {
@@ -163,7 +157,7 @@ CEC_Pull_Counting_Consumer::try_pull (CORBA::Boolean_out has_event
     }
 
   CORBA::Any_var event =
-    this->supplier_proxy_->try_pull (has_event ACE_ENV_ARG_PARAMETER);
+    this->supplier_proxy_->try_pull (has_event);
 
   if (has_event)
     this->event_count++;
@@ -215,15 +209,14 @@ CEC_Counting_Consumer_Task::
 int
 CEC_Counting_Consumer_Task::svc ()
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       this->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -250,8 +243,7 @@ CEC_Counting_Consumer_Task::run (void)
   do {
     CORBA::Boolean has_event;
     CORBA::Any_var event =
-      this->consumer_->try_pull (has_event
-                                 ACE_ENV_ARG_PARAMETER);
+      this->consumer_->try_pull (has_event);
 
     if (this->milliseconds_ != 0)
       {
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
index fc5473649c5..7b30ad07f53 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
@@ -39,8 +39,7 @@ public:
   CEC_Counting_Consumer (const char* name);
   // Constructor
 
-  void connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                ACE_ENV_ARG_DECL);
+  void connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin);
   void disconnect (void);
   // Simple connect/disconnect methods..
 
@@ -50,8 +49,7 @@ public:
 
   // = The CosEventComm::PushConsumer methods
 
-  virtual void push (const CORBA::Any& events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const CORBA::Any& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -85,8 +83,7 @@ public:
   CEC_Pull_Counting_Consumer (const char* name);
   // Constructor
 
-  void connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                ACE_ENV_ARG_DECL);
+  void connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin);
   void disconnect (void);
   // Simple connect/disconnect methods..
 
@@ -95,8 +92,7 @@ public:
   // expected count.
 
   CORBA::Any *pull (void);
-  CORBA::Any *try_pull (CORBA::Boolean_out has_event
-                        ACE_ENV_ARG_DECL);
+  CORBA::Any *try_pull (CORBA::Boolean_out has_event);
 
   // = The CosEventComm::PullConsumer methods
   virtual void disconnect_pull_consumer (void)
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
index 5c26a242646..2ac8fb804a5 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
@@ -13,8 +13,7 @@ CEC_Counting_Supplier::CEC_Counting_Supplier (void)
 
 void
 CEC_Counting_Supplier::connect (
-    CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin
-    ACE_ENV_ARG_DECL)
+    CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin)
 {
   CosEventComm::PushSupplier_var supplier =
     this->_this ();
@@ -25,8 +24,7 @@ CEC_Counting_Supplier::connect (
         supplier_admin->obtain_push_consumer ();
     }
 
-  this->consumer_proxy_->connect_push_supplier (supplier.in ()
-                                                ACE_ENV_ARG_PARAMETER);
+  this->consumer_proxy_->connect_push_supplier (supplier.in ());
 }
 
 void
@@ -40,16 +38,15 @@ CEC_Counting_Supplier::disconnect (void)
   PortableServer::POA_var supplier_poa =
     this->_default_POA ();
   PortableServer::ObjectId_var supplier_id =
-    supplier_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  supplier_poa->deactivate_object (supplier_id.in () ACE_ENV_ARG_PARAMETER);
+    supplier_poa->servant_to_id (this);
+  supplier_poa->deactivate_object (supplier_id.in ());
 
   this->consumer_proxy_ =
     CosEventChannelAdmin::ProxyPushConsumer::_nil ();
 }
 
 void
-CEC_Counting_Supplier::push (const CORBA::Any&
-                ACE_ENV_ARG_DECL)
+CEC_Counting_Supplier::push (const CORBA::Any&)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
@@ -58,7 +55,7 @@ CEC_Counting_Supplier::push (const CORBA::Any&
   CORBA::Any event;
   event <<= CORBA::Long(0);
 
-  this->consumer_proxy_->push (event ACE_ENV_ARG_PARAMETER);
+  this->consumer_proxy_->push (event);
   this->event_count++;
 }
 
@@ -86,15 +83,14 @@ CEC_Counting_Supplier_Task::
 int
 CEC_Counting_Supplier_Task::svc ()
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       this->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -119,7 +115,7 @@ CEC_Counting_Supplier_Task::run (void)
 
   int stop = 0;
   do {
-    this->supplier_->push (event ACE_ENV_ARG_PARAMETER);
+    this->supplier_->push (event);
 
     if (this->milliseconds_ != 0)
       {
@@ -150,8 +146,7 @@ CEC_Pull_Counting_Supplier::CEC_Pull_Counting_Supplier (void)
 
 void
 CEC_Pull_Counting_Supplier::connect (
-    CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin
-    ACE_ENV_ARG_DECL)
+    CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin)
 {
   CosEventComm::PullSupplier_var supplier =
     this->_this ();
@@ -162,8 +157,7 @@ CEC_Pull_Counting_Supplier::connect (
         supplier_admin->obtain_pull_consumer ();
     }
 
-  this->consumer_proxy_->connect_pull_supplier (supplier.in ()
-                                                ACE_ENV_ARG_PARAMETER);
+  this->consumer_proxy_->connect_pull_supplier (supplier.in ());
 }
 
 void
@@ -177,8 +171,8 @@ CEC_Pull_Counting_Supplier::disconnect (void)
   PortableServer::POA_var supplier_poa =
     this->_default_POA ();
   PortableServer::ObjectId_var supplier_id =
-    supplier_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  supplier_poa->deactivate_object (supplier_id.in () ACE_ENV_ARG_PARAMETER);
+    supplier_poa->servant_to_id (this);
+  supplier_poa->deactivate_object (supplier_id.in ());
 
   this->consumer_proxy_ =
     CosEventChannelAdmin::ProxyPullConsumer::_nil ();
@@ -205,8 +199,7 @@ CEC_Pull_Counting_Supplier::pull (void)
 }
 
 CORBA::Any*
-CEC_Pull_Counting_Supplier::try_pull (CORBA::Boolean_out has_event
-                                      ACE_ENV_ARG_DECL)
+CEC_Pull_Counting_Supplier::try_pull (CORBA::Boolean_out has_event)
     ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected))
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
index 0fa909e7315..b8505bdb9c8 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
@@ -41,13 +41,11 @@ public:
 
   // = The CosEventComm::PushSupplier methods
 
-  void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin
-                ACE_ENV_ARG_DECL);
+  void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin);
   void disconnect (void);
   // Simple connect/disconnect methods..
 
-  void push (const CORBA::Any& events
-             ACE_ENV_ARG_DECL)
+  void push (const CORBA::Any& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Push an event.
 
@@ -115,16 +113,14 @@ public:
 
   // = The CosEventComm::PullSupplier methods
 
-  void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin
-                ACE_ENV_ARG_DECL);
+  void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin);
   void disconnect (void);
   // Simple connect/disconnect methods..
 
   // The PullSupplier methods.
   CORBA::Any* pull (void)
     ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected));
-  CORBA::Any* try_pull (CORBA::Boolean_out has_event
-                        ACE_ENV_ARG_DECL)
+  CORBA::Any* try_pull (CORBA::Boolean_out has_event)
     ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected));
   virtual void disconnect_pull_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
index 9231a2a2b4c..93e22a5ab75 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
@@ -46,14 +46,13 @@ Driver::Driver (void)
 int
 Driver::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -61,7 +60,7 @@ Driver::run (int argc, char* argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -119,8 +118,7 @@ Driver::run (int argc, char* argv[])
         }
 
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService"
-                                         ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -128,25 +126,24 @@ Driver::run (int argc, char* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
       CosNaming::Name name (1);
       name.length (1);
       name[0].id = CORBA::string_dup ("EventService");
 
       CORBA::Object_var ec_obj =
-        naming_context->resolve (name ACE_ENV_ARG_PARAMETER);
+        naming_context->resolve (name);
 
       RtecEventChannelAdmin::EventChannel_var channel;
       if (CORBA::is_nil (ec_obj.in ()))
         channel = RtecEventChannelAdmin::EventChannel::_nil ();
       else
-        channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ()
-                                                                ACE_ENV_ARG_PARAMETER);
+        channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ());
 
       poa_manager->activate ();
 
-      this->connect_consumers (channel.in () ACE_ENV_ARG_PARAMETER);
+      this->connect_consumers (channel.in ());
 
       ACE_DEBUG ((LM_DEBUG, "connected consumer(s)\n"));
 
@@ -159,23 +156,21 @@ Driver::run (int argc, char* argv[])
 
       channel->destroy ();
     }
-  ACE_CATCH (CORBA::SystemException, sys_ex)
+  catch (const CORBA::SystemException& sys_ex)
     {
-      ACE_PRINT_EXCEPTION (sys_ex, "SYS_EX in Consumer");
+      sys_ex._tao_print_exception ("SYS_EX in Consumer");
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "NON SYS EX in Consumer");
+      ex._tao_print_exception ("NON SYS EX in Consumer");
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 void
 Driver::push_consumer (void* /* consumer_cookie */,
                        ACE_hrtime_t /* arrival */,
-                       const RtecEventComm::EventSet& events
-                       ACE_ENV_ARG_DECL_NOT_USED)
+                       const RtecEventComm::EventSet& events)
 {
   // int ID =
   //   (reinterpret_cast<Test_Consumer**> (consumer_cookie)
@@ -267,8 +262,7 @@ Driver::push_consumer (void* /* consumer_cookie */,
 }
 
 void
-Driver::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr channel
-                           ACE_ENV_ARG_DECL)
+Driver::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr channel)
 {
   for (int i = 0; i < this->n_consumers_; ++i)
     {
@@ -280,8 +274,7 @@ Driver::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr channel
 
       this->consumers_[i]->connect (this->event_a_,
                                     this->event_b_,
-                                    channel
-                                    ACE_ENV_ARG_PARAMETER);
+                                    channel);
     }
 }
 
@@ -373,8 +366,7 @@ Test_Consumer::Test_Consumer (Driver *driver, void *cookie)
 void
 Test_Consumer::connect (int event_a,
                         int event_b,
-                        RtecEventChannelAdmin::EventChannel_ptr ec
-                        ACE_ENV_ARG_DECL)
+                        RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   ACE_ConsumerQOS_Factory qos;
   qos.start_disjunction_group ();
@@ -392,8 +384,7 @@ Test_Consumer::connect (int event_a,
   RtecEventComm::PushConsumer_var objref = this->_this ();
 
   this->supplier_proxy_->connect_push_consumer (objref.in (),
-                                                qos.get_ConsumerQOS ()
-                                                ACE_ENV_ARG_PARAMETER);
+                                                qos.get_ConsumerQOS ());
 
 }
 
@@ -410,12 +401,11 @@ Test_Consumer::disconnect (void)
 }
 
 void
-Test_Consumer::push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+Test_Consumer::push (const RtecEventComm::EventSet& events)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t arrival = ACE_OS::gethrtime ();
-  this->driver_->push_consumer (this->cookie_, arrival, events ACE_ENV_ARG_PARAMETER);
+  this->driver_->push_consumer (this->cookie_, arrival, events);
 }
 
 void
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
index 2be5bfea4a5..3aea5b9c7d3 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
@@ -35,15 +35,13 @@ public:
 
   void connect (int event_a,
                 int event_b,
-                RtecEventChannelAdmin::EventChannel_ptr ec
-                ACE_ENV_ARG_DECL);
+                RtecEventChannelAdmin::EventChannel_ptr ec);
   // This method connects the consumer to the EC.
 
   void disconnect (void);
   // Disconnect from the EC.
 
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet& events)
       ACE_THROW_SPEC ((CORBA::SystemException));
   virtual void disconnect_push_consumer (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
@@ -81,8 +79,7 @@ public:
 
   void push_consumer (void* consumer_cookie,
                       ACE_hrtime_t arrival,
-                      const RtecEventComm::EventSet& events
-                      ACE_ENV_ARG_DECL_NOT_USED);
+                      const RtecEventComm::EventSet& events);
   // Callback method for consumers, if any of our consumers has
   // received events it will invoke this method.
 
@@ -90,8 +87,7 @@ private:
   int parse_args (int argc, char* argv[]);
   // parse the command line args
 
-  void connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec
-                          ACE_ENV_ARG_DECL);
+  void connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec);
   void disconnect_consumers (void);
   // Connect and disconnect the consumers.
 
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
index 27c53aa2123..69323bee397 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
@@ -34,21 +34,20 @@ ECMS_Driver::ECMS_Driver (void)
 int
 ECMS_Driver::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA");
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize the POA.\n"),
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -110,32 +109,31 @@ ECMS_Driver::run (int argc, char* argv[])
         }
 
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("NameService");
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to get the Naming Service.\n"),
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
       CosNaming::Name name (1);
       name.length (1);
       name[0].id = CORBA::string_dup ("EventService");
 
       CORBA::Object_var ec_obj =
-        naming_context->resolve (name ACE_ENV_ARG_PARAMETER);
+        naming_context->resolve (name);
 
       RtecEventChannelAdmin::EventChannel_var channel;
       if (CORBA::is_nil (ec_obj.in ()))
         channel = RtecEventChannelAdmin::EventChannel::_nil ();
       else
-        channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ()
-                                                                ACE_ENV_ARG_PARAMETER);
+        channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ());
 
       poa_manager->activate ();
 
-      this->connect_suppliers (channel.in () ACE_ENV_ARG_PARAMETER);
+      this->connect_suppliers (channel.in ());
 
       ACE_DEBUG ((LM_DEBUG, "connected supplier(s)\n"));
 
@@ -156,15 +154,14 @@ ECMS_Driver::run (int argc, char* argv[])
 
       // @@ Deactivate the suppliers (as CORBA Objects?)
     }
-  ACE_CATCH (CORBA::SystemException, sys_ex)
+  catch (const CORBA::SystemException& sys_ex)
     {
-      ACE_PRINT_EXCEPTION (sys_ex, "SYS_EX in Supplier");
+      sys_ex._tao_print_exception ("SYS_EX in Supplier");
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "NON SYS EX in Supplier");
+      ex._tao_print_exception ("NON SYS EX in Supplier");
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -172,8 +169,7 @@ int
 ECMS_Driver::supplier_task (Test_Supplier *supplier,
                             void* /* cookie */)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       ACE_Time_Value tv (0, this->event_period_);
 
@@ -257,28 +253,26 @@ ECMS_Driver::supplier_task (Test_Supplier *supplier,
             }
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
 
-          supplier->consumer_proxy ()->push(event ACE_ENV_ARG_PARAMETER);
+          supplier->consumer_proxy ()->push(event);
 
           // ACE_DEBUG ((LM_DEBUG, "(%t) supplier push event\n"));
 
           ACE_OS::sleep (tv);
         }
     }
-  ACE_CATCH (CORBA::SystemException, sys_ex)
+  catch (const CORBA::SystemException& sys_ex)
     {
-      ACE_PRINT_EXCEPTION (sys_ex, "SYS_EX");
+      sys_ex._tao_print_exception ("SYS_EX");
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "NON SYS EX");
+      ex._tao_print_exception ("NON SYS EX");
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 void
-ECMS_Driver::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr channel
-                                ACE_ENV_ARG_DECL)
+ECMS_Driver::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr channel)
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
@@ -290,8 +284,7 @@ ECMS_Driver::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr channel
       this->suppliers_[i]->connect (buf,
                                     this->event_a_,
                                     this->event_b_,
-                                    channel
-                                    ACE_ENV_ARG_PARAMETER);
+                                    channel);
     }
 }
 
@@ -412,8 +405,7 @@ void
 Test_Supplier::connect (const char* name,
                         int event_a,
                         int event_b,
-                        RtecEventChannelAdmin::EventChannel_ptr ec
-                        ACE_ENV_ARG_DECL)
+                        RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   this->supplier_id_ = ACE::crc32 (name);
   ACE_DEBUG ((LM_DEBUG,
@@ -442,8 +434,7 @@ Test_Supplier::connect (const char* name,
     this->supplier_._this ();
 
   this->consumer_proxy_->connect_push_supplier (objref.in (),
-                                                qos.get_SupplierQOS ()
-                                                ACE_ENV_ARG_PARAMETER);
+                                                qos.get_SupplierQOS ());
 }
 
 void
@@ -455,25 +446,24 @@ Test_Supplier::disconnect (void)
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy =
     this->consumer_proxy_._retn ();
 
-  ACE_TRY
+  try
     {
       proxy->disconnect_push_consumer ();
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+  catch (const CORBA::OBJECT_NOT_EXIST& ex)
     {
       // Ignore, the EC can shutdown before we get a chance to
       // disconnect
     }
-  ACE_CATCH (CORBA::TRANSIENT, ex)
+  catch (const CORBA::TRANSIENT& ex)
     {
       // Ignore, the EC can shutdown before we get a chance to
       // disconnect
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 int
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
index ae25dbf779f..eff3dc62727 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
@@ -39,8 +39,7 @@ public:
   void connect (const char* name,
                 int event_a,
                 int event_b,
-                RtecEventChannelAdmin::EventChannel_ptr ec
-                ACE_ENV_ARG_DECL);
+                RtecEventChannelAdmin::EventChannel_ptr ec);
   // This method connects the supplier to the EC.
 
   void disconnect (void);
@@ -99,8 +98,7 @@ public:
 
   void push_supplier (void* supplier_cookie,
                       RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer,
-                      const RtecEventComm::EventSet &events
-                      ACE_ENV_ARG_DECL_NOT_USED);
+                      const RtecEventComm::EventSet &events);
   // Callback method for suppliers, we push for them to their
   // consumers and take statistics on the way.
   // It is possible that we ignore the <consumer> parameter when
@@ -110,8 +108,7 @@ private:
   int parse_args (int argc, char* argv[]);
   // parse the command line args
 
-  void connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec
-                          ACE_ENV_ARG_DECL);
+  void connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec);
   void disconnect_suppliers (void);
   // Connect the suppliers.
 
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp
index 50ea5a9002b..a7f4dc64cef 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp
@@ -14,8 +14,7 @@ AddrServer::AddrServer (const RtecUDPAdmin::UDP_Addr& addr)
 
 void
 AddrServer::get_addr (const RtecEventComm::EventHeader&,
-                      RtecUDPAdmin::UDP_Addr_out addr
-                      ACE_ENV_ARG_DECL_NOT_USED)
+                      RtecUDPAdmin::UDP_Addr_out addr)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   addr = this->addr_;
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h
index 232f63a5071..7fcc819f905 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h
@@ -27,8 +27,7 @@ public:
 
   // = The RtecUDPAdmin::AddrServer methods
   virtual void get_addr (const RtecEventComm::EventHeader& header,
-                         RtecUDPAdmin::UDP_Addr_out addr
-                         ACE_ENV_ARG_DECL_NOT_USED)
+                         RtecUDPAdmin::UDP_Addr_out addr)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp
index 4513a0573ce..e08f25ae9e3 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp
@@ -15,8 +15,7 @@ Consumer::Consumer (void)
 }
 
 void
-Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                   ACE_ENV_ARG_DECL)
+Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin)
 {
   this->proxy_ =
     consumer_admin->obtain_push_supplier ();
@@ -40,23 +39,21 @@ Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
   h1.type   = ACE_ES_EVENT_UNDEFINED;  // first free event type
   h1.source = ACE_ES_EVENT_SOURCE_ANY; // Any source is OK
 
-  this->proxy_->connect_push_consumer (me.in (), qos
-                                       ACE_ENV_ARG_PARAMETER);
+  this->proxy_->connect_push_consumer (me.in (), qos);
 }
 
 void
 Consumer::disconnect (void)
 {
-  ACE_TRY
+  try
     {
       // Disconnect from the proxy
       this->proxy_->disconnect_push_supplier ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore exceptions
     }
-  ACE_ENDTRY;
   this->proxy_ = RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
 
   // Deactivate this object
@@ -64,14 +61,13 @@ Consumer::disconnect (void)
     this->_default_POA ();
   // Get the Object Id used for the servant..
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
+    poa->servant_to_id (this);
   // Deactivate the object
-  poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
+  poa->deactivate_object (oid.in ());
 }
 
 void
-Consumer::push (const RtecEventComm::EventSet& events
-                ACE_ENV_ARG_DECL_NOT_USED)
+Consumer::push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h
index d02b498acc3..b09bde069d3 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h
@@ -24,8 +24,7 @@ public:
   Consumer (void);
   // Constructor
 
-  void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                ACE_ENV_ARG_DECL);
+  void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin);
   // Connect to the Event Channel
 
   void disconnect (void);
@@ -33,8 +32,7 @@ public:
 
   // = The RtecEventComm::PushConsumer methods
 
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
index 34b30ae6448..306419936da 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
@@ -31,11 +31,10 @@ static const int data_items = 60000;
 void *
 run_orb_within_thread (void *)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   while (! terminate_threads)
     {
-      ACE_TRY
+      try
         {
           CORBA::Boolean there_is_work =
             orb->work_pending ();
@@ -46,17 +45,15 @@ run_orb_within_thread (void *)
               // perform_work() or work_pending(), so just calling
               // them results in a spin loop.
               ACE_Time_Value tv (0, 50000);
-              orb->perform_work (tv ACE_ENV_ARG_PARAMETER);
+              orb->perform_work (tv);
             }
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "perform work");
+          ex._tao_print_exception ("perform work");
 
           return 0;
         }
-      ACE_ENDTRY;
     }
 
   return 0;
@@ -74,13 +71,12 @@ main (int argc, char* argv[])
   // so we have to explicitly invoke this function.
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // **************** HERE IS THE ORB SETUP
 
       // Create the ORB, pass the argv list for parsing.
-      orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+      orb = CORBA::ORB_init (argc, argv, "");
 
       // Parse the arguments, you usually want to do this after
       // invoking ORB_init() because ORB_init() will remove all the
@@ -97,9 +93,9 @@ main (int argc, char* argv[])
       // The POA starts in the holding state, if it is not activated
       // it will not process any requests.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
         poa->the_POAManager ();
       poa_manager->activate ();
@@ -187,8 +183,7 @@ main (int argc, char* argv[])
 
       sender->init (event_channel.in (),
                     address_server.in (),
-                    endpoint
-                    ACE_ENV_ARG_PARAMETER);
+                    endpoint);
 
       // Now we connect the sender as a consumer of events, it will
       // receive any event from any source and send it to the "right"
@@ -202,7 +197,7 @@ main (int argc, char* argv[])
       sub.dependencies[0].event.header.source =
         ACE_ES_EVENT_SOURCE_ANY; // Any source is OK
 
-      sender->connect (sub ACE_ENV_ARG_PARAMETER);
+      sender->connect (sub);
 
       // To receive events we need to setup an event handler:
       TAO_EC_Servant_Var<TAO_ECG_UDP_Receiver> receiver;
@@ -220,16 +215,14 @@ main (int argc, char* argv[])
       // required by all the local consumer.
       // Then it register for the multicast groups that carry those
       // events:
-      mcast_eh.open (event_channel.in ()
-                     ACE_ENV_ARG_PARAMETER);
+      mcast_eh.open (event_channel.in ());
 
       // Again the receiver connects to the event channel as a
       // supplier of events, using the Observer features to detect
       // local consumers and their interests:
       receiver->init (event_channel.in (),
                       endpoint,
-                      address_server.in ()
-                      ACE_ENV_ARG_PARAMETER);
+                      address_server.in ());
 
       // The Receiver is also a supplier of events.  The exact type of
       // events is only known to the application, because it depends
@@ -248,7 +241,7 @@ main (int argc, char* argv[])
       pub.publications[0].event.header.source = ACE_ES_EVENT_SOURCE_ANY;
       pub.is_gateway = 1;
 
-      receiver->connect (pub ACE_ENV_ARG_PARAMETER);
+      receiver->connect (pub);
 
       // **************** THAT COMPLETES THE FEDERATION SETUP
 
@@ -260,15 +253,14 @@ main (int argc, char* argv[])
       Consumer consumer2;
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
         event_channel->for_consumers ();
-      consumer1.connect (consumer_admin.in () ACE_ENV_ARG_PARAMETER);
-      consumer2.connect (consumer_admin.in () ACE_ENV_ARG_PARAMETER);
+      consumer1.connect (consumer_admin.in ());
+      consumer2.connect (consumer_admin.in ());
 
       // And now create a supplier
       Supplier supplier;
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
         event_channel->for_suppliers ();
-      supplier.connect (supplier_admin.in ()
-                        ACE_ENV_ARG_PARAMETER);
+      supplier.connect (supplier_admin.in ());
 
       // **************** THAT COMPLETES THE CLIENT SETUP
 
@@ -336,14 +328,14 @@ main (int argc, char* argv[])
           ec_impl._default_POA ();
         // Get the Object Id used for the servant..
         PortableServer::ObjectId_var oid =
-          poa->servant_to_id (&ec_impl ACE_ENV_ARG_PARAMETER);
+          poa->servant_to_id (&ec_impl);
         // Deactivate the object
-        poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
+        poa->deactivate_object (oid.in ());
       }
 
       // Now we can destroy the POA, the flags mean that we want to
       // wait until the POA is really destroyed
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1);
 
       // Finally destroy the ORB
       orb->destroy ();
@@ -353,12 +345,11 @@ main (int argc, char* argv[])
       ACE_DEBUG ((LM_DEBUG,
                   "MCast example finished\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp
index 253b0e4182d..adc2b007fa0 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp
@@ -14,8 +14,7 @@ Supplier::Supplier (void)
 }
 
 void
-Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin
-                   ACE_ENV_ARG_DECL)
+Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin)
 {
   this->proxy_ =
     supplier_admin->obtain_push_consumer ();
@@ -34,34 +33,32 @@ Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin
   h0.type   = ACE_ES_EVENT_UNDEFINED; // first free event type
   h0.source = 1;                      // first free event source
 
-  this->proxy_->connect_push_supplier (me.in (), qos
-                                       ACE_ENV_ARG_PARAMETER);
+  this->proxy_->connect_push_supplier (me.in (), qos);
 }
 
 void
 Supplier::disconnect (void)
 {
   // Disconnect from the EC
-  ACE_TRY
+  try
     {
       this->proxy_->disconnect_push_consumer ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
     }
-  ACE_ENDTRY;
 
   PortableServer::POA_var poa =
     this->_default_POA ();
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
+    poa->servant_to_id (this);
+  poa->deactivate_object (id.in ());
 }
 
 void
 Supplier::perform_push (void)
 {
-  ACE_TRY
+  try
     {
       // The event type and source must match our publications
       RtecEventComm::EventSet event (1);
@@ -71,12 +68,11 @@ Supplier::perform_push (void)
       // Avoid loops throught the event channel federations
       event[0].header.ttl    = 1;
 
-      this->proxy_->push (event ACE_ENV_ARG_PARAMETER);
+      this->proxy_->push (event);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
     }
-  ACE_ENDTRY;
 }
 
 void
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h
index 048b23daf20..432359e4202 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h
@@ -25,8 +25,7 @@ public:
   Supplier (void);
   // Constructor
 
-  void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin
-                ACE_ENV_ARG_DECL);
+  void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin);
   // Connect to the event channel
 
   void disconnect (void);
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
index 670e4d89039..167661c7c83 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
@@ -40,15 +40,13 @@ ECM_Driver::ECM_Driver (void)
 int
 ECM_Driver::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       this->orb_ =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references("RootPOA"
-                                               ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -56,7 +54,7 @@ ECM_Driver::run (int argc, char* argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -135,7 +133,7 @@ ECM_Driver::run (int argc, char* argv[])
         ec_impl._this ();
 
       CORBA::String_var str =
-        this->orb_->object_to_string (ec.in () ACE_ENV_ARG_PARAMETER);
+        this->orb_->object_to_string (ec.in ());
 
       ACE_DEBUG ((LM_DEBUG, "The (local) EC IOR is <%s>\n", str.in ()));
 
@@ -145,23 +143,19 @@ ECM_Driver::run (int argc, char* argv[])
 
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: local EC objref ready\n"));
 
-      this->open_federations (ec.in ()
-                              ACE_ENV_ARG_PARAMETER);
+      this->open_federations (ec.in ());
 
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: open_federations done\n"));
 
-      this->open_senders (ec.in ()
-                          ACE_ENV_ARG_PARAMETER);
+      this->open_senders (ec.in ());
 
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: open_senders done\n"));
 
-      this->open_receivers (ec.in ()
-                            ACE_ENV_ARG_PARAMETER);
+      this->open_receivers (ec.in ());
 
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: open_receivers done\n"));
 
-      this->activate_federations (ec.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+      this->activate_federations (ec.in ());
 
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: activate_federations done\n"));
 
@@ -181,21 +175,19 @@ ECM_Driver::run (int argc, char* argv[])
       ec_impl.shutdown ();
 
     }
-  ACE_CATCH (CORBA::SystemException, sys_ex)
+  catch (const CORBA::SystemException& sys_ex)
     {
-      ACE_PRINT_EXCEPTION (sys_ex, "SYS_EX");
+      sys_ex._tao_print_exception ("SYS_EX");
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "NON SYS EX");
+      ex._tao_print_exception ("NON SYS EX");
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 void
-ECM_Driver::federation_has_shutdown (ECM_Local_Federation *federation
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+ECM_Driver::federation_has_shutdown (ECM_Local_Federation *federation)
 {
   ACE_DEBUG ((LM_DEBUG, "Federation <%s> shuting down\n",
               federation->name ()));
@@ -204,19 +196,17 @@ ECM_Driver::federation_has_shutdown (ECM_Local_Federation *federation
 }
 
 void
-ECM_Driver::open_federations (RtecEventChannelAdmin::EventChannel_ptr ec
-                              ACE_ENV_ARG_DECL)
+ECM_Driver::open_federations (RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   for (int i = 0; i < this->local_federations_count_; ++i)
     {
       this->local_federations_[i]->open (this->event_count_,
-                                         ec ACE_ENV_ARG_PARAMETER);
+                                         ec);
     }
 }
 
 void
-ECM_Driver::activate_federations (RtecEventChannelAdmin::EventChannel_ptr ec
-                                  ACE_ENV_ARG_DECL)
+ECM_Driver::activate_federations (RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   this->federations_running_ = this->local_federations_count_;
   RtecEventComm::Time interval = this->event_period_;
@@ -224,8 +214,7 @@ ECM_Driver::activate_federations (RtecEventChannelAdmin::EventChannel_ptr ec
   for (int i = 0; i < this->local_federations_count_; ++i)
     {
       this->local_federations_[i]->activate (ec,
-                                             interval
-                                             ACE_ENV_ARG_PARAMETER);
+                                             interval);
     }
 }
 
@@ -239,13 +228,12 @@ ECM_Driver::close_federations (void)
 }
 
 void
-ECM_Driver::open_senders (RtecEventChannelAdmin::EventChannel_ptr ec
-                          ACE_ENV_ARG_DECL)
+ECM_Driver::open_senders (RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   if (this->endpoint_.dgram ().open (ACE_Addr::sap_any) == -1)
     {
       // @@ TODO throw an application specific exception.
-      ACE_THROW (CORBA::COMM_FAILURE ());
+      throw CORBA::COMM_FAILURE ();
     }
 
   ACE_INET_Addr ignore_from;
@@ -262,8 +250,7 @@ ECM_Driver::open_senders (RtecEventChannelAdmin::EventChannel_ptr ec
                TAO_ECG_UDP_Out_Endpoint (this->endpoint_));
 
       this->all_federations_[i]->open (clone,
-                                       ec
-                                       ACE_ENV_ARG_PARAMETER);
+                                       ec);
     }
 }
 
@@ -278,8 +265,7 @@ ECM_Driver::close_senders (void)
 }
 
 void
-ECM_Driver::open_receivers (RtecEventChannelAdmin::EventChannel_ptr ec
-                            ACE_ENV_ARG_DECL)
+ECM_Driver::open_receivers (RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   for (int i = 0; i < this->local_federations_count_; ++i)
     {
@@ -290,8 +276,7 @@ ECM_Driver::open_receivers (RtecEventChannelAdmin::EventChannel_ptr ec
       endpoint.reset (clone);
 
       this->local_federations_[i]->open_receiver (ec,
-                                                  endpoint
-                                                  ACE_ENV_ARG_PARAMETER);
+                                                  endpoint);
     }
 }
 
@@ -582,8 +567,7 @@ ECM_Federation::~ECM_Federation (void)
 
 void
 ECM_Federation::open (TAO_ECG_UDP_Out_Endpoint *endpoint,
-                      RtecEventChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+                      RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   RtecUDPAdmin::AddrServer_var addr_server =
     this->addr_server ();
@@ -592,8 +576,7 @@ ECM_Federation::open (TAO_ECG_UDP_Out_Endpoint *endpoint,
 
   this->sender_->init (ec,
                        addr_server.in (),
-                       ref_endpoint
-                       ACE_ENV_ARG_PARAMETER);
+                       ref_endpoint);
 
   // @@ TODO Make this a parameter....
   this->sender_->mtu (64);
@@ -611,7 +594,7 @@ ECM_Federation::open (TAO_ECG_UDP_Out_Endpoint *endpoint,
       qos.insert_type (this->consumer_ipaddr (i), 0);
     }
   RtecEventChannelAdmin::ConsumerQOS qos_copy = qos.get_ConsumerQOS ();
-  this->sender_->connect (qos_copy ACE_ENV_ARG_PARAMETER);
+  this->sender_->connect (qos_copy);
 }
 
 void
@@ -636,8 +619,7 @@ ECM_Supplier::ECM_Supplier (ECM_Local_Federation* federation)
 
 void
 ECM_Supplier::open (const char* name,
-                    RtecEventChannelAdmin::EventChannel_ptr ec
-                    ACE_ENV_ARG_DECL)
+                    RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   this->supplier_id_ = ACE::crc32 (name);
   ACE_DEBUG ((LM_DEBUG, "ID for <%s> is %04.4x\n", name,
@@ -663,8 +645,7 @@ ECM_Supplier::open (const char* name,
   RtecEventComm::PushSupplier_var objref = this->_this ();
 
   this->consumer_proxy_->connect_push_supplier (objref.in (),
-                                                qos.get_SupplierQOS ()
-                                                ACE_ENV_ARG_PARAMETER);
+                                                qos.get_SupplierQOS ());
 }
 
 void
@@ -680,8 +661,7 @@ ECM_Supplier::close (void)
 
 void
 ECM_Supplier::activate (RtecEventChannelAdmin::EventChannel_ptr ec,
-                        RtecEventComm::Time interval
-                        ACE_ENV_ARG_DECL)
+                        RtecEventComm::Time interval)
 {
   ACE_ConsumerQOS_Factory consumer_qos;
   consumer_qos.start_disjunction_group ();
@@ -700,8 +680,7 @@ ECM_Supplier::activate (RtecEventChannelAdmin::EventChannel_ptr ec,
     this->consumer_._this ();
 
   this->supplier_proxy_->connect_push_consumer (cref.in (),
-                                                consumer_qos.get_ConsumerQOS ()
-                                                ACE_ENV_ARG_PARAMETER);
+                                                consumer_qos.get_ConsumerQOS ());
 }
 
 int
@@ -711,8 +690,7 @@ ECM_Supplier::supplier_id (void) const
 }
 
 void
-ECM_Supplier::push (const RtecEventComm::EventSet& events
-                    ACE_ENV_ARG_DECL)
+ECM_Supplier::push (const RtecEventComm::EventSet& events)
 {
   for (u_int i = 0; i < events.length (); ++i)
     {
@@ -720,8 +698,7 @@ ECM_Supplier::push (const RtecEventComm::EventSet& events
       if (e.header.type != ACE_ES_EVENT_INTERVAL_TIMEOUT)
         continue;
 
-      this->federation_->supplier_timeout (this->consumer_proxy_.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+      this->federation_->supplier_timeout (this->consumer_proxy_.in ());
     }
 }
 
@@ -749,8 +726,7 @@ ECM_Consumer::ECM_Consumer (ECM_Local_Federation *federation)
 void
 ECM_Consumer::open (const char*,
                     RtecEventChannelAdmin::EventChannel_ptr ec,
-                    ACE_RANDR_TYPE &seed
-                    ACE_ENV_ARG_DECL)
+                    ACE_RANDR_TYPE &seed)
 {
   // The worst case execution time is far less than 2
   // milliseconds, but that is a safe estimate....
@@ -761,12 +737,11 @@ ECM_Consumer::open (const char*,
   // = Connect as a consumer.
   this->consumer_admin_ = ec->for_consumers ();
 
-  this->connect (seed ACE_ENV_ARG_PARAMETER);
+  this->connect (seed);
 }
 
 void
-ECM_Consumer::connect (ACE_RANDR_TYPE &seed
-                       ACE_ENV_ARG_DECL)
+ECM_Consumer::connect (ACE_RANDR_TYPE &seed)
 {
   if (CORBA::is_nil (this->consumer_admin_.in ()))
     return;
@@ -801,8 +776,7 @@ ECM_Consumer::connect (ACE_RANDR_TYPE &seed
   RtecEventComm::PushConsumer_var objref = this->_this ();
 
   this->supplier_proxy_->connect_push_consumer (objref.in (),
-                                                qos.get_ConsumerQOS ()
-                                                ACE_ENV_ARG_PARAMETER);
+                                                qos.get_ConsumerQOS ());
 }
 
 void
@@ -821,28 +795,26 @@ ECM_Consumer::disconnect (void)
 void
 ECM_Consumer::close (void)
 {
-  ACE_TRY
+  try
     {
       this->disconnect ();
       this->consumer_admin_ =
         RtecEventChannelAdmin::ConsumerAdmin::_nil ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       this->consumer_admin_ =
         RtecEventChannelAdmin::ConsumerAdmin::_nil ();
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 void
-ECM_Consumer::push (const RtecEventComm::EventSet& events
-                    ACE_ENV_ARG_DECL)
+ECM_Consumer::push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t arrival = ACE_OS::gethrtime ();
-  this->federation_->consumer_push (arrival, events ACE_ENV_ARG_PARAMETER);
+  this->federation_->consumer_push (arrival, events);
 }
 
 void
@@ -887,8 +859,7 @@ ECM_Local_Federation::~ECM_Local_Federation (void)
 
 void
 ECM_Local_Federation::open (int event_count,
-                            RtecEventChannelAdmin::EventChannel_ptr ec
-                            ACE_ENV_ARG_DECL)
+                            RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   this->event_count_ = event_count;
 
@@ -897,11 +868,11 @@ ECM_Local_Federation::open (int event_count,
   ACE_OS::strcpy (buf, this->federation_->name ());
   ACE_OS::strcat (buf, "/supplier");
 
-  this->supplier_.open (buf, ec ACE_ENV_ARG_PARAMETER);
+  this->supplier_.open (buf, ec);
 
   ACE_OS::strcpy (buf, this->federation_->name ());
   ACE_OS::strcat (buf, "/consumer");
-  this->consumer_.open (buf, ec, this->seed_ ACE_ENV_ARG_PARAMETER);
+  this->consumer_.open (buf, ec, this->seed_);
 
   this->last_subscription_change_ = ACE_OS::gettimeofday ();
 }
@@ -916,15 +887,13 @@ ECM_Local_Federation::close (void)
 
 void
 ECM_Local_Federation::activate (RtecEventChannelAdmin::EventChannel_ptr ec,
-                                RtecEventComm::Time interval
-                                ACE_ENV_ARG_DECL)
+                                RtecEventComm::Time interval)
 {
-  this->supplier_.activate (ec, interval ACE_ENV_ARG_PARAMETER);
+  this->supplier_.activate (ec, interval);
 }
 
 void
-ECM_Local_Federation::supplier_timeout (RtecEventComm::PushConsumer_ptr consumer
-                                        ACE_ENV_ARG_DECL)
+ECM_Local_Federation::supplier_timeout (RtecEventComm::PushConsumer_ptr consumer)
 {
   RtecEventComm::EventSet sent (1);
   sent.length (1);
@@ -943,13 +912,13 @@ ECM_Local_Federation::supplier_timeout (RtecEventComm::PushConsumer_ptr consumer
 
   if (this->event_count_ < 0)
     {
-      this->driver_->federation_has_shutdown (this ACE_ENV_ARG_PARAMETER);
+      this->driver_->federation_has_shutdown (this);
       return;
     }
   int i = this->event_count_ % this->federation_->supplier_types ();
   s.header.type = this->federation_->supplier_ipaddr (i);
 
-  consumer->push (sent ACE_ENV_ARG_PARAMETER);
+  consumer->push (sent);
 
   this->send_count_++;
 
@@ -966,15 +935,14 @@ ECM_Local_Federation::supplier_timeout (RtecEventComm::PushConsumer_ptr consumer
                   "Reconfiguring federation %s: %f %f [%d]\n",
                   this->name (), p, maxp, x));
       this->consumer_.disconnect ();
-      this->consumer_.connect (this->seed_ ACE_ENV_ARG_PARAMETER);
+      this->consumer_.connect (this->seed_);
       this->last_subscription_change_ = ACE_OS::gettimeofday ();
     }
 }
 
 void
 ECM_Local_Federation::consumer_push (ACE_hrtime_t,
-                                     const RtecEventComm::EventSet &event
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+                                     const RtecEventComm::EventSet &event)
 {
   if (event.length () == 0)
     {
@@ -1005,8 +973,7 @@ ECM_Local_Federation::consumer_push (ACE_hrtime_t,
 
 void
 ECM_Local_Federation::open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
-                                     TAO_ECG_Refcounted_Endpoint ignore_from
-                                     ACE_ENV_ARG_DECL)
+                                     TAO_ECG_Refcounted_Endpoint ignore_from)
 {
   RtecUDPAdmin::AddrServer_var addr_server =
     this->federation_->addr_server ();
@@ -1015,8 +982,7 @@ ECM_Local_Federation::open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
 
   this->receiver_->init (ec,
                          ignore_from,
-                         addr_server.in ()
-                         ACE_ENV_ARG_PARAMETER);
+                         addr_server.in ());
 
   const int bufsize = 512;
   char buf[bufsize];
@@ -1027,7 +993,7 @@ ECM_Local_Federation::open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
 
   this->mcast_eh_->reactor (reactor);
 
-  this->mcast_eh_->open (ec ACE_ENV_ARG_PARAMETER);
+  this->mcast_eh_->open (ec);
 
   ACE_SupplierQOS_Factory qos;
   for (int i = 0; i < this->consumer_types (); ++i)
@@ -1039,7 +1005,7 @@ ECM_Local_Federation::open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
 
   RtecEventChannelAdmin::SupplierQOS qos_copy =
     qos.get_SupplierQOS ();
-  this->receiver_->connect (qos_copy ACE_ENV_ARG_PARAMETER);
+  this->receiver_->connect (qos_copy);
 
 
 }
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
index 86f84d1f5ef..05c79b18523 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
@@ -116,8 +116,7 @@ public:
   // The ipaddr (in host byte order) of the event type <i>
 
   void open (TAO_ECG_UDP_Out_Endpoint *endoint,
-             RtecEventChannelAdmin::EventChannel_ptr ec
-             ACE_ENV_ARG_DECL);
+             RtecEventChannelAdmin::EventChannel_ptr ec);
   // Connect the UDP sender to the EC.
 
   void close (void);
@@ -169,23 +168,20 @@ public:
   ECM_Supplier (ECM_Local_Federation* federation);
 
   void open (const char* name,
-             RtecEventChannelAdmin::EventChannel_ptr event_channel
-             ACE_ENV_ARG_DECL);
+             RtecEventChannelAdmin::EventChannel_ptr event_channel);
   // This method connects the supplier to the EC.
 
   void close (void);
   // Disconnect from the EC.
 
   void activate (RtecEventChannelAdmin::EventChannel_ptr event_channel,
-                 RtecEventComm::Time interval
-                 ACE_ENV_ARG_DECL);
+                 RtecEventComm::Time interval);
   // Connect as a consumer to start receiving events.
 
   RtecEventComm::EventSourceID supplier_id (void) const;
   // The supplier ID.
 
-  void push (const RtecEventComm::EventSet& events
-             ACE_ENV_ARG_DECL);
+  void push (const RtecEventComm::EventSet& events);
   void disconnect_push_consumer (void);
   // Implement the callbacks for our consumer personality.
 
@@ -226,22 +222,19 @@ public:
 
   void open (const char* name,
              RtecEventChannelAdmin::EventChannel_ptr event_channel,
-             ACE_RANDR_TYPE &seed
-             ACE_ENV_ARG_DECL);
+             ACE_RANDR_TYPE &seed);
   // This method connects the consumer to the EC.
 
   void close (void);
   // Disconnect from the EC.
 
-  void connect (ACE_RANDR_TYPE& seed
-                ACE_ENV_ARG_DECL);
+  void connect (ACE_RANDR_TYPE& seed);
   void disconnect (void);
   // Disconnect from the supplier, but do not forget about it or close
   // it.
 
   // = The POA_RtecEventComm::PushComsumer methods.
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -271,33 +264,28 @@ public:
   // Destructor
 
   void open (int event_count,
-             RtecEventChannelAdmin::EventChannel_ptr event_channel
-             ACE_ENV_ARG_DECL);
+             RtecEventChannelAdmin::EventChannel_ptr event_channel);
   // Connect both the supplier and the consumer.
 
   void close (void);
   // Disconnect everybody from the EC
 
   void activate (RtecEventChannelAdmin::EventChannel_ptr event_channel,
-                 RtecEventComm::Time interval
-                 ACE_ENV_ARG_DECL);
+                 RtecEventComm::Time interval);
   // Activate the supplier
 
-  void supplier_timeout (RtecEventComm::PushConsumer_ptr consumer
-                         ACE_ENV_ARG_DECL);
+  void supplier_timeout (RtecEventComm::PushConsumer_ptr consumer);
   // The supplier is ready to send a new event.
 
   void consumer_push (ACE_hrtime_t arrival,
-                      const RtecEventComm::EventSet& event
-                      ACE_ENV_ARG_DECL);
+                      const RtecEventComm::EventSet& event);
   // The consumer just received an event.
 
   const ECM_Federation *federation (void) const;
   // The federation description.
 
   void open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
-                      TAO_ECG_Refcounted_Endpoint ignore_from
-                      ACE_ENV_ARG_DECL);
+                      TAO_ECG_Refcounted_Endpoint ignore_from);
   // Connect the UDP receiver to the EC.
 
   void close_receiver (void);
@@ -419,31 +407,26 @@ public:
   int run (int argc, char* argv[]);
   // Run the test, read all the configuration files, etc.
 
-  void federation_has_shutdown (ECM_Local_Federation *federation
-                                ACE_ENV_ARG_DECL);
+  void federation_has_shutdown (ECM_Local_Federation *federation);
   // One of the federations has completed its simulation, once all of
   // them finish the test exists.
 
 
 private:
-  void open_federations (RtecEventChannelAdmin::EventChannel_ptr ec
-                         ACE_ENV_ARG_DECL);
+  void open_federations (RtecEventChannelAdmin::EventChannel_ptr ec);
   // Connect the federations to the EC.
 
-  void activate_federations (RtecEventChannelAdmin::EventChannel_ptr ec
-                             ACE_ENV_ARG_DECL);
+  void activate_federations (RtecEventChannelAdmin::EventChannel_ptr ec);
   // Activate all the federations
 
   void close_federations (void);
   // Close the federations, i.e. disconnect from the EC, deactivate
   // the objects, etc.
 
-  void open_senders (RtecEventChannelAdmin::EventChannel_ptr ec
-                     ACE_ENV_ARG_DECL);
+  void open_senders (RtecEventChannelAdmin::EventChannel_ptr ec);
   // Connect all the senders, so we can start multicasting events.
 
-  void open_receivers (RtecEventChannelAdmin::EventChannel_ptr ec
-                       ACE_ENV_ARG_DECL);
+  void open_receivers (RtecEventChannelAdmin::EventChannel_ptr ec);
   // Connect all the receivers, thus we accept events arriving through
   // multicast.
 
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
index f0535a8558e..656b0258f7e 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
@@ -127,15 +127,13 @@ print_priority_info (const char *const name)
 int
 Test_ECG::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA"
-                                        ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -143,7 +141,7 @@ Test_ECG::run (int argc, char* argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -249,7 +247,7 @@ Test_ECG::run (int argc, char* argv[])
       print_priority_info ("Test_ECG::run (Main after thr_setprio)");
 
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -257,7 +255,7 @@ Test_ECG::run (int argc, char* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
       auto_ptr<POA_RtecScheduler::Scheduler> scheduler_impl;
       RtecScheduler::Scheduler_var scheduler;
@@ -375,7 +373,7 @@ Test_ECG::run (int argc, char* argv[])
         case Test_ECG::ss_runtime:
           {
             CORBA::String_var str =
-              orb->object_to_string (scheduler.in () ACE_ENV_ARG_PARAMETER);
+              orb->object_to_string (scheduler.in ());
             ACE_DEBUG ((LM_DEBUG, "The (local) scheduler IOR is <%s>\n",
                         str.in ()));
 
@@ -386,7 +384,7 @@ Test_ECG::run (int argc, char* argv[])
             CosNaming::Name schedule_name (1);
             schedule_name.length (1);
             schedule_name[0].id = CORBA::string_dup (buf);
-            naming_context->bind (schedule_name, scheduler.in () ACE_ENV_ARG_PARAMETER);
+            naming_context->bind (schedule_name, scheduler.in ());
 
             if (ACE_Scheduler_Factory::use_config (naming_context.in (),
                                                    buf) == -1)
@@ -406,7 +404,7 @@ Test_ECG::run (int argc, char* argv[])
         ec_impl._this ();
 
       CORBA::String_var str =
-        orb->object_to_string (ec.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (ec.in ());
 
       ACE_OS::sleep (5);
       ACE_DEBUG ((LM_DEBUG, "The (local) EC IOR is <%s>\n", str.in ()));
@@ -417,7 +415,7 @@ Test_ECG::run (int argc, char* argv[])
       CosNaming::Name channel_name (1);
       channel_name.length (1);
       channel_name[0].id = CORBA::string_dup (buf);
-      naming_context->bind (channel_name, ec.in () ACE_ENV_ARG_PARAMETER);
+      naming_context->bind (channel_name, ec.in ());
 
       ACE_DEBUG ((LM_DEBUG, "waiting to start\n"));
 
@@ -425,27 +423,26 @@ Test_ECG::run (int argc, char* argv[])
 
       if (this->rmt_name_ != 0)
         {
-          orb->run (&tv ACE_ENV_ARG_PARAMETER);
+          orb->run (&tv);
         }
 
       ACE_DEBUG ((LM_DEBUG, "starting....\n"));
 
       RtecEventChannelAdmin::EventChannel_var local_ec =
         this->get_ec (naming_context.in (),
-                      this->lcl_name_
-                      ACE_ENV_ARG_PARAMETER);
+                      this->lcl_name_);
 
       ACE_DEBUG ((LM_DEBUG, "located local EC\n"));
 
       for (int sd = 0; sd < this->supplier_disconnects_; ++sd)
         {
-          this->connect_suppliers (local_ec.in () ACE_ENV_ARG_PARAMETER);
+          this->connect_suppliers (local_ec.in ());
           this->disconnect_suppliers ();
           ACE_OS::sleep (5);
           ACE_DEBUG ((LM_DEBUG, "Supplier disconnection %d\n", sd));
         }
 
-      this->connect_suppliers (local_ec.in () ACE_ENV_ARG_PARAMETER);
+      this->connect_suppliers (local_ec.in ());
 
       ACE_DEBUG ((LM_DEBUG, "connected supplier\n"));
 
@@ -453,12 +450,11 @@ Test_ECG::run (int argc, char* argv[])
       if (this->rmt_name_ != 0)
         {
           tv.set (5, 0);
-          orb->run (&tv ACE_ENV_ARG_PARAMETER);
+          orb->run (&tv);
 
           RtecEventChannelAdmin::EventChannel_var remote_ec =
             this->get_ec (naming_context.in (),
-                          this->rmt_name_
-                          ACE_ENV_ARG_PARAMETER);
+                          this->rmt_name_);
           ACE_DEBUG ((LM_DEBUG, "located remote EC\n"));
 
           CosNaming::Name rsch_name (1);
@@ -471,39 +467,37 @@ Test_ECG::run (int argc, char* argv[])
             }
           rsch_name[0].id = CORBA::string_dup (buf);
           CORBA::Object_var tmpobj =
-            naming_context->resolve (rsch_name ACE_ENV_ARG_PARAMETER);
+            naming_context->resolve (rsch_name);
 
           RtecScheduler::Scheduler_var remote_sch =
-            RtecScheduler::Scheduler::_narrow (tmpobj.in () ACE_ENV_ARG_PARAMETER);
+            RtecScheduler::Scheduler::_narrow (tmpobj.in ());
 
           this->connect_ecg (local_ec.in (),
                              remote_ec.in (),
-                             remote_sch.in ()
-                             ACE_ENV_ARG_PARAMETER);
+                             remote_sch.in ());
 
           ACE_DEBUG ((LM_DEBUG, "connected proxy\n"));
 
           tv.set (5, 0);
-          orb->run (&tv ACE_ENV_ARG_PARAMETER);
+          orb->run (&tv);
 
           RtecEventChannelAdmin::Observer_ptr observer =
             this->ecg_._this ();
-          observer_handle = ec_impl.append_observer (observer
-                                                     ACE_ENV_ARG_PARAMETER);
+          observer_handle = ec_impl.append_observer (observer);
         }
 
       for (int cd = 0; cd < this->consumer_disconnects_; ++cd)
         {
-          this->connect_consumers (local_ec.in () ACE_ENV_ARG_PARAMETER);
+          this->connect_consumers (local_ec.in ());
           this->disconnect_consumers ();
           ACE_OS::sleep (5);
           ACE_DEBUG ((LM_DEBUG, "Consumer disconnection %d\n", cd));
         }
-      this->connect_consumers (local_ec.in () ACE_ENV_ARG_PARAMETER);
+      this->connect_consumers (local_ec.in ());
 
       ACE_DEBUG ((LM_DEBUG, "connected consumer\n"));
 
-      this->activate_suppliers (local_ec.in () ACE_ENV_ARG_PARAMETER);
+      this->activate_suppliers (local_ec.in ());
 
       ACE_DEBUG ((LM_DEBUG, "suppliers are active\n"));
 
@@ -521,7 +515,7 @@ Test_ECG::run (int argc, char* argv[])
 
       if (this->rmt_name_ != 0)
         {
-          ec_impl.remove_observer (observer_handle ACE_ENV_ARG_PARAMETER);
+          ec_impl.remove_observer (observer_handle);
         }
 
       // Create the EC internal threads
@@ -550,8 +544,7 @@ Test_ECG::run (int argc, char* argv[])
              ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                              ACE_SCOPE_THREAD),
              infos.out (), deps.out (),
-             configs.out (), anomalies.out ()
-             ACE_ENV_ARG_PARAMETER);
+             configs.out (), anomalies.out ());
 
           ACE_Scheduler_Factory::dump_schedule (infos.in (),
                                                 deps.in (),
@@ -560,7 +553,7 @@ Test_ECG::run (int argc, char* argv[])
                                                 this->schedule_file_);
         }
 
-      naming_context->unbind (channel_name ACE_ENV_ARG_PARAMETER);
+      naming_context->unbind (channel_name);
 
       if (this->rmt_name_ != 0)
         {
@@ -573,24 +566,22 @@ Test_ECG::run (int argc, char* argv[])
 
       ACE_DEBUG ((LM_DEBUG, "shutdown grace period\n"));
       tv.set (5, 0);
-      orb->run (&tv ACE_ENV_ARG_PARAMETER);
+      orb->run (&tv);
     }
-  ACE_CATCH (CORBA::SystemException, sys_ex)
+  catch (const CORBA::SystemException& sys_ex)
     {
-      ACE_PRINT_EXCEPTION (sys_ex, "SYS_EX");
+      sys_ex._tao_print_exception ("SYS_EX");
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "NON SYS EX");
+      ex._tao_print_exception ("NON SYS EX");
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 RtecEventChannelAdmin::EventChannel_ptr
 Test_ECG::get_ec (CosNaming::NamingContext_ptr naming_context,
-                  const char* process_name
-                  ACE_ENV_ARG_DECL)
+                  const char* process_name)
 {
   const int bufsize = 512;
   char buf[bufsize];
@@ -602,12 +593,11 @@ Test_ECG::get_ec (CosNaming::NamingContext_ptr naming_context,
   channel_name[0].id = CORBA::string_dup (buf);
 
   CORBA::Object_var ec_ptr =
-    naming_context->resolve (channel_name ACE_ENV_ARG_PARAMETER);
+    naming_context->resolve (channel_name);
   if (CORBA::is_nil (ec_ptr.in ()))
     return RtecEventChannelAdmin::EventChannel::_nil ();
 
-  return RtecEventChannelAdmin::EventChannel::_narrow (ec_ptr.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
+  return RtecEventChannelAdmin::EventChannel::_narrow (ec_ptr.in ());
 }
 
 void
@@ -620,8 +610,7 @@ Test_ECG::disconnect_suppliers (void)
 }
 
 void
-Test_ECG::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec
-                             ACE_ENV_ARG_DECL)
+Test_ECG::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec)
 {
   int i;
   for (i = 0; i < this->hp_suppliers_; ++i)
@@ -642,8 +631,7 @@ Test_ECG::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec
                                  this->hps_event_b_,
                                  mc,
                                  this->hp_interval_ * 10,
-                                 local_ec
-                                 ACE_ENV_ARG_PARAMETER);
+                                 local_ec);
     }
 
   for (; i < this->hp_suppliers_ + this->lp_suppliers_; ++i)
@@ -665,8 +653,7 @@ Test_ECG::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec
                                  this->lps_event_b_,
                                  mc,
                                  this->lp_interval_ * 10,
-                                 local_ec
-                                 ACE_ENV_ARG_PARAMETER);
+                                 local_ec);
     }
 }
 
@@ -680,10 +667,9 @@ Test_ECG::disconnect_consumers (void)
 }
 
 void
-Test_ECG::activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec
-                              ACE_ENV_ARG_DECL)
+Test_ECG::activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec)
 {
-  ACE_TRY
+  try
     {
       int i;
       for (i = 0; i < this->hp_suppliers_; ++i)
@@ -698,8 +684,7 @@ Test_ECG::activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec
 
           this->suppliers_[i]->activate (buf,
                                          this->hp_interval_ * 10,
-                                         local_ec
-                                         ACE_ENV_ARG_PARAMETER);
+                                         local_ec);
         }
 
       for (; i < this->hp_suppliers_ + this->lp_suppliers_; ++i)
@@ -715,20 +700,17 @@ Test_ECG::activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec
 
           this->suppliers_[i]->activate (buf,
                                          this->lp_interval_ * 10,
-                                         local_ec
-                                         ACE_ENV_ARG_PARAMETER);
+                                         local_ec);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 void
-Test_ECG::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec
-                             ACE_ENV_ARG_DECL)
+Test_ECG::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec)
 {
   int i;
   for (i = 0; i < this->hp_consumers_; ++i)
@@ -742,8 +724,7 @@ Test_ECG::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec
       this->consumers_[i]->open (buf,
                                  this->hpc_event_a_,
                                  this->hpc_event_b_,
-                                 local_ec
-                                 ACE_ENV_ARG_PARAMETER);
+                                 local_ec);
       this->stats_[i].total_time_ = 0;
       this->stats_[i].lcl_count_ = 0;
       this->stats_[i].rmt_count_ = 0;
@@ -761,8 +742,7 @@ Test_ECG::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec
       this->consumers_[i]->open (buf,
                                  this->lpc_event_a_,
                                  this->lpc_event_b_,
-                                 local_ec
-                                 ACE_ENV_ARG_PARAMETER);
+                                 local_ec);
       this->stats_[i].total_time_ = 0;
       this->stats_[i].lcl_count_ = 0;
       this->stats_[i].rmt_count_ = 0;
@@ -773,8 +753,7 @@ Test_ECG::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec
 void
 Test_ECG::connect_ecg (RtecEventChannelAdmin::EventChannel_ptr local_ec,
                        RtecEventChannelAdmin::EventChannel_ptr remote_ec,
-                       RtecScheduler::Scheduler_ptr remote_sch
-                       ACE_ENV_ARG_DECL)
+                       RtecScheduler::Scheduler_ptr remote_sch)
 {
   RtecScheduler::Scheduler_ptr local_sch =
     ACE_Scheduler_Factory::server ();
@@ -800,32 +779,31 @@ Test_ECG::connect_ecg (RtecEventChannelAdmin::EventChannel_ptr local_ec,
   ACE_OS::strcat (lcl, this->lcl_name_);
 
   this->ecg_.init (remote_ec, local_ec, remote_sch, local_sch,
-                   rmt, lcl ACE_ENV_ARG_PARAMETER);
+                   rmt, lcl);
 }
 
 void
 Test_ECG::push_supplier (void * /* cookie */,
                          RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer,
-                         const RtecEventComm::EventSet &events
-                         ACE_ENV_ARG_DECL)
+                         const RtecEventComm::EventSet &events)
 {
   this->wait_until_ready ();
   // ACE_DEBUG ((LM_DEBUG, "(%P|%t) events sent by supplier\n"));
   // @@ TODO we could keep somekind of stats here...
   if (!this->short_circuit_)
     {
-      consumer->push (events ACE_ENV_ARG_PARAMETER);
+      consumer->push (events);
     }
   else
     {
       int i = 0;
       for (; i < this->hp_consumers_; ++i)
         {
-          this->consumers_[i]->push (events ACE_ENV_ARG_PARAMETER);
+          this->consumers_[i]->push (events);
         }
       for (; i < this->hp_consumers_ + this->lp_consumers_; ++i)
         {
-          this->consumers_[i]->push (events ACE_ENV_ARG_PARAMETER);
+          this->consumers_[i]->push (events);
         }
     }
 }
@@ -833,8 +811,7 @@ Test_ECG::push_supplier (void * /* cookie */,
 void
 Test_ECG::push_consumer (void *consumer_cookie,
                          ACE_hrtime_t arrival,
-                         const RtecEventComm::EventSet &events
-                         ACE_ENV_ARG_DECL_NOT_USED)
+                         const RtecEventComm::EventSet &events)
 {
   int ID =
     (reinterpret_cast<Test_Consumer**> (consumer_cookie)
@@ -927,8 +904,7 @@ Test_ECG::wait_until_ready (void)
 
 void
 Test_ECG::shutdown_supplier (void* /* supplier_cookie */,
-                             RtecEventComm::PushConsumer_ptr consumer
-                             ACE_ENV_ARG_DECL)
+                             RtecEventComm::PushConsumer_ptr consumer)
 {
 
   this->running_suppliers_--;
@@ -946,7 +922,7 @@ Test_ECG::shutdown_supplier (void* /* supplier_cookie */,
   ACE_hrtime_t t = ACE_OS::gethrtime ();
   ORBSVCS_Time::hrtime_to_TimeT (s.header.creation_time, t);
   s.header.type = ACE_ES_EVENT_SHUTDOWN;
-  consumer->push (shutdown ACE_ENV_ARG_PARAMETER);
+  consumer->push (shutdown);
 }
 
 void
@@ -1224,8 +1200,7 @@ Test_Supplier::open (const char* name,
                      int event_b,
                      int message_count,
                      const RtecScheduler::Period_t& rate,
-                     RtecEventChannelAdmin::EventChannel_ptr ec
-                     ACE_ENV_ARG_DECL)
+                     RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   this->event_a_ = event_a;
   this->event_b_ = event_b;
@@ -1235,7 +1210,7 @@ Test_Supplier::open (const char* name,
     ACE_Scheduler_Factory::server ();
 
   RtecScheduler::handle_t rt_info =
-    server->create (name ACE_ENV_ARG_PARAMETER);
+    server->create (name);
 
   // The execution times are set to reasonable values, but
   // actually they are changed on the real execution, i.e. we
@@ -1252,8 +1227,7 @@ Test_Supplier::open (const char* name,
                RtecScheduler::VERY_LOW_IMPORTANCE,
                time,
                1,
-                   RtecScheduler::OPERATION
-               ACE_ENV_ARG_PARAMETER);
+                   RtecScheduler::OPERATION);
 
   this->supplier_id_ = ACE::crc32 (name);
   ACE_DEBUG ((LM_DEBUG, "ID for <%s> is %04.4x\n", name,
@@ -1279,8 +1253,7 @@ Test_Supplier::open (const char* name,
   RtecEventComm::PushSupplier_var objref = this->_this ();
 
   this->consumer_proxy_->connect_push_supplier (objref.in (),
-                                                qos.get_SupplierQOS ()
-                                                ACE_ENV_ARG_PARAMETER);
+                                                qos.get_SupplierQOS ());
 }
 
 void
@@ -1297,8 +1270,7 @@ Test_Supplier::close (void)
 void
 Test_Supplier::activate (const char* name,
                          const RtecScheduler::Period_t& rate,
-                         RtecEventChannelAdmin::EventChannel_ptr ec
-                         ACE_ENV_ARG_DECL)
+                         RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   RtecScheduler::Scheduler_ptr server =
     ACE_Scheduler_Factory::server ();
@@ -1308,7 +1280,7 @@ Test_Supplier::activate (const char* name,
   ACE_OS::strcpy (buf, "consumer_");
   ACE_OS::strcat (buf, name);
   RtecScheduler::handle_t rt_info =
-    server->create (buf ACE_ENV_ARG_PARAMETER);
+    server->create (buf);
 
   // The execution times are set to reasonable values, but
   // actually they are changed on the real execution, i.e. we
@@ -1325,8 +1297,7 @@ Test_Supplier::activate (const char* name,
                RtecScheduler::VERY_LOW_IMPORTANCE,
                time,
                1,
-               RtecScheduler::OPERATION
-               ACE_ENV_ARG_PARAMETER);
+               RtecScheduler::OPERATION);
 
   // Also connect our consumer for timeout events from the EC.
   int interval = rate / 10;
@@ -1353,13 +1324,11 @@ Test_Supplier::activate (const char* name,
 
   this->supplier_proxy_->connect_push_consumer (
        cref.in (),
-       consumer_qos.get_ConsumerQOS ()
-       ACE_ENV_ARG_PARAMETER);
+       consumer_qos.get_ConsumerQOS ());
 }
 
 void
-Test_Supplier::push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+Test_Supplier::push (const RtecEventComm::EventSet& events)
 {
 #if 0
    const int bufsize = 128;
@@ -1398,8 +1367,7 @@ Test_Supplier::push (const RtecEventComm::EventSet& events
       if (this->message_count_ < 0)
         {
           this->test_->shutdown_supplier (this->cookie_,
-                                          this->consumer_proxy_.in ()
-                                          ACE_ENV_ARG_PARAMETER);
+                                          this->consumer_proxy_.in ());
         }
       if (this->message_count_ % 2 == 0)
         {
@@ -1413,8 +1381,7 @@ Test_Supplier::push (const RtecEventComm::EventSet& events
     }
   this->test_->push_supplier (this->cookie_,
                               this->consumer_proxy_.in (),
-                              sent
-                              ACE_ENV_ARG_PARAMETER);
+                              sent);
 }
 
 void
@@ -1447,14 +1414,13 @@ Test_Consumer::Test_Consumer (Test_ECG *test,
 void
 Test_Consumer::open (const char* name,
                      int event_a, int event_b,
-                     RtecEventChannelAdmin::EventChannel_ptr ec
-                     ACE_ENV_ARG_DECL)
+                     RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   RtecScheduler::Scheduler_ptr server =
     ACE_Scheduler_Factory::server ();
 
   RtecScheduler::handle_t rt_info =
-    server->create (name ACE_ENV_ARG_PARAMETER);
+    server->create (name);
 
   // The worst case execution time is far less than 2
   // milliseconds, but that is a safe estimate....
@@ -1469,8 +1435,7 @@ Test_Consumer::open (const char* name,
                RtecScheduler::VERY_LOW_IMPORTANCE,
                time,
                0,
-               RtecScheduler::OPERATION
-               ACE_ENV_ARG_PARAMETER);
+               RtecScheduler::OPERATION);
 
   ACE_ConsumerQOS_Factory qos;
   qos.start_disjunction_group ();
@@ -1488,8 +1453,7 @@ Test_Consumer::open (const char* name,
   RtecEventComm::PushConsumer_var objref = this->_this ();
 
   this->supplier_proxy_->connect_push_consumer (objref.in (),
-                                                qos.get_ConsumerQOS ()
-                                                ACE_ENV_ARG_PARAMETER);
+                                                qos.get_ConsumerQOS ());
 }
 
 void
@@ -1504,12 +1468,11 @@ Test_Consumer::close (void)
 }
 
 void
-Test_Consumer::push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+Test_Consumer::push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t arrival = ACE_OS::gethrtime ();
-  this->test_->push_consumer (this->cookie_, arrival, events ACE_ENV_ARG_PARAMETER);
+  this->test_->push_consumer (this->cookie_, arrival, events);
 }
 
 void
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
index c5a78d16be9..5307080c435 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
@@ -50,8 +50,7 @@ public:
              int event_a, int event_b,
              int message_count,
              const RtecScheduler::Period_t& rate,
-             RtecEventChannelAdmin::EventChannel_ptr ec
-             ACE_ENV_ARG_DECL);
+             RtecEventChannelAdmin::EventChannel_ptr ec);
   // This method connects the supplier to the EC.
 
   void close (void);
@@ -59,11 +58,9 @@ public:
 
   void activate (const char* name,
                  const RtecScheduler::Period_t& rate,
-                 RtecEventChannelAdmin::EventChannel_ptr ec
-                 ACE_ENV_ARG_DECL);
+                 RtecEventChannelAdmin::EventChannel_ptr ec);
 
-  void push (const RtecEventComm::EventSet& events
-             ACE_ENV_ARG_DECL);
+  void push (const RtecEventComm::EventSet& events);
   void disconnect_push_consumer (void);
   // Implement the callbacks for our consumer personality.
 
@@ -120,15 +117,13 @@ public:
 
   void open (const char* name,
              int event_a, int event_b,
-             RtecEventChannelAdmin::EventChannel_ptr ec
-             ACE_ENV_ARG_DECL);
+             RtecEventChannelAdmin::EventChannel_ptr ec);
   // This method connects the consumer to the EC.
 
   void close (void);
   // Disconnect from the EC.
 
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -185,8 +180,7 @@ public:
 
   void push_supplier (void* supplier_cookie,
                       RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer,
-                      const RtecEventComm::EventSet &events
-                      ACE_ENV_ARG_DECL_NOT_USED);
+                      const RtecEventComm::EventSet &events);
   // Callback method for suppliers, we push for them to their
   // consumers and take statistics on the way.
   // It is possible that we ignore the <consumer> parameter when
@@ -194,41 +188,34 @@ public:
 
   void push_consumer (void* consumer_cookie,
                       ACE_hrtime_t arrival,
-                      const RtecEventComm::EventSet& events
-                      ACE_ENV_ARG_DECL_NOT_USED);
+                      const RtecEventComm::EventSet& events);
   // Callback method for consumers, if any of our consumers has
   // received events it will invoke this method.
 
   void shutdown_supplier (void* supplier_cookie,
-                          RtecEventComm::PushConsumer_ptr consumer
-                          ACE_ENV_ARG_DECL);
+                          RtecEventComm::PushConsumer_ptr consumer);
   // One of the suppliers has completed its work.
 
 private:
   RtecEventChannelAdmin::EventChannel_ptr
     get_ec (CosNaming::NamingContext_ptr naming_context,
-            const char* ec_name
-            ACE_ENV_ARG_DECL);
+            const char* ec_name);
   // Helper routine to obtain an EC given its name.
 
-  void connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec
-                          ACE_ENV_ARG_DECL);
+  void connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec);
   void disconnect_suppliers (void);
   // Connect the suppliers.
 
-  void activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec
-                           ACE_ENV_ARG_DECL);
+  void activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec);
   // Activate the suppliers, i.e. they start generating events.
 
   void connect_ecg (RtecEventChannelAdmin::EventChannel_ptr local_ec,
                     RtecEventChannelAdmin::EventChannel_ptr remote_ec,
-                    RtecScheduler::Scheduler_ptr remote_sch
-                    ACE_ENV_ARG_DECL);
+                    RtecScheduler::Scheduler_ptr remote_sch);
   // Connect the EC gateway, it builds the Subscriptions and the
   // Publications list.
 
-  void connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec
-                          ACE_ENV_ARG_DECL);
+  void connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec);
   void disconnect_consumers (void);
   // Connect and disconnect the consumers.
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
index 26561f30381..8ce4695e239 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
@@ -33,11 +33,10 @@ Test_Consumer::connect (RtecScheduler::Scheduler_ptr scheduler,
                         const char* name,
                         int type_start,
                         int type_count,
-                        RtecEventChannelAdmin::EventChannel_ptr ec
-                        ACE_ENV_ARG_DECL)
+                        RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   RtecScheduler::handle_t rt_info =
-    scheduler->create (name ACE_ENV_ARG_PARAMETER);
+    scheduler->create (name);
 
   // The worst case execution time is far less than 2
   // milliseconds, but that is a safe estimate....
@@ -51,8 +50,7 @@ Test_Consumer::connect (RtecScheduler::Scheduler_ptr scheduler,
                   RtecScheduler::VERY_LOW_IMPORTANCE,
                   time,
                   0,
-                  RtecScheduler::OPERATION
-                  ACE_ENV_ARG_PARAMETER);
+                  RtecScheduler::OPERATION);
 
   ACE_ConsumerQOS_Factory qos;
   qos.start_disjunction_group ();
@@ -72,8 +70,7 @@ Test_Consumer::connect (RtecScheduler::Scheduler_ptr scheduler,
   RtecEventComm::PushConsumer_var objref = this->_this ();
 
   this->supplier_proxy_->connect_push_consumer (objref.in (),
-                                                qos.get_ConsumerQOS ()
-                                                ACE_ENV_ARG_PARAMETER);
+                                                qos.get_ConsumerQOS ());
 }
 
 void
@@ -91,8 +88,8 @@ Test_Consumer::disconnect (void)
   PortableServer::POA_var poa =
     this->_default_POA ();
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
+    poa->servant_to_id (this);
+  poa->deactivate_object (id.in ());
 }
 
 void
@@ -109,8 +106,7 @@ Test_Consumer::accumulate (ACE_Throughput_Stats& stats) const
 }
 
 void
-Test_Consumer::push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+Test_Consumer::push (const RtecEventComm::EventSet& events)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
@@ -149,7 +145,7 @@ Test_Consumer::push (const RtecEventComm::EventSet& events
             {
               // We stop the timer as soon as we realize it is time to
               // do so.
-              this->driver_->shutdown_consumer (this->cookie_ ACE_ENV_ARG_PARAMETER);
+              this->driver_->shutdown_consumer (this->cookie_);
             }
         }
       else
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
index fc6db8aa9a0..5621cc3d99a 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
@@ -45,8 +45,7 @@ public:
                 const char* name,
                 int type_start,
                 int type_count,
-                RtecEventChannelAdmin::EventChannel_ptr ec
-                ACE_ENV_ARG_DECL);
+                RtecEventChannelAdmin::EventChannel_ptr ec);
   // This method connects the consumer to the EC.
 
   void disconnect (void);
@@ -59,8 +58,7 @@ public:
   void accumulate (ACE_Throughput_Stats& stats) const;
   // Add our throughput and latency statistics to <stats>
 
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet& events)
       ACE_THROW_SPEC ((CORBA::SystemException));
   virtual void disconnect_push_consumer (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
index 82f52e91aa2..5ca4305b28f 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
@@ -47,15 +47,13 @@ ECT_Consumer_Driver::~ECT_Consumer_Driver (void)
 int
 ECT_Consumer_Driver::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       this->orb_ =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references("RootPOA"
-                                               ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -63,7 +61,7 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -124,8 +122,7 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
         }
 
       CORBA::Object_var naming_obj =
-        this->orb_->resolve_initial_references ("NameService"
-                                                ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -133,37 +130,35 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
       CosNaming::Name schedule_name (1);
       schedule_name.length (1);
       schedule_name[0].id = CORBA::string_dup ("ScheduleService");
 
       CORBA::Object_var sched_obj =
-        naming_context->resolve (schedule_name ACE_ENV_ARG_PARAMETER);
+        naming_context->resolve (schedule_name);
       if (CORBA::is_nil (sched_obj.in ()))
         return 1;
       RtecScheduler::Scheduler_var scheduler =
-        RtecScheduler::Scheduler::_narrow (sched_obj.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+        RtecScheduler::Scheduler::_narrow (sched_obj.in ());
 
       CosNaming::Name name (1);
       name.length (1);
       name[0].id = CORBA::string_dup ("EventService");
 
       CORBA::Object_var ec_obj =
-        naming_context->resolve (name ACE_ENV_ARG_PARAMETER);
+        naming_context->resolve (name);
 
       RtecEventChannelAdmin::EventChannel_var channel;
       if (CORBA::is_nil (ec_obj.in ()))
         channel = RtecEventChannelAdmin::EventChannel::_nil ();
       else
-        channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ()
-                                                                ACE_ENV_ARG_PARAMETER);
+        channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ());
 
       poa_manager->activate ();
 
-      this->connect_consumers (scheduler.in (), channel.in () ACE_ENV_ARG_PARAMETER);
+      this->connect_consumers (scheduler.in (), channel.in ());
 
       ACE_DEBUG ((LM_DEBUG, "connected consumer(s)\n"));
 
@@ -171,7 +166,7 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
       for (;;)
         {
           ACE_Time_Value tv (1, 0);
-          this->orb_->perform_work (tv ACE_ENV_ARG_PARAMETER);
+          this->orb_->perform_work (tv);
           ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 1);
           if (this->active_count_ <= 0)
             break;
@@ -187,25 +182,23 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
           channel->destroy ();
         }
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1);
 
       this->orb_->destroy ();
     }
-  ACE_CATCH (CORBA::SystemException, sys_ex)
+  catch (const CORBA::SystemException& sys_ex)
     {
-      ACE_PRINT_EXCEPTION (sys_ex, "SYS_EX");
+      sys_ex._tao_print_exception ("SYS_EX");
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "NON SYS EX");
+      ex._tao_print_exception ("NON SYS EX");
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 void
-ECT_Consumer_Driver::shutdown_consumer (void*
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+ECT_Consumer_Driver::shutdown_consumer (void*)
 {
   // int ID =
   //   (reinterpret_cast<Test_Consumer**> (consumer_cookie)
@@ -220,8 +213,7 @@ ECT_Consumer_Driver::shutdown_consumer (void*
 void
 ECT_Consumer_Driver::connect_consumers
      (RtecScheduler::Scheduler_ptr scheduler,
-      RtecEventChannelAdmin::EventChannel_ptr channel
-      ACE_ENV_ARG_DECL)
+      RtecEventChannelAdmin::EventChannel_ptr channel)
 {
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
@@ -241,8 +233,7 @@ ECT_Consumer_Driver::connect_consumers
                                     buf,
                                     this->type_start_,
                                     this->type_count_,
-                                    channel
-                                    ACE_ENV_ARG_PARAMETER);
+                                    channel);
     }
 }
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
index 35c31f8591e..198c4160cc5 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
@@ -44,8 +44,7 @@ public:
   int run (int argc, char* argv[]);
   // Execute the test.
 
-  virtual void shutdown_consumer (void* consumer_cookie
-                                  ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void shutdown_consumer (void* consumer_cookie);
   // Callback method for consumers, each consumer will call this
   // method once it receives all the shutdown events from the
   // suppliers.
@@ -55,8 +54,7 @@ private:
   // parse the command line args
 
   void connect_consumers (RtecScheduler::Scheduler_ptr scheduler,
-                          RtecEventChannelAdmin::EventChannel_ptr local_ec
-                          ACE_ENV_ARG_DECL);
+                          RtecEventChannelAdmin::EventChannel_ptr local_ec);
   void disconnect_consumers (void);
   // Connect and disconnect the consumers.
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h
index 1debc666c37..6aaff0c1448 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h
@@ -33,8 +33,7 @@ class ECT_Driver
 public:
   virtual ~ECT_Driver (void);
 
-  virtual void shutdown_consumer (void* consumer_cookie
-                                  ACE_ENV_ARG_DECL_NOT_USED) = 0;
+  virtual void shutdown_consumer (void* consumer_cookie) = 0;
   // Callback method for consumers, each consumer will call this
   // method once it receives all the shutdown events from the
   // suppliers.
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
index b5b04c3e371..49efa019ecf 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
@@ -41,8 +41,7 @@ Test_Supplier::connect (RtecScheduler::Scheduler_ptr scheduler,
                         int burst_pause,
                         int type_start,
                         int type_count,
-                        RtecEventChannelAdmin::EventChannel_ptr ec
-                        ACE_ENV_ARG_DECL)
+                        RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   this->burst_count_ = burst_count;
   this->burst_size_ = burst_size;
@@ -52,7 +51,7 @@ Test_Supplier::connect (RtecScheduler::Scheduler_ptr scheduler,
   this->type_count_ = type_count;
 
   RtecScheduler::handle_t rt_info =
-    scheduler->create (name ACE_ENV_ARG_PARAMETER);
+    scheduler->create (name);
 
   ACE_Time_Value tv (0, burst_pause);
   RtecScheduler::Period_t rate = tv.usec () * 10;
@@ -71,8 +70,7 @@ Test_Supplier::connect (RtecScheduler::Scheduler_ptr scheduler,
                   RtecScheduler::VERY_LOW_IMPORTANCE,
                   time,
                   1,
-                  RtecScheduler::OPERATION
-                  ACE_ENV_ARG_PARAMETER);
+                  RtecScheduler::OPERATION);
 
   this->supplier_id_ = ACE::crc32 (name);
   ACE_DEBUG ((LM_DEBUG, "ID for <%s> is %04.4x\n", name,
@@ -99,8 +97,7 @@ Test_Supplier::connect (RtecScheduler::Scheduler_ptr scheduler,
     this->supplier_._this ();
 
   this->consumer_proxy_->connect_push_supplier (objref.in (),
-                                                qos.get_SupplierQOS ()
-                                                ACE_ENV_ARG_PARAMETER);
+                                                qos.get_SupplierQOS ());
 }
 
 void
@@ -118,15 +115,14 @@ Test_Supplier::disconnect (void)
   PortableServer::POA_var poa =
     this->supplier_._default_POA ();
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (&this->supplier_ ACE_ENV_ARG_PARAMETER);
-  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
+    poa->servant_to_id (&this->supplier_);
+  poa->deactivate_object (id.in ());
 }
 
 int
 Test_Supplier::svc ()
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize a time value to pace the test
       ACE_Time_Value tv (0, this->burst_pause_);
@@ -174,7 +170,7 @@ Test_Supplier::svc ()
               ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time,
                                              request_start);
               // ACE_DEBUG ((LM_DEBUG, "(%t) supplier push event\n"));
-              this->consumer_proxy ()->push (event ACE_ENV_ARG_PARAMETER);
+              this->consumer_proxy ()->push (event);
 
               ACE_hrtime_t end = ACE_OS::gethrtime ();
               this->throughput_.sample (end - test_start,
@@ -197,20 +193,19 @@ Test_Supplier::svc ()
       ACE_hrtime_t request_start = ACE_OS::gethrtime ();
       ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time,
                                      request_start);
-      this->consumer_proxy ()->push(event ACE_ENV_ARG_PARAMETER);
+      this->consumer_proxy ()->push(event);
       ACE_hrtime_t end = ACE_OS::gethrtime ();
       this->throughput_.sample (end - test_start,
                                 end - request_start);
     }
-  ACE_CATCH (CORBA::SystemException, sys_ex)
+  catch (const CORBA::SystemException& sys_ex)
     {
-      ACE_PRINT_EXCEPTION (sys_ex, "SYS_EX");
+      sys_ex._tao_print_exception ("SYS_EX");
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "NON SYS EX");
+      ex._tao_print_exception ("NON SYS EX");
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
               "Supplier %4.4x completed\n",
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
index ec0f8e02ccd..073e85e601d 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
@@ -45,8 +45,7 @@ public:
                 int burst_pause,
                 int type_start,
                 int type_count,
-                RtecEventChannelAdmin::EventChannel_ptr ec
-                ACE_ENV_ARG_DECL);
+                RtecEventChannelAdmin::EventChannel_ptr ec);
   // This method connects the supplier to the EC.
 
   void disconnect (void);
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
index 4cf395bd7c6..8a052c303a1 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
@@ -46,22 +46,20 @@ ECT_Supplier_Driver::~ECT_Supplier_Driver (void)
 }
 
 void
-ECT_Supplier_Driver::shutdown_consumer (void*
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+ECT_Supplier_Driver::shutdown_consumer (void*)
 {
 }
 
 int
 ECT_Supplier_Driver::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -69,7 +67,7 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -136,7 +134,7 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
         }
 
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -144,38 +142,35 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
       CosNaming::Name schedule_name (1);
       schedule_name.length (1);
       schedule_name[0].id = CORBA::string_dup ("ScheduleService");
 
       CORBA::Object_var sched_obj =
-        naming_context->resolve (schedule_name ACE_ENV_ARG_PARAMETER);
+        naming_context->resolve (schedule_name);
       if (CORBA::is_nil (sched_obj.in ()))
         return 1;
       RtecScheduler::Scheduler_var scheduler =
-        RtecScheduler::Scheduler::_narrow (sched_obj.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+        RtecScheduler::Scheduler::_narrow (sched_obj.in ());
       CosNaming::Name name (1);
       name.length (1);
       name[0].id = CORBA::string_dup ("EventService");
 
       CORBA::Object_var ec_obj =
-        naming_context->resolve (name ACE_ENV_ARG_PARAMETER);
+        naming_context->resolve (name);
 
       RtecEventChannelAdmin::EventChannel_var channel;
       if (CORBA::is_nil (ec_obj.in ()))
         channel = RtecEventChannelAdmin::EventChannel::_nil ();
       else
-        channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ()
-                                                                ACE_ENV_ARG_PARAMETER);
+        channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ());
 
       poa_manager->activate ();
 
       this->connect_suppliers (scheduler.in (),
-                               channel.in ()
-                               ACE_ENV_ARG_PARAMETER);
+                               channel.in ());
 
       ACE_DEBUG ((LM_DEBUG, "connected supplier(s)\n"));
 
@@ -200,29 +195,27 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
 
       // @@ Deactivate the suppliers (as CORBA Objects?)
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1);
 
       orb->destroy ();
 
       ACE_DEBUG ((LM_DEBUG, "orb and poa destroyed\n"));
     }
-  ACE_CATCH (CORBA::SystemException, sys_ex)
+  catch (const CORBA::SystemException& sys_ex)
     {
-      ACE_PRINT_EXCEPTION (sys_ex, "SYS_EX");
+      sys_ex._tao_print_exception ("SYS_EX");
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "NON SYS EX");
+      ex._tao_print_exception ("NON SYS EX");
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 void
 ECT_Supplier_Driver::connect_suppliers
     (RtecScheduler::Scheduler_ptr scheduler,
-     RtecEventChannelAdmin::EventChannel_ptr channel
-     ACE_ENV_ARG_DECL)
+     RtecEventChannelAdmin::EventChannel_ptr channel)
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
@@ -239,8 +232,7 @@ ECT_Supplier_Driver::connect_suppliers
                                     this->burst_pause_,
                                     this->type_start_,
                                     this->type_count_,
-                                    channel
-                                    ACE_ENV_ARG_PARAMETER);
+                                    channel);
     }
 }
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h
index 71f06bf4de8..27f364428cb 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h
@@ -34,8 +34,7 @@ public:
   ECT_Supplier_Driver (void);
   virtual ~ECT_Supplier_Driver (void);
 
-  virtual void shutdown_consumer (void* consumer_cookie
-                                  ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void shutdown_consumer (void* consumer_cookie);
   // Not used....
 
   enum {
@@ -51,8 +50,7 @@ private:
   // parse the command line args
 
   void connect_suppliers (RtecScheduler::Scheduler_ptr scheduler,
-                          RtecEventChannelAdmin::EventChannel_ptr local_ec
-                          ACE_ENV_ARG_DECL);
+                          RtecEventChannelAdmin::EventChannel_ptr local_ec);
   void disconnect_suppliers (void);
   // Connect the suppliers.
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
index 5a3c157b5d8..490fe9dd72f 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
@@ -63,18 +63,17 @@ ECT_Throughput::~ECT_Throughput (void)
 int
 ECT_Throughput::run (int argc, char* argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Calibrate the high resolution timer *before* starting the
       // test.
       ACE_High_Res_Timer::calibrate ();
 
       this->orb_ =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references("RootPOA"
-                                               ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -82,7 +81,7 @@ ECT_Throughput::run (int argc, char* argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -184,8 +183,7 @@ ECT_Throughput::run (int argc, char* argv[])
 
 #if 0
       CORBA::Object_var naming_obj =
-        this->orb_->resolve_initial_references ("NameService"
-                                                ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -193,7 +191,7 @@ ECT_Throughput::run (int argc, char* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
       // This is the name we (potentially) register the Scheduling
       // Service in the Naming Service.
@@ -202,12 +200,12 @@ ECT_Throughput::run (int argc, char* argv[])
       schedule_name[0].id = CORBA::string_dup ("ScheduleService");
 
       CORBA::String_var str =
-        this->orb_->object_to_string (scheduler.in () ACE_ENV_ARG_PARAMETER);
+        this->orb_->object_to_string (scheduler.in ());
       ACE_DEBUG ((LM_DEBUG, "The (local) scheduler IOR is <%s>\n",
                   str.in ()));
 
       // Register the servant with the Naming Context....
-      naming_context->rebind (schedule_name, scheduler.in () ACE_ENV_ARG_PARAMETER);
+      naming_context->rebind (schedule_name, scheduler.in ());
 
       ACE_Scheduler_Factory::use_config (naming_context.in ());
 #endif /* 0 */
@@ -229,13 +227,12 @@ ECT_Throughput::run (int argc, char* argv[])
         ec_impl->_this ();
 
       this->connect_consumers (scheduler.in (),
-                               channel.in () ACE_ENV_ARG_PARAMETER);
+                               channel.in ());
 
       ACE_DEBUG ((LM_DEBUG, "connected consumer(s)\n"));
 
       this->connect_suppliers (scheduler.in (),
-                               channel.in ()
-                               ACE_ENV_ARG_PARAMETER);
+                               channel.in ());
 
       ACE_DEBUG ((LM_DEBUG, "connected supplier(s)\n"));
 
@@ -271,8 +268,8 @@ ECT_Throughput::run (int argc, char* argv[])
         PortableServer::POA_var poa =
           ec_impl->_default_POA ();
         PortableServer::ObjectId_var id =
-          poa->servant_to_id (ec_impl.get () ACE_ENV_ARG_PARAMETER);
-        poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
+          poa->servant_to_id (ec_impl.get ());
+        poa->deactivate_object (id.in ());
 
         ACE_DEBUG ((LM_DEBUG, "EC deactivated\n"));
       }
@@ -282,29 +279,26 @@ ECT_Throughput::run (int argc, char* argv[])
         PortableServer::POA_var poa =
           scheduler_impl._default_POA ();
         PortableServer::ObjectId_var id =
-          poa->servant_to_id (&scheduler_impl ACE_ENV_ARG_PARAMETER);
-        poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
+          poa->servant_to_id (&scheduler_impl);
+        poa->deactivate_object (id.in ());
 
         ACE_DEBUG ((LM_DEBUG, "scheduler deactivated\n"));
       }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "ECT_Throughput::run");
+      ex._tao_print_exception ("ECT_Throughput::run");
     }
-  ACE_CATCHALL
+  catch (...)
     {
       ACE_ERROR ((LM_ERROR, "non-corba exception raised\n"));
     }
-  ACE_ENDTRY;
 
   return 0;
 }
 
 void
-ECT_Throughput::shutdown_consumer (void*
-                                   ACE_ENV_ARG_DECL_NOT_USED)
+ECT_Throughput::shutdown_consumer (void*)
 {
   // int ID =
   //   (reinterpret_cast<Test_Consumer**> (consumer_cookie)
@@ -318,15 +312,14 @@ ECT_Throughput::shutdown_consumer (void*
     {
       ACE_DEBUG ((LM_DEBUG,
                   "(%t) shutting down the ORB\n"));
-      // Not needed: this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+      // Not needed: this->orb_->shutdown (0);
     }
 }
 
 void
 ECT_Throughput::connect_consumers
      (RtecScheduler::Scheduler_ptr scheduler,
-      RtecEventChannelAdmin::EventChannel_ptr channel
-      ACE_ENV_ARG_DECL)
+      RtecEventChannelAdmin::EventChannel_ptr channel)
 {
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
@@ -349,16 +342,14 @@ ECT_Throughput::connect_consumers
                                     buf,
                                     start,
                                     this->consumer_type_count_,
-                                    channel
-                                    ACE_ENV_ARG_PARAMETER);
+                                    channel);
     }
 }
 
 void
 ECT_Throughput::connect_suppliers
      (RtecScheduler::Scheduler_ptr scheduler,
-      RtecEventChannelAdmin::EventChannel_ptr channel
-      ACE_ENV_ARG_DECL)
+      RtecEventChannelAdmin::EventChannel_ptr channel)
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
@@ -376,8 +367,7 @@ ECT_Throughput::connect_suppliers
                                     this->burst_pause_,
                                     start,
                                     this->supplier_type_count_,
-                                    channel
-                                    ACE_ENV_ARG_PARAMETER);
+                                    channel);
     }
 }
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h
index 9cfadae7a92..cf7a13ac3ad 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h
@@ -43,8 +43,7 @@ public:
   int run (int argc, char* argv[]);
   // Execute the test.
 
-  virtual void shutdown_consumer (void* consumer_cookie
-                                  ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void shutdown_consumer (void* consumer_cookie);
   // Callback method for consumers, each consumer will call this
   // method once it receives all the shutdown events from the
   // suppliers.
@@ -54,14 +53,12 @@ private:
   // parse the command line args
 
   void connect_consumers (RtecScheduler::Scheduler_ptr scheduler,
-                          RtecEventChannelAdmin::EventChannel_ptr local_ec
-                          ACE_ENV_ARG_DECL);
+                          RtecEventChannelAdmin::EventChannel_ptr local_ec);
   void disconnect_consumers (void);
   // Connect and disconnect the consumers.
 
   void connect_suppliers (RtecScheduler::Scheduler_ptr scheduler,
-                          RtecEventChannelAdmin::EventChannel_ptr local_ec
-                          ACE_ENV_ARG_DECL);
+                          RtecEventChannelAdmin::EventChannel_ptr local_ec);
   void disconnect_suppliers (void);
   // Connect the suppliers.
 
diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
index 83ead81a375..85e43d7675f 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
@@ -22,17 +22,16 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
         poa->the_POAManager ();
       poa_manager->activate ();
@@ -70,15 +69,13 @@ main (int argc, char* argv[])
                          event_source,
                          event_type,
                          event_source,
-                         event_type
-                         ACE_ENV_ARG_PARAMETER);
+                         event_type);
 
       supplier1.connect (supplier_admin.in (),
                          event_source,
                          event_type + 1,
                          event_source,
-                         event_type + 1
-                         ACE_ENV_ARG_PARAMETER);
+                         event_type + 1);
 
       // ****************************************************************
 
@@ -100,24 +97,21 @@ main (int argc, char* argv[])
       consumer_qos01.insert (event_source, event_type + 1, 0);
 
       consumer01.connect (consumer_admin.in (),
-                          consumer_qos01.get_ConsumerQOS ()
-                          ACE_ENV_ARG_PARAMETER);
+                          consumer_qos01.get_ConsumerQOS ());
 
       Consumer consumer0 ("Consumer/0", event_type);
       // Create a consumer, intialize its RT_Info structures, and
       // connnect to the event channel....
 
       consumer0.connect (consumer_admin.in (),
-                         consumer_qos0.get_ConsumerQOS ()
-                         ACE_ENV_ARG_PARAMETER);
+                         consumer_qos0.get_ConsumerQOS ());
 
       Consumer consumer1 ("Consumer/1", event_type);
       // Create a consumer, intialize its RT_Info structures, and
       // connnect to the event channel....
 
       consumer1.connect (consumer_admin.in (),
-                         consumer_qos1.get_ConsumerQOS ()
-                         ACE_ENV_ARG_PARAMETER);
+                         consumer_qos1.get_ConsumerQOS ());
 
       // ****************************************************************
 
@@ -135,22 +129,18 @@ main (int argc, char* argv[])
         {
           ACE_Time_Value tv (0, 10000);
           consumer0.connect (consumer_admin.in (),
-                             consumer_qos0.get_ConsumerQOS ()
-                             ACE_ENV_ARG_PARAMETER);
+                             consumer_qos0.get_ConsumerQOS ());
           consumer1.connect (consumer_admin.in (),
-                             consumer_qos1.get_ConsumerQOS ()
-                             ACE_ENV_ARG_PARAMETER);
+                             consumer_qos1.get_ConsumerQOS ());
           if (i % 2 == 0)
             {
               consumer01.connect (consumer_admin.in (),
-                                  consumer_qos0.get_ConsumerQOS ()
-                                  ACE_ENV_ARG_PARAMETER);
+                                  consumer_qos0.get_ConsumerQOS ());
             }
           else
             {
               consumer01.connect (consumer_admin.in (),
-                                  consumer_qos01.get_ConsumerQOS ()
-                                  ACE_ENV_ARG_PARAMETER);
+                                  consumer_qos01.get_ConsumerQOS ());
             }
 
           ACE_OS::sleep (tv);
@@ -181,7 +171,7 @@ main (int argc, char* argv[])
 
       // ****************************************************************
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1);
 
       // ****************************************************************
 
@@ -199,12 +189,11 @@ main (int argc, char* argv[])
                                task1.push_count (),
                                1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -269,8 +258,7 @@ Consumer::dump_results (int base_count,
 }
 
 void
-Consumer::push (const RtecEventComm::EventSet& events
-                ACE_ENV_ARG_DECL_NOT_USED)
+Consumer::push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h
index 1cb23396ef5..15356ef9f95 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h
@@ -40,8 +40,7 @@ public:
 
   // = The RtecEventComm::PushConsumer methods
 
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Number of events of type <event_base_type_> received.
diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
index 88da8d128cc..59c00b65055 100644
--- a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
@@ -81,7 +81,7 @@ EC_BCast::execute_test (void)
   // UDP socket.
   RtecEventChannelAdmin::ConsumerQOS sub;
   int shutdown_event_type;
-  this->build_consumer_qos (0, sub, shutdown_event_type ACE_ENV_ARG_PARAMETER);
+  this->build_consumer_qos (0, sub, shutdown_event_type);
 
   // Obtain UDP address in the string format for Gateway initialization.
   char address_server_arg [256];
@@ -108,8 +108,7 @@ EC_BCast::execute_test (void)
     return;
 
   gateway.run (this->orb_.in (),
-               this->event_channel_.in ()
-               ACE_ENV_ARG_PARAMETER);
+               this->event_channel_.in ());
 
   if (this->allocate_tasks () == -1)
     return;
@@ -146,8 +145,7 @@ Simple_Address_Server (const ACE_INET_Addr& address)
 
 void
 Simple_Address_Server::get_addr (const RtecEventComm::EventHeader&,
-                                 RtecUDPAdmin::UDP_Addr& address
-                                 ACE_ENV_ARG_DECL_NOT_USED)
+                                 RtecUDPAdmin::UDP_Addr& address)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   address = this->address_;
diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.h b/TAO/orbsvcs/tests/Event/Basic/BCast.h
index 0d07003579d..99048d0c9ab 100644
--- a/TAO/orbsvcs/tests/Event/Basic/BCast.h
+++ b/TAO/orbsvcs/tests/Event/Basic/BCast.h
@@ -73,8 +73,7 @@ public:
   Simple_Address_Server (const ACE_INET_Addr& address);
 
   virtual void get_addr (const RtecEventComm::EventHeader& header,
-                         RtecUDPAdmin::UDP_Addr& address
-                         ACE_ENV_ARG_DECL)
+                         RtecUDPAdmin::UDP_Addr& address)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp
index 3397f5ee01b..c95577609b9 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp
@@ -17,17 +17,16 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
         poa->the_POAManager ();
       poa_manager->activate ();
@@ -63,26 +62,22 @@ main (int argc, char* argv[])
       EC_Counting_Supplier first_supplier;
 
       first_supplier.activate (consumer_admin.in (),
-                               milliseconds
-                               ACE_ENV_ARG_PARAMETER);
+                               milliseconds);
       first_supplier.connect (supplier_admin.in (),
                               0x00001111UL,
                               0x11110000UL,
                               0x00001111UL,
-                              0x11110000UL
-                              ACE_ENV_ARG_PARAMETER);
+                              0x11110000UL);
 
       EC_Counting_Supplier second_supplier;
 
       second_supplier.activate (consumer_admin.in (),
-                                milliseconds
-                                ACE_ENV_ARG_PARAMETER);
+                                milliseconds);
       second_supplier.connect (supplier_admin.in (),
                                0x01100000UL,
                                0x00000110UL,
                                0x01100000UL,
-                               0x00000110UL
-                               ACE_ENV_ARG_PARAMETER);
+                               0x00000110UL);
 
       // ****************************************************************
 
@@ -97,8 +92,7 @@ main (int argc, char* argv[])
         consumer_qos.insert (0x01100000, 0x00000110, 0);
 
         consumer_bitmask_reject.connect (consumer_admin.in (),
-                                         consumer_qos.get_ConsumerQOS ()
-                                         ACE_ENV_ARG_PARAMETER);
+                                         consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -113,8 +107,7 @@ main (int argc, char* argv[])
         consumer_qos.insert_null_terminator ();
 
         consumer_bitmask_accept.connect (consumer_admin.in (),
-                                         consumer_qos.get_ConsumerQOS ()
-                                         ACE_ENV_ARG_PARAMETER);
+                                         consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -129,8 +122,7 @@ main (int argc, char* argv[])
         consumer_qos.insert_null_terminator ();
 
         consumer_bitmask_filter.connect (consumer_admin.in (),
-                                         consumer_qos.get_ConsumerQOS ()
-                                         ACE_ENV_ARG_PARAMETER);
+                                         consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -146,8 +138,7 @@ main (int argc, char* argv[])
                                              0x01100000, 0x00000110);
 
         consumer_bitmask_value.connect (consumer_admin.in (),
-                                        consumer_qos.get_ConsumerQOS ()
-                                        ACE_ENV_ARG_PARAMETER);
+                                        consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -163,8 +154,7 @@ main (int argc, char* argv[])
                                              0x01100000, 0x00000110);
 
         consumer_bitmask_loose.connect (consumer_admin.in (),
-                                        consumer_qos.get_ConsumerQOS ()
-                                        ACE_ENV_ARG_PARAMETER);
+                                        consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -195,7 +185,7 @@ main (int argc, char* argv[])
 
       // ****************************************************************
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1);
 
       // ****************************************************************
 
@@ -214,11 +204,10 @@ main (int argc, char* argv[])
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp
index fef941cd784..52950b5c3aa 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp
@@ -16,17 +16,16 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
         poa->the_POAManager ();
       poa_manager->activate ();
@@ -62,56 +61,48 @@ main (int argc, char* argv[])
       EC_Counting_Supplier supplier_00;
 
       supplier_00.activate (consumer_admin.in (),
-                            milliseconds
-                            ACE_ENV_ARG_PARAMETER);
+                            milliseconds);
       supplier_00.connect (supplier_admin.in (),
                            event_source,
                            event_type,
                            event_source,
-                           event_type
-                           ACE_ENV_ARG_PARAMETER);
+                           event_type);
 
       // ****************************************************************
 
       EC_Counting_Supplier supplier_01;
 
       supplier_01.activate (consumer_admin.in (),
-                            milliseconds
-                            ACE_ENV_ARG_PARAMETER);
+                            milliseconds);
       supplier_01.connect (supplier_admin.in (),
                            event_source,
                            event_type + 1,
                            event_source,
-                           event_type + 1
-                           ACE_ENV_ARG_PARAMETER);
+                           event_type + 1);
 
       // ****************************************************************
 
       EC_Counting_Supplier supplier_10;
 
       supplier_10.activate (consumer_admin.in (),
-                            milliseconds
-                            ACE_ENV_ARG_PARAMETER);
+                            milliseconds);
       supplier_10.connect (supplier_admin.in (),
                            event_source + 1,
                            event_type,
                            event_source + 1,
-                           event_type
-                           ACE_ENV_ARG_PARAMETER);
+                           event_type);
 
       // ****************************************************************
 
       EC_Counting_Supplier supplier_11;
 
       supplier_11.activate (consumer_admin.in (),
-                            milliseconds
-                            ACE_ENV_ARG_PARAMETER);
+                            milliseconds);
       supplier_11.connect (supplier_admin.in (),
                            event_source + 1,
                            event_type + 1,
                            event_source + 1,
-                           event_type + 1
-                           ACE_ENV_ARG_PARAMETER);
+                           event_type + 1);
 
       // ****************************************************************
 
@@ -128,8 +119,7 @@ main (int argc, char* argv[])
         consumer_qos.insert_type (event_type, 0);
 
         consumer_00.connect (consumer_admin.in (),
-                             consumer_qos.get_ConsumerQOS ()
-                             ACE_ENV_ARG_PARAMETER);
+                             consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -147,8 +137,7 @@ main (int argc, char* argv[])
         consumer_qos.insert (event_source, event_type, 0);
 
         consumer_01.connect (consumer_admin.in (),
-                             consumer_qos.get_ConsumerQOS ()
-                             ACE_ENV_ARG_PARAMETER);
+                             consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -180,7 +169,7 @@ main (int argc, char* argv[])
 
       // ****************************************************************
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1);
 
       orb->destroy ();
 
@@ -196,11 +185,10 @@ main (int argc, char* argv[])
         + supplier_11.event_count;
       consumer_01.dump_results (expected, 5);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.cpp b/TAO/orbsvcs/tests/Event/Basic/Control.cpp
index cc364beb3b9..04ba3be9f2d 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Control.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Control.cpp
@@ -22,17 +22,16 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
         poa->the_POAManager ();
       poa_manager->activate ();
@@ -69,8 +68,7 @@ main (int argc, char* argv[])
                          event_source,
                          event_type,
                          event_source,
-                         event_type
-                         ACE_ENV_ARG_PARAMETER);
+                         event_type);
 
       // ****************************************************************
 
@@ -83,16 +81,14 @@ main (int argc, char* argv[])
       consumer_qos0.insert (event_source, event_type, 0);
 
       consumer0.connect (consumer_admin.in (),
-                         consumer_qos0.get_ConsumerQOS ()
-                         ACE_ENV_ARG_PARAMETER);
+                         consumer_qos0.get_ConsumerQOS ());
 
       // Create a consumer, intialize its RT_Info structures, and
       // connnect to the event channel....
       Consumer consumer1 ("Consumer/1", 200);
 
       consumer1.connect (consumer_admin.in (),
-                         consumer_qos0.get_ConsumerQOS ()
-                         ACE_ENV_ARG_PARAMETER);
+                         consumer_qos0.get_ConsumerQOS ());
 
       // ****************************************************************
 
@@ -128,7 +124,7 @@ main (int argc, char* argv[])
 
       // ****************************************************************
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1);
 
       // ****************************************************************
 
@@ -144,12 +140,11 @@ main (int argc, char* argv[])
       consumer0.dump_results (100, 5);
       consumer1.dump_results (200, 5);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -163,8 +158,7 @@ Consumer::Consumer (const char* name,
 }
 
 void
-Consumer::push (const RtecEventComm::EventSet& events
-                ACE_ENV_ARG_DECL)
+Consumer::push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.h b/TAO/orbsvcs/tests/Event/Basic/Control.h
index f8e27523603..dbf5944fcab 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Control.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Control.h
@@ -34,8 +34,7 @@ public:
 
   // = The RtecEventComm::PushConsumer methods
 
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
index a834b3d9955..389845e2d77 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
@@ -13,68 +13,63 @@ ACE_RCSID (EC_Tests,
            "$Id$")
 
 static void run_test (PortableServer::POA_ptr poa,
-                      int use_callbacks
-                      ACE_ENV_ARG_DECL);
+                      int use_callbacks);
 
 int
 main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
         poa->the_POAManager ();
       poa_manager->activate ();
 
       // ****************************************************************
 
-      run_test (poa.in (), 0 ACE_ENV_ARG_PARAMETER);
+      run_test (poa.in (), 0);
 
-      run_test (poa.in (), 1 ACE_ENV_ARG_PARAMETER);
+      run_test (poa.in (), 1);
 
       // ****************************************************************
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1);
 
       orb->destroy ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 // ****************************************************************
 
 void
-deactivate_servant (PortableServer::Servant servant
-                    ACE_ENV_ARG_DECL)
+deactivate_servant (PortableServer::Servant servant)
 {
   PortableServer::POA_var poa =
     servant->_default_POA ();
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER);
-  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
+    poa->servant_to_id (servant);
+  poa->deactivate_object (id.in ());
 }
 
 void
 run_test (PortableServer::POA_ptr poa,
-          int use_callbacks
-          ACE_ENV_ARG_DECL)
+          int use_callbacks)
 {
   TAO_EC_Event_Channel_Attributes attributes (poa, poa);
   attributes.disconnect_callbacks = use_callbacks;
@@ -119,19 +114,15 @@ run_test (PortableServer::POA_ptr poa,
   for (int i = 0; i != iterations; ++i)
     {
       supplier_0.connect (supplier_admin.in (),
-                          supplier_qos.get_SupplierQOS ()
-                          ACE_ENV_ARG_PARAMETER);
+                          supplier_qos.get_SupplierQOS ());
       consumer_0.connect (consumer_admin.in (),
-                          consumer_qos.get_ConsumerQOS ()
-                          ACE_ENV_ARG_PARAMETER);
+                          consumer_qos.get_ConsumerQOS ());
       if (i % 2 == 1)
         {
           supplier_1.connect (supplier_admin.in (),
-                              supplier_qos.get_SupplierQOS ()
-                              ACE_ENV_ARG_PARAMETER);
+                              supplier_qos.get_SupplierQOS ());
           consumer_1.connect (consumer_admin.in (),
-                              consumer_qos.get_ConsumerQOS ()
-                              ACE_ENV_ARG_PARAMETER);
+                              consumer_qos.get_ConsumerQOS ());
         }
       supplier_0.disconnect ();
       consumer_0.disconnect ();
@@ -143,19 +134,17 @@ run_test (PortableServer::POA_ptr poa,
     }
 
   supplier_0.connect (supplier_admin.in (),
-                      supplier_qos.get_SupplierQOS ()
-                      ACE_ENV_ARG_PARAMETER);
+                      supplier_qos.get_SupplierQOS ());
   consumer_0.connect (consumer_admin.in (),
-                      consumer_qos.get_ConsumerQOS ()
-                      ACE_ENV_ARG_PARAMETER);
+                      consumer_qos.get_ConsumerQOS ());
 
   event_channel->destroy ();
 
-  deactivate_servant (&supplier_0 ACE_ENV_ARG_PARAMETER);
+  deactivate_servant (&supplier_0);
 
-  deactivate_servant (&consumer_0 ACE_ENV_ARG_PARAMETER);
+  deactivate_servant (&consumer_0);
 
-  deactivate_servant (&ec_impl ACE_ENV_ARG_PARAMETER);
+  deactivate_servant (&ec_impl);
 
   CORBA::ULong count_0 = 1;
   CORBA::ULong count_1 = 0;
diff --git a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
index f98ea924d49..ffe5ab0ee09 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
@@ -17,17 +17,16 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
         poa->the_POAManager ();
       poa_manager->activate ();
@@ -77,14 +76,13 @@ main (int argc, char* argv[])
 
       TAO_EC_Gateway_IIOP gateway;
       gateway.init (event_channel_1.in (),
-                    event_channel_2.in ()
-                    ACE_ENV_ARG_PARAMETER);
+                    event_channel_2.in ());
 
       RtecEventChannelAdmin::Observer_var obs =
         gateway._this ();
 
       RtecEventChannelAdmin::Observer_Handle h =
-        event_channel_2->append_observer (obs.in () ACE_ENV_ARG_PARAMETER);
+        event_channel_2->append_observer (obs.in ());
 
       gateway.observer_handle (h);
 
@@ -97,26 +95,22 @@ main (int argc, char* argv[])
       EC_Counting_Supplier supplier_00;
 
       supplier_00.activate (consumer_admin_1.in (),
-                            milliseconds
-                            ACE_ENV_ARG_PARAMETER);
+                            milliseconds);
       supplier_00.connect (supplier_admin_1.in (),
                            event_source,
                            event_type,
                            event_source,
-                           event_type
-                           ACE_ENV_ARG_PARAMETER);
+                           event_type);
 
       EC_Counting_Supplier supplier_01;
 
       supplier_01.activate (consumer_admin_1.in (),
-                            milliseconds
-                            ACE_ENV_ARG_PARAMETER);
+                            milliseconds);
       supplier_01.connect (supplier_admin_1.in (),
                            event_source,
                            event_type + 1,
                            event_source,
-                           event_type + 1
-                           ACE_ENV_ARG_PARAMETER);
+                           event_type + 1);
 
       // ****************************************************************
 
@@ -131,8 +125,7 @@ main (int argc, char* argv[])
         consumer_qos.insert (event_source, event_type, 0);
 
         consumer_00.connect (consumer_admin_2.in (),
-                             consumer_qos.get_ConsumerQOS ()
-                             ACE_ENV_ARG_PARAMETER);
+                             consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -161,8 +154,7 @@ main (int argc, char* argv[])
         consumer_qos.insert (event_source, event_type + 1, 0);
 
         consumer_00.connect (consumer_admin_2.in (),
-                             consumer_qos.get_ConsumerQOS ()
-                             ACE_ENV_ARG_PARAMETER);
+                             consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -187,8 +179,7 @@ main (int argc, char* argv[])
         consumer_qos.insert (event_source, event_type, 0);
 
         consumer_00.connect (consumer_admin_2.in (),
-                             consumer_qos.get_ConsumerQOS ()
-                             ACE_ENV_ARG_PARAMETER);
+                             consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -216,8 +207,7 @@ main (int argc, char* argv[])
         consumer_qos.insert_type (event_type, 0);
 
         consumer_00.connect (consumer_admin_2.in (),
-                             consumer_qos.get_ConsumerQOS ()
-                             ACE_ENV_ARG_PARAMETER);
+                             consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -246,8 +236,7 @@ main (int argc, char* argv[])
         consumer_qos.insert_type (event_type + 1, 0);
 
         consumer_00.connect (consumer_admin_2.in (),
-                             consumer_qos.get_ConsumerQOS ()
-                             ACE_ENV_ARG_PARAMETER);
+                             consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -272,8 +261,7 @@ main (int argc, char* argv[])
         consumer_qos.insert_type (event_type, 0);
 
         consumer_00.connect (consumer_admin_2.in (),
-                             consumer_qos.get_ConsumerQOS ()
-                             ACE_ENV_ARG_PARAMETER);
+                             consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -309,15 +297,14 @@ main (int argc, char* argv[])
 
       // ****************************************************************
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1);
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
index 596b32de23e..517abfd04ff 100644
--- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
@@ -14,68 +14,63 @@ ACE_RCSID (EC_Tests,
            "$Id$")
 
 static void run_test (PortableServer::POA_ptr poa,
-                      int use_callbacks
-                      ACE_ENV_ARG_DECL);
+                      int use_callbacks);
 
 int
 main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
         poa->the_POAManager ();
       poa_manager->activate ();
 
       // ****************************************************************
 
-      run_test (poa.in (), 0 ACE_ENV_ARG_PARAMETER);
+      run_test (poa.in (), 0);
 
-      run_test (poa.in (), 1 ACE_ENV_ARG_PARAMETER);
+      run_test (poa.in (), 1);
 
       // ****************************************************************
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1);
 
       orb->destroy ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 // ****************************************************************
 
 void
-deactivate_servant (PortableServer::Servant servant
-                    ACE_ENV_ARG_DECL)
+deactivate_servant (PortableServer::Servant servant)
 {
   PortableServer::POA_var poa =
     servant->_default_POA ();
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER);
-  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
+    poa->servant_to_id (servant);
+  poa->deactivate_object (id.in ());
 }
 
 void
 run_test (PortableServer::POA_ptr poa,
-          int use_callbacks
-          ACE_ENV_ARG_DECL)
+          int use_callbacks)
 {
   TAO_EC_Event_Channel_Attributes attributes (poa, poa);
   attributes.disconnect_callbacks = use_callbacks;
@@ -98,7 +93,7 @@ run_test (PortableServer::POA_ptr poa,
 
   event_channel->destroy ();
 
-  deactivate_servant (&ec_impl ACE_ENV_ARG_PARAMETER);
+  deactivate_servant (&ec_impl);
 }
 
 Task::Task (RtecEventChannelAdmin::EventChannel_ptr ec,
@@ -114,15 +109,14 @@ Task::svc ()
 {
   for (int i = 0; i < 10; ++i)
     {
-      ACE_TRY_NEW_ENV
+      try
         {
           this->run_iteration ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           return -1;
         }
-      ACE_ENDTRY;
     }
   return 0;
 }
@@ -162,19 +156,15 @@ Task::run_iteration (void)
   for (int i = 0; i != iterations; ++i)
     {
       supplier_0.connect (supplier_admin.in (),
-                          supplier_qos.get_SupplierQOS ()
-                          ACE_ENV_ARG_PARAMETER);
+                          supplier_qos.get_SupplierQOS ());
       consumer_0.connect (consumer_admin.in (),
-                          consumer_qos.get_ConsumerQOS ()
-                          ACE_ENV_ARG_PARAMETER);
+                          consumer_qos.get_ConsumerQOS ());
       if (i % 2 == 1)
         {
           supplier_1.connect (supplier_admin.in (),
-                              supplier_qos.get_SupplierQOS ()
-                              ACE_ENV_ARG_PARAMETER);
+                              supplier_qos.get_SupplierQOS ());
           consumer_1.connect (consumer_admin.in (),
-                              consumer_qos.get_ConsumerQOS ()
-                              ACE_ENV_ARG_PARAMETER);
+                              consumer_qos.get_ConsumerQOS ());
         }
       supplier_0.disconnect ();
       consumer_0.disconnect ();
@@ -185,9 +175,9 @@ Task::run_iteration (void)
         }
     }
 
-  deactivate_servant (&supplier_0 ACE_ENV_ARG_PARAMETER);
+  deactivate_servant (&supplier_0);
 
-  deactivate_servant (&consumer_0 ACE_ENV_ARG_PARAMETER);
+  deactivate_servant (&consumer_0);
 
   CORBA::ULong count_0 = 0;
   CORBA::ULong count_1 = 0;
diff --git a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
index 3383cb24d2f..5e2a7583dd0 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
@@ -17,17 +17,16 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
         poa->the_POAManager ();
       poa_manager->activate ();
@@ -65,38 +64,32 @@ main (int argc, char* argv[])
       EC_Counting_Supplier first_supplier;
 
       first_supplier.activate (consumer_admin.in (),
-                               milliseconds
-                               ACE_ENV_ARG_PARAMETER);
+                               milliseconds);
       first_supplier.connect (supplier_admin.in (),
                               event_source,
                               event_type,
                               event_source,
-                              event_type
-                              ACE_ENV_ARG_PARAMETER);
+                              event_type);
 
       EC_Counting_Supplier second_supplier;
 
       second_supplier.activate (consumer_admin.in (),
-                                milliseconds
-                                ACE_ENV_ARG_PARAMETER);
+                                milliseconds);
       second_supplier.connect (supplier_admin.in (),
                                event_source,
                                event_type + 1,
                                event_source,
-                               event_type + 1
-                               ACE_ENV_ARG_PARAMETER);
+                               event_type + 1);
 
       EC_Counting_Supplier third_supplier;
 
       third_supplier.activate (consumer_admin.in (),
-                               milliseconds
-                               ACE_ENV_ARG_PARAMETER);
+                               milliseconds);
       third_supplier.connect (supplier_admin.in (),
                               event_source,
                               event_type + 1,
                               event_source,
-                              event_type + 1
-                              ACE_ENV_ARG_PARAMETER);
+                              event_type + 1);
 
       // ****************************************************************
 
@@ -111,8 +104,7 @@ main (int argc, char* argv[])
         consumer_qos.insert (event_source, event_type, 0);
 
         regular_consumer.connect (consumer_admin.in (),
-                                  consumer_qos.get_ConsumerQOS ()
-                                  ACE_ENV_ARG_PARAMETER);
+                                  consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -128,8 +120,7 @@ main (int argc, char* argv[])
         consumer_qos.insert (event_source, event_type, 0);
 
         negation_consumer.connect (consumer_admin.in (),
-                                   consumer_qos.get_ConsumerQOS ()
-                                   ACE_ENV_ARG_PARAMETER);
+                                   consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -162,7 +153,7 @@ main (int argc, char* argv[])
 
       // ****************************************************************
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1);
 
       // ****************************************************************
 
@@ -176,11 +167,10 @@ main (int argc, char* argv[])
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
index 1760f2ba518..42e6d25d91c 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
@@ -42,7 +42,7 @@ EC_Master::~EC_Master (void)
 int
 EC_Master::run (int argc, char* argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Calibrate the high resolution timer *before* starting the
       // test.
@@ -50,7 +50,7 @@ EC_Master::run (int argc, char* argv[])
 
       this->seed_ = ACE_OS::time (0);
 
-      this->initialize_orb_and_poa (argc, argv ACE_ENV_ARG_PARAMETER);
+      this->initialize_orb_and_poa (argc, argv);
 
       if (this->parse_args (argc, argv))
         return 1;
@@ -85,7 +85,7 @@ EC_Master::run (int argc, char* argv[])
             int targc = argc;
             for (int j = 0; j < targc; ++j)
               targv[j] = argv[j];
-            this->channels_[i]->run_init (targc, targv ACE_ENV_ARG_PARAMETER);
+            this->channels_[i]->run_init (targc, targv);
           }
         delete[] targv;
       }
@@ -133,32 +133,29 @@ EC_Master::run (int argc, char* argv[])
       }
 
       this->root_poa_->destroy (1,
-                                1
-                                ACE_ENV_ARG_PARAMETER);
+                                1);
 
       this->orb_->destroy ();
    }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "EC_Driver::run");
+      ex._tao_print_exception ("EC_Driver::run");
     }
-  ACE_CATCHALL
+  catch (...)
     {
       ACE_ERROR ((LM_ERROR, "EC_Driver (%P|%t) non-corba exception raised\n"));
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 void
-EC_Master::initialize_orb_and_poa (int &argc, char* argv[]
-                                   ACE_ENV_ARG_DECL)
+EC_Master::initialize_orb_and_poa (int &argc, char* argv[])
 {
   this->orb_ =
-    CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+    CORBA::ORB_init (argc, argv, "");
 
   CORBA::Object_var poa_object =
-    this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references("RootPOA");
 
   if (CORBA::is_nil (poa_object.in ()))
     {
@@ -168,7 +165,7 @@ EC_Master::initialize_orb_and_poa (int &argc, char* argv[]
     }
 
   this->root_poa_ =
-    PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (poa_object.in ());
 
   PortableServer::POAManager_var poa_manager =
     this->root_poa_->the_POAManager ();
@@ -236,8 +233,7 @@ EC_Observer::~EC_Observer (void)
 }
 
 void
-EC_Observer::initialize_orb_and_poa (int&, char*[]
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+EC_Observer::initialize_orb_and_poa (int&, char*[])
 {
 }
 
@@ -274,14 +270,13 @@ EC_Observer::execute_test (void)
         this->master_->channel (i)->event_channel_.in ();
 
       this->gwys_[i].init (rmt_ec,
-                           this->event_channel_.in ()
-                           ACE_ENV_ARG_PARAMETER);
+                           this->event_channel_.in ());
 
       RtecEventChannelAdmin::Observer_var obs =
         this->gwys_[i]._this ();
 
       RtecEventChannelAdmin::Observer_Handle h =
-        rmt_ec->append_observer (obs.in () ACE_ENV_ARG_PARAMETER);
+        rmt_ec->append_observer (obs.in ());
 
       this->gwys_[i].observer_handle (h);
 
@@ -307,8 +302,7 @@ EC_Observer::run_cleanup (void)
 
       RtecEventChannelAdmin::EventChannel_ptr rmt_ec =
         this->master_->channel (j)->event_channel_.in ();
-      rmt_ec->remove_observer (this->gwys_[j].observer_handle ()
-                               ACE_ENV_ARG_PARAMETER);
+      rmt_ec->remove_observer (this->gwys_[j].observer_handle ());
 
       this->gwys_[j].shutdown ();
     }
@@ -343,25 +337,21 @@ EC_Observer::dump_results (void)
 void
 EC_Observer::connect_consumer (
     RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-    int i
-    ACE_ENV_ARG_DECL)
+    int i)
 {
   if (i == 0)
     {
-      this->EC_Driver::connect_consumer (consumer_admin, i
-                                         ACE_ENV_ARG_PARAMETER);
+      this->EC_Driver::connect_consumer (consumer_admin, i);
       return;
     }
   unsigned int x = ACE_OS::rand_r (this->seed_);
   if (x < RAND_MAX / 8)
-    this->EC_Driver::connect_consumer (consumer_admin, i
-                                       ACE_ENV_ARG_PARAMETER);
+    this->EC_Driver::connect_consumer (consumer_admin, i);
 }
 
 void
 EC_Observer::consumer_push (void*,
-                            const RtecEventComm::EventSet&
-                            ACE_ENV_ARG_DECL)
+                            const RtecEventComm::EventSet&)
 {
   unsigned int x = ACE_OS::rand_r (this->seed_);
   if (x < (RAND_MAX / 64))
@@ -384,7 +374,7 @@ EC_Observer::consumer_push (void*,
           else
             {
               this->EC_Driver::connect_consumer (consumer_admin.in (),
-                                                 i ACE_ENV_ARG_PARAMETER);
+                                                 i);
             }
         }
     }
diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.h b/TAO/orbsvcs/tests/Event/Basic/Observer.h
index f4a3150655a..d307ba61e04 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Observer.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Observer.h
@@ -41,8 +41,7 @@ public:
   virtual int run (int argc, char* argv[]);
 
   /// Obtain the orb and the poa pointers
-  virtual void initialize_orb_and_poa (int& argc, char* argv[]
-                                       ACE_ENV_ARG_DECL);
+  virtual void initialize_orb_and_poa (int& argc, char* argv[]);
 
   /// Accessors
   int channel_count (void) const;
@@ -87,8 +86,7 @@ public:
 
   // = The EC_Driver methods
   /// add some command line args to enable/disable observerions
-  virtual void initialize_orb_and_poa (int& argc, char* argv[]
-                                       ACE_ENV_ARG_DECL);
+  virtual void initialize_orb_and_poa (int& argc, char* argv[]);
   virtual int parse_args (int& argc, char* argv[]);
   virtual void print_args (void) const;
   virtual void print_usage (void);
@@ -100,11 +98,9 @@ public:
   void dump_results (void);
   void connect_consumer (
     RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-    int i
-    ACE_ENV_ARG_DECL);
+    int i);
   void consumer_push (void*,
-                      const RtecEventComm::EventSet&
-                      ACE_ENV_ARG_DECL);
+                      const RtecEventComm::EventSet&);
 
 private:
   EC_Master *master_;
diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.cpp b/TAO/orbsvcs/tests/Event/Basic/Random.cpp
index 8e6f8be808d..a81426f0c6a 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Random.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Random.cpp
@@ -25,14 +25,13 @@ main (int argc, char* argv[])
 const int base_type = 20;
 
 void
-deactivate_servant (PortableServer::Servant servant
-                    ACE_ENV_ARG_DECL)
+deactivate_servant (PortableServer::Servant servant)
 {
   PortableServer::POA_var poa =
     servant->_default_POA ();
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER);
-  poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
+    poa->servant_to_id (servant);
+  poa->deactivate_object (oid.in ());
 }
 
 
@@ -50,11 +49,10 @@ RND_Driver::RND_Driver (void)
 int
 RND_Driver::run (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       // ****************************************************************
 
@@ -116,9 +114,9 @@ RND_Driver::run (int argc, char *argv[])
       // ****************************************************************
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
         poa->the_POAManager ();
       poa_manager->activate ();
@@ -164,8 +162,7 @@ RND_Driver::run (int argc, char *argv[])
                          0);
 
         this->timer_.connect (this->consumer_admin_.in (),
-                              qos.get_ConsumerQOS ()
-                              ACE_ENV_ARG_PARAMETER);
+                              qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -175,8 +172,7 @@ RND_Driver::run (int argc, char *argv[])
         qos.insert (0, base_type, 0, 1);
 
         this->supplier_.connect (this->supplier_admin_.in (),
-                                 qos.get_SupplierQOS ()
-                                 ACE_ENV_ARG_PARAMETER);
+                                 qos.get_SupplierQOS ());
       }
 
       // ****************************************************************
@@ -222,8 +218,7 @@ RND_Driver::run (int argc, char *argv[])
       {
         for (int k = 0; k != this->nsuppliers_; ++k)
           {
-            deactivate_servant (this->suppliers_[k]
-                                ACE_ENV_ARG_PARAMETER);
+            deactivate_servant (this->suppliers_[k]);
             this->suppliers_[k]->_remove_ref ();
           }
         delete[] this->suppliers_;
@@ -241,8 +236,7 @@ RND_Driver::run (int argc, char *argv[])
       {
         for (int k = 0; k != this->nconsumers_; ++k)
           {
-            deactivate_servant (this->consumers_[k]
-                                ACE_ENV_ARG_PARAMETER);
+            deactivate_servant (this->consumers_[k]);
             this->consumers_[k]->_remove_ref ();
           }
         delete[] this->consumers_;
@@ -251,29 +245,26 @@ RND_Driver::run (int argc, char *argv[])
 
       // ****************************************************************
 
-      deactivate_servant (&ec_impl
-                          ACE_ENV_ARG_PARAMETER);
+      deactivate_servant (&ec_impl);
 
       // ****************************************************************
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1);
 
       // ****************************************************************
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Random");
+      ex._tao_print_exception ("Random");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 void
-RND_Driver::timer (const RtecEventComm::Event &e
-                   ACE_ENV_ARG_DECL)
+RND_Driver::timer (const RtecEventComm::Event &e)
 {
   int r = ACE_OS::rand ();
   if (r < 0)
@@ -293,7 +284,7 @@ RND_Driver::timer (const RtecEventComm::Event &e
             event.length (1);
             event[0] = e;
             event[0].header.source ++;
-            this->supplier_.push (event ACE_ENV_ARG_PARAMETER);
+            this->supplier_.push (event);
           }
       }
       break;
@@ -316,8 +307,7 @@ RND_Driver::timer (const RtecEventComm::Event &e
         qos.insert (0, base_type, 0, 1);
 
         this->suppliers_[n]->connect (this->supplier_admin_.in (),
-                                      qos.get_SupplierQOS ()
-                                      ACE_ENV_ARG_PARAMETER);
+                                      qos.get_SupplierQOS ());
       }
       break;
 
@@ -332,8 +322,7 @@ RND_Driver::timer (const RtecEventComm::Event &e
         qos.insert_type (base_type, 0);
 
         this->consumers_[n]->connect (this->consumer_admin_.in (),
-                                      qos.get_ConsumerQOS ()
-                                      ACE_ENV_ARG_PARAMETER);
+                                      qos.get_ConsumerQOS ());
       }
       break;
 
@@ -360,35 +349,31 @@ RND_Driver::timer (const RtecEventComm::Event &e
 }
 
 void
-RND_Driver::event (const RtecEventComm::Event &e
-                   ACE_ENV_ARG_DECL)
+RND_Driver::event (const RtecEventComm::Event &e)
 {
-  this->timer (e ACE_ENV_ARG_PARAMETER);
+  this->timer (e);
 }
 
 // ****************************************************************
 
 void
-RND_Timer::push (const RtecEventComm::EventSet &event
-                 ACE_ENV_ARG_DECL)
+RND_Timer::push (const RtecEventComm::EventSet &event)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
-      this->driver_->timer (event[0] ACE_ENV_ARG_PARAMETER);
+      this->driver_->timer (event[0]);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
     }
-  ACE_ENDTRY;
 }
 
 // ****************************************************************
 
 void
 RND_Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr admin,
-                       const RtecEventChannelAdmin::ConsumerQOS &qos
-                       ACE_ENV_ARG_DECL)
+                       const RtecEventChannelAdmin::ConsumerQOS &qos)
 {
   RtecEventChannelAdmin::ProxyPushSupplier_var proxy;
   {
@@ -404,8 +389,7 @@ RND_Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr admin,
   RtecEventComm::PushConsumer_var me =
     this->_this ();
   proxy->connect_push_consumer (me.in (),
-                                qos
-                                ACE_ENV_ARG_PARAMETER);
+                                qos);
 }
 
 void
@@ -421,11 +405,10 @@ RND_Consumer::disconnect (void)
 }
 
 void
-RND_Consumer::push (const RtecEventComm::EventSet &event
-                    ACE_ENV_ARG_DECL)
+RND_Consumer::push (const RtecEventComm::EventSet &event)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->driver_->event (event[0] ACE_ENV_ARG_PARAMETER);
+  this->driver_->event (event[0]);
 }
 
 void
@@ -438,8 +421,7 @@ RND_Consumer::disconnect_push_consumer (void)
 
 void
 RND_Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr admin,
-                       const RtecEventChannelAdmin::SupplierQOS &qos
-                       ACE_ENV_ARG_DECL)
+                       const RtecEventChannelAdmin::SupplierQOS &qos)
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
   {
@@ -456,8 +438,7 @@ RND_Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr admin,
   RtecEventComm::PushSupplier_var me =
     this->_this ();
   proxy->connect_push_supplier (me.in (),
-                                qos
-                                ACE_ENV_ARG_PARAMETER);
+                                qos);
 }
 
 void
@@ -480,12 +461,11 @@ RND_Supplier::push_new_event (void)
   event[0].header.type   = base_type;
   event[0].header.source = 0;
 
-  this->push (event ACE_ENV_ARG_PARAMETER);
+  this->push (event);
 }
 
 void
-RND_Supplier::push (RtecEventComm::EventSet &event
-                    ACE_ENV_ARG_DECL)
+RND_Supplier::push (RtecEventComm::EventSet &event)
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
   {
@@ -498,7 +478,7 @@ RND_Supplier::push (RtecEventComm::EventSet &event
       RtecEventChannelAdmin::ProxyPushConsumer::_duplicate(this->proxy_.in ());
   }
 
-  proxy->push (event ACE_ENV_ARG_PARAMETER);
+  proxy->push (event);
 }
 
 void
@@ -515,18 +495,16 @@ RND_Supplier::svc (void)
   int niterations = 5000;
   for (int i = 0; i != niterations; ++i)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
+      try
         {
           ACE_Time_Value tv (0, 10000);
           ACE_OS::sleep (tv);
 
           this->push_new_event ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
         }
-      ACE_ENDTRY;
       if (this->verbose_
           && i * 100 / niterations >= percent)
         {
diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.h b/TAO/orbsvcs/tests/Event/Basic/Random.h
index 858179740a3..b18d4a3e44d 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Random.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Random.h
@@ -35,15 +35,13 @@ public:
   /// Constructor
   RND_Consumer (RND_Driver *driver);
 
-  void push (const RtecEventComm::EventSet &event
-             ACE_ENV_ARG_DECL)
+  void push (const RtecEventComm::EventSet &event)
     ACE_THROW_SPEC ((CORBA::SystemException));
   void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr admin,
-                const RtecEventChannelAdmin::ConsumerQOS &qos
-                ACE_ENV_ARG_DECL);
+                const RtecEventChannelAdmin::ConsumerQOS &qos);
   void disconnect (void);
 
 protected:
@@ -70,8 +68,7 @@ class RND_Timer : public RND_Consumer
 public:
   RND_Timer (RND_Driver *driver);
 
-  void push (const RtecEventComm::EventSet &event
-             ACE_ENV_ARG_DECL)
+  void push (const RtecEventComm::EventSet &event)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
@@ -97,14 +94,12 @@ public:
   RND_Supplier (int verbose);
 
   void connect (RtecEventChannelAdmin::SupplierAdmin_ptr admin,
-                const RtecEventChannelAdmin::SupplierQOS &qos
-                ACE_ENV_ARG_DECL);
+                const RtecEventChannelAdmin::SupplierQOS &qos);
   void disconnect (void);
 
   /// Push a single event...
   void push_new_event (void);
-  void push (RtecEventComm::EventSet &event
-             ACE_ENV_ARG_DECL);
+  void push (RtecEventComm::EventSet &event);
 
   virtual void disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -140,12 +135,10 @@ public:
   int run (int argc, char *argv[]);
 
   /// The main timer has expired
-  void timer (const RtecEventComm::Event &e
-              ACE_ENV_ARG_DECL);
+  void timer (const RtecEventComm::Event &e);
 
   /// One of the consumers has received an event
-  void event (const RtecEventComm::Event &e
-              ACE_ENV_ARG_DECL);
+  void event (const RtecEventComm::Event &e);
 
 private:
   RND_Driver (const RND_Driver &);
diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
index 8fad75483d0..ebeab3df0bb 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
@@ -112,7 +112,7 @@ EC_Reconnect::execute_consumer_test (void)
 {
   RtecEventChannelAdmin::ConsumerQOS qos;
   int shutdown_event_type;
-  this->build_consumer_qos (0, qos, shutdown_event_type ACE_ENV_ARG_PARAMETER);
+  this->build_consumer_qos (0, qos, shutdown_event_type);
 
   if (this->allow_consumer_reconnect_)
     {
@@ -121,8 +121,7 @@ EC_Reconnect::execute_consumer_test (void)
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
           this->consumers_[0]->connect (qos,
-                                        shutdown_event_type
-                                        ACE_ENV_ARG_PARAMETER);
+                                        shutdown_event_type);
           ACE_hrtime_t stop = ACE_OS::gethrtime ();
           this->consumer_reconnect_.sample (stop - start_time,
                                             stop - start);
@@ -130,24 +129,21 @@ EC_Reconnect::execute_consumer_test (void)
     }
   else
     {
-      ACE_TRY
+      try
         {
           this->consumers_[0]->connect (qos,
-                                        shutdown_event_type
-                                        ACE_ENV_ARG_PARAMETER);
+                                        shutdown_event_type);
 
           ACE_DEBUG ((LM_ERROR, "Expected exception\n"));
         }
-      ACE_CATCH (RtecEventChannelAdmin::AlreadyConnected, ex)
+      catch (const RtecEventChannelAdmin::AlreadyConnected& ex)
         {
           /* do nothing */
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Expected AlreadyConnected exception");
+          ex._tao_print_exception ("Expected AlreadyConnected exception");
         }
-      ACE_ENDTRY;
 
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
         this->event_channel_->for_consumers ();
@@ -159,8 +155,7 @@ EC_Reconnect::execute_consumer_test (void)
           this->consumers_[0]->disconnect ();
           this->consumers_[0]->connect (consumer_admin.in (),
                                         qos,
-                                        shutdown_event_type
-                                        ACE_ENV_ARG_PARAMETER);
+                                        shutdown_event_type);
           ACE_hrtime_t stop = ACE_OS::gethrtime ();
           this->consumer_reconnect_.sample (stop - start_time,
                                             stop - start);
@@ -173,7 +168,7 @@ EC_Reconnect::execute_supplier_test (void)
 {
   RtecEventChannelAdmin::SupplierQOS qos;
   int shutdown_event_type;
-  this->build_supplier_qos (0, qos, shutdown_event_type ACE_ENV_ARG_PARAMETER);
+  this->build_supplier_qos (0, qos, shutdown_event_type);
 
   if (this->allow_supplier_reconnect_)
     {
@@ -181,8 +176,7 @@ EC_Reconnect::execute_supplier_test (void)
       for (int i = 0; i < this->disconnections_; ++i)
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
-          this->suppliers_[0]->connect (qos, shutdown_event_type
-                                        ACE_ENV_ARG_PARAMETER);
+          this->suppliers_[0]->connect (qos, shutdown_event_type);
           ACE_hrtime_t stop = ACE_OS::gethrtime ();
           this->supplier_reconnect_.sample (stop - start_time,
                                             stop - start);
@@ -190,23 +184,20 @@ EC_Reconnect::execute_supplier_test (void)
     }
   else
     {
-      ACE_TRY
+      try
         {
-          this->suppliers_[0]->connect (qos, shutdown_event_type
-                                        ACE_ENV_ARG_PARAMETER);
+          this->suppliers_[0]->connect (qos, shutdown_event_type);
 
           ACE_DEBUG ((LM_ERROR, "Expected exception\n"));
         }
-      ACE_CATCH (RtecEventChannelAdmin::AlreadyConnected, ex)
+      catch (const RtecEventChannelAdmin::AlreadyConnected& ex)
         {
           /* do nothing */
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Expected AlreadyConnected exception");
+          ex._tao_print_exception ("Expected AlreadyConnected exception");
         }
-      ACE_ENDTRY;
 
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
         this->event_channel_->for_suppliers ();
@@ -218,8 +209,7 @@ EC_Reconnect::execute_supplier_test (void)
           this->suppliers_[0]->disconnect ();
           this->suppliers_[0]->connect (supplier_admin.in (),
                                         qos,
-                                        shutdown_event_type
-                                        ACE_ENV_ARG_PARAMETER);
+                                        shutdown_event_type);
           ACE_hrtime_t stop = ACE_OS::gethrtime ();
           this->supplier_reconnect_.sample (stop - start_time,
                                             stop - start);
diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
index 21823adbeb0..399a00fe4e7 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
@@ -91,8 +91,7 @@ EC_Schedule::execute_test (void)
                                         infos.out (),
                                         deps.out (),
                                         configs.out (),
-                                        anomalies.out ()
-                                        ACE_ENV_ARG_PARAMETER);
+                                        anomalies.out ());
 
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG,
@@ -113,14 +112,13 @@ void
 EC_Schedule::build_consumer_qos (
   int i,
   RtecEventChannelAdmin::ConsumerQOS& qos,
-  int& shutdown_event_type
-  ACE_ENV_ARG_DECL)
+  int& shutdown_event_type)
 {
   char name[128];
   ACE_OS::sprintf (name, "EC_Schedule::Consumer::%04x", i);
 
   RtecScheduler::handle_t rt_info =
-    this->scheduler_->create (name ACE_ENV_ARG_PARAMETER);
+    this->scheduler_->create (name);
 
   // The worst case execution time is far less than 2
   // milliseconds, but that is a safe estimate....
@@ -134,8 +132,7 @@ EC_Schedule::build_consumer_qos (
                          RtecScheduler::VERY_LOW_IMPORTANCE,
                          time,
                          0,
-                         RtecScheduler::OPERATION
-                         ACE_ENV_ARG_PARAMETER);
+                         RtecScheduler::OPERATION);
 
   int type_start =
     this->consumer_type_start_
@@ -157,14 +154,13 @@ void
 EC_Schedule::build_supplier_qos (
       int i,
       RtecEventChannelAdmin::SupplierQOS& qos,
-      int& shutdown_event_type
-      ACE_ENV_ARG_DECL)
+      int& shutdown_event_type)
 {
   char name[128];
   ACE_OS::sprintf (name, "EC_Schedule::Supplier::%04x", i);
 
   RtecScheduler::handle_t rt_info =
-    this->scheduler_->create (name ACE_ENV_ARG_PARAMETER);
+    this->scheduler_->create (name);
 
   ACE_Time_Value tv (0, this->burst_pause_);
   RtecScheduler::Period_t rate = tv.usec () * 10;
@@ -183,8 +179,7 @@ EC_Schedule::build_supplier_qos (
                          RtecScheduler::VERY_LOW_IMPORTANCE,
                          time,
                          1,
-                         RtecScheduler::OPERATION
-                         ACE_ENV_ARG_PARAMETER);
+                         RtecScheduler::OPERATION);
 
   int type_start = this->supplier_type_start_ + i*this->supplier_type_shift_;
   int supplier_id = i + 1;
diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.h b/TAO/orbsvcs/tests/Event/Basic/Schedule.h
index 7a96f7dd68f..c627edeb04d 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Schedule.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.h
@@ -66,13 +66,11 @@ public:
   virtual void build_consumer_qos (
       int i,
       RtecEventChannelAdmin::ConsumerQOS& qos,
-      int& shutdown_event_type
-      ACE_ENV_ARG_DECL_NOT_USED);
+      int& shutdown_event_type);
   virtual void build_supplier_qos (
       int i,
       RtecEventChannelAdmin::SupplierQOS& qos,
-      int& shutdown_event_type
-      ACE_ENV_ARG_DECL_NOT_USED);
+      int& shutdown_event_type);
 
 private:
   /// The scheduler implementation
diff --git a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp
index 42a021e0822..69353f28f52 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp
@@ -66,8 +66,7 @@ EC_Shutdown::dump_results (void)
 }
 
 void
-EC_Shutdown::consumer_disconnect (void* cookie
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+EC_Shutdown::consumer_disconnect (void* cookie)
 {
   this->consumer_disconnects_++;
   if (this->verbose ())
@@ -75,8 +74,7 @@ EC_Shutdown::consumer_disconnect (void* cookie
 }
 
 void
-EC_Shutdown::supplier_disconnect (void* cookie
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+EC_Shutdown::supplier_disconnect (void* cookie)
 {
   this->supplier_disconnects_++;
   if (this->verbose ())
diff --git a/TAO/orbsvcs/tests/Event/Basic/Shutdown.h b/TAO/orbsvcs/tests/Event/Basic/Shutdown.h
index bab331f1a07..b24d59eed49 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Shutdown.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Shutdown.h
@@ -42,12 +42,10 @@ public:
   void dump_results (void);
 
   /// One of the consumers in the test has been disconnected from the EC
-  virtual void consumer_disconnect (void* consumer_cookie
-                                    ACE_ENV_ARG_DECL);
+  virtual void consumer_disconnect (void* consumer_cookie);
 
   /// One of the suppliers in the test has been disconnected from the EC
-  virtual void supplier_disconnect (void* supplier_cookie
-                                    ACE_ENV_ARG_DECL);
+  virtual void supplier_disconnect (void* supplier_cookie);
 
 
 private:
diff --git a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp
index 876866bfeb1..267c97c53e2 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp
@@ -19,17 +19,16 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
         poa->the_POAManager ();
       poa_manager->activate ();
@@ -61,11 +60,10 @@ main (int argc, char* argv[])
       EC_Counting_Supplier supplier;
 
       supplier.activate (consumer_admin.in (),
-                         50 ACE_ENV_ARG_PARAMETER);
+                         50);
       supplier.connect (supplier_admin.in (),
                         0, 20,
-                        0, 20
-                        ACE_ENV_ARG_PARAMETER);
+                        0, 20);
 
       // ****************************************************************
 
@@ -90,8 +88,7 @@ main (int argc, char* argv[])
                                   0);
 
         interval_consumer.connect (consumer_admin.in (),
-                                   consumer_qos.get_ConsumerQOS ()
-                                   ACE_ENV_ARG_PARAMETER);
+                                   consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -116,8 +113,7 @@ main (int argc, char* argv[])
                                   0);
 
         conjunction_consumer.connect (consumer_admin.in (),
-                                      consumer_qos.get_ConsumerQOS ()
-                                      ACE_ENV_ARG_PARAMETER);
+                                      consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -138,8 +134,7 @@ main (int argc, char* argv[])
                                   0);
 
         deadline_consumer.connect (consumer_admin.in (),
-                                   consumer_qos.get_ConsumerQOS ()
-                                   ACE_ENV_ARG_PARAMETER);
+                                   consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -166,7 +161,7 @@ main (int argc, char* argv[])
 
       // ****************************************************************
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1);
 
       // ****************************************************************
 
@@ -174,11 +169,10 @@ main (int argc, char* argv[])
       conjunction_consumer.dump_results (25, 5);
       deadline_consumer.dump_results (100, 5);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp
index 7f8b2f0e7f3..8025a446b2b 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp
@@ -16,17 +16,16 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
         poa->the_POAManager ();
       poa_manager->activate ();
@@ -62,70 +61,60 @@ main (int argc, char* argv[])
       EC_Counting_Supplier supplier;
 
       supplier.activate (consumer_admin.in (),
-                         milliseconds
-                         ACE_ENV_ARG_PARAMETER);
+                         milliseconds);
       supplier.connect (supplier_admin.in (),
                         event_source,
                         event_type,
                         event_source,
-                        event_type
-                        ACE_ENV_ARG_PARAMETER);
+                        event_type);
 
       // ****************************************************************
 
       EC_Counting_Supplier other_supplier;
 
       other_supplier.activate (consumer_admin.in (),
-                               milliseconds
-                               ACE_ENV_ARG_PARAMETER);
+                               milliseconds);
       other_supplier.connect (supplier_admin.in (),
                               event_source + 1,
                               event_type + 1,
                               event_source + 1,
-                              event_type + 1
-                              ACE_ENV_ARG_PARAMETER);
+                              event_type + 1);
 
       // ****************************************************************
 
       EC_Counting_Supplier any_source_supplier;
 
       any_source_supplier.activate (consumer_admin.in (),
-                                    milliseconds
-                                    ACE_ENV_ARG_PARAMETER);
+                                    milliseconds);
       any_source_supplier.connect (supplier_admin.in (),
                                    0,
                                    event_type,
                                    event_source,
-                                   event_type
-                                   ACE_ENV_ARG_PARAMETER);
+                                   event_type);
 
       // ****************************************************************
 
       EC_Counting_Supplier any_type_supplier;
 
       any_type_supplier.activate (consumer_admin.in (),
-                                  milliseconds
-                                  ACE_ENV_ARG_PARAMETER);
+                                  milliseconds);
       any_type_supplier.connect (supplier_admin.in (),
                                  event_source,
                                  0,
                                  event_source,
-                                 event_type
-                                 ACE_ENV_ARG_PARAMETER);
+                                 event_type);
 
       // ****************************************************************
 
       EC_Counting_Supplier wildcard_supplier;
 
       wildcard_supplier.activate (consumer_admin.in (),
-                                  milliseconds
-                                  ACE_ENV_ARG_PARAMETER);
+                                  milliseconds);
       wildcard_supplier.connect (supplier_admin.in (),
                                  0,
                                  0,
                                  event_source,
-                                 event_type
-                                 ACE_ENV_ARG_PARAMETER);
+                                 event_type);
 
       // ****************************************************************
 
@@ -140,8 +129,7 @@ main (int argc, char* argv[])
         consumer_qos.insert (event_source, event_type, 0);
 
         regular_consumer.connect (consumer_admin.in (),
-                                  consumer_qos.get_ConsumerQOS ()
-                                  ACE_ENV_ARG_PARAMETER);
+                                  consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -157,8 +145,7 @@ main (int argc, char* argv[])
         consumer_qos.insert (event_source, 0, 0);
 
         any_type_consumer.connect (consumer_admin.in (),
-                                   consumer_qos.get_ConsumerQOS ()
-                                   ACE_ENV_ARG_PARAMETER);
+                                   consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -174,8 +161,7 @@ main (int argc, char* argv[])
         consumer_qos.insert (0, event_type, 0);
 
         any_source_consumer.connect (consumer_admin.in (),
-                                     consumer_qos.get_ConsumerQOS ()
-                                     ACE_ENV_ARG_PARAMETER);
+                                     consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -191,8 +177,7 @@ main (int argc, char* argv[])
         consumer_qos.insert (0, 0, 0);
 
         wildcard_consumer.connect (consumer_admin.in (),
-                                   consumer_qos.get_ConsumerQOS ()
-                                   ACE_ENV_ARG_PARAMETER);
+                                   consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -232,7 +217,7 @@ main (int argc, char* argv[])
 
       // ****************************************************************
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1);
 
       orb->destroy ();
 
@@ -270,11 +255,10 @@ main (int argc, char* argv[])
         + supplier.event_count;
       regular_consumer.dump_results (expected, 5);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp
index 64bd7e250f3..5988fdd7ce0 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp
@@ -22,15 +22,14 @@ EC_Wrapper::create (void)
 
 EC_Wrapper::~EC_Wrapper (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       this->destroy_ec ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // ignore
     }
-  ACE_ENDTRY;
 }
 
 int
@@ -58,18 +57,16 @@ EC_Wrapper::init (CORBA::ORB_ptr orb,
                   -1);
   auto_ptr<TAO_EC_Event_Channel> impl_release (impl);
 
-  ACE_TRY_NEW_ENV
+  try
     {
       impl->activate ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Suppressed the following exception "
-                           "in EC_Wrapper::init:\n");
+      ex._tao_print_exception (
+        "Suppressed the following exception ""in EC_Wrapper::init:\n");
       return -1;
     }
-  ACE_ENDTRY;
 
   this->ec_impl_ = impl_release.release ();
   return 0;
@@ -115,44 +112,41 @@ EC_Wrapper::destroy (void)
   // Deregister from POA.
   this->deactivator_.deactivate ();
 
-  ACE_TRY
+  try
     {
       this->destroy_ec ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       this->orb_->shutdown ();
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
 
   this->orb_->shutdown ();
 }
 
 RtecEventChannelAdmin::Observer_Handle
-EC_Wrapper::append_observer (RtecEventChannelAdmin::Observer_ptr observer
-                             ACE_ENV_ARG_DECL)
+EC_Wrapper::append_observer (RtecEventChannelAdmin::Observer_ptr observer)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
           RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER))
 {
   if (this->ec_impl_)
-    return this->ec_impl_->append_observer (observer ACE_ENV_ARG_PARAMETER);
+    return this->ec_impl_->append_observer (observer);
   else
     ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
 }
 
 void
-EC_Wrapper::remove_observer (RtecEventChannelAdmin::Observer_Handle handle
-                             ACE_ENV_ARG_DECL)
+EC_Wrapper::remove_observer (RtecEventChannelAdmin::Observer_Handle handle)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
           RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER))
 {
   if (this->ec_impl_)
-    this->ec_impl_->remove_observer (handle ACE_ENV_ARG_PARAMETER);
+    this->ec_impl_->remove_observer (handle);
   else
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 }
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
index 0cb0b2407d6..adc71f8e9b5 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
@@ -56,14 +56,12 @@ public:
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual RtecEventChannelAdmin::Observer_Handle
-    append_observer (RtecEventChannelAdmin::Observer_ptr observer
-                     ACE_ENV_ARG_DECL)
+    append_observer (RtecEventChannelAdmin::Observer_ptr observer)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
           RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER));
-  virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle
-                                ACE_ENV_ARG_DECL)
+  virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp
index a9f0c8d0fbf..23c8c23cbff 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp
@@ -55,12 +55,11 @@ Gateway_EC::parse_args (int argc, char *argv [])
 
 void
 Gateway_EC::write_ior_file (CORBA::ORB_ptr orb,
-                            RtecEventChannelAdmin::EventChannel_ptr ec
-                            ACE_ENV_ARG_DECL)
+                            RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   // Write EC ior to a file.
   CORBA::String_var str;
-  str = orb->object_to_string (ec ACE_ENV_ARG_PARAMETER);
+  str = orb->object_to_string (ec);
 
   FILE *output_file= ACE_OS::fopen (this->ec_ior_file_, "w");
   if (output_file == 0)
@@ -68,7 +67,7 @@ Gateway_EC::write_ior_file (CORBA::ORB_ptr orb,
       ACE_ERROR ((LM_ERROR,
                   "Cannot open output file for writing IOR: %s",
                   this->ec_ior_file_));
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   ACE_OS::fprintf (output_file, "%s", str.in ());
@@ -85,20 +84,20 @@ Gateway_EC::run (int argc, char ** argv)
 
   TAO_EC_ORB_Holder orb_destroyer;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize ORB and POA, POA Manager, parse args.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
       orb_destroyer.init (orb);
 
       if (parse_args (argc, argv) == -1)
         return -1;
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in ());
       if (check_for_nil (poa.in (), "POA") == -1)
         return -1;
       PortableServer::POAManager_var manager =
@@ -119,11 +118,10 @@ Gateway_EC::run (int argc, char ** argv)
       activate (ec,
                 poa.in (),
                 ec_wrapper.in (),
-                ec_deactivator
-                ACE_ENV_ARG_PARAMETER);
+                ec_deactivator);
       ec_wrapper->set_deactivator (ec_deactivator);
 
-      this->write_ior_file (orb.in (), ec.in () ACE_ENV_ARG_PARAMETER);
+      this->write_ior_file (orb.in (), ec.in ());
 
       // Set up multicast components.
       // Obtain mcast gateway from service configurator.
@@ -133,19 +131,17 @@ Gateway_EC::run (int argc, char ** argv)
 
       if (!gateway)
         {
-          ACE_TRY_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
-      gateway->run (orb.in (), ec.in () ACE_ENV_ARG_PARAMETER);
+      gateway->run (orb.in (), ec.in ());
 
       // Run server.
       orb->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected Exception in Gateway EC:");
+      ex._tao_print_exception ("Unexpected Exception in Gateway EC:");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.h b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.h
index 1db97bc26de..801040fa6d4 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.h
@@ -37,8 +37,7 @@ private:
   int parse_args (int argc, char *argv[]);
   int check_for_nil (CORBA::Object_ptr obj, const char *message);
   void write_ior_file (CORBA::ORB_ptr orb,
-                       RtecEventChannelAdmin::EventChannel_ptr ec
-                       ACE_ENV_ARG_DECL);
+                       RtecEventChannelAdmin::EventChannel_ptr ec);
   //@}
 
   /// Event Channel ior is written to this file.
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp
index 440bad5455f..365939b8c4d 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp
@@ -19,8 +19,7 @@ public:
   //@{
   /// Logs each event.  Initiates shutdown after receiving 100 events
   /// of each type.
-  virtual void push (const RtecEventComm::EventSet &events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet &events)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// No-op.
@@ -57,8 +56,7 @@ EC_Consumer::EC_Consumer (CORBA::ORB_var orb,
 }
 
 void
-EC_Consumer::push (const RtecEventComm::EventSet &events
-                   ACE_ENV_ARG_DECL)
+EC_Consumer::push (const RtecEventComm::EventSet &events)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   for (CORBA::ULong i = 0; i < events.length (); ++i)
@@ -113,7 +111,7 @@ EC_Consumer::disconnect (void)
 
   this->ec_->destroy ();
 
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 ////////////////////////////////////////////////////////////
@@ -138,19 +136,19 @@ parse_args (int /* argc */, char ** /* argv */)
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize ORB and POA, POA Manager, parse args.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) == -1)
         return 1;
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in ());
       if (check_for_nil (poa.in (), "POA") == -1)
         return 1;
 
@@ -158,10 +156,9 @@ main (int argc, char *argv[])
         poa->the_POAManager ();
 
       // Obtain reference to EC.
-      obj = orb->resolve_initial_references ("Event_Service" ACE_ENV_ARG_PARAMETER);
+      obj = orb->resolve_initial_references ("Event_Service");
       RtecEventChannelAdmin::EventChannel_var ec =
-        RtecEventChannelAdmin::EventChannel::_narrow (obj.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
+        RtecEventChannelAdmin::EventChannel::_narrow (obj.in ());
       if (check_for_nil (ec.in (), "EC") == -1)
         return 1;
 
@@ -177,8 +174,7 @@ main (int argc, char *argv[])
       activate (consumer,
                 poa.in (),
                 consumer_impl.in (),
-                consumer_deactivator
-                ACE_ENV_ARG_PARAMETER);
+                consumer_deactivator);
       consumer_deactivator.disallow_deactivation ();
 
       // Obtain reference to ConsumerAdmin.
@@ -195,8 +191,7 @@ main (int argc, char *argv[])
       qos.insert_type (B_EVENT_TYPE, 0);
       qos.insert_type (C_EVENT_TYPE, 0);
       supplier->connect_push_consumer (consumer.in (),
-                                       qos.get_ConsumerQOS ()
-                                       ACE_ENV_ARG_PARAMETER);
+                                       qos.get_ConsumerQOS ());
 
       // Allow processing of CORBA requests.
       manager->activate ();
@@ -204,13 +199,11 @@ main (int argc, char *argv[])
       // Receive events from EC.
       orb->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in Consumer:");
+      ex._tao_print_exception ("Exception in Consumer:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp
index 0d93222b9ea..2945e468ffc 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp
@@ -7,8 +7,7 @@
 #include "ace/Log_Msg.h"
 
 void
-send_events (RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer
-             ACE_ENV_ARG_DECL)
+send_events (RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer)
 {
   // Events we'll send.
   RtecEventComm::EventSet events (1);
@@ -22,13 +21,13 @@ send_events (RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer
     {
       // Send 1 event of each type.
       events[0].header.type = A_EVENT_TYPE;
-      consumer->push (events ACE_ENV_ARG_PARAMETER);
+      consumer->push (events);
 
       events[0].header.type = B_EVENT_TYPE;
-      consumer->push (events ACE_ENV_ARG_PARAMETER);
+      consumer->push (events);
 
       events[0].header.type = C_EVENT_TYPE;
-      consumer->push (events ACE_ENV_ARG_PARAMETER);
+      consumer->push (events);
     }
 }
 
@@ -53,22 +52,20 @@ parse_args (int /*argc*/, char ** /*argv*/)
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize ORB and parse args.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) == -1)
         return 1;
 
       // Obtain reference to EC.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("Event_Service" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("Event_Service");
       RtecEventChannelAdmin::EventChannel_var ec =
-        RtecEventChannelAdmin::EventChannel::_narrow (obj.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
+        RtecEventChannelAdmin::EventChannel::_narrow (obj.in ());
       if (check_for_nil (ec.in (), "EC") == -1)
         return 1;
 
@@ -87,23 +84,20 @@ main (int argc, char *argv[])
 
       consumer->connect_push_supplier
         (RtecEventComm::PushSupplier::_nil (),
-         qos.get_SupplierQOS ()
-         ACE_ENV_ARG_PARAMETER);
+         qos.get_SupplierQOS ());
 
       // Send events to EC.
-      send_events (consumer.in () ACE_ENV_ARG_PARAMETER);
+      send_events (consumer.in ());
 
       // Tell EC to shut down.
       ec->destroy ();
     }
 
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in Supplier:");
+      ex._tao_print_exception ("Exception in Supplier:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp
index 1221a97921a..473802c28d6 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp
@@ -18,8 +18,7 @@ public:
   /// PushConsumer methods.
   //@{
   /// Logs each event.  Initiates shutdown after receiving 100 events.
-  virtual void push (const RtecEventComm::EventSet &events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet &events)
     ACE_THROW_SPEC ((CORBA::SystemException));
   /// No-op.
   virtual void disconnect_push_consumer (void)
@@ -49,8 +48,7 @@ EC_Consumer::EC_Consumer (CORBA::ORB_var orb,
 }
 
 void
-EC_Consumer::push (const RtecEventComm::EventSet &events
-                   ACE_ENV_ARG_DECL)
+EC_Consumer::push (const RtecEventComm::EventSet &events)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   for (CORBA::ULong i = 0; i < events.length (); ++i)
@@ -80,7 +78,7 @@ EC_Consumer::disconnect (void)
 
   this->ec_->destroy ();
 
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 ////////////////////////////////////////////////////////////
@@ -105,19 +103,19 @@ parse_args (int /* argc */, char ** /* argv */)
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize ORB and POA, POA Manager, parse args.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) == -1)
         return 1;
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in ());
       if (check_for_nil (poa.in (), "POA") == -1)
         return 1;
 
@@ -125,10 +123,9 @@ main (int argc, char *argv[])
         poa->the_POAManager ();
 
       // Obtain reference to EC.
-      obj = orb->resolve_initial_references ("Event_Service" ACE_ENV_ARG_PARAMETER);
+      obj = orb->resolve_initial_references ("Event_Service");
       RtecEventChannelAdmin::EventChannel_var ec =
-        RtecEventChannelAdmin::EventChannel::_narrow (obj.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
+        RtecEventChannelAdmin::EventChannel::_narrow (obj.in ());
       if (check_for_nil (ec.in (), "EC") == -1)
         return 1;
 
@@ -144,8 +141,7 @@ main (int argc, char *argv[])
       activate (consumer,
                 poa.in (),
                 consumer_impl.in (),
-                consumer_deactivator
-                ACE_ENV_ARG_PARAMETER);
+                consumer_deactivator);
       consumer_deactivator.disallow_deactivation ();
 
       // Obtain reference to ConsumerAdmin.
@@ -160,8 +156,7 @@ main (int argc, char *argv[])
       qos.start_disjunction_group (1);
       qos.insert_type (ACE_ES_EVENT_ANY, 0);
       supplier->connect_push_consumer (consumer.in (),
-                                       qos.get_ConsumerQOS ()
-                                       ACE_ENV_ARG_PARAMETER);
+                                       qos.get_ConsumerQOS ());
 
       // Allow processing of CORBA requests.
       manager->activate ();
@@ -169,13 +164,11 @@ main (int argc, char *argv[])
       // Receive events from EC.
       orb->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in Consumer:");
+      ex._tao_print_exception ("Exception in Consumer:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp
index 307e6176a95..dddfe6c6d60 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp
@@ -7,8 +7,7 @@
 #include "ace/Log_Msg.h"
 
 void
-send_events (RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer
-             ACE_ENV_ARG_DECL)
+send_events (RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer)
 {
   RtecEventComm::EventSet events (1);
   events.length (1);
@@ -20,7 +19,7 @@ send_events (RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer
 
   for (int i = 0; i < 100; ++i)
     {
-      consumer->push (events ACE_ENV_ARG_PARAMETER);
+      consumer->push (events);
     }
 }
 
@@ -45,21 +44,20 @@ parse_args (int /*argc*/, char ** /*argv*/)
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize ORB and parse args.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) == -1)
         return 1;
 
       // Obtain reference to EC.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("Event_Service" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("Event_Service");
       RtecEventChannelAdmin::EventChannel_var ec =
-        RtecEventChannelAdmin::EventChannel::_narrow (obj.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
+        RtecEventChannelAdmin::EventChannel::_narrow (obj.in ());
       if (check_for_nil (ec.in (), "EC") == -1)
         return 1;
 
@@ -76,23 +74,20 @@ main (int argc, char *argv[])
 
       consumer->connect_push_supplier
         (RtecEventComm::PushSupplier::_nil (),
-         qos.get_SupplierQOS ()
-         ACE_ENV_ARG_PARAMETER);
+         qos.get_SupplierQOS ());
 
       // Send 100 events to EC.
-      send_events (consumer.in () ACE_ENV_ARG_PARAMETER);
+      send_events (consumer.in ());
 
       // Tell EC to shut down.
       ec->destroy ();
     }
 
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in Supplier:");
+      ex._tao_print_exception ("Exception in Supplier:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp
index cb529dba339..4b1da1ae0a0 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp
@@ -56,8 +56,7 @@ public:
   // will not have a chance to execute, it is the responsibility of
   // the user.)
   void init (CORBA::ORB_var orb,
-             RtecEventChannelAdmin::EventChannel_var ec
-             ACE_ENV_ARG_DECL);
+             RtecEventChannelAdmin::EventChannel_var ec);
 
   // No-op if the object hasn't been fully initialized.  Otherwise,
   // deregister from reactor and poa, destroy ec or just disconnect from it
@@ -72,8 +71,7 @@ public:
   /// PushConsumer methods.
   //@{
   /// Update our <heartbeats_> database to reflect newly received heartbeats.
-  virtual void push (const RtecEventComm::EventSet &events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet &events)
     ACE_THROW_SPEC((CORBA::SystemException));
 
   /// Initiate shutdown().
@@ -221,13 +219,12 @@ Heartbeat_Application::check_args (CORBA::ORB_var orb,
 
 void
 Heartbeat_Application::init (CORBA::ORB_var orb,
-                             RtecEventChannelAdmin::EventChannel_var ec
-                             ACE_ENV_ARG_DECL)
+                             RtecEventChannelAdmin::EventChannel_var ec)
 {
   // Verify arguments.
   if (this->check_args (orb, ec) == -1)
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   // Get hostname & process id, i.e., identity of this application.
@@ -243,23 +240,22 @@ Heartbeat_Application::init (CORBA::ORB_var orb,
       ACE_ERROR ((LM_ERROR,
                   "Heartbeat_Application::init - "
                   "cannot get hostname\n"));
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   // Connect to EC as a supplier.
   this->connect_as_supplier ();
 
   // Connect to EC as a consumer.
-  ACE_TRY
+  try
     {
       this->connect_as_consumer ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       this->consumer_proxy_disconnect_.execute ();
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
 
   // Register for reactor timeouts.
   if (this->register_for_timeouts () == -1)
@@ -267,7 +263,7 @@ Heartbeat_Application::init (CORBA::ORB_var orb,
       this->consumer_proxy_disconnect_.execute ();
       this->supplier_proxy_disconnect_.execute ();
       this->deactivator_.deactivate ();
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   this->initialized_ = 1;
@@ -322,8 +318,7 @@ Heartbeat_Application::connect_as_supplier (void)
   qos.insert (SOURCE_ID, HEARTBEAT, 0, 1);
 
   proxy->connect_push_supplier (RtecEventComm::PushSupplier::_nil (),
-                                qos.get_SupplierQOS ()
-                                ACE_ENV_ARG_PARAMETER);
+                                qos.get_SupplierQOS ());
 
   // Update resource managers.
   this->consumer_ = proxy._retn ();
@@ -341,8 +336,7 @@ Heartbeat_Application::connect_as_consumer (void)
   activate (consumer_ref,
             poa.in (),
             this,
-            deactivator
-            ACE_ENV_ARG_PARAMETER);
+            deactivator);
 
   // Obtain reference to ConsumerAdmin.
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
@@ -358,8 +352,7 @@ Heartbeat_Application::connect_as_consumer (void)
   qos.start_disjunction_group (1);
   qos.insert_type (ACE_ES_EVENT_ANY, 0);
   proxy->connect_push_consumer (consumer_ref.in (),
-                                qos.get_ConsumerQOS ()
-                                ACE_ENV_ARG_PARAMETER);
+                                qos.get_ConsumerQOS ());
 
   // Update resource managers.
   this->supplier_proxy_disconnect_.set_command (new_proxy_disconnect);
@@ -370,7 +363,7 @@ int
 Heartbeat_Application::handle_timeout (const ACE_Time_Value&,
                                        const void*)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       if (this->n_timeouts_++ < HEARTBEATS_TO_SEND)
         {
@@ -389,7 +382,7 @@ Heartbeat_Application::handle_timeout (const ACE_Time_Value&,
                                           (u_char *)this->hostname_and_pid_,
                                           0);
 
-          this->consumer_->push (events ACE_ENV_ARG_PARAMETER);
+          this->consumer_->push (events);
         }
       else
         // We already sent the required number of heartbeats.  Time to
@@ -398,19 +391,16 @@ Heartbeat_Application::handle_timeout (const ACE_Time_Value&,
           this->shutdown ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Suppressed the following exception in "
-                           "Heartbeat_Application::handle_timeout:\n");
+      ex._tao_print_exception (
+        "Suppressed the following exception in ""Heartbeat_Application::handle_timeout:\n");
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 void
-Heartbeat_Application::push (const RtecEventComm::EventSet &events
-                             ACE_ENV_ARG_DECL_NOT_USED)
+Heartbeat_Application::push (const RtecEventComm::EventSet &events)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   for (CORBA::ULong i = 0; i < events.length (); ++i)
@@ -467,17 +457,15 @@ Heartbeat_Application::destroy_ec (void)
 {
   if (!CORBA::is_nil (this->ec_.in ()))
     {
-      ACE_TRY_NEW_ENV
+      try
         {
           this->ec_->destroy ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Suppressed the following exception in "
-                               "Application_Heartbeat::destroy_ec\n");
+          ex._tao_print_exception (
+            "Suppressed the following exception in ""Application_Heartbeat::destroy_ec\n");
         }
-      ACE_ENDTRY;
 
       this->ec_ = RtecEventChannelAdmin::EventChannel::_nil ();
     }
@@ -529,17 +517,15 @@ Heartbeat_Application::shutdown (void)
     }
 
   // Shutdown the ORB.
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+      this->orb_->shutdown (0);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "The following exception occured in "
-                           "Heartbeat_Application::shutdown:\n");
+      ex._tao_print_exception (
+        "The following exception occured in ""Heartbeat_Application::shutdown:\n");
     }
-  ACE_ENDTRY;
 }
 
 ////////////////////////////////////////////////////////////
@@ -589,19 +575,19 @@ main (int argc, char *argv[])
   // We may want this to be alive beyond the next block.
   TAO_EC_Servant_Var<Heartbeat_Application> app;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize ORB and POA, POA Manager, parse args.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) == -1)
         return 1;
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in ());
       if (check_for_nil (poa.in (), "POA") == -1)
         return 1;
 
@@ -609,10 +595,9 @@ main (int argc, char *argv[])
         poa->the_POAManager ();
 
       // Obtain reference to EC.
-      obj = orb->resolve_initial_references ("Event_Service" ACE_ENV_ARG_PARAMETER);
+      obj = orb->resolve_initial_references ("Event_Service");
       RtecEventChannelAdmin::EventChannel_var ec =
-        RtecEventChannelAdmin::EventChannel::_narrow (obj.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
+        RtecEventChannelAdmin::EventChannel::_narrow (obj.in ());
       if (check_for_nil (ec.in (), "EC") == -1)
         return 1;
 
@@ -621,7 +606,7 @@ main (int argc, char *argv[])
       if (!app.in ())
         return 1;
 
-      app->init (orb, ec ACE_ENV_ARG_PARAMETER);
+      app->init (orb, ec);
 
       // Allow processing of CORBA requests.
       manager->activate ();
@@ -629,16 +614,14 @@ main (int argc, char *argv[])
       // Receive events from EC.
       orb->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in Heartbeat Application:");
+      ex._tao_print_exception ("Exception in Heartbeat Application:");
       // Since there was an exception, application might not have had
       // a chance to shutdown.
       app->shutdown ();
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
index 8fdeeeb0f6e..9d49de34f95 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
@@ -111,13 +111,11 @@ EC_Connect::dump_results (void)
 void
 EC_Connect::connect_consumer (
     RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-    int i
-    ACE_ENV_ARG_DECL)
+    int i)
 {
   ACE_hrtime_t start = ACE_OS::gethrtime ();
   this->EC_Driver::connect_consumer (consumer_admin,
-                                     i
-                                     ACE_ENV_ARG_PARAMETER);
+                                     i);
   ACE_hrtime_t now = ACE_OS::gethrtime ();
   this->consumer_connect_.sample (now - this->start_time_,
                                   now - start);
@@ -126,13 +124,11 @@ EC_Connect::connect_consumer (
 void
 EC_Connect::connect_supplier (
     RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
-    int i
-    ACE_ENV_ARG_DECL)
+    int i)
 {
   ACE_hrtime_t start = ACE_OS::gethrtime ();
   this->EC_Driver::connect_supplier (supplier_admin,
-                                     i
-                                     ACE_ENV_ARG_PARAMETER);
+                                     i);
   ACE_hrtime_t now = ACE_OS::gethrtime ();
   this->supplier_connect_.sample (now - this->start_time_,
                                   now - start);
@@ -185,11 +181,11 @@ EC_Connect::connect_clients (void)
     {
       if (i < this->n_consumers_)
         {
-          this->connect_consumer (consumer_admin.in (), i ACE_ENV_ARG_PARAMETER);
+          this->connect_consumer (consumer_admin.in (), i);
         }
       if (i < this->n_suppliers_)
         {
-          this->connect_supplier (supplier_admin.in (), i ACE_ENV_ARG_PARAMETER);
+          this->connect_supplier (supplier_admin.in (), i);
         }
     }
 
@@ -308,25 +304,21 @@ void
 ECC_Consumer::connect (
     RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
     const RtecEventChannelAdmin::ConsumerQOS& qos,
-    int shutdown_event_type
-    ACE_ENV_ARG_DECL)
+    int shutdown_event_type)
 {
   this->EC_Consumer::connect (consumer_admin,
                               qos,
-                              shutdown_event_type
-                              ACE_ENV_ARG_PARAMETER);
+                              shutdown_event_type);
 }
 
 void
 ECC_Consumer::connect (
     const RtecEventChannelAdmin::ConsumerQOS& qos,
-    int shutdown_event_type
-    ACE_ENV_ARG_DECL)
+    int shutdown_event_type)
 {
   ACE_hrtime_t start = ACE_OS::gethrtime ();
   this->EC_Consumer::connect (qos,
-                              shutdown_event_type
-                              ACE_ENV_ARG_PARAMETER);
+                              shutdown_event_type);
   ACE_hrtime_t now = ACE_OS::gethrtime ();
   this->connect_time_.sample (now, now - start);
 }
@@ -350,25 +342,21 @@ void
 ECC_Supplier::connect (
     RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
     const RtecEventChannelAdmin::SupplierQOS& qos,
-    int shutdown_event_type
-    ACE_ENV_ARG_DECL)
+    int shutdown_event_type)
 {
   this->EC_Supplier::connect (supplier_admin,
                               qos,
-                              shutdown_event_type
-                              ACE_ENV_ARG_PARAMETER);
+                              shutdown_event_type);
 }
 
 void
 ECC_Supplier::connect (
     const RtecEventChannelAdmin::SupplierQOS& qos,
-    int shutdown_event_type
-    ACE_ENV_ARG_DECL)
+    int shutdown_event_type)
 {
   ACE_hrtime_t start = ACE_OS::gethrtime ();
   this->EC_Supplier::connect (qos,
-                              shutdown_event_type
-                              ACE_ENV_ARG_PARAMETER);
+                              shutdown_event_type);
   ACE_hrtime_t now = ACE_OS::gethrtime ();
   this->connect_time_.sample (now, now - start);
 }
diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.h b/TAO/orbsvcs/tests/Event/Performance/Connect.h
index 91e22f1d8d7..03e7896e3da 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Connect.h
+++ b/TAO/orbsvcs/tests/Event/Performance/Connect.h
@@ -58,12 +58,10 @@ public:
 
   virtual void connect_consumer (
     RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-    int i
-    ACE_ENV_ARG_DECL);
+    int i);
   virtual void connect_supplier (
     RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
-    int i
-    ACE_ENV_ARG_DECL);
+    int i);
   virtual void disconnect_consumers (void);
   virtual void disconnect_suppliers (void);
 
@@ -94,12 +92,10 @@ public:
   virtual void connect (
       RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
       const RtecEventChannelAdmin::ConsumerQOS& qos,
-      int shutdown_event_type
-      ACE_ENV_ARG_DECL);
+      int shutdown_event_type);
   virtual void connect (
       const RtecEventChannelAdmin::ConsumerQOS& qos,
-      int shutdown_event_type
-      ACE_ENV_ARG_DECL);
+      int shutdown_event_type);
   virtual void dump_results (const char* name,
                              ACE_UINT32 global_scale_factor);
 
@@ -117,12 +113,10 @@ public:
   virtual void connect (
         RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
         const RtecEventChannelAdmin::SupplierQOS& qos,
-        int shutdown_event_type
-        ACE_ENV_ARG_DECL);
+        int shutdown_event_type);
   virtual void connect (
       const RtecEventChannelAdmin::SupplierQOS& qos,
-      int shutdown_event_type
-      ACE_ENV_ARG_DECL);
+      int shutdown_event_type);
   virtual void dump_results (const char* name,
                              ACE_UINT32 global_scale_factor);
 
diff --git a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
index f2bc579fd69..a8a4c1c9eee 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
@@ -68,8 +68,7 @@ EC_Inversion::connect_consumers (void)
 
   this->consumers_[0]->connect (consumer_admin.in (),
                                 qos0.get_ConsumerQOS (),
-                                ACE_ES_EVENT_UNDEFINED + 1
-                                ACE_ENV_ARG_PARAMETER);
+                                ACE_ES_EVENT_UNDEFINED + 1);
 
   for (int i = 1; i < this->n_consumers_; ++i)
     {
@@ -84,8 +83,7 @@ EC_Inversion::connect_consumers (void)
 
       this->consumers_[i]->connect (consumer_admin.in (),
                                     qos1.get_ConsumerQOS (),
-                                    base_event + 1
-                                    ACE_ENV_ARG_PARAMETER);
+                                    base_event + 1);
     }
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG, "EC_Inversion (%P|%t) connected consumer(s)\n"));
@@ -103,8 +101,7 @@ EC_Inversion::connect_suppliers (void)
 
   this->suppliers_[0]->connect (supplier_admin.in (),
                                 qos0.get_SupplierQOS (),
-                                ACE_ES_EVENT_UNDEFINED + 1
-                                ACE_ENV_ARG_PARAMETER);
+                                ACE_ES_EVENT_UNDEFINED + 1);
 
   for (int j = 1; j != this->n_suppliers_; ++j)
     {
@@ -118,8 +115,7 @@ EC_Inversion::connect_suppliers (void)
 
       this->suppliers_[j]->connect (supplier_admin.in (),
                                     qos1.get_SupplierQOS (),
-                                    base_event + 1
-                                    ACE_ENV_ARG_PARAMETER);
+                                    base_event + 1);
     }
 
   if (this->verbose ())
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
index 9ac0e220da9..39d220bae76 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
@@ -47,19 +47,17 @@ main (int argc, char *argv [])
                     "server (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
       CORBA::Object_var manager_object =
-        orb->resolve_initial_references ("ORBPolicyManager"
-                                         ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("ORBPolicyManager");
 
       CORBA::PolicyManager_var policy_manager =
-        CORBA::PolicyManager::_narrow (manager_object.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+        CORBA::PolicyManager::_narrow (manager_object.in ());
 
       CORBA::Any sync_scope;
       sync_scope <<= Messaging::SYNC_WITH_TARGET;
@@ -68,11 +66,9 @@ main (int argc, char *argv [])
       policy_list.length (1);
       policy_list[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                            sync_scope
-                            ACE_ENV_ARG_PARAMETER);
+                            sync_scope);
       policy_manager->set_policy_overrides (policy_list,
-                                            CORBA::SET_OVERRIDE
-                                            ACE_ENV_ARG_PARAMETER);
+                                            CORBA::SET_OVERRIDE);
 #else
       ACE_DEBUG ((LM_DEBUG,
                   "CORBA Messaging disabled in this configuration,"
@@ -80,7 +76,7 @@ main (int argc, char *argv [])
 #endif /* TAO_HAS_MESSAGING */
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -88,7 +84,7 @@ main (int argc, char *argv [])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -100,11 +96,10 @@ main (int argc, char *argv [])
 
       // Get the event channel object reference
       CORBA::Object_var object =
-        orb->string_to_object (ec_ior ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object (ec_ior);
 
       RtecEventChannelAdmin::EventChannel_var ec =
-        RtecEventChannelAdmin::EventChannel::_narrow (object.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
+        RtecEventChannelAdmin::EventChannel::_narrow (object.in ());
       if (CORBA::is_nil (ec.in ()))
         {
           ACE_ERROR ((LM_ERROR,
@@ -148,8 +143,7 @@ main (int argc, char *argv [])
       h1.source = ACE_ES_EVENT_SOURCE_ANY;
 
       proxy_supplier->connect_push_consumer (consumer_reference.in (),
-                                             consumer_qos
-                                             ACE_ENV_ARG_PARAMETER);
+                                             consumer_qos);
 
       ACE_DEBUG ((LM_DEBUG, "Connected consumer\n"));
 
@@ -176,8 +170,7 @@ main (int argc, char *argv [])
       sh0.source = 1;                      // first free event source
 
       proxy_consumer->connect_push_supplier (supplier_reference.in (),
-                                             supplier_qos
-                                             ACE_ENV_ARG_PARAMETER);
+                                             supplier_qos);
 
       ACE_DEBUG ((LM_DEBUG, "Connected supplier\n"));
 
@@ -189,7 +182,7 @@ main (int argc, char *argv [])
       while (!task.done () || !consumer.done ())
         {
           ACE_Time_Value tv (1, 0);
-          orb->run (tv ACE_ENV_ARG_PARAMETER);
+          orb->run (tv);
         }
       ACE_hrtime_t end = ACE_OS::gethrtime ();
 
@@ -225,19 +218,18 @@ main (int argc, char *argv [])
 
       PortableServer::ObjectId_var id;
 
-      id = root_poa->servant_to_id (&consumer ACE_ENV_ARG_PARAMETER);
-      root_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
+      id = root_poa->servant_to_id (&consumer);
+      root_poa->deactivate_object (id.in ());
 
-      id = root_poa->servant_to_id (&supplier ACE_ENV_ARG_PARAMETER);
-      root_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
+      id = root_poa->servant_to_id (&supplier);
+      root_poa->deactivate_object (id.in ());
 
       orb->destroy ();
     }
-  ACE_CATCH (CORBA::Exception, ex)
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ex, argv[0]);
+      ex._tao_print_exception (argv[0]);
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -297,8 +289,7 @@ EC_Latency_Consumer::done (void)
 }
 
 void
-EC_Latency_Consumer::push (const RtecEventComm::EventSet& events
-                           ACE_ENV_ARG_DECL_NOT_USED)
+EC_Latency_Consumer::push (const RtecEventComm::EventSet& events)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t creation;
@@ -354,7 +345,7 @@ Task::done (void)
 int
 Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       RtecEventComm::EventSet event (1);
       event.length (1);
@@ -368,7 +359,7 @@ Task::svc (void)
           ACE_hrtime_t creation = ACE_OS::gethrtime ();
           ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time,
                                          creation);
-          this->consumer_->push (event ACE_ENV_ARG_PARAMETER);
+          this->consumer_->push (event);
 
           // ACE_Time_Value tv (0, 5000);
           // ACE_OS::sleep (tv);
@@ -385,10 +376,9 @@ Task::svc (void)
             return 0;
         }
     }
-  ACE_CATCH (CORBA::SystemException, ex)
+  catch (const CORBA::SystemException& ex)
     {
-      ACE_PRINT_EXCEPTION (ex, "Task::svc");
+      ex._tao_print_exception ("Task::svc");
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.h b/TAO/orbsvcs/tests/Event/Performance/Latency.h
index 2008d7f09fb..b88d5855ba1 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency.h
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency.h
@@ -41,8 +41,7 @@ public:
   /// Return 1 when all the messages have been received
   int done (void);
 
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL_NOT_USED)
+  virtual void push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
index 30f9eae7f9b..668480f86b2 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
@@ -46,19 +46,17 @@ main (int argc, char *argv [])
                     "server (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
       CORBA::Object_var manager_object =
-        orb->resolve_initial_references ("ORBPolicyManager"
-                                         ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("ORBPolicyManager");
 
       CORBA::PolicyManager_var policy_manager =
-        CORBA::PolicyManager::_narrow (manager_object.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+        CORBA::PolicyManager::_narrow (manager_object.in ());
 
       CORBA::Any sync_scope;
       sync_scope <<= Messaging::SYNC_WITH_TARGET;
@@ -67,11 +65,9 @@ main (int argc, char *argv [])
       policy_list.length (1);
       policy_list[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                            sync_scope
-                            ACE_ENV_ARG_PARAMETER);
+                            sync_scope);
       policy_manager->set_policy_overrides (policy_list,
-                                            CORBA::SET_OVERRIDE
-                                            ACE_ENV_ARG_PARAMETER);
+                                            CORBA::SET_OVERRIDE);
 #else
       ACE_DEBUG ((LM_DEBUG,
                   "CORBA Messaging disabled in this configuration,"
@@ -79,7 +75,7 @@ main (int argc, char *argv [])
 #endif /* TAO_HAS_MESSAGING */
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -87,7 +83,7 @@ main (int argc, char *argv [])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -106,7 +102,7 @@ main (int argc, char *argv [])
         ec_impl._this ();
 
       CORBA::String_var str =
-        orb->object_to_string (ec.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (ec.in ());
 
       if (ior_file_name != 0)
         {
@@ -123,16 +119,15 @@ main (int argc, char *argv [])
       orb->run ();
 
       PortableServer::ObjectId_var id =
-        root_poa->servant_to_id (&ec_impl ACE_ENV_ARG_PARAMETER);
-      root_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
+        root_poa->servant_to_id (&ec_impl);
+      root_poa->deactivate_object (id.in ());
 
       orb->destroy ();
     }
-  ACE_CATCH (CORBA::Exception, ex)
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ex, argv[0]);
+      ex._tao_print_exception (argv[0]);
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp b/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp
index 05fd4d9c983..c7ba18ae47b 100644
--- a/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp
@@ -11,8 +11,7 @@ AddrServer::AddrServer (const RtecUDPAdmin::UDP_Addr& addr)
 
 void
 AddrServer::get_addr (const RtecEventComm::EventHeader&,
-                      RtecUDPAdmin::UDP_Addr_out addr
-                      ACE_ENV_ARG_DECL_NOT_USED)
+                      RtecUDPAdmin::UDP_Addr_out addr)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   addr = this->addr_;
diff --git a/TAO/orbsvcs/tests/Event/UDP/AddrServer.h b/TAO/orbsvcs/tests/Event/UDP/AddrServer.h
index 8439914f22b..deeced433db 100644
--- a/TAO/orbsvcs/tests/Event/UDP/AddrServer.h
+++ b/TAO/orbsvcs/tests/Event/UDP/AddrServer.h
@@ -40,8 +40,7 @@ public:
 
   // = The RtecUDPAdmin::AddrServer methods
   virtual void get_addr (const RtecEventComm::EventHeader& header,
-                         RtecUDPAdmin::UDP_Addr_out addr
-                         ACE_ENV_ARG_DECL_NOT_USED)
+                         RtecUDPAdmin::UDP_Addr_out addr)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp b/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp
index 8e06bcecd75..21347a34e9f 100644
--- a/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp
@@ -23,8 +23,7 @@ Consumer::event_count (void) const
 }
 
 void
-Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                   ACE_ENV_ARG_DECL)
+Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin)
 {
   this->proxy_ =
     consumer_admin->obtain_push_supplier ();
@@ -48,23 +47,21 @@ Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
   h1.type   = ACE_ES_EVENT_UNDEFINED;  // first free event type
   h1.source = ACE_ES_EVENT_SOURCE_ANY; // Any source is OK
 
-  this->proxy_->connect_push_consumer (me.in (), qos
-                                       ACE_ENV_ARG_PARAMETER);
+  this->proxy_->connect_push_consumer (me.in (), qos);
 }
 
 void
 Consumer::disconnect (void)
 {
-  ACE_TRY
+  try
     {
       // Disconnect from the proxy
       this->proxy_->disconnect_push_supplier ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Ignore exceptions
     }
-  ACE_ENDTRY;
   this->proxy_ = RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
 
   // Deactivate this object
@@ -72,14 +69,13 @@ Consumer::disconnect (void)
     this->_default_POA ();
   // Get the Object Id used for the servant..
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
+    poa->servant_to_id (this);
   // Deactivate the object
-  poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
+  poa->deactivate_object (oid.in ());
 }
 
 void
-Consumer::push (const RtecEventComm::EventSet& events
-                ACE_ENV_ARG_DECL_NOT_USED)
+Consumer::push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
diff --git a/TAO/orbsvcs/tests/Event/UDP/Consumer.h b/TAO/orbsvcs/tests/Event/UDP/Consumer.h
index 5a8fa58df14..0442a5ff6e2 100644
--- a/TAO/orbsvcs/tests/Event/UDP/Consumer.h
+++ b/TAO/orbsvcs/tests/Event/UDP/Consumer.h
@@ -37,8 +37,7 @@ public:
   Consumer (bool valuetype);
   // Constructor
 
-  void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                ACE_ENV_ARG_DECL);
+  void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin);
   // Connect to the Event Channel
 
   void disconnect (void);
@@ -46,8 +45,7 @@ public:
 
   // = The RtecEventComm::PushConsumer methods
 
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
diff --git a/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp b/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp
index 8317c9e6c63..e13fc1e2903 100644
--- a/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp
@@ -13,8 +13,7 @@ Supplier::Supplier (bool valuetype) : valuetype_ (valuetype), event_count_ (0)
 }
 
 void
-Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin
-                   ACE_ENV_ARG_DECL)
+Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin)
 {
   this->proxy_ =
     supplier_admin->obtain_push_consumer ();
@@ -33,28 +32,26 @@ Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin
   h0.type   = ACE_ES_EVENT_UNDEFINED; // first free event type
   h0.source = 1;                      // first free event source
 
-  this->proxy_->connect_push_supplier (me.in (), qos
-                                       ACE_ENV_ARG_PARAMETER);
+  this->proxy_->connect_push_supplier (me.in (), qos);
 }
 
 void
 Supplier::disconnect (void)
 {
   // Disconnect from the EC
-  ACE_TRY
+  try
     {
       this->proxy_->disconnect_push_consumer ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
     }
-  ACE_ENDTRY;
 
   PortableServer::POA_var poa =
     this->_default_POA ();
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
+    poa->servant_to_id (this);
+  poa->deactivate_object (id.in ());
 }
 
 void
@@ -66,7 +63,7 @@ Supplier::insert_into_any (CORBA::Any& any, Components::EventBase* vb)
 void
 Supplier::perform_push (void)
 {
-  ACE_TRY
+  try
     {
       // The event type and source must match our publications
       ++event_count_;
@@ -90,12 +87,11 @@ Supplier::perform_push (void)
           event[0].data.any_value <<= CORBA::string_dup( "ACE/TAO/CIAO");
         }
 
-      this->proxy_->push (event ACE_ENV_ARG_PARAMETER);
+      this->proxy_->push (event);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
     }
-  ACE_ENDTRY;
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Event/UDP/Supplier.h b/TAO/orbsvcs/tests/Event/UDP/Supplier.h
index 99f71afca5f..f8de21817f6 100644
--- a/TAO/orbsvcs/tests/Event/UDP/Supplier.h
+++ b/TAO/orbsvcs/tests/Event/UDP/Supplier.h
@@ -39,8 +39,7 @@ public:
   Supplier (bool valuetype);
   // Constructor
 
-  void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin
-                ACE_ENV_ARG_DECL);
+  void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin);
   // Connect to the event channel
 
   void disconnect (void);
diff --git a/TAO/orbsvcs/tests/Event/UDP/receiver.cpp b/TAO/orbsvcs/tests/Event/UDP/receiver.cpp
index 383bde44a26..b00d2680fce 100644
--- a/TAO/orbsvcs/tests/Event/UDP/receiver.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/receiver.cpp
@@ -38,18 +38,17 @@ main (int argc, char* argv[])
   // and defined in $ACE_ROOT/ace/CORBA_macros.h.
   // If your platform supports native exceptions, and TAO was compiled
   // with native exception support then you can simply use try/catch
-  // and avoid the ACE_ENV_SINGLE_ARG_PARAMETER argument.
+  // and avoid the argument.
   // Unfortunately many embedded systems cannot use exceptions due to
   // the space and time overhead.
   //
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // **************** HERE STARTS THE ORB SETUP
 
       // Create the ORB, pass the argv list for parsing.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       // Parse the arguments, you usually want to do this after
       // invoking ORB_init() because ORB_init() will remove all the
@@ -69,8 +68,7 @@ main (int argc, char* argv[])
                           1); // supplied by mapping
 
           orb->register_value_factory (vb_factory->tao_repository_id (),
-                                       vb_factory
-                                       ACE_ENV_ARG_PARAMETER);
+                                       vb_factory);
           vb_factory->_remove_ref (); // release ownership
         }
 
@@ -79,9 +77,9 @@ main (int argc, char* argv[])
       // The POA starts in the holding state, if it is not activated
       // it will not process any requests.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
         poa->the_POAManager ();
       poa_manager->activate ();
@@ -178,16 +176,14 @@ main (int argc, char* argv[])
       // required by all the local consumer.
       // Then it register for the multicast groups that carry those
       // events:
-      mcast_eh.open (event_channel.in ()
-                             ACE_ENV_ARG_PARAMETER);
+      mcast_eh.open (event_channel.in ());
 
       // Again the receiver connects to the event channel as a
       // supplier of events, using the Observer features to detect
       // local consumers and their interests:
       receiver->init (event_channel.in (),
                       endpoint,
-                      address_server.in ()
-                      ACE_ENV_ARG_PARAMETER);
+                      address_server.in ());
 
       // The Receiver is also a supplier of events.  The exact type of
       // events is only known to the application, because it depends
@@ -206,7 +202,7 @@ main (int argc, char* argv[])
       pub.publications[0].event.header.source = ACE_ES_EVENT_SOURCE_ANY;
       pub.is_gateway = 1;
 
-      receiver->connect (pub ACE_ENV_ARG_PARAMETER);
+      receiver->connect (pub);
 
       // **************** THAT COMPLETES THE FEDERATION SETUP
 
@@ -217,8 +213,7 @@ main (int argc, char* argv[])
       Consumer consumer (valuetype);
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
         event_channel->for_consumers ();
-      consumer.connect (consumer_admin.in ()
-                        ACE_ENV_ARG_PARAMETER);
+      consumer.connect (consumer_admin.in ());
 
       // **************** THAT COMPLETES THE CLIENT SETUP
 
@@ -238,7 +233,7 @@ main (int argc, char* argv[])
               // perform_work() or work_pending(), so just calling
               // them results in a spin loop.
               ACE_Time_Value tv (0, 50000);
-              orb->perform_work (tv ACE_ENV_ARG_PARAMETER);
+              orb->perform_work (tv);
             }
           ACE_Time_Value tv (0, 100000);
           ACE_OS::sleep (tv);
@@ -282,14 +277,14 @@ main (int argc, char* argv[])
           ec_impl._default_POA ();
         // Get the Object Id used for the servant..
         PortableServer::ObjectId_var oid =
-          poa->servant_to_id (&ec_impl ACE_ENV_ARG_PARAMETER);
+          poa->servant_to_id (&ec_impl);
         // Deactivate the object
-        poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
+        poa->deactivate_object (oid.in ());
       }
 
       // Now we can destroy the POA, the flags mean that we want to
       // wait until the POA is really destroyed
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1);
 
       // Finally destroy the ORB
       orb->destroy ();
@@ -299,12 +294,11 @@ main (int argc, char* argv[])
       ACE_DEBUG ((LM_DEBUG,
                   "UDP receiver ready\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/tests/Event/UDP/sender.cpp b/TAO/orbsvcs/tests/Event/UDP/sender.cpp
index 2de064826ac..d8b7ee230a2 100644
--- a/TAO/orbsvcs/tests/Event/UDP/sender.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/sender.cpp
@@ -37,18 +37,17 @@ main (int argc, char* argv[])
   // and defined in $ACE_ROOT/ace/CORBA_macros.h.
   // If your platform supports native exceptions, and TAO was compiled
   // with native exception support then you can simply use try/catch
-  // and avoid the ACE_ENV_SINGLE_ARG_PARAMETER argument.
+  // and avoid the argument.
   // Unfortunately many embedded systems cannot use exceptions due to
   // the space and time overhead.
   //
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // **************** HERE STARTS THE ORB SETUP
 
       // Create the ORB, pass the argv list for parsing.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       // Parse the arguments, you usually want to do this after
       // invoking ORB_init() because ORB_init() will remove all the
@@ -65,9 +64,9 @@ main (int argc, char* argv[])
       // The POA starts in the holding state, if it is not activated
       // it will not process any requests.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
         poa->the_POAManager ();
       poa_manager->activate ();
@@ -149,8 +148,7 @@ main (int argc, char* argv[])
       TAO_EC_Servant_Var<TAO_ECG_UDP_Sender> sender = TAO_ECG_UDP_Sender::create();
       sender->init (event_channel.in (),
                     address_server.in (),
-                    endpoint
-                    ACE_ENV_ARG_PARAMETER);
+                    endpoint);
 
       // Now we connect the sender as a consumer of events, it will
       // receive any event from any source and send it to the "right"
@@ -164,7 +162,7 @@ main (int argc, char* argv[])
       sub.dependencies[0].event.header.source =
         ACE_ES_EVENT_SOURCE_ANY; // Any source is OK
 
-      sender->connect (sub ACE_ENV_ARG_PARAMETER);
+      sender->connect (sub);
 
       // **************** THAT COMPLETES THE FEDERATION SETUP
 
@@ -174,8 +172,7 @@ main (int argc, char* argv[])
       Supplier supplier (valuetype);
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
         event_channel->for_suppliers ();
-      supplier.connect (supplier_admin.in ()
-                        ACE_ENV_ARG_PARAMETER);
+      supplier.connect (supplier_admin.in ());
 
       // **************** THAT COMPLETES THE CLIENT SETUP
 
@@ -195,7 +192,7 @@ main (int argc, char* argv[])
               // perform_work() or work_pending(), so just calling
               // them results in a spin loop.
               ACE_Time_Value tv (0, 50000);
-              orb->perform_work (tv ACE_ENV_ARG_PARAMETER);
+              orb->perform_work (tv);
             }
           ACE_Time_Value tv (0, 100000);
           ACE_OS::sleep (tv);
@@ -229,14 +226,14 @@ main (int argc, char* argv[])
           ec_impl._default_POA ();
         // Get the Object Id used for the servant..
         PortableServer::ObjectId_var oid =
-          poa->servant_to_id (&ec_impl ACE_ENV_ARG_PARAMETER);
+          poa->servant_to_id (&ec_impl);
         // Deactivate the object
-        poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
+        poa->deactivate_object (oid.in ());
       }
 
       // Now we can destroy the POA, the flags mean that we want to
       // wait until the POA is really destroyed
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1);
 
       // Finally destroy the ORB
       orb->destroy ();
@@ -246,12 +243,11 @@ main (int argc, char* argv[])
       ACE_DEBUG ((LM_DEBUG,
                   "UDP sender ready\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
index 7306d2685ac..f94031f8750 100644
--- a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
@@ -24,20 +24,18 @@ void
 EC_Consumer::connect (
     RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
     const RtecEventChannelAdmin::ConsumerQOS& qos,
-    int shutdown_event_type
-    ACE_ENV_ARG_DECL)
+    int shutdown_event_type)
 {
   this->supplier_proxy_ =
     consumer_admin->obtain_push_supplier ();
 
-  this->connect (qos, shutdown_event_type ACE_ENV_ARG_PARAMETER);
+  this->connect (qos, shutdown_event_type);
 }
 
 void
 EC_Consumer::connect (
     const RtecEventChannelAdmin::ConsumerQOS& qos,
-    int shutdown_event_type
-    ACE_ENV_ARG_DECL)
+    int shutdown_event_type)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     return; // @@ Throw?
@@ -51,8 +49,7 @@ EC_Consumer::connect (
   this->is_active_ = 1;
 
   this->supplier_proxy_->connect_push_consumer (this->myself_.in (),
-                                                qos
-                                                ACE_ENV_ARG_PARAMETER);
+                                                qos);
 }
 
 int
@@ -83,8 +80,8 @@ EC_Consumer::shutdown (void)
   PortableServer::POA_var poa =
     this->_default_POA ();
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
+    poa->servant_to_id (this);
+  poa->deactivate_object (id.in ());
   this->myself_ = RtecEventComm::PushConsumer::_nil ();
   this->is_active_ = 0;
 }
@@ -103,11 +100,10 @@ EC_Consumer::accumulate (ACE_Throughput_Stats& throughput) const
 }
 
 void
-EC_Consumer::push (const RtecEventComm::EventSet& events
-                   ACE_ENV_ARG_DECL)
+EC_Consumer::push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->driver_->consumer_push (this->cookie_, events ACE_ENV_ARG_PARAMETER);
+  this->driver_->consumer_push (this->cookie_, events);
 
   if (events.length () == 0)
     {
@@ -143,7 +139,7 @@ EC_Consumer::push (const RtecEventComm::EventSet& events
                                 now - creation);
 
       if (e.header.type == this->shutdown_event_type_)
-        this->driver_->consumer_shutdown (this->cookie_ ACE_ENV_ARG_PARAMETER);
+        this->driver_->consumer_shutdown (this->cookie_);
     }
 }
 
@@ -151,7 +147,7 @@ void
 EC_Consumer::disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->driver_->consumer_disconnect (this->cookie_ ACE_ENV_ARG_PARAMETER);
+  this->driver_->consumer_disconnect (this->cookie_);
   this->supplier_proxy_ =
     RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
 }
diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.h b/TAO/orbsvcs/tests/Event/lib/Consumer.h
index cbab389f954..e7e0eb758de 100644
--- a/TAO/orbsvcs/tests/Event/lib/Consumer.h
+++ b/TAO/orbsvcs/tests/Event/lib/Consumer.h
@@ -46,8 +46,7 @@ public:
   virtual void connect (
       RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
       const RtecEventChannelAdmin::ConsumerQOS& qos,
-      int shutdown_event_type
-      ACE_ENV_ARG_DECL);
+      int shutdown_event_type);
 
   /**
    * The driver program can build the QoS attributes and we use
@@ -56,8 +55,7 @@ public:
    */
   virtual void connect (
       const RtecEventChannelAdmin::ConsumerQOS& qos,
-      int shutdown_event_type
-      ACE_ENV_ARG_DECL);
+      int shutdown_event_type);
 
   /// returns 0 if it is not connected
   virtual int connected (void) const;
@@ -79,8 +77,7 @@ public:
   // = The RtecEventComm::PushConsumer methods
 
   /// The skeleton methods.
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
index cfa0c1c3b30..e3fa9afacbb 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
@@ -13,8 +13,7 @@ EC_Counting_Consumer::EC_Counting_Consumer (const char* name)
 
 void
 EC_Counting_Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-                   const RtecEventChannelAdmin::ConsumerQOS &qos
-                   ACE_ENV_ARG_DECL)
+                   const RtecEventChannelAdmin::ConsumerQOS &qos)
 {
   // The canonical protocol to connect to the EC
 
@@ -28,8 +27,7 @@ EC_Counting_Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer
     }
 
   this->supplier_proxy_->connect_push_consumer (consumer.in (),
-                                                qos
-                                                ACE_ENV_ARG_PARAMETER);
+                                                qos);
 }
 
 void
@@ -50,8 +48,8 @@ EC_Counting_Consumer::deactivate (void)
   PortableServer::POA_var consumer_poa =
     this->_default_POA ();
   PortableServer::ObjectId_var consumer_id =
-    consumer_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  consumer_poa->deactivate_object (consumer_id.in () ACE_ENV_ARG_PARAMETER);
+    consumer_poa->servant_to_id (this);
+  consumer_poa->deactivate_object (consumer_id.in ());
 
 }
 
@@ -76,8 +74,7 @@ EC_Counting_Consumer::dump_results (int expected_count, int tolerance)
 }
 
 void
-EC_Counting_Consumer::push (const RtecEventComm::EventSet& events
-                ACE_ENV_ARG_DECL_NOT_USED)
+EC_Counting_Consumer::push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h
index f61be75b8c5..5c63615d8f5 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h
@@ -37,8 +37,7 @@ public:
 
   /// Simple connect/disconnect methods..
   void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-                const RtecEventChannelAdmin::ConsumerQOS &qos
-                ACE_ENV_ARG_DECL);
+                const RtecEventChannelAdmin::ConsumerQOS &qos);
   void disconnect (void);
   void deactivate (void);
 
@@ -49,8 +48,7 @@ public:
   // = The RtecEventComm::PushConsumer methods
 
   /// The skeleton methods.
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
index 0d7c67a7469..4c7ac41f29c 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
@@ -19,8 +19,7 @@ EC_Counting_Supplier::EC_Counting_Supplier (void)
 
 void
 EC_Counting_Supplier::activate (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-                    int milliseconds
-                    ACE_ENV_ARG_DECL)
+                    int milliseconds)
 {
   RtecEventComm::PushConsumer_var consumer =
     this->consumer_adapter_._this ();
@@ -41,8 +40,7 @@ EC_Counting_Supplier::activate (RtecEventChannelAdmin::ConsumerAdmin_ptr consume
                             0);
 
   this->supplier_proxy_->connect_push_consumer (consumer.in (),
-                                                consumer_qos.get_ConsumerQOS ()
-                                                ACE_ENV_ARG_PARAMETER);
+                                                consumer_qos.get_ConsumerQOS ());
 }
 
 void
@@ -53,8 +51,8 @@ EC_Counting_Supplier::deactivate (void)
   PortableServer::POA_var consumer_poa =
     this->consumer_adapter_._default_POA ();
   PortableServer::ObjectId_var consumer_id =
-    consumer_poa->servant_to_id (&this->consumer_adapter_ ACE_ENV_ARG_PARAMETER);
-  consumer_poa->deactivate_object (consumer_id.in () ACE_ENV_ARG_PARAMETER);
+    consumer_poa->servant_to_id (&this->consumer_adapter_);
+  consumer_poa->deactivate_object (consumer_id.in ());
 }
 
 void
@@ -63,8 +61,7 @@ EC_Counting_Supplier::connect (
     int published_source,
     int published_type,
     int event_source,
-    int event_type
-    ACE_ENV_ARG_DECL)
+    int event_type)
 {
   this->event_source_ = event_source;
   this->event_type_ = event_type;
@@ -74,15 +71,13 @@ EC_Counting_Supplier::connect (
                        published_type,
                        0, 1);
   this->connect (supplier_admin,
-                 supplier_qos.get_SupplierQOS ()
-                 ACE_ENV_ARG_PARAMETER);
+                 supplier_qos.get_SupplierQOS ());
 }
 
 void
 EC_Counting_Supplier::connect (
     RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
-    const RtecEventChannelAdmin::SupplierQOS &qos
-    ACE_ENV_ARG_DECL)
+    const RtecEventChannelAdmin::SupplierQOS &qos)
 {
   RtecEventComm::PushSupplier_var supplier =
     this->_this ();
@@ -94,8 +89,7 @@ EC_Counting_Supplier::connect (
     }
 
   this->consumer_proxy_->connect_push_supplier (supplier.in (),
-                                                qos
-                                                ACE_ENV_ARG_PARAMETER);
+                                                qos);
 }
 
 void
@@ -109,16 +103,15 @@ EC_Counting_Supplier::disconnect (void)
   PortableServer::POA_var supplier_poa =
     this->_default_POA ();
   PortableServer::ObjectId_var supplier_id =
-    supplier_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  supplier_poa->deactivate_object (supplier_id.in () ACE_ENV_ARG_PARAMETER);
+    supplier_poa->servant_to_id (this);
+  supplier_poa->deactivate_object (supplier_id.in ());
 
   this->consumer_proxy_ =
     RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
 }
 
 void
-EC_Counting_Supplier::push (const RtecEventComm::EventSet&
-                ACE_ENV_ARG_DECL)
+EC_Counting_Supplier::push (const RtecEventComm::EventSet&)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
@@ -130,7 +123,7 @@ EC_Counting_Supplier::push (const RtecEventComm::EventSet&
   event[0].header.type = this->event_type_;
   event[0].header.ttl = 1;
 
-  this->consumer_proxy_->push (event ACE_ENV_ARG_PARAMETER);
+  this->consumer_proxy_->push (event);
   this->event_count++;
 }
 
@@ -162,15 +155,14 @@ EC_Counting_Supplier_Task::
 int
 EC_Counting_Supplier_Task::svc ()
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       this->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -194,7 +186,7 @@ EC_Counting_Supplier_Task::run (void)
 
   int stop = 0;
   do {
-    this->supplier_->push (this->event_ ACE_ENV_ARG_PARAMETER);
+    this->supplier_->push (this->event_);
 
     // Sleep for a short time to avoid spinning...
     ACE_OS::sleep (0);
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h
index 7a89f71d468..54702a32de9 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h
@@ -45,8 +45,7 @@ public:
    * receives the timeout.
    */
   void activate (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-                 int period
-                 ACE_ENV_ARG_DECL);
+                 int period);
   void deactivate (void);
 
   /// Simple connect/disconnect methods..
@@ -54,16 +53,13 @@ public:
                 int published_source,
                 int published_type,
                 int event_source,
-                int event_type
-                ACE_ENV_ARG_DECL);
+                int event_type);
   void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
-                const RtecEventChannelAdmin::SupplierQOS &qos
-                ACE_ENV_ARG_DECL);
+                const RtecEventChannelAdmin::SupplierQOS &qos);
   void disconnect (void);
 
   /// The Consumer side methods.
-  void push (const RtecEventComm::EventSet& events
-             ACE_ENV_ARG_DECL)
+  void push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
   void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
index d83239d9f4d..624e05b0c3a 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
@@ -61,13 +61,13 @@ EC_Driver::~EC_Driver (void)
 int
 EC_Driver::run (int argc, char* argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Calibrate the high resolution timer *before* starting the
       // test.
       ACE_High_Res_Timer::calibrate ();
 
-      this->run_init (argc, argv ACE_ENV_ARG_PARAMETER);
+      this->run_init (argc, argv);
 
       this->execute_test ();
 
@@ -75,27 +75,24 @@ EC_Driver::run (int argc, char* argv[])
 
       this->run_cleanup ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "EC_Driver::run");
+      ex._tao_print_exception ("EC_Driver::run");
     }
-  ACE_CATCHALL
+  catch (...)
     {
       ACE_ERROR ((LM_ERROR, "EC_Driver (%P|%t) non-corba exception raised\n"));
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 void
-EC_Driver::run_init (int &argc, char* argv[]
-                     ACE_ENV_ARG_DECL)
+EC_Driver::run_init (int &argc, char* argv[])
 {
-  this->initialize_orb_and_poa (argc, argv ACE_ENV_ARG_PARAMETER);
+  this->initialize_orb_and_poa (argc, argv);
 
   if (this->parse_args (argc, argv))
-    ACE_THROW (CORBA::INTERNAL (TAO::VMCID,
-                                CORBA::COMPLETED_NO));
+    throw CORBA::INTERNAL (TAO::VMCID, CORBA::COMPLETED_NO);
 
   if (this->verbose ())
     this->print_args ();
@@ -112,18 +109,15 @@ EC_Driver::run_init (int &argc, char* argv[]
     }
 
   if (this->move_to_rt_class () == -1)
-    ACE_THROW (CORBA::INTERNAL (TAO::VMCID,
-                                CORBA::COMPLETED_NO));
+    throw CORBA::INTERNAL (TAO::VMCID, CORBA::COMPLETED_NO);
 
   this->initialize_ec_impl ();
 
   if (this->allocate_consumers () == -1)
-    ACE_THROW (CORBA::NO_MEMORY (TAO::VMCID,
-                                 CORBA::COMPLETED_NO));
+    throw CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO);
 
   if (this->allocate_suppliers () == -1)
-    ACE_THROW (CORBA::NO_MEMORY (TAO::VMCID,
-                                 CORBA::COMPLETED_NO));
+    throw CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO);
 
   this->connect_clients ();
 }
@@ -150,7 +144,7 @@ EC_Driver::run_cleanup (void)
   this->cleanup_consumers ();
   this->cleanup_ec ();
 
-  this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+  this->root_poa_->destroy (1, 1);
   this->root_poa_ = PortableServer::POA::_nil ();
 
   this->orb_->destroy ();
@@ -158,14 +152,13 @@ EC_Driver::run_cleanup (void)
 }
 
 void
-EC_Driver::initialize_orb_and_poa (int &argc, char* argv[]
-                                   ACE_ENV_ARG_DECL)
+EC_Driver::initialize_orb_and_poa (int &argc, char* argv[])
 {
   this->orb_ =
-    CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+    CORBA::ORB_init (argc, argv, "");
 
   CORBA::Object_var poa_object =
-    this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references("RootPOA");
 
   if (CORBA::is_nil (poa_object.in ()))
     {
@@ -175,7 +168,7 @@ EC_Driver::initialize_orb_and_poa (int &argc, char* argv[]
     }
 
   this->root_poa_ =
-    PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (poa_object.in ());
 
   PortableServer::POAManager_var poa_manager =
     this->root_poa_->the_POAManager ();
@@ -280,24 +273,24 @@ EC_Driver::obtain_remote_ec (void)
   channel_name[0].id = CORBA::string_dup (this->event_service_name_);
 
   CORBA::Object_var tmp =
-    naming_context->resolve (channel_name ACE_ENV_ARG_PARAMETER);
+    naming_context->resolve (channel_name);
 
   this->event_channel_ =
-    RtecEventChannelAdmin::EventChannel::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER);
+    RtecEventChannelAdmin::EventChannel::_narrow (tmp.in ());
 }
 
 CosNaming::NamingContext_ptr
 EC_Driver::get_naming_context (void)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references ("NameService");
 
   if (CORBA::is_nil (naming_obj.in ()))
     ACE_ERROR ((LM_ERROR,
                 "EC_Driver (%P|%t) Unable to obtain the "
                 "Naming Service.\n"));
 
-  return CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
+  return CosNaming::NamingContext::_narrow (naming_obj.in ());
 }
 #endif
 
@@ -332,8 +325,8 @@ EC_Driver::deactivate_ec (void)
     PortableServer::POA_var poa =
       this->ec_impl_->_default_POA ();
     PortableServer::ObjectId_var id =
-      poa->servant_to_id (this->ec_impl_ ACE_ENV_ARG_PARAMETER);
-    poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
+      poa->servant_to_id (this->ec_impl_);
+    poa->deactivate_object (id.in ());
   }
 
   if (this->verbose ())
@@ -417,7 +410,7 @@ EC_Driver::connect_consumers (void)
 
   for (int i = 0; i < this->n_consumers_; ++i)
     {
-      this->connect_consumer (consumer_admin.in (), i ACE_ENV_ARG_PARAMETER);
+      this->connect_consumer (consumer_admin.in (), i);
     }
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) connected consumer(s)\n"));
@@ -426,25 +419,22 @@ EC_Driver::connect_consumers (void)
 void
 EC_Driver::connect_consumer (
     RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-    int i
-    ACE_ENV_ARG_DECL)
+    int i)
 {
   RtecEventChannelAdmin::ConsumerQOS qos;
   int shutdown_event_type;
-  this->build_consumer_qos (i, qos, shutdown_event_type ACE_ENV_ARG_PARAMETER);
+  this->build_consumer_qos (i, qos, shutdown_event_type);
 
   this->consumers_[i]->connect (consumer_admin,
                                 qos,
-                                shutdown_event_type
-                                ACE_ENV_ARG_PARAMETER);
+                                shutdown_event_type);
 }
 
 void
 EC_Driver::build_consumer_qos (
   int i,
   RtecEventChannelAdmin::ConsumerQOS& qos,
-  int& shutdown_event_type
-  ACE_ENV_ARG_DECL_NOT_USED)
+  int& shutdown_event_type)
 {
   RtecBase::handle_t rt_info = 0;
 
@@ -472,7 +462,7 @@ EC_Driver::connect_suppliers (void)
 
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
-      this->connect_supplier (supplier_admin.in (), i ACE_ENV_ARG_PARAMETER);
+      this->connect_supplier (supplier_admin.in (), i);
     }
 
   if (this->verbose ())
@@ -482,25 +472,22 @@ EC_Driver::connect_suppliers (void)
 void
 EC_Driver::connect_supplier (
     RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
-    int i
-    ACE_ENV_ARG_DECL)
+    int i)
 {
   RtecEventChannelAdmin::SupplierQOS qos;
   int shutdown_event_type;
-  this->build_supplier_qos (i, qos, shutdown_event_type ACE_ENV_ARG_PARAMETER);
+  this->build_supplier_qos (i, qos, shutdown_event_type);
 
   this->suppliers_[i]->connect (supplier_admin,
                                 qos,
-                                shutdown_event_type
-                                ACE_ENV_ARG_PARAMETER);
+                                shutdown_event_type);
 }
 
 void
 EC_Driver::build_supplier_qos (
       int i,
       RtecEventChannelAdmin::SupplierQOS& qos,
-      int& shutdown_event_type
-      ACE_ENV_ARG_DECL_NOT_USED)
+      int& shutdown_event_type)
 {
   int type_start = this->supplier_type_start_ + i*this->supplier_type_shift_;
   int supplier_id = i + 1;
@@ -958,25 +945,21 @@ EC_Driver::decode_supplier_cookie (void* cookie) const
 
 void
 EC_Driver::consumer_push (void*,
-                          const RtecEventComm::EventSet&
-                          ACE_ENV_ARG_DECL_NOT_USED)
+                          const RtecEventComm::EventSet&)
 {
 }
 
 void
-EC_Driver::consumer_shutdown (void*
-                              ACE_ENV_ARG_DECL_NOT_USED)
+EC_Driver::consumer_shutdown (void*)
 {
 }
 
 void
-EC_Driver::consumer_disconnect (void*
-                                ACE_ENV_ARG_DECL_NOT_USED)
+EC_Driver::consumer_disconnect (void*)
 {
 }
 
 void
-EC_Driver::supplier_disconnect (void*
-                                ACE_ENV_ARG_DECL_NOT_USED)
+EC_Driver::supplier_disconnect (void*)
 {
 }
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.h b/TAO/orbsvcs/tests/Event/lib/Driver.h
index 31de1c799b1..0c2ec1a622c 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.h
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.h
@@ -64,15 +64,13 @@ public:
   virtual int run (int argc, char* argv[]);
 
   /// The initialization section
-  virtual void run_init (int& argc, char* argv[]
-                         ACE_ENV_ARG_DECL);
+  virtual void run_init (int& argc, char* argv[]);
 
   /// The cleanup section
   virtual void run_cleanup (void);
 
   /// Initialize the ORB and obtain the RootPOA object
-  virtual void initialize_orb_and_poa (int& argc, char* argv[]
-                                       ACE_ENV_ARG_DECL);
+  virtual void initialize_orb_and_poa (int& argc, char* argv[]);
 
   /// Parse the common command-line arguments for all tests
   virtual int parse_args (int& argc, char* argv[]);
@@ -109,15 +107,13 @@ public:
   /// Connect consumer number <i> using the consumer_admin provided.
   virtual void connect_consumer (
     RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-    int i
-    ACE_ENV_ARG_DECL);
+    int i);
 
   /// Build the QoS requirements for consumer <i>
   virtual void build_consumer_qos (
       int i,
       RtecEventChannelAdmin::ConsumerQOS& qos,
-      int& shutdown_event_type
-      ACE_ENV_ARG_DECL_NOT_USED);
+      int& shutdown_event_type);
 
   /// Connect all the suppliers, by default it lets each supplier
   /// connect itself.
@@ -126,15 +122,13 @@ public:
   /// Connect supplier number <i> using the supplier_admin provided.
   virtual void connect_supplier (
     RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
-    int i
-    ACE_ENV_ARG_DECL);
+    int i);
 
   /// Build the QoS requirements for supplier <i>
   virtual void build_supplier_qos (
       int i,
       RtecEventChannelAdmin::SupplierQOS& qos,
-      int& shutdown_event_type
-      ACE_ENV_ARG_DECL_NOT_USED);
+      int& shutdown_event_type);
 
   /// Execute the test, by default simply call activate_suppliers()
   virtual void execute_test (void);
@@ -181,20 +175,16 @@ public:
 
   /// One of the consumers in the test has received an event
   virtual void consumer_push (void* consumer_cookie,
-                              const RtecEventComm::EventSet& event
-                              ACE_ENV_ARG_DECL);
+                              const RtecEventComm::EventSet& event);
 
   /// One of the consumers has received a shutdown event
-  virtual void consumer_shutdown (void* consumer_cookie
-                                  ACE_ENV_ARG_DECL);
+  virtual void consumer_shutdown (void* consumer_cookie);
 
   /// One of the consumers in the test has been disconnected from the EC
-  virtual void consumer_disconnect (void* consumer_cookie
-                                    ACE_ENV_ARG_DECL);
+  virtual void consumer_disconnect (void* consumer_cookie);
 
   /// One of the suppliers in the test has been disconnected from the EC
-  virtual void supplier_disconnect (void* supplier_cookie
-                                    ACE_ENV_ARG_DECL);
+  virtual void supplier_disconnect (void* supplier_cookie);
 
 #if !defined(EC_DISABLE_REMOTE_EC)
   /// Obtain the EC from the Naming service
diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
index 1bbf0a96679..e1c135d0398 100644
--- a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
@@ -26,8 +26,7 @@ EC_Supplier::EC_Supplier (EC_Driver *driver,
 }
 
 void
-EC_Supplier::send_event (int event_number
-                         ACE_ENV_ARG_DECL)
+EC_Supplier::send_event (int event_number)
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return;
@@ -48,12 +47,11 @@ EC_Supplier::send_event (int event_number
 
   this->event_type (event_number, event[0]);
 
-  this->send_event (event ACE_ENV_ARG_PARAMETER);
+  this->send_event (event);
 }
 
 void
-EC_Supplier::send_event (const RtecEventComm::EventSet& event
-                         ACE_ENV_ARG_DECL)
+EC_Supplier::send_event (const RtecEventComm::EventSet& event)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
@@ -72,7 +70,7 @@ EC_Supplier::send_event (const RtecEventComm::EventSet& event
 
   ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-  this->consumer_proxy_->push (event ACE_ENV_ARG_PARAMETER);
+  this->consumer_proxy_->push (event);
 
   ACE_hrtime_t end = ACE_OS::gethrtime ();
   this->throughput_.sample (end - this->throughput_start_,
@@ -108,19 +106,17 @@ EC_Supplier::event_type (int event_number,
 void
 EC_Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
                       const RtecEventChannelAdmin::SupplierQOS& qos,
-                      int shutdown_event_type
-                      ACE_ENV_ARG_DECL)
+                      int shutdown_event_type)
 {
   this->consumer_proxy_ =
     supplier_admin->obtain_push_consumer ();
 
-  this->connect (qos, shutdown_event_type ACE_ENV_ARG_PARAMETER);
+  this->connect (qos, shutdown_event_type);
 }
 
 void
 EC_Supplier::connect (const RtecEventChannelAdmin::SupplierQOS& qos,
-                      int shutdown_event_type
-                      ACE_ENV_ARG_DECL)
+                      int shutdown_event_type)
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return; // @@ Throw?
@@ -135,8 +131,7 @@ EC_Supplier::connect (const RtecEventChannelAdmin::SupplierQOS& qos,
   this->is_active_ = 1;
 
   this->consumer_proxy_->connect_push_supplier (this->myself_.in (),
-                                                qos
-                                                ACE_ENV_ARG_PARAMETER);
+                                                qos);
 }
 
 void
@@ -161,8 +156,8 @@ EC_Supplier::shutdown (void)
   PortableServer::POA_var poa =
     this->_default_POA ();
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
+    poa->servant_to_id (this);
+  poa->deactivate_object (id.in ());
   this->is_active_ = 0;
   this->myself_ = RtecEventComm::PushSupplier::_nil ();
 }
@@ -171,7 +166,7 @@ void
 EC_Supplier::disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->driver_->supplier_disconnect (this->cookie_ ACE_ENV_ARG_PARAMETER);
+  this->driver_->supplier_disconnect (this->cookie_);
   this->consumer_proxy_ =
     RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
 }
@@ -215,7 +210,6 @@ EC_Supplier_Task::EC_Supplier_Task (EC_Supplier* supplier,
 int
 EC_Supplier_Task::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   // Initialize a time value to pace the test
   ACE_Time_Value tv (0, this->burst_pause_);
@@ -236,7 +230,7 @@ EC_Supplier_Task::svc (void)
     {
       for (int j = 0; j < this->burst_size_; ++j)
         {
-          ACE_TRY
+          try
             {
               this->supplier_->event_type (j, event[0]);
 
@@ -245,41 +239,38 @@ EC_Supplier_Task::svc (void)
                                              now);
               // ACE_DEBUG ((LM_DEBUG, "(%t) supplier push event\n"));
 
-              this->supplier_->send_event (event ACE_ENV_ARG_PARAMETER);
+              this->supplier_->send_event (event);
 
             }
-          ACE_CATCH (CORBA::SystemException, sys_ex)
+          catch (const CORBA::SystemException& sys_ex)
             {
-              ACE_PRINT_EXCEPTION (sys_ex, "SYS_EX");
+              sys_ex._tao_print_exception ("SYS_EX");
             }
-          ACE_CATCHANY
+          catch (const CORBA::Exception& ex)
             {
-              ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "SYS_EX");
+              ex._tao_print_exception ("SYS_EX");
             }
-          ACE_ENDTRY;
         }
       ACE_OS::sleep (tv);
     }
 
-  ACE_TRY_EX(SHUTDOWN)
+  try
     {
       // Send one event shutdown from each supplier
       event[0].header.type = this->shutdown_event_type_;
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time,
                                      now);
-      this->supplier_->send_event (event ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (SHUTDOWN);
+      this->supplier_->send_event (event);
     }
-  ACE_CATCH (CORBA::SystemException, sys_ex)
+  catch (const CORBA::SystemException& sys_ex)
     {
-      ACE_PRINT_EXCEPTION (sys_ex, "SYS_EX");
+      sys_ex._tao_print_exception ("SYS_EX");
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "SYS_EX");
+      ex._tao_print_exception ("SYS_EX");
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
               "Supplier task finished\n"));
diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.h b/TAO/orbsvcs/tests/Event/lib/Supplier.h
index 29fd4a3451f..a5bd9d2fb1e 100644
--- a/TAO/orbsvcs/tests/Event/lib/Supplier.h
+++ b/TAO/orbsvcs/tests/Event/lib/Supplier.h
@@ -52,12 +52,10 @@ public:
 
   /// The types of the event is chosen by the driver, based on the
   /// cookie and the <event_number>
-  void send_event (int event_number
-                   ACE_ENV_ARG_DECL);
+  void send_event (int event_number);
 
   /// Send <event> to the EC.
-  void send_event (const RtecEventComm::EventSet& event
-                   ACE_ENV_ARG_DECL);
+  void send_event (const RtecEventComm::EventSet& event);
 
   /// Set the event type and source in <event>
   void send_event (int event_number,
@@ -71,14 +69,12 @@ public:
   virtual void connect (
         RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
         const RtecEventChannelAdmin::SupplierQOS& qos,
-        int shutdown_event_type
-        ACE_ENV_ARG_DECL);
+        int shutdown_event_type);
 
   /// Connect using the current consumer_proxy (useful for reconnect test)
   virtual void connect (
         const RtecEventChannelAdmin::SupplierQOS& qos,
-        int shutdown_event_type
-        ACE_ENV_ARG_DECL);
+        int shutdown_event_type);
 
   /// Disconnect from the EC, also deactivates the object
   void disconnect (void);
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
index 0939a948c69..38604e57127 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
@@ -37,7 +37,7 @@ private:
     int & more,             // out
     ACE_CString & command,  // inout
     int retry               // in
-    ACE_ENV_ARG_DECL);
+    );
 
 
   int next_replica (void);
@@ -220,8 +220,7 @@ int FTClientMain::pass (
   long & counter,
   int & more,
   ACE_CString & command,
-  int retry
-  ACE_ENV_ARG_DECL)
+  int retry)
 {
   int result = 0;
 
@@ -275,7 +274,7 @@ int FTClientMain::pass (
           {
             ACE_OS::fprintf (stdout, "FT Client: ->set(%ld);\n", operand);
           }
-          this->replica_->set(operand ACE_ENV_ARG_PARAMETER);
+          this->replica_->set(operand);
           counter = operand;
           break;
         }
@@ -305,7 +304,7 @@ int FTClientMain::pass (
           {
             ACE_OS::fprintf (stdout, "FT Client: ->counter(%ld);\n", operand);
           }
-          this->replica_->counter(operand ACE_ENV_ARG_PARAMETER);
+          this->replica_->counter(operand);
           counter = operand;
           break;
         }
@@ -315,7 +314,7 @@ int FTClientMain::pass (
           {
             ACE_OS::fprintf (stdout, "FT Client: ->increment(%ld);\n", operand);
           }
-          this->replica_->increment(operand ACE_ENV_ARG_PARAMETER);
+          this->replica_->increment(operand);
           counter += operand;
           break;
         }
@@ -325,7 +324,7 @@ int FTClientMain::pass (
           {
             ACE_OS::fprintf (stdout, "FT Client: ->increment(%ld);\n", -operand);
           }
-          this->replica_->increment(-operand ACE_ENV_ARG_PARAMETER);
+          this->replica_->increment(-operand);
           counter -= operand;
           break;
         }
@@ -356,7 +355,7 @@ int FTClientMain::pass (
           {
             ACE_OS::fprintf (stdout, "FT Client: ->die(%ld);\n", operand);
           }
-          this->replica_->die(static_cast<FT_TEST::TestReplica::Bane> (operand) ACE_ENV_ARG_PARAMETER);
+          this->replica_->die(static_cast<FT_TEST::TestReplica::Bane> (operand));
           echo = 0;
           break;
         }
@@ -378,8 +377,7 @@ int FTClientMain::pass (
             {
               ACE_OS::fprintf (stdout, "FT Client: ->set_state(saved_state);\n");
             }
-            this->replica_->set_state (state.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+            this->replica_->set_state (state.in ());
             counter = stateValue;
           }
           else
@@ -406,7 +404,7 @@ int FTClientMain::pass (
             {
               ACE_OS::fprintf (stdout, "FT Client: ->set_update(saved_update);\n");
             }
-            this->replica_->set_update(update.in () ACE_ENV_ARG_PARAMETER);
+            this->replica_->set_update(update.in ());
             counter = updateValue;
           }
           else
@@ -434,24 +432,23 @@ int FTClientMain::pass (
         {
           if (operand != 0)
           {
-            ACE_TRY_NEW_ENV
+            try
             {
               if (this->verbose_ >= LOUD)
               {
                 ACE_OS::fprintf (stdout, "FT Client: ->shutdown();\n");
               }
-              this->replica_->shutdown( ACE_ENV_SINGLE_ARG_PARAMETER);
+              this->replica_->shutdown();
               // @@ Note: this is here because the corba event loop seems to go to sleep
               // if there's nothing for it to do.
               // not quite sure why, yet.  Dale
               this->replica_->is_alive();
             }
-            ACE_CATCHANY
+            catch (const CORBA::Exception& ex)
             {
               ACE_OS::fprintf (stdout, "FT Client: Ignoring expected exception during shutdown.\n");
               ; // ignore exception during shutdown
             }
-            ACE_ENDTRY;
           }
           echo = 0;
           more = 0;
@@ -500,7 +497,7 @@ int FTClientMain::next_replica (void)
   {
     this->replica_name_ = this->replica_iors_[this->replica_pos_].c_str();
     this->replica_pos_ += 1;
-    CORBA::Object_var rep_obj = this->orb_->string_to_object (this->replica_name_ ACE_ENV_ARG_PARAMETER);
+    CORBA::Object_var rep_obj = this->orb_->string_to_object (this->replica_name_);
     this->replica_ = FT_TEST::TestReplica::_narrow (rep_obj.in ());
     if (! CORBA::is_nil (replica_.in ()))
     {
@@ -547,14 +544,14 @@ int FTClientMain::run (void)
     int more = 1;
     while (more && result == 0 &&  !feof (this->commandIn_))
     {
-      ACE_TRY_NEW_ENV
+      try
       {
-        result = pass (counter, more, command, retry ACE_ENV_ARG_PARAMETER);
+        result = pass (counter, more, command, retry);
       }
-      ACE_CATCH (CORBA::SystemException, sysex)
+      catch (const CORBA::SystemException& sysex)
       {
         ACE_OS::fprintf (stdout, "FT Client: Caught system exception: \n");
-        ACE_PRINT_EXCEPTION (sysex, "FT Client");
+        sysex._tao_print_exception ("FT Client");
 
         retry = 0;
         int handled = 0;
@@ -589,10 +586,9 @@ int FTClientMain::run (void)
         if (! handled)
         {
           ACE_OS::fprintf (stdout, "FT Client: Exception not handled.  Rethrow. ");
-          ACE_RE_THROW;
+          throw;
         }
       }
-      ACE_ENDTRY;
     }
   }
   else
@@ -610,17 +606,15 @@ main (int argc, char *argv[])
   int result = app.parse_args(argc, argv);
   if (result == 0)
   {
-    ACE_TRY_NEW_ENV
+    try
     {
       result = app.run ();
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "FT_Client::main\t\n");
+      ex._tao_print_exception ("FT_Client::main\t\n");
       result = -1;
     }
-    ACE_ENDTRY;
   }
   return result;
 }
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
index 09a49aa7f0c..e2bd22e9d1c 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
@@ -131,7 +131,7 @@ void FTAPP::FT_Creator::usage(FILE* out)const
 
 
 
-int FTAPP::FT_Creator::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+int FTAPP::FT_Creator::init (CORBA::ORB_ptr orb)
 {
   int result = 0;
   this->orb_ = CORBA::ORB::_duplicate (orb);
@@ -140,9 +140,9 @@ int FTAPP::FT_Creator::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
   if ( this->registry_ior_ != 0)
   {
     CORBA::Object_var registry_obj
-      = this->orb_->string_to_object (this->registry_ior_  ACE_ENV_ARG_PARAMETER);
+      = this->orb_->string_to_object (this->registry_ior_);
     PortableGroup::FactoryRegistry_var registry
-      = PortableGroup::FactoryRegistry::_narrow(registry_obj.in ()  ACE_ENV_ARG_PARAMETER);
+      = PortableGroup::FactoryRegistry::_narrow(registry_obj.in ());
     if (! CORBA::is_nil (registry.in ()))
     {
       result = this->creator_.set_factory_registry(registry.in());
@@ -151,14 +151,14 @@ int FTAPP::FT_Creator::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 
   if (result == 0)
   {
-    result = this->creator_.init (orb ACE_ENV_ARG_PARAMETER);
+    result = this->creator_.init (orb);
   }
 
 
   if (result == 0 && this->ns_register_)
   {
     CORBA::Object_var naming_obj =
-      this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
+      this->orb_->resolve_initial_references ("NameService");
 
     if (CORBA::is_nil(naming_obj.in ()))
     {
@@ -167,7 +167,7 @@ int FTAPP::FT_Creator::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
                         1);
     }
     this->naming_context_=
-      CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
+      CosNaming::NamingContext::_narrow (naming_obj.in ());
   }
 
   return result;
@@ -184,12 +184,11 @@ int FTAPP::FT_Creator::run (void)
     ACE_OS::fprintf (stdout, "\nCreator: Creating group of %s\n", role);
     PortableGroup::ObjectGroup_var group = this->creator_.create_group (
       role,
-      this->write_iors_
-      ACE_ENV_ARG_PARAMETER);
+      this->write_iors_);
 
     if (this->write_iogr_)
     {
-      CORBA::String_var iogr = this->orb_->object_to_string (group.in () ACE_ENV_ARG_PARAMETER);
+      CORBA::String_var iogr = this->orb_->object_to_string (group.in ());
 
       char iogr_filename[1000];
       ACE_OS::snprintf (iogr_filename, sizeof(iogr_filename)-1, "%s%s_%d.iogr",
@@ -222,8 +221,7 @@ int FTAPP::FT_Creator::run (void)
       this_name.length (1);
       this_name[0].id = CORBA::string_dup (iogr_name);
 
-      this->naming_context_->rebind (this_name, group.in()
-                              ACE_ENV_ARG_PARAMETER);
+      this->naming_context_->rebind (this_name, group.in());
     }
 
     iogr_seq_ += 1;
@@ -234,7 +232,7 @@ int FTAPP::FT_Creator::run (void)
   for ( nType = 0; result == 0 && nType < typeCount; ++nType)
   {
     const char * role = this->unregister_roles_[nType].c_str();
-    result = this->creator_.unregister_role (role ACE_ENV_ARG_PARAMETER);
+    result = this->creator_.unregister_role (role);
   }
 
   return result;
@@ -249,14 +247,14 @@ int
 main (int argc, char *argv[])
 {
   int result = 0;
-  ACE_TRY_NEW_ENV
+  try
   {
     CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
     FTAPP::FT_Creator app;
     result = app.parse_args(argc, argv);
     if (result == 0)
     {
-      result = app.init (orb.in () ACE_ENV_ARG_PARAMETER);
+      result = app.init (orb.in ());
       if (result == 0)
       {
         result = app.run ();
@@ -267,12 +265,10 @@ main (int argc, char *argv[])
       }
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                         "FT_Creator::main\t\n");
+    ex._tao_print_exception ("FT_Creator::main\t\n");
     result = -1;
   }
-  ACE_ENDTRY;
   return result;
 }
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.h b/TAO/orbsvcs/tests/FT_App/FT_Creator.h
index 6545964e6c2..e7908de8f98 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Creator.h
+++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.h
@@ -42,7 +42,7 @@ namespace FTAPP
     // initialization
     int parse_args (int argc, char *argv[]);
 
-    int init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL);
+    int init (CORBA::ORB_ptr orb);
 
     ////////////
     // execution
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
index 9fae64420d9..bdccea37752 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
@@ -73,7 +73,6 @@ FT_ReplicaFactory_i::FT_ReplicaFactory_i ()
   , empty_slots_(0)
   , quit_requested_(0)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
   char const * repo_id =
     FT_TEST::_tc_TestReplica->id ();
 
@@ -242,7 +241,7 @@ const char * FT_ReplicaFactory_i::identity () const
   return this->identity_.c_str();
 }
 
-int FT_ReplicaFactory_i::idle (int & result ACE_ENV_ARG_DECL)
+int FT_ReplicaFactory_i::idle (int & result)
 {
   result = 0;
   size_t replicaCount = this->replicas_.size();
@@ -257,7 +256,7 @@ int FT_ReplicaFactory_i::idle (int & result ACE_ENV_ARG_DECL)
         // ignore the return status (the replica should shut itself down
         // unless result is non-zero.
         // non-zero result means panic.
-        replica->idle(result ACE_ENV_ARG_PARAMETER);
+        replica->idle(result);
       }
     }
   }
@@ -285,7 +284,7 @@ int FT_ReplicaFactory_i::idle (int & result ACE_ENV_ARG_DECL)
 
 
 
-int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb)
 {
   int result = 0;
 
@@ -293,8 +292,7 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 
   // Use the ROOT POA for now
   CORBA::Object_var poa_object =
-    this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA
-                                            ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA);
 
   if (CORBA::is_nil (poa_object.in ()))
   {
@@ -305,8 +303,7 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 
   // Get the POA object.
   this->poa_ =
-    PortableServer::POA::_narrow (poa_object.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (poa_object.in ());
 
   if (CORBA::is_nil(this->poa_.in ()))
   {
@@ -322,21 +319,18 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 
   // Register with the POA.
 
-  this->object_id_ = this->poa_->activate_object (this ACE_ENV_ARG_PARAMETER);
+  this->object_id_ = this->poa_->activate_object (this);
 
   CORBA::Object_var this_obj =
-    this->poa_->id_to_reference (object_id_.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+    this->poa_->id_to_reference (object_id_.in ());
 
-  this->ior_ = this->orb_->object_to_string (this_obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+  this->ior_ = this->orb_->object_to_string (this_obj.in ());
 
   if (this->factory_registry_ior_ != 0)
   {
     if (ACE_OS::strcmp (this->factory_registry_ior_, "none") != 0)
     {
-      CORBA::Object_var reg_obj = this->orb_->string_to_object(factory_registry_ior_
-                                    ACE_ENV_ARG_PARAMETER);
+      CORBA::Object_var reg_obj = this->orb_->string_to_object(factory_registry_ior_);
       this->factory_registry_ = ::PortableGroup::FactoryRegistry::_narrow(reg_obj.in ());
       if (CORBA::is_nil(this->factory_registry_.in ()))
       {
@@ -352,16 +346,16 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
   {
     ///////////////////////////////
     // Find the ReplicationManager
-    ACE_TRY_NEW_ENV
+    try
     {
-      CORBA::Object_var rm_obj = orb->resolve_initial_references("ReplicationManager" ACE_ENV_ARG_PARAMETER);
-      this->replication_manager_ = ::FT::ReplicationManager::_narrow(rm_obj.in() ACE_ENV_ARG_PARAMETER);
+      CORBA::Object_var rm_obj = orb->resolve_initial_references("ReplicationManager");
+      this->replication_manager_ = ::FT::ReplicationManager::_narrow(rm_obj.in());
       if (!CORBA::is_nil (replication_manager_.in ()))
       {
         this->have_replication_manager_ = 1;
         // empty criteria
         ::PortableGroup::Criteria criteria;
-        this->factory_registry_ = this->replication_manager_->get_factory_registry(criteria  ACE_ENV_ARG_PARAMETER);
+        this->factory_registry_ = this->replication_manager_->get_factory_registry(criteria);
         if (CORBA::is_nil (this->factory_registry_.in ()))
         {
           ACE_ERROR ((LM_ERROR,"ReplicaFactory: ReplicationManager failed to return FactoryRegistry.  Factory will not be registered.\n" ));
@@ -369,7 +363,7 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
       }
       else
       {
-        this->factory_registry_ =  ::PortableGroup::FactoryRegistry::_narrow(rm_obj.in()  ACE_ENV_ARG_PARAMETER);
+        this->factory_registry_ =  ::PortableGroup::FactoryRegistry::_narrow(rm_obj.in());
         if (!CORBA::is_nil(this->factory_registry_.in ()))
         {
           ACE_DEBUG ((LM_DEBUG,"Found a FactoryRegistry DBA ReplicationManager\n" ));
@@ -380,15 +374,14 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
         }
       }
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
       if (this->test_output_file_ == 0) // ignore if this is a test run
       {
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-          "ReplicaFactory: Exception resolving ReplicationManager. Factory will not be registered.\n" );
+        ex._tao_print_exception (
+          "ReplicaFactory: Exception resolving ReplicationManager. Factory will not be registered.\n");
       }
     }
-    ACE_ENDTRY;
 
   }
 
@@ -420,8 +413,7 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
       this->factory_registry_->register_factory(
         roleName,
         replica_repository_id,
-        info
-        ACE_ENV_ARG_PARAMETER);
+        info);
     }
     this->registered_ = 1;
   }
@@ -469,7 +461,7 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
     }
 
     CORBA::Object_var naming_obj =
-      this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
+      this->orb_->resolve_initial_references ("NameService");
 
     if (CORBA::is_nil(naming_obj.in ())){
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -478,13 +470,13 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
     }
 
     this->naming_context_ =
-      CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
+      CosNaming::NamingContext::_narrow (naming_obj.in ());
 
     this->this_name_.length (1);
     this->this_name_[0].id = CORBA::string_dup (this->ns_name_);
 
     this->naming_context_->rebind (this->this_name_, this_obj.in()  // CORBA::Object::_duplicate(this_obj)
-                            ACE_ENV_ARG_PARAMETER);
+                            );
   }
 
   // if we're testing.  Create a replica at startup time
@@ -492,11 +484,11 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
   {
     // shouldn't be necessary, but create_replica assumes this
     InternalGuard guard (this->internals_);
-    FT_TestReplica_i * replica = create_replica ("test" ACE_ENV_ARG_PARAMETER);
+    FT_TestReplica_i * replica = create_replica ("test");
 
     PortableServer::POA_var poa = replica->_default_POA ();
-    ::CORBA::Object_var replica_obj = poa->servant_to_reference(replica ACE_ENV_ARG_PARAMETER);
-    ::CORBA::String_var replicaIOR = this->orb_->object_to_string(replica_obj.in () ACE_ENV_ARG_PARAMETER);
+    ::CORBA::Object_var replica_obj = poa->servant_to_reference(replica);
+    ::CORBA::String_var replicaIOR = this->orb_->object_to_string(replica_obj.in ());
     write_ior (this->test_output_file_, replicaIOR.in ());
   }
 
@@ -512,8 +504,7 @@ int FT_ReplicaFactory_i::fini (void)
   }
   if (this->ns_name_ != 0)
   {
-    this->naming_context_->unbind (this_name_
-                            ACE_ENV_ARG_PARAMETER);
+    this->naming_context_->unbind (this_name_);
     this->ns_name_ = 0;
   }
 
@@ -533,8 +524,7 @@ int FT_ReplicaFactory_i::fini (void)
       location.length(1);
       location[0].id = CORBA::string_dup(location_);
       this->factory_registry_->unregister_factory_by_location (
-              location
-        ACE_ENV_ARG_PARAMETER);
+              location);
     }
     else
     {
@@ -553,8 +543,7 @@ int FT_ReplicaFactory_i::fini (void)
         location[0].id = CORBA::string_dup(location_);
         this->factory_registry_->unregister_factory (
                 roleName,
-                location
-          ACE_ENV_ARG_PARAMETER);
+                location);
       }
     }
   }
@@ -563,7 +552,7 @@ int FT_ReplicaFactory_i::fini (void)
 }
 
 
-void FT_ReplicaFactory_i::remove_replica(CORBA::ULong id, FT_TestReplica_i * replica ACE_ENV_ARG_DECL)
+void FT_ReplicaFactory_i::remove_replica(CORBA::ULong id, FT_TestReplica_i * replica)
 {
   InternalGuard guard (this->internals_);
   if (id < this->replicas_.size())
@@ -600,7 +589,6 @@ CORBA::Object_ptr FT_ReplicaFactory_i::create_object (
     const char * type_id,
     const PortableGroup::Criteria & the_criteria,
     PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -649,7 +637,7 @@ CORBA::Object_ptr FT_ReplicaFactory_i::create_object (
     ACE_THROW_RETURN ( PortableGroup::InvalidCriteria(), 0);
   }
 
-  FT_TestReplica_i * replica = create_replica(role ACE_ENV_ARG_PARAMETER);
+  FT_TestReplica_i * replica = create_replica(role);
   if (replica == 0)
   {
     ACE_ERROR ((LM_ERROR,
@@ -674,7 +662,7 @@ CORBA::Object_ptr FT_ReplicaFactory_i::create_object (
   METHOD_RETURN(FT_ReplicaFactory_i::create_object) replica_obj->_duplicate(replica_obj);
 }
 
-FT_TestReplica_i * FT_ReplicaFactory_i::create_replica(const char * name ACE_ENV_ARG_DECL)
+FT_TestReplica_i * FT_ReplicaFactory_i::create_replica(const char * name)
 {
   // assume mutex is locked
   CORBA::ULong factoryId = allocate_id();
@@ -690,13 +678,12 @@ FT_TestReplica_i * FT_ReplicaFactory_i::create_replica(const char * name ACE_ENV
   this->replicas_[factoryId] = pFTReplica;
   this->empty_slots_ -= 1;
 
-  pFTReplica->init (this->orb_ ACE_ENV_ARG_PARAMETER);
+  pFTReplica->init (this->orb_);
   return pFTReplica;
 }
 
 void FT_ReplicaFactory_i::delete_object (
     const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -717,12 +704,12 @@ void FT_ReplicaFactory_i::delete_object (
     }
     else
     {
-      ACE_THROW(::PortableGroup::ObjectNotFound());
+      throw ::PortableGroup::ObjectNotFound();
     }
   }
   else
   {
-    ACE_THROW(::PortableGroup::ObjectNotFound());
+    throw ::PortableGroup::ObjectNotFound();
   }
   METHOD_RETURN(FT_ReplicaFactory_i::delete_object);
 }
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
index 18678e96962..ca8eec537e8 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
@@ -74,7 +74,7 @@ public:
    * @param orb our ORB -- we keep var to it.
    * @return zero for success; nonzero is process return code for failure.
    */
-  int init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL);
+  int init (CORBA::ORB_ptr orb);
 
   /**
    * Prepare to exit.
@@ -82,7 +82,7 @@ public:
    */
   int fini (void);
 
-  int idle(int & result ACE_ENV_ARG_DECL);
+  int idle(int & result);
 
 
   /**
@@ -99,7 +99,7 @@ public:
    * @param id the numerical id assigned to this replica.
    * @param replica a pointer to the Replica object (redundant for safety.)
    */
-  void remove_replica (CORBA::ULong id, FT_TestReplica_i * replica ACE_ENV_ARG_DECL);
+  void remove_replica (CORBA::ULong id, FT_TestReplica_i * replica);
 
   //////////////////
   // CORBA interface
@@ -116,7 +116,6 @@ public:
     const char * type_id,
     const PortableGroup::Criteria & the_criteria,
     PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -129,7 +128,6 @@ public:
 
   virtual void delete_object (
     const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -149,7 +147,7 @@ private:
    * Actual replica creation happens in this method.
    * @param name becomes part of the objects identity.
    */
-  FT_TestReplica_i * create_replica(const char * name ACE_ENV_ARG_DECL);
+  FT_TestReplica_i * create_replica(const char * name);
 
   /**
    * Find or allocate an ID for a new replica
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
index 4b2a849c9f9..153eefeb0c6 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
@@ -60,10 +60,10 @@ int TAO_FT_ReplicationManagerController::init (int & argc, char * argv[])
 {
   int result = 0;
 
-  ACE_TRY_NEW_ENV
+  try
   {
     // Initialize the ORB.
-    this->orb_ = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+    this->orb_ = CORBA::ORB_init (argc, argv, "");
 
     // Parse arguments.
     result = this->parse_args (argc, argv);
@@ -73,15 +73,15 @@ int TAO_FT_ReplicationManagerController::init (int & argc, char * argv[])
       if (this->rm_ior_ != 0)
       {
         obj = this->orb_->string_to_object (
-          this->rm_ior_ ACE_ENV_ARG_PARAMETER);
+          this->rm_ior_);
       }
       else
       {
         obj = this->orb_->resolve_initial_references (
-          "ReplicationManager" ACE_ENV_ARG_PARAMETER);
+          "ReplicationManager");
       }
       this->replication_manager_ = FT::ReplicationManager::_narrow (
-        obj.in() ACE_ENV_ARG_PARAMETER);
+        obj.in());
       if (CORBA::is_nil (this->replication_manager_.in()))
       {
         ACE_ERROR ((LM_ERROR,
@@ -93,16 +93,13 @@ int TAO_FT_ReplicationManagerController::init (int & argc, char * argv[])
       }
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (
-      ACE_ANY_EXCEPTION,
+    ex._tao_print_exception (
       ACE_TEXT (
-        "TAO_FT_ReplicationManagerController::init: \n")
-    );
+        "TAO_FT_ReplicationManagerController::init: \n"));
     result = -1;
   }
-  ACE_ENDTRY;
 
   return result;
 }
@@ -158,7 +155,7 @@ int TAO_FT_ReplicationManagerController::run ()
 {
   int result = 0;
 
-  ACE_TRY_NEW_ENV
+  try
   {
     if (this->shutdown_ == 1)
     {
@@ -167,16 +164,13 @@ int TAO_FT_ReplicationManagerController::run ()
       ACE_OS::sleep (tv);
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (
-      ACE_ANY_EXCEPTION,
+    ex._tao_print_exception (
       ACE_TEXT (
-        "TAO_FT_ReplicationManagerController::run: \n")
-    );
+        "TAO_FT_ReplicationManagerController::run: \n"));
     result = -1;
   }
-  ACE_ENDTRY;
 
   return result;
 }
diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
index 1d9fa603940..6d6d18de21a 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
@@ -75,21 +75,21 @@ namespace
 #define KEVORKIAN(value, method)                                   \
   if (this->death_pending_ == (FT_TEST::TestReplica::value)){      \
     suicide (#value " in method " #method);                        \
-    ACE_THROW (FAULT_CODE (                                        \
-      CORBA::SystemException::_tao_minor_code (                    \
-            TAO::VMCID,                                \
-            EFAULT),                                               \
-            CORBA::COMPLETED_NO));                                 \
+    throw FAULT_CODE (                                             \
+             CORBA::SystemException::_tao_minor_code (             \
+               TAO::VMCID,                                         \
+               EFAULT),                                            \
+             CORBA::COMPLETED_NO);                                 \
     } else ;
 
 #define KEVORKIAN_DURING(method)                                   \
   if (this->death_pending_ == FT_TEST::TestReplica::BEFORE_REPLY ){\
     suicide ("read-only method " #method);                         \
-    ACE_THROW (FAULT_CODE (                                        \
-      CORBA::SystemException::_tao_minor_code (                    \
-            TAO::VMCID,                                \
-            EFAULT),                                               \
-            CORBA::COMPLETED_NO));                                 \
+    throw FAULT_CODE (                                             \
+             CORBA::SystemException::_tao_minor_code (             \
+               TAO::VMCID,                                         \
+               EFAULT),                                            \
+             CORBA::COMPLETED_NO);                                 \
     } else ;
 
 #define KEVORKIAN_RETURN(value, method, result)                    \
@@ -97,7 +97,7 @@ namespace
     suicide (#value " in method " #method);                        \
     ACE_THROW_RETURN (FAULT_CODE (                                 \
       CORBA::SystemException::_tao_minor_code (                    \
-            TAO::VMCID,                                \
+            TAO::VMCID,                                            \
             EFAULT),                                               \
             CORBA::COMPLETED_NO),                                  \
       result);                                                     \
@@ -108,7 +108,7 @@ namespace
     suicide ("read-only method " #method);                         \
     ACE_THROW_RETURN (FAULT_CODE (                                 \
       CORBA::SystemException::_tao_minor_code (                    \
-            TAO::VMCID,                                \
+            TAO::VMCID,                                            \
             EFAULT),                                               \
             CORBA::COMPLETED_NO),                                  \
             result);                                               \
@@ -154,7 +154,6 @@ void FT_TestReplica_i::suicide(const char * note)
 //static
 const char * FT_TestReplica_i::repository_id()
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   const char * id =
     FT_TEST::_tc_TestReplica->id();
@@ -198,14 +197,13 @@ PortableServer::ObjectId FT_TestReplica_i::object_id()const
  * @param orbManager our ORB -- we keep var to it.
  * @return zero for success; nonzero is process return code for failure.
  */
-int FT_TestReplica_i::init (CORBA::ORB_var & orb ACE_ENV_ARG_DECL)
+int FT_TestReplica_i::init (CORBA::ORB_var & orb)
 {
   this->orb_ = orb;
 
   // Use the ROOT POA for now
   CORBA::Object_var poa_object =
-    this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA
-                                            ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA);
 
   if (CORBA::is_nil (poa_object.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -214,8 +212,7 @@ int FT_TestReplica_i::init (CORBA::ORB_var & orb ACE_ENV_ARG_DECL)
 
   // Get the POA object.
   this->poa_ =
-    PortableServer::POA::_narrow (poa_object.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (poa_object.in ());
 
 
   if (CORBA::is_nil(this->poa_.in ()))
@@ -233,7 +230,7 @@ int FT_TestReplica_i::init (CORBA::ORB_var & orb ACE_ENV_ARG_DECL)
 
   // Register with the POA.
 
-  this->object_id_ = this->poa_->activate_object (this ACE_ENV_ARG_PARAMETER);
+  this->object_id_ = this->poa_->activate_object (this);
 
   return 0;
 }
@@ -242,7 +239,7 @@ void FT_TestReplica_i::_remove_ref (void)
 {
   //////////////////////////////////////////////////
   // WARNING: The following call invokes fini then deletes this object
-  this->factory_->remove_replica(this->factory_id_, this ACE_ENV_ARG_PARAMETER);
+  this->factory_->remove_replica(this->factory_id_, this);
 }
 
 int FT_TestReplica_i::fini (void)
@@ -282,11 +279,11 @@ FT::State * FT_TestReplica_i::get_update (void)
   return vState._retn();
 }
 
-void FT_TestReplica_i::set_update (const FT::State & s ACE_ENV_ARG_DECL)
+void FT_TestReplica_i::set_update (const FT::State & s)
   ACE_THROW_SPEC ((CORBA::SystemException, FT::InvalidUpdate))
 {
 #if defined(FT_TEST_LACKS_UPDATE)
-  ACE_THROW ( FT::InvalidUpdate () );
+  throw FT::InvalidUpdate ();
 #else // FT_TEST_LACKS_UPDATE
   KEVORKIAN(BEFORE_SET_UPDATE, set_update)
   long counter = loadLong<FT::State>(s, 0);
@@ -301,7 +298,7 @@ void FT_TestReplica_i::set_update (const FT::State & s ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException, FT::NoStateAvailable))
 {
 #if defined(FT_TEST_LACKS_STATE)
-  ACE_THROW( FT::NoStateAvailable () );
+  throw FT::NoStateAvailable ();
 #else // FT_TEST_LACKS_STATE
   KEVORKIAN_RETURN(DURING_GET_STATE, get_state, 0)
   long counter = load();
@@ -312,11 +309,11 @@ void FT_TestReplica_i::set_update (const FT::State & s ACE_ENV_ARG_DECL)
 #endif // FT_TEST_LACKS_STATE
 }
 
-void FT_TestReplica_i::set_state (const FT::State & s ACE_ENV_ARG_DECL)
+void FT_TestReplica_i::set_state (const FT::State & s)
   ACE_THROW_SPEC ((CORBA::SystemException, FT::InvalidState))
 {
 #if defined(FT_TEST_LACKS_STATE)
-  ACE_THROW ( FT::InvalidState () );
+  throw FT::InvalidState ();
 #else // FT_TEST_LACKS_STATE
   KEVORKIAN(BEFORE_SET_STATE, set_state)
   long counter = loadLong<FT::State>(s, 0);
@@ -329,7 +326,6 @@ void FT_TestReplica_i::tao_update_object_group (
     const char * iogr,
     PortableGroup::ObjectGroupRefVersion version,
     CORBA::Boolean is_primary
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -337,14 +333,13 @@ void FT_TestReplica_i::tao_update_object_group (
   ACE_UNUSED_ARG (version);
   ACE_UNUSED_ARG (is_primary);
 
-  ACE_THROW (CORBA::NO_IMPLEMENT());
+  throw CORBA::NO_IMPLEMENT();
 }
 
 //////////////////////////////
 // implement FT_TEST::Replica
 
-void FT_TestReplica_i::set (CORBA::Long value
-    ACE_ENV_ARG_DECL)
+void FT_TestReplica_i::set (CORBA::Long value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   KEVORKIAN(BEFORE_STATE_CHANGE, set)
@@ -353,8 +348,7 @@ void FT_TestReplica_i::set (CORBA::Long value
   KEVORKIAN(BEFORE_REPLY, set)
 }
 
-CORBA::Long FT_TestReplica_i::increment (CORBA::Long delta
-    ACE_ENV_ARG_DECL)
+CORBA::Long FT_TestReplica_i::increment (CORBA::Long delta)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   KEVORKIAN_RETURN(BEFORE_STATE_CHANGE, increment, 0)
@@ -381,8 +375,7 @@ CORBA::Long FT_TestReplica_i::counter (void)
   return counter;
 }
 
-void FT_TestReplica_i::counter (CORBA::Long counter
-    ACE_ENV_ARG_DECL)
+void FT_TestReplica_i::counter (CORBA::Long counter)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   KEVORKIAN(BEFORE_STATE_CHANGE, [set]counter)
@@ -390,8 +383,7 @@ void FT_TestReplica_i::counter (CORBA::Long counter
   KEVORKIAN(BEFORE_REPLY, [set]counter)
 }
 
-void FT_TestReplica_i::die (FT_TEST::TestReplica::Bane  when
-      ACE_ENV_ARG_DECL)
+void FT_TestReplica_i::die (FT_TEST::TestReplica::Bane  when)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_OS::fprintf (stdout, "%s@%s#%lu Received death threat: %d\n",
@@ -411,7 +403,7 @@ void FT_TestReplica_i::shutdown (void)
 
 //////////////////////////////////////////////
 // FT_TestReplica_i public non-CORBA interface
-int FT_TestReplica_i::idle (int & result ACE_ENV_ARG_DECL)
+int FT_TestReplica_i::idle (int & result)
 {
   int quit = 0;
   if (this->death_pending_ == FT_TEST::TestReplica::WHILE_IDLE)
@@ -422,15 +414,13 @@ int FT_TestReplica_i::idle (int & result ACE_ENV_ARG_DECL)
       this->factory_->location(),
       static_cast<int> (this->factory_id_ )
       ));
-    this->poa_->deactivate_object (this->object_id_.in ()
-                 ACE_ENV_ARG_PARAMETER);
+    this->poa_->deactivate_object (this->object_id_.in ());
     result = 0;
     quit = 1;
   }
   else if (this->death_pending_ == FT_TEST::TestReplica::CLEAN_EXIT)
   {
-    this->poa_->deactivate_object (this->object_id_.in ()
-                 ACE_ENV_ARG_PARAMETER);
+    this->poa_->deactivate_object (this->object_id_.in ());
     result = 0;
     quit = 1;
   }
diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h
index a13ce425118..b7b99dc33f0 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h
+++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h
@@ -62,7 +62,7 @@ public:
    * @param orbManager our ORB -- we keep var to it.
    * @return zero for success; nonzero is process return code for failure.
    */
-  int init (CORBA::ORB_var & orb ACE_ENV_ARG_DECL);
+  int init (CORBA::ORB_var & orb);
 
   /**
    * Prepare to exit.
@@ -75,7 +75,7 @@ public:
    * @param result [out] status code to return from process
    * @returns 0 to continue; nonzero to quit
    */
-  int idle(int &result ACE_ENV_ARG_DECL);
+  int idle(int &result);
 
   void request_quit();
 
@@ -96,12 +96,10 @@ public:
 private:
   ///////////////////////////
   // override Replica methods
-  virtual void set (CORBA::Long value
-      ACE_ENV_ARG_DECL)
+  virtual void set (CORBA::Long value)
       ACE_THROW_SPEC (( CORBA::SystemException));
 
-  virtual CORBA::Long increment (CORBA::Long delta
-      ACE_ENV_ARG_DECL)
+  virtual CORBA::Long increment (CORBA::Long delta)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Long get (void)
@@ -110,12 +108,10 @@ private:
   virtual CORBA::Long counter (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void counter (CORBA::Long counter
-      ACE_ENV_ARG_DECL)
+  virtual void counter (CORBA::Long counter)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void die (FT_TEST::TestReplica::Bane when
-      ACE_ENV_ARG_DECL)
+  virtual void die (FT_TEST::TestReplica::Bane when)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void shutdown (void)
@@ -133,13 +129,13 @@ private:
   virtual ::FT::State * get_update (void)
     ACE_THROW_SPEC ((CORBA::SystemException, FT::NoUpdateAvailable));
 
-  virtual void set_update (const FT::State & s ACE_ENV_ARG_DECL)
+  virtual void set_update (const FT::State & s)
     ACE_THROW_SPEC ((CORBA::SystemException, FT::InvalidUpdate));
 
   virtual ::FT::State * get_state (void)
     ACE_THROW_SPEC ((CORBA::SystemException, FT::NoStateAvailable));
 
-  virtual void set_state (const FT::State & s ACE_ENV_ARG_DECL)
+  virtual void set_state (const FT::State & s)
     ACE_THROW_SPEC ((CORBA::SystemException, FT::InvalidState));
 
   ////////////////
@@ -149,7 +145,6 @@ private:
       const char * iogr,
       PortableGroup::ObjectGroupRefVersion version,
       CORBA::Boolean is_primary
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp
index 31b74887a84..30274758980 100644
--- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp
+++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp
@@ -111,8 +111,7 @@ int ReplicationManagerFaultConsumerAdapter::parse_args (int argc, char * argv[])
  * Register this object.
  */
 int ReplicationManagerFaultConsumerAdapter::init (
-  CORBA::ORB_ptr orb
-  ACE_ENV_ARG_DECL)
+  CORBA::ORB_ptr orb)
 {
   ACE_DEBUG ((
     LM_DEBUG,
@@ -131,9 +130,9 @@ int ReplicationManagerFaultConsumerAdapter::init (
   ));
 
   CORBA::Object_var detector_obj = this->orb_->string_to_object (
-    this->detector_ior_ ACE_ENV_ARG_PARAMETER);
+    this->detector_ior_);
   this->factory_ = ::FT::FaultDetectorFactory::_narrow (
-    detector_obj.in() ACE_ENV_ARG_PARAMETER);
+    detector_obj.in());
   if (CORBA::is_nil (this->factory_.in()))
   {
     ACE_ERROR_RETURN ((
@@ -153,9 +152,9 @@ int ReplicationManagerFaultConsumerAdapter::init (
   ));
 
   CORBA::Object_var notifier_ior = this->orb_->string_to_object (
-    this->notifier_ior_ ACE_ENV_ARG_PARAMETER);
+    this->notifier_ior_);
   this->notifier_ = ::FT::FaultNotifier::_narrow (
-    notifier_ior.in() ACE_ENV_ARG_PARAMETER);
+    notifier_ior.in());
   if (CORBA::is_nil (this->notifier_.in()))
   {
     ACE_ERROR_RETURN ((
@@ -192,9 +191,9 @@ int ReplicationManagerFaultConsumerAdapter::init (
 
   // Get the RootPOA from the ORB.
   CORBA::Object_var poa_obj = this->orb_->resolve_initial_references (
-    "RootPOA" ACE_ENV_ARG_PARAMETER);
+    "RootPOA");
   PortableServer::POA_var poa = PortableServer::POA::_narrow (
-    poa_obj.in() ACE_ENV_ARG_PARAMETER);
+    poa_obj.in());
 
   // Create a fault analyzer.
   TAO::FT_FaultAnalyzer * analyzer = 0;
@@ -212,8 +211,7 @@ int ReplicationManagerFaultConsumerAdapter::init (
   result = this->p_fault_consumer_->init (
     poa.in(),
     this->notifier_.in(),
-    analyzer
-    ACE_ENV_ARG_PARAMETER);
+    analyzer);
   if (result != 0)
   {
     ACE_ERROR_RETURN ((
@@ -246,9 +244,9 @@ int ReplicationManagerFaultConsumerAdapter::init (
     {
       const char * iorName = this->replica_iors_[nRep];
       CORBA::Object_var replica_obj = this->orb_->string_to_object (
-        iorName ACE_ENV_ARG_PARAMETER);
+        iorName);
       FT::PullMonitorable_var replica = FT::PullMonitorable::_narrow (
-        replica_obj.in() ACE_ENV_ARG_PARAMETER);
+        replica_obj.in());
       if (CORBA::is_nil(replica.in()))
       {
         ACE_ERROR_RETURN ((
@@ -314,8 +312,7 @@ int ReplicationManagerFaultConsumerAdapter::init (
           this->factory_->create_object (
             type_id.in(),
             criteria.in(),
-            factory_creation_id
-            ACE_ENV_ARG_PARAMETER);
+            factory_creation_id);
         }
       }
     }
@@ -353,8 +350,7 @@ int ReplicationManagerFaultConsumerAdapter::fini (void)
 }
 
 
-int ReplicationManagerFaultConsumerAdapter::idle(int & result
-    ACE_ENV_ARG_DECL_NOT_USED)
+int ReplicationManagerFaultConsumerAdapter::idle(int & result)
 {
   ACE_UNUSED_ARG(result);
   int quit = 0;
diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
index 804fb572a80..de87010da8e 100644
--- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
+++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
@@ -43,7 +43,7 @@ public:
   /**
    * Initialize this object
    */
-  int init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  int init (CORBA::ORB_ptr orb);
 
   /**
    * Return a string to identify this object for logging/console message purposes.
@@ -55,7 +55,7 @@ public:
    * @param result [out] status code to return from process
    * @returns 0 to continue; nonzero to quit
    */
-  int idle(int &result ACE_ENV_ARG_DECL);
+  int idle(int &result);
 
   /**
    * Clean house for process shut down.
diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp
index 50fc461555f..e57d6787089 100644
--- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp
@@ -41,7 +41,7 @@ PortableServer::ObjectId StubBatchConsumer::objectId()const
 /**
  * register this object
  */
-int StubBatchConsumer::init (CORBA::ORB_ptr orb, ::FT::FaultNotifier_var & notifier ACE_ENV_ARG_DECL)
+int StubBatchConsumer::init (CORBA::ORB_ptr orb, ::FT::FaultNotifier_var & notifier)
 {
   int result = 0;
   this->orb_ = CORBA::ORB::_duplicate (orb);
@@ -51,8 +51,7 @@ int StubBatchConsumer::init (CORBA::ORB_ptr orb, ::FT::FaultNotifier_var & notif
 
   // Use the ROOT POA for now
   CORBA::Object_var poa_object =
-    this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA
-                                            ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA);
 
   if (CORBA::is_nil (poa_object.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -60,8 +59,7 @@ int StubBatchConsumer::init (CORBA::ORB_ptr orb, ::FT::FaultNotifier_var & notif
                       -1);
 
   // Get the POA .
-  this->poa_ = PortableServer::POA::_narrow (poa_object.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+  this->poa_ = PortableServer::POA::_narrow (poa_object.in ());
 
 
   if (CORBA::is_nil(this->poa_.in ()))
@@ -78,13 +76,12 @@ int StubBatchConsumer::init (CORBA::ORB_ptr orb, ::FT::FaultNotifier_var & notif
 
   // Register with the POA.
 
-  this->object_id_ = this->poa_->activate_object (this ACE_ENV_ARG_PARAMETER);
+  this->object_id_ = this->poa_->activate_object (this);
 
   // find my identity as an object
 
   CORBA::Object_var this_obj =
-    this->poa_->id_to_reference (object_id_.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+    this->poa_->id_to_reference (object_id_.in ());
 
   CosNotifyFilter::Filter_var filter = CosNotifyFilter::Filter::_nil();
 
@@ -108,7 +105,7 @@ const char * StubBatchConsumer::identity () const
  */
 void StubBatchConsumer::fini (void)
 {
-  this->notifier_->disconnect_consumer(this->consumer_id_ ACE_ENV_ARG_PARAMETER);
+  this->notifier_->disconnect_consumer(this->consumer_id_);
 }
 
 
@@ -125,7 +122,6 @@ int StubBatchConsumer::idle(int & result)
 //virtual
 void StubBatchConsumer::push_structured_events (
     const CosNotification::EventBatch & notifications
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -139,7 +135,6 @@ void StubBatchConsumer::push_structured_events (
 void StubBatchConsumer::offer_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyComm::InvalidEventType))
 {
@@ -153,7 +148,6 @@ void StubBatchConsumer::offer_change (
 
 //virtual
 void StubBatchConsumer::disconnect_sequence_push_consumer (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
index 9cadd2dbbfe..24f067a4fd2 100644
--- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
@@ -49,7 +49,7 @@ public:
   /**
    * Publish this objects IOR.
    */
-  int init (CORBA::ORB_ptr orbManager, ::FT::FaultNotifier_var & notifier ACE_ENV_ARG_DECL);
+  int init (CORBA::ORB_ptr orbManager, ::FT::FaultNotifier_var & notifier);
 
   /**
    * Return a string to identify this object for logging/console message purposes.
@@ -76,7 +76,6 @@ public:
 
     virtual void push_structured_events (
         const CosNotification::EventBatch & notifications
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -84,7 +83,6 @@ public:
       ));
 
     virtual void disconnect_sequence_push_consumer (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -93,7 +91,6 @@ public:
    virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
      ACE_THROW_SPEC ((
        CORBA::SystemException, CosNotifyComm::InvalidEventType
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
index 7951b5f1bd5..448a3438905 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
@@ -105,7 +105,7 @@ int StubFaultAnalyzer::parse_args (int argc, char * argv[])
 /**
  * Register this object as necessary
  */
-int StubFaultAnalyzer::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+int StubFaultAnalyzer::init (CORBA::ORB_ptr orb)
 {
   int result = 0;
   this->orb_ = CORBA::ORB::_duplicate (orb);
@@ -134,14 +134,12 @@ int StubFaultAnalyzer::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
   // register fault consumers
   if (result == 0)
   {
-    result = this->faultConsumer_.init (orb, this->notifier_
-                            ACE_ENV_ARG_PARAMETER);
+    result = this->faultConsumer_.init (orb, this->notifier_);
   }
 
   if (result == 0)
   {
-    result = this->batchConsumer_.init (orb, this->notifier_
-                            ACE_ENV_ARG_PARAMETER);
+    result = this->batchConsumer_.init (orb, this->notifier_);
   }
 
   /////////////////////////
@@ -217,8 +215,7 @@ int StubFaultAnalyzer::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
           this->factory_->create_object (
             type_id.in(),
             criteria.in(),
-            factory_creation_id
-            ACE_ENV_ARG_PARAMETER);
+            factory_creation_id);
         }
       }
     }
@@ -256,7 +253,7 @@ int StubFaultAnalyzer::fini (void)
 }
 
 
-int StubFaultAnalyzer::idle(int & result ACE_ENV_ARG_DECL_NOT_USED)
+int StubFaultAnalyzer::idle(int & result)
 {
   ACE_UNUSED_ARG(result);
   int quit = 0;
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h
index 6f75ae1d52a..eec5a427da0 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h
@@ -48,7 +48,7 @@ public:
   /**
    * Initialize this object
    */
-  int init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL);
+  int init (CORBA::ORB_ptr orb);
 
   /**
    * Return a string to identify this object for logging/console message purposes.
@@ -60,7 +60,7 @@ public:
    * @param result [out] status code to return from process
    * @returns 0 to continue; nonzero to quit
    */
-  int idle(int &result ACE_ENV_ARG_DECL);
+  int idle(int &result);
 
   /**
    * Prepare to exit.
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp
index 8c89a2ade40..3dfc0f4bdb5 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp
@@ -156,8 +156,7 @@ int StubFaultConsumer::parse_args (int argc, char * argv[])
  * Register this object.
  */
 int StubFaultConsumer::init (CORBA::ORB_ptr orb,
-    ::FT::FaultNotifier_var & notifier
-    ACE_ENV_ARG_DECL)
+    ::FT::FaultNotifier_var & notifier)
 {
   int result = 0;
   this->orb_ = CORBA::ORB::_duplicate (orb);
@@ -167,8 +166,7 @@ int StubFaultConsumer::init (CORBA::ORB_ptr orb,
 
   // Use the ROOT POA for now
   CORBA::Object_var poa_object =
-    this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA
-                                            ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA);
 
   if (CORBA::is_nil (poa_object.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -177,8 +175,7 @@ int StubFaultConsumer::init (CORBA::ORB_ptr orb,
 
   // Get the POA object.
   this->poa_ =
-    PortableServer::POA::_narrow (poa_object.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (poa_object.in ());
 
   if (CORBA::is_nil(this->poa_.in ()))
   {
@@ -194,13 +191,12 @@ int StubFaultConsumer::init (CORBA::ORB_ptr orb,
 
   // Register with the POA.
 
-  this->object_id_ = this->poa_->activate_object (this ACE_ENV_ARG_PARAMETER);
+  this->object_id_ = this->poa_->activate_object (this);
 
   // find my identity as an object
 
   CORBA::Object_var this_obj =
-    this->poa_->id_to_reference (object_id_.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+    this->poa_->id_to_reference (object_id_.in ());
 
   CosNotifyFilter::Filter_var filter = CosNotifyFilter::Filter::_nil();
 
@@ -224,7 +220,7 @@ const char * StubFaultConsumer::identity () const
  */
 int StubFaultConsumer::fini (void)
 {
-  this->notifier_->disconnect_consumer(this->consumer_id_ ACE_ENV_ARG_PARAMETER);
+  this->notifier_->disconnect_consumer(this->consumer_id_);
   return 0;
 }
 
@@ -239,7 +235,6 @@ int StubFaultConsumer::idle(int & result)
 // CORBA methods
 void StubFaultConsumer::push_structured_event(
   const CosNotification::StructuredEvent &notification
-  ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException, CosEventComm::Disconnected))
 {
@@ -284,7 +279,6 @@ void StubFaultConsumer::push_structured_event(
 void StubFaultConsumer::offer_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyComm::InvalidEventType))
 {
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
index b423f43d1df..111d44eac95 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
@@ -51,8 +51,7 @@ public:
   /**
    * Publish this objects IOR.
    */
-  int init (CORBA::ORB_ptr orb, ::FT::FaultNotifier_var & notifier
-    ACE_ENV_ARG_DECL);
+  int init (CORBA::ORB_ptr orb, ::FT::FaultNotifier_var & notifier);
 
   /**
    * Return a string to identify this object for logging/console message purposes.
@@ -80,14 +79,12 @@ public:
     // CORBA methods
     virtual void push_structured_event(
       const CosNotification::StructuredEvent &notification
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((CORBA::SystemException, CosEventComm::Disconnected));
 
    virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyComm::InvalidEventType));
 
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
index 1fb1c8dd487..862c6c94d34 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
@@ -112,7 +112,7 @@ int StubFaultNotifier::fini (void)
   if(this->ns_name_ != 0)
   {
     CORBA::Object_var naming_obj =
-      this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
+      this->orb_->resolve_initial_references ("NameService");
 
     if (CORBA::is_nil(naming_obj.in ())){
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -121,14 +121,13 @@ int StubFaultNotifier::fini (void)
     }
 
     CosNaming::NamingContext_var naming_context =
-      CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
+      CosNaming::NamingContext::_narrow (naming_obj.in ());
 
     CosNaming::Name this_name (1);
     this_name.length (1);
     this_name[0].id = CORBA::string_dup (this->ns_name_);
 
-    naming_context->unbind (this_name
-                            ACE_ENV_ARG_PARAMETER);
+    naming_context->unbind (this_name);
   }
   return 0;
 }
@@ -137,15 +136,14 @@ int StubFaultNotifier::fini (void)
 /**
  * Publish this objects IOR.
  */
-int StubFaultNotifier::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+int StubFaultNotifier::init (CORBA::ORB_ptr orb)
 {
   int result = 0;
   this->orb_ = CORBA::ORB::_duplicate (orb);
 
   // Use the ROOT POA for now
   CORBA::Object_var poa_object =
-    this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA
-                                            ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA);
 
   if (CORBA::is_nil (poa_object.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -154,8 +152,7 @@ int StubFaultNotifier::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 
   // Get the POA object.
   this->poa_ =
-    PortableServer::POA::_narrow (poa_object.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (poa_object.in ());
 
 
   if (CORBA::is_nil(this->poa_.in ()))
@@ -172,12 +169,11 @@ int StubFaultNotifier::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 
   // Register with the POA.
 
-  this->object_id_ = this->poa_->activate_object (this ACE_ENV_ARG_PARAMETER);
+  this->object_id_ = this->poa_->activate_object (this);
 
   // find my identity as a corba object
   CORBA::Object_var this_obj =
-    this->poa_->id_to_reference (object_id_.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+    this->poa_->id_to_reference (object_id_.in ());
 
   //////////////////////////////////////////
   // resolve references to detector factory
@@ -261,8 +257,7 @@ int StubFaultNotifier::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
           this->factory_->create_object (
             type_id.in(),
             criteria.in(),
-            factory_creation_id
-            ACE_ENV_ARG_PARAMETER);
+            factory_creation_id);
         }
       }
     }
@@ -286,7 +281,7 @@ int StubFaultNotifier::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
       this->identity_ += this->ns_name_;
 
       CORBA::Object_var naming_obj =
-        this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil(naming_obj.in ())){
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -295,14 +290,13 @@ int StubFaultNotifier::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
       }
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
       CosNaming::Name this_name (1);
       this_name.length (1);
       this_name[0].id = CORBA::string_dup (this->ns_name_);
 
-      naming_context->rebind (this_name, this_obj.in()
-                              ACE_ENV_ARG_PARAMETER);
+      naming_context->rebind (this_name, this_obj.in());
     }
   }
   return result;
@@ -334,12 +328,11 @@ const char * StubFaultNotifier::identity () const
  */
 void StubFaultNotifier::shutdown_i (void)
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 void StubFaultNotifier::push_structured_fault (
     const CosNotification::StructuredEvent & event
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -369,19 +362,17 @@ void StubFaultNotifier::push_structured_fault (
 
 void StubFaultNotifier::push_sequence_fault (
     const CosNotification::EventBatch & events
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   ACE_UNUSED_ARG (events);
-  ACE_THROW (CORBA::NO_IMPLEMENT());
+  throw CORBA::NO_IMPLEMENT();
 }
 
 ::CosNotifyFilter::Filter_ptr StubFaultNotifier::create_subscription_filter (
     const char * constraint_grammar
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -397,7 +388,6 @@ void StubFaultNotifier::push_sequence_fault (
 FT::FaultNotifier::ConsumerId StubFaultNotifier::connect_structured_fault_consumer (
     CosNotifyComm::StructuredPushConsumer_ptr push_consumer,
     CosNotifyFilter::Filter_ptr filter
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -414,7 +404,6 @@ FT::FaultNotifier::ConsumerId StubFaultNotifier::connect_structured_fault_consum
 FT::FaultNotifier::ConsumerId StubFaultNotifier::connect_sequence_fault_consumer (
     CosNotifyComm::SequencePushConsumer_ptr push_consumer,
     CosNotifyFilter::Filter_ptr filter
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -429,7 +418,6 @@ FT::FaultNotifier::ConsumerId StubFaultNotifier::connect_sequence_fault_consumer
 
 void StubFaultNotifier::disconnect_consumer (
     FT::FaultNotifier::ConsumerId connection
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -438,7 +426,7 @@ void StubFaultNotifier::disconnect_consumer (
 {
   ACE_UNUSED_ARG(connection);
 
-  ACE_THROW (CORBA::NO_IMPLEMENT());
+  throw CORBA::NO_IMPLEMENT();
 }
 
 CORBA::Boolean StubFaultNotifier::is_alive (void)
@@ -447,25 +435,24 @@ CORBA::Boolean StubFaultNotifier::is_alive (void)
   return 1;
 }
 
-int StubFaultNotifier::idle(int & result ACE_ENV_ARG_DECL_NOT_USED)
+int StubFaultNotifier::idle(int & result)
 {
   ACE_UNUSED_ARG(result);
   int quit = 0;
-  ACE_TRY_NEW_ENV
+  try
   {
     if(!CORBA::is_nil(this->factory_.in ()))
     {
-      int ok = this->factory_->is_alive( ACE_ENV_SINGLE_ARG_PARAMETER);
+      int ok = this->factory_->is_alive();
       if (!ok)
       {
         quit = 1;
       }
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
     quit = 1;
   }
-  ACE_ENDTRY;
   return quit;
 }
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
index ff2d4995d95..7197c9a72fa 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
@@ -48,7 +48,7 @@ public:
   /**
    * Initialize.
    */
-  int init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL);
+  int init (CORBA::ORB_ptr orb);
 
   /**
    * Prepare to exit.
@@ -65,7 +65,7 @@ public:
    * @param result [out] status code to return from process
    * @returns 0 to continue; nonzero to quit
    */
-  int idle(int &result ACE_ENV_ARG_DECL);
+  int idle(int &result);
 
   // override virtuals
 ::PortableServer::POA_ptr _default_POA (void);
@@ -84,39 +84,33 @@ public:
 
   virtual void push_structured_fault (
       const CosNotification::StructuredEvent & event
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void push_sequence_fault (
     const CosNotification::EventBatch & events
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS
   )
   ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual ::CosNotifyFilter::Filter_ptr create_subscription_filter (
     const char * constraint_grammar
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS
   )
   ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyFilter::InvalidGrammar));
 
   virtual FT::FaultNotifier::ConsumerId connect_structured_fault_consumer (
     CosNotifyComm::StructuredPushConsumer_ptr push_consumer,
     CosNotifyFilter::Filter_ptr filter
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS
   )
   ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual FT::FaultNotifier::ConsumerId connect_sequence_fault_consumer (
     CosNotifyComm::SequencePushConsumer_ptr push_consumer,
     CosNotifyFilter::Filter_ptr filter
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS
   )
   ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void disconnect_consumer (
     FT::FaultNotifier::ConsumerId connection
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS
   )
   ACE_THROW_SPEC ((CORBA::SystemException, CosEventComm::Disconnected));
 
diff --git a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
index 4d3ae2c4b8f..4f193a80688 100644
--- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
+++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
@@ -40,7 +40,7 @@ int TAO::Object_Group_Creator::set_factory_registry (PortableGroup::FactoryRegis
 }
 
 
-int TAO::Object_Group_Creator::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL_NOT_USED)
+int TAO::Object_Group_Creator::init (CORBA::ORB_ptr orb)
 {
   int result = 0;
   this->orb_ = CORBA::ORB::_duplicate (orb);
@@ -49,15 +49,15 @@ int TAO::Object_Group_Creator::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL_NOT_USE
   {
     ///////////////////////////////
     // Find the ReplicationManager
-    ACE_TRY_NEW_ENV
+    try
     {
       CORBA::Object_var rm_obj
         = orb->resolve_initial_references (
-          "ReplicationManager" ACE_ENV_ARG_PARAMETER);
+          "ReplicationManager");
 
       this->replication_manager_
         = ::FT::ReplicationManager::_narrow (
-          rm_obj.in () ACE_ENV_ARG_PARAMETER);
+          rm_obj.in ());
       if (!CORBA::is_nil (this->replication_manager_.in ()))
       {
         this->have_replication_manager_ = 1;
@@ -65,14 +65,13 @@ int TAO::Object_Group_Creator::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL_NOT_USE
         ::PortableGroup::Criteria criteria;
         this->registry_
           = this->replication_manager_->get_factory_registry (
-            criteria  ACE_ENV_ARG_PARAMETER);
+            criteria);
         if (!CORBA::is_nil (this->registry_.in ()))
         {
           this->detector_infos_
             = this->registry_->list_factories_by_role (
               FT::FAULT_DETECTOR_ROLE_NAME,
-              this->detector_type_id_.out ()
-              ACE_ENV_ARG_PARAMETER);
+              this->detector_type_id_.out ());
           CORBA::ULong count = this->detector_infos_->length ();
           ACE_DEBUG ( (LM_DEBUG,
             "%T %n (%P|%t)Object_Group_Creator: found %u factories for FaultDetectors\n",
@@ -84,7 +83,7 @@ int TAO::Object_Group_Creator::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL_NOT_USE
           ACE_ERROR ( (LM_ERROR,
             "%T %n (%P|%t) Object_Group_Creator: ReplicationManager failed to return FactoryRegistry.\n"
             ));
-          ACE_TRY_THROW (CORBA::NO_IMPLEMENT ());
+          throw CORBA::NO_IMPLEMENT ();
         }
       }
       else
@@ -92,30 +91,29 @@ int TAO::Object_Group_Creator::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL_NOT_USE
         ACE_ERROR ( (LM_ERROR,
           "%T %n (%P|%t) Object_Group_Creator: resolve_initial_references for ReplicationManager failed.\n"
           ));
-        ACE_TRY_THROW (CORBA::OBJECT_NOT_EXIST ());
+        throw CORBA::OBJECT_NOT_EXIST ();
       }
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Creator: Exception resolving ReplicationManager,\n");
+      ex._tao_print_exception (
+        "Creator: Exception resolving ReplicationManager,\n");
 
       result = 1;
     }
-    ACE_ENDTRY;
   }
 
   return result;
 }
 
-int TAO::Object_Group_Creator::unregister_role (const char * role ACE_ENV_ARG_DECL)
+int TAO::Object_Group_Creator::unregister_role (const char * role)
 {
   int result = 0;
   ACE_ERROR ( (LM_INFO,
     "%T %n (%P|%t) Object_Group_Creator: Unregistering all factories for %s\n",
     role
     ));
-  this->registry_->unregister_factory_by_role (role ACE_ENV_ARG_PARAMETER);
+  this->registry_->unregister_factory_by_role (role);
   return result;
 }
 
@@ -126,8 +124,7 @@ int TAO::Object_Group_Creator::create_detector_for_replica (
   const char * role,
   const char * type_id,
   PortableGroup::ObjectGroupId group_id,
-  const PortableGroup::Location & location
-  ACE_ENV_ARG_DECL)
+  const PortableGroup::Location & location)
 {
   int result = 0;
 
@@ -182,8 +179,7 @@ int TAO::Object_Group_Creator::create_detector_for_replica (
           info.the_factory->create_object (
             type_id,
             criteria.in (),
-            factory_creation_id
-            ACE_ENV_ARG_PARAMETER);
+            factory_creation_id);
           result = 1;
         }
       }
@@ -194,8 +190,7 @@ int TAO::Object_Group_Creator::create_detector_for_replica (
 
 
 CORBA::Object_ptr TAO::Object_Group_Creator::create_infrastructure_managed_group (
-    const char * type_id
-    ACE_ENV_ARG_DECL)
+    const char * type_id)
   ACE_THROW_SPEC ( (CORBA::SystemException ))
 {
   CORBA::Object_var group = CORBA::Object::_nil ();
@@ -222,8 +217,7 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_infrastructure_managed_group
 
     this->replication_manager_->set_type_properties (
       type_id,
-      properties
-      ACE_ENV_ARG_PARAMETER);
+      properties);
 
     ::PortableGroup::GenericFactory::FactoryCreationId_var creation_id;
     PortableGroup::Criteria criteria (1);
@@ -236,7 +230,6 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_infrastructure_managed_group
       type_id,
       criteria,
       creation_id
-      ACE_ENV_ARG_PARAMETER
       );
   }
   else
@@ -250,16 +243,14 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_infrastructure_managed_group
 
 CORBA::Object_ptr TAO::Object_Group_Creator::create_group (
     const char * role,
-    int write_iors
-    ACE_ENV_ARG_DECL)
+    int write_iors)
   ACE_THROW_SPEC ( (CORBA::SystemException ))
 {
   CORBA::Object_var group = CORBA::Object::_nil ();
 
   PortableGroup::ObjectGroupId group_id = 0;
   CORBA::String_var type_id;
-  ::PortableGroup::FactoryInfos_var infos = this->registry_->list_factories_by_role (role, type_id
-      ACE_ENV_ARG_PARAMETER);
+  ::PortableGroup::FactoryInfos_var infos = this->registry_->list_factories_by_role (role, type_id);
 
   CORBA::ULong count = infos->length ();
   ACE_ERROR ((LM_INFO,
@@ -307,7 +298,6 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_group (
         type_id.in (),
         criteria,
         creation_id
-        ACE_ENV_ARG_PARAMETER
         );
 
       //@@ this is a bit of a hack
@@ -332,8 +322,7 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_group (
       CORBA::Object_var created_obj = info.the_factory->create_object (
         type_id.in (),
         info.the_criteria,
-        factory_creation_id.out ()
-        ACE_ENV_ARG_PARAMETER);
+        factory_creation_id.out ());
       if ( !CORBA::is_nil (created_obj.in ()) )
       {
 // that which was first shall now be last        if (nFact == 0)
@@ -347,10 +336,9 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_group (
           role,
           type_id.in (),
           group_id,
-          info.the_location
-          ACE_ENV_ARG_PARAMETER);
+          info.the_location);
 
-        const char * replica_ior = orb_->object_to_string (created_obj.in () ACE_ENV_ARG_PARAMETER );
+        const char * replica_ior = orb_->object_to_string (created_obj.in () );
 
 
         if (write_iors)
@@ -404,8 +392,7 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_group (
           group = this->replication_manager_->add_member (
             group.in (),
             info.the_location,
-            created_obj.in ()
-            ACE_ENV_ARG_PARAMETER);
+            created_obj.in ());
         }
       }
       else
@@ -418,7 +405,7 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_group (
 
     if (first_location != 0 && this->have_replication_manager_)
     {
-      group = this->replication_manager_->set_primary_member (group.in (), * first_location ACE_ENV_ARG_PARAMETER);
+      group = this->replication_manager_->set_primary_member (group.in (), * first_location);
     }
     ACE_ERROR ( (LM_INFO,
       "%T %n (%P|%t) Object_Group_Creator:  Successfully created group of %s\n",
diff --git a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h
index 2d3128b96d1..7cbd507c530 100644
--- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h
+++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h
@@ -44,24 +44,22 @@ namespace TAO
 
     /////////////////
     // initialization
-    int init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL);
+    int init (CORBA::ORB_ptr orb);
 
     /////////////////
     // functionality
     CORBA::Object_ptr create_group(
         const char * role,
-        int write_iors
-        ACE_ENV_ARG_DECL)
+        int write_iors)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /////////////////
     // functionality
     CORBA::Object_ptr create_infrastructure_managed_group(
-        const char * type_id
-        ACE_ENV_ARG_DECL)
+        const char * type_id)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    int unregister_role(const char * role ACE_ENV_ARG_DECL);
+    int unregister_role(const char * role);
 
     ////////////
     // shut down
@@ -77,8 +75,7 @@ namespace TAO
     const char * role,
     const char * type_id,
     PortableGroup::ObjectGroupId group_id,
-    const PortableGroup::Location & location
-    ACE_ENV_ARG_DECL);
+    const PortableGroup::Location & location);
 
     ////////////////////
     // forbidden methods
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp
index 45a25c7fda0..e81d1e0ddfc 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp
@@ -18,16 +18,14 @@ Server_ORBInitializer::Server_ORBInitializer (void)
 
 void
 Server_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ServerRequestInterceptor_ptr interceptor;
@@ -42,8 +40,7 @@ Server_ORBInitializer::post_init (
 
   this->server_interceptor_ = interceptor;
 
-  info->add_server_request_interceptor (interceptor
-                                        ACE_ENV_ARG_PARAMETER);
+  info->add_server_request_interceptor (interceptor);
 }
 
 PortableInterceptor::ServerRequestInterceptor_ptr
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h
index f2c7f5d20e8..a4a8999d72a 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h
@@ -48,12 +48,10 @@ public:
   /// Constructor.
   Server_ORBInitializer (void);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the created server request interceptor.  Only valid after
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
index 7151a24463a..dc02d137738 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
@@ -24,7 +24,7 @@ Server_Request_Interceptor::~Server_Request_Interceptor (void)
 }
 
 void
-Server_Request_Interceptor::reset (ACE_ENV_ARG_DECL)
+Server_Request_Interceptor::reset ()
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->request_count_ = 0;
@@ -34,30 +34,29 @@ Server_Request_Interceptor::reset (ACE_ENV_ARG_DECL)
 void
 Server_Request_Interceptor::forward_references (
   CORBA::Object_ptr obj1,
-  CORBA::Object_ptr obj2
-  ACE_ENV_ARG_DECL)
+  CORBA::Object_ptr obj2)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (obj1) || CORBA::is_nil (obj2))
-    ACE_THROW (CORBA::INV_OBJREF (
-                 CORBA::SystemException::_tao_minor_code (
-                   TAO::VMCID,
-                   EINVAL),
-                 CORBA::COMPLETED_NO));
+    throw CORBA::INV_OBJREF (
+      CORBA::SystemException::_tao_minor_code (
+        TAO::VMCID,
+        EINVAL),
+      CORBA::COMPLETED_NO);
 
   char *argv[] = {NULL};
   int   argc = 0;
 
   // Fetch the ORB having been initialized in main()
   CORBA::ORB_var orb =
-    CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER);
+    CORBA::ORB_init (argc, argv, "Server ORB");
 
-  CORBA::String_var str1 = orb->object_to_string (obj1 ACE_ENV_ARG_PARAMETER);
+  CORBA::String_var str1 = orb->object_to_string (obj1);
 
-  CORBA::String_var str2 = orb->object_to_string (obj2 ACE_ENV_ARG_PARAMETER);
+  CORBA::String_var str2 = orb->object_to_string (obj2);
 
-  this->obj_[0] = orb->string_to_object (str1.in () ACE_ENV_ARG_PARAMETER);
-  this->obj_[1] = orb->string_to_object (str2.in () ACE_ENV_ARG_PARAMETER);
+  this->obj_[0] = orb->string_to_object (str1.in ());
+  this->obj_[1] = orb->string_to_object (str2.in ());
 }
 
 char *
@@ -77,8 +76,7 @@ Server_Request_Interceptor::destroy (void)
 
 void
 Server_Request_Interceptor::receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -92,8 +90,7 @@ Server_Request_Interceptor::receive_request_service_contexts (
   if (this->forward_request_thrown_ == true)
     {
       IOP::ServiceContext_var svc =
-        ri->get_request_service_context (IOP::FT_GROUP_VERSION
-                                         ACE_ENV_ARG_PARAMETER);
+        ri->get_request_service_context (IOP::FT_GROUP_VERSION);
 
       // extract the group component
       TAO_InputCDR cdr (reinterpret_cast<const char*> (svc->context_data.get_buffer ()),
@@ -126,8 +123,7 @@ Server_Request_Interceptor::receive_request_service_contexts (
 
 void
 Server_Request_Interceptor::receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -143,14 +139,13 @@ Server_Request_Interceptor::receive_request (
       this->forward_request_thrown_ = true;
 
       // Throw forward exception
-      ACE_THROW (PortableInterceptor::ForwardRequest (this->obj_[1]));
+      throw PortableInterceptor::ForwardRequest (this->obj_[1]);
     }
 
   if (this->forward_request_thrown_ == true)
     {
       IOP::ServiceContext_var svc =
-        ri->get_request_service_context (IOP::FT_GROUP_VERSION
-                                         ACE_ENV_ARG_PARAMETER);
+        ri->get_request_service_context (IOP::FT_GROUP_VERSION);
 
       // extract the group component
       TAO_InputCDR cdr (reinterpret_cast<const char*> (svc->context_data.get_buffer ()),
@@ -184,16 +179,14 @@ Server_Request_Interceptor::receive_request (
 
 void
 Server_Request_Interceptor::send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_Request_Interceptor::send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -201,8 +194,7 @@ Server_Request_Interceptor::send_exception (
 
 void
 Server_Request_Interceptor::send_other (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h
index 6c50f49e8e7..0f1ea6e848d 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h
@@ -51,12 +51,11 @@ public:
 
   /// Set the references to which requests will be forwarded.
   virtual void forward_references (CORBA::Object_ptr obj1,
-                                   CORBA::Object_ptr obj2
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                   CORBA::Object_ptr obj2)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Reset to initial state, like counter etc, keeps the object-references
-  virtual void reset (ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void reset ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -77,31 +76,26 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_request_service_contexts (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_request (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_reply (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_exception (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_other (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
   //@}
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
index ac5c1e777d2..82a81c531bb 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
@@ -39,13 +39,11 @@ main (int argc, char *argv[])
 {
   int status = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            "Client ORB"
-                                            ACE_ENV_ARG_PARAMETER);
+                                            "Client ORB");
 
       if (::parse_args (argc, argv) != 0)
         return -1;
@@ -54,17 +52,17 @@ main (int argc, char *argv[])
       // IOR occurs during the various interceptions executed during
       // this test.
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior);
 
       ForwardRequestTest::test_var server =
-        ForwardRequestTest::test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        ForwardRequestTest::test::_narrow (object.in ());
 
       // Before and after the LOCATION_FORWARD_PERM the marshaled
       // object reference must differ.
 
       // Create a stringified/marshaled snapshot of Object reference
       CORBA::String_var marshaled_obj_snapshot1 =
-          orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
+          orb->object_to_string (server.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -102,7 +100,7 @@ main (int argc, char *argv[])
       // consequence the marshaled representation of "server" should
       // look different now, compare to snapshot1.
       CORBA::String_var marshaled_obj_snapshot2 =
-          orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
+          orb->object_to_string (server.in ());
 
       if (strcmp (marshaled_obj_snapshot1.in (), marshaled_obj_snapshot2.in ()) == 0)
         {
@@ -114,13 +112,11 @@ main (int argc, char *argv[])
 
       server->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return -1;
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_INFO,
               "Group_Ref_Manip Test passed.\n"));
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
index d4e3d3653f2..082e91dc80f 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
@@ -46,17 +46,15 @@ parse_args (int argc, char *argv[])
 void
 add_ft_prop (CORBA::ORB_ptr o,
              CORBA::Object_ptr obj1,
-             CORBA::Object_ptr obj2
-             ACE_ENV_ARG_DECL)
+             CORBA::Object_ptr obj2)
 {
   // Get an object reference for the ORBs IORManipultion object!
   CORBA::Object_var IORM =
     o->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-                                   0
-                                   ACE_ENV_ARG_PARAMETER);
+                                   0);
 
   TAO_IOP::TAO_IOR_Manipulation_var iorm =
-    TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in() ACE_ENV_ARG_PARAMETER);
+    TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in());
 
   FT::TagFTGroupTaggedComponent ft_tag_component;
 
@@ -82,15 +80,13 @@ add_ft_prop (CORBA::ORB_ptr o,
 
   // Set the property for object 1
   CORBA::Boolean retval = iorm->set_property (&iogr_prop,
-                                              obj1
-                                              ACE_ENV_ARG_PARAMETER);
+                                              obj1);
 
   if (retval != 0)
     {
       retval = iorm->set_primary (&iogr_prop,
                                   obj1,
-                                  obj1
-                                  ACE_ENV_ARG_PARAMETER);
+                                  obj1);
     }
 
 
@@ -100,22 +96,19 @@ add_ft_prop (CORBA::ORB_ptr o,
   ft_tag_component.object_group_ref_version = (CORBA::ULong) 5;
 
   retval = iorm->set_property (&iogr_prop,
-                                              obj2
-                                              ACE_ENV_ARG_PARAMETER);
+                                              obj2);
 
   if (retval != 0)
     {
       retval = iorm->set_primary (&iogr_prop,
                                   obj2,
-                                  obj2
-                                  ACE_ENV_ARG_PARAMETER);
+                                  obj2);
     }
 
   return;
 }
 
-void test_colocal (ForwardRequestTest::test_ptr server
-                   ACE_ENV_ARG_DECL)
+void test_colocal (ForwardRequestTest::test_ptr server)
 {
   CORBA::ULong number = 0;
   for (int i = 1; i <= 25; ++i)
@@ -155,8 +148,7 @@ void test_colocal (ForwardRequestTest::test_ptr server
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       Server_ORBInitializer *temp_initializer = 0;
       ACE_NEW_RETURN (temp_initializer,
@@ -165,14 +157,13 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "Server ORB");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -180,7 +171,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -197,34 +188,28 @@ main (int argc, char *argv[])
       PortableServer::POA_var first_poa =
         root_poa->create_POA ("first POA",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
+                              policies);
 
 
 
       PortableServer::ObjectId_var oid1 =
-        first_poa->activate_object (&servant1
-                                    ACE_ENV_ARG_PARAMETER);
+        first_poa->activate_object (&servant1);
 
       PortableServer::ObjectId_var oid2 =
-        first_poa->activate_object (&servant2
-                                    ACE_ENV_ARG_PARAMETER);
+        first_poa->activate_object (&servant2);
 
       CORBA::Object_var obj1 =
-        first_poa->servant_to_reference (&servant1
-                                         ACE_ENV_ARG_PARAMETER);
+        first_poa->servant_to_reference (&servant1);
 
       CORBA::Object_var obj2 =
-        first_poa->servant_to_reference (&servant2
-                                         ACE_ENV_ARG_PARAMETER);
+        first_poa->servant_to_reference (&servant2);
 
       (void) add_ft_prop (orb.in (),
                           obj1.in (),
-                          obj2.in ()
-                          ACE_ENV_ARG_PARAMETER);
+                          obj2.in ());
 
       CORBA::String_var ior =
-        orb->object_to_string (obj1.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (obj1.in ());
 
       ACE_DEBUG ((LM_DEBUG,
                   "ForwardRequestTest::test servant 1: <%s>\n",
@@ -238,7 +223,7 @@ main (int argc, char *argv[])
 
       ForwardRequestTest::ServerRequestInterceptor_var interceptor =
         ForwardRequestTest::ServerRequestInterceptor::_narrow (
-           server_interceptor.in () ACE_ENV_ARG_PARAMETER);
+           server_interceptor.in ());
 
       if (CORBA::is_nil (interceptor.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -247,14 +232,13 @@ main (int argc, char *argv[])
                           -1);
 
       interceptor->forward_references (obj1.in (),
-                                       obj2.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+                                       obj2.in ());
 
       // Run co-local test
         {
           ForwardRequestTest::test_var server =
-            ForwardRequestTest::test::_narrow (obj1.in () ACE_ENV_ARG_PARAMETER);
-          test_colocal (server.in() ACE_ENV_ARG_PARAMETER);
+            ForwardRequestTest::test::_narrow (obj1.in ());
+          test_colocal (server.in());
 
           // Reset interceptor for remote tests
           interceptor->reset ();
@@ -276,19 +260,17 @@ main (int argc, char *argv[])
       // Run the ORB event loop.
       orb->run ();
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1);
 
       orb->destroy ();
 
       ACE_DEBUG ((LM_DEBUG, "Event loop finished.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp
index 122324ab774..283aae38b3c 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp
@@ -31,5 +31,5 @@ test_i::shutdown (void)
   ACE_DEBUG ((LM_DEBUG,
               "Server is shutting down via object %d.\n",
               this->number_));
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
index 87fc72368e8..2edb37fe9f7 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
@@ -62,16 +62,14 @@ int
 main (int argc,
       char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   Manager manager;
 
-  ACE_TRY
+  try
     {
       // Initilaize the ORB, POA etc.
       manager.init (argc,
-                    argv
-                    ACE_ENV_ARG_PARAMETER);
+                    argv);
 
       // the command line arguments
       if (parse_args (argc, argv) == -1)
@@ -92,13 +90,11 @@ main (int argc,
       Client_i client_imp (manager.orb ());
       client_imp.init ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught");
+      ex._tao_print_exception ("Caught");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -112,22 +108,19 @@ Manager::Manager (void)
 
 void
 Manager::init (int argc,
-               char *argv[]
-               ACE_ENV_ARG_DECL)
+               char *argv[])
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                0
-                                ACE_ENV_ARG_PARAMETER);
+                                0);
 
   // Obtain the RootPOA.
   CORBA::Object_var obj_var =
-    this->orb_->resolve_initial_references ("RootPOA"
-                                            ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references ("RootPOA");
 
   // Get the POA_var object from Object_var.
   PortableServer::POA_var root_poa_var =
-    PortableServer::POA::_narrow (obj_var.in () ACE_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (obj_var.in ());
 
   // Get the POAManager of the RootPOA.
   PortableServer::POAManager_var poa_manager_var =
@@ -141,22 +134,19 @@ Manager::make_merged_iors (void)
 {
   // First  server
   object_primary =
-    this->orb_->string_to_object (first_ior
-                                  ACE_ENV_ARG_PARAMETER);
+    this->orb_->string_to_object (first_ior);
 
   //Second server
   object_secondary =
-    this->orb_->string_to_object (second_ior
-                                  ACE_ENV_ARG_PARAMETER);
+    this->orb_->string_to_object (second_ior);
 
   // Get an object reference for the ORBs IORManipultion object!
   CORBA::Object_var IORM =
     this->orb_->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-                                            0
-                                            ACE_ENV_ARG_PARAMETER);
+                                            0);
 
   iorm =
-    TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in() ACE_ENV_ARG_PARAMETER);
+    TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in());
 
 
   // Create the list
@@ -167,7 +157,7 @@ Manager::make_merged_iors (void)
 
   // Create a merged set 1;
   merged_set_ =
-    iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
+    iorm->merge_iors (iors);
 
   return 0;
 }
@@ -200,8 +190,7 @@ Manager::set_properties (void)
 
   // Set the property
   CORBA::Boolean retval = iorm->set_property (&iogr_prop,
-                                              this->merged_set_.in ()
-                                              ACE_ENV_ARG_PARAMETER);
+                                              this->merged_set_.in ());
 
   // Set the primary
   // See we are setting the second ior as the primary
@@ -209,8 +198,7 @@ Manager::set_properties (void)
     {
       retval = iorm->set_primary (&iogr_prop,
                                   object_secondary.in (),
-                                  this->merged_set_.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+                                  this->merged_set_.in ());
     }
 
   return 0;
@@ -219,17 +207,16 @@ Manager::set_properties (void)
 int
 Manager::run (void)
 {
-  ACE_TRY
+  try
     {
       this->orb_->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_ERROR_RETURN ((LM_DEBUG,
                          "Error in run \n"),
                         -1);
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -268,8 +255,7 @@ Client_i::Client_i (CORBA::ORB_ptr orb)
 }
 
 void
-run_test (Simple_Server_ptr server
-          ACE_ENV_ARG_DECL);
+run_test (Simple_Server_ptr server);
 
 void
 Client_i::init (void)
@@ -296,17 +282,14 @@ Client_i::init (void)
   char **argv = 0;
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                0
-                                ACE_ENV_ARG_PARAMETER);
+                                0);
 
   CORBA::Object_var object =
-    this->orb_->string_to_object (data
-                                  ACE_ENV_ARG_PARAMETER);
+    this->orb_->string_to_object (data);
 
   // Combined IOR stuff
   Simple_Server_var server =
-    Simple_Server::_narrow (object.in ()
-                            ACE_ENV_ARG_PARAMETER);
+    Simple_Server::_narrow (object.in ());
 
   if (CORBA::is_nil (server.in ()))
     {
@@ -315,23 +298,21 @@ Client_i::init (void)
                   data));
     }
 
-  run_test (server.in ()
-            ACE_ENV_ARG_PARAMETER);
+  run_test (server.in ());
 
   ior_buffer.alloc ()->free (data);
   ACE_OS::close (f_handle);
 }
 
 
-void run_test (Simple_Server_ptr server
-               ACE_ENV_ARG_DECL)
+void run_test (Simple_Server_ptr server)
 {
   // We do this twice as we know that there are only two servers.
   for (CORBA::ULong i = 0;
        i < 2;
        i++)
     {
-      ACE_TRY
+      try
         {
           for (CORBA::ULong j = 0;
                j < 10;
@@ -348,11 +329,11 @@ void run_test (Simple_Server_ptr server
           server->shutdown ();
           ACE_OS::sleep (2);
         }
-      ACE_CATCH (CORBA::TRANSIENT, t)
+      catch (const CORBA::TRANSIENT& t)
         {
           if (t.completed () != CORBA::COMPLETED_NO)
             {
-              ACE_PRINT_EXCEPTION (t, "Unexpected kind of TRANSIENT");
+              t._tao_print_exception ("Unexpected kind of TRANSIENT");
             }
           else
             {
@@ -363,18 +344,16 @@ void run_test (Simple_Server_ptr server
               ACE_OS::sleep (1);
             }
         }
-      ACE_CATCH (CORBA::COMM_FAILURE, f)
+      catch (const CORBA::COMM_FAILURE& f)
         {
-          ACE_PRINT_EXCEPTION (f, "A (sort of) expected COMM_FAILURE");
+          f._tao_print_exception ("A (sort of) expected COMM_FAILURE");
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("Automagically re-issuing request on COMM_FAILURE\n")));
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Unexpected exception");
-          ACE_RE_THROW;
+          ex._tao_print_exception ("Unexpected exception");
+          throw;
         }
-      ACE_ENDTRY;
     }
 }
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h
index f31970bd98f..f2c0fd796a5 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h
@@ -36,8 +36,7 @@ public:
   // Ctor
 
   void init (int argc,
-             char *argv[]
-             ACE_ENV_ARG_DECL);
+             char *argv[]);
 
   // Initialize the ORB, POA etc.
 
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
index 4b8a80b26d6..9dfac7c264f 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
@@ -36,17 +36,16 @@ main (int argc, char *argv[])
 {
 
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       // We do the command line parsing first
       if (parse_args (argc, argv) != 0)
         return 1;
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -54,7 +53,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -66,7 +65,7 @@ main (int argc, char *argv[])
         display_impl._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -88,12 +87,10 @@ main (int argc, char *argv[])
       orb->run ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
index d16bb668f1d..4dfc4d3c0ed 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
@@ -20,7 +20,7 @@ Simple_Server_i::Simple_Server_i (void)
 }
 
 void
-Simple_Server_i::remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+Simple_Server_i::remote_call ( /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp
index 30ea67466a3..95d0056e813 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp
@@ -32,34 +32,30 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG, "---------------------------------------------\n"));
   ACE_DEBUG ((LM_DEBUG, "Running the IOGRManipulation Tests.\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Retrieve the ORB.
       CORBA::ORB_var orb_ = CORBA::ORB_init (argc,
                                              argv,
-                                             0
-                                             ACE_ENV_ARG_PARAMETER);
+                                             0);
       // **********************************************************************
 
       // Get an object reference for the ORBs IORManipulation object!
       CORBA::Object_var IORM =
         orb_->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-                                          0
-                                          ACE_ENV_ARG_PARAMETER);
+                                          0);
 
       TAO_IOP::TAO_IOR_Manipulation_var iorm =
-               TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
+               TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in ());
       // **********************************************************************
 
       // Create a few fictitious IORs
       CORBA::Object_var name1 =
         orb_->string_to_object ("iiop://acme.cs.wustl.edu:6060/xyz"
-                                ACE_ENV_ARG_PARAMETER);
+                                );
       CORBA::Object_var name2 =
         orb_->string_to_object ("iiop://tango.cs.wustl.edu:7070/xyz"
-                                ACE_ENV_ARG_PARAMETER);
+                                );
 
       // **********************************************************************
       // Create IOR list for use with merge_iors.
@@ -70,7 +66,7 @@ main (int argc, char *argv[])
       // **********************************************************************
 
       CORBA::Object_var merged =
-        iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
+        iorm->merge_iors (iors);
 
       // Check for set and get primaries
       // Make a dummy property set
@@ -78,7 +74,7 @@ main (int argc, char *argv[])
       TAO_FT_IOGR_Property prop (ft_tag_component);
 
       CORBA::Boolean retval =
-        iorm->set_primary (&prop, name2.in (), merged.in () ACE_ENV_ARG_PARAMETER);
+        iorm->set_primary (&prop, name2.in (), merged.in ());
 
       if (retval != 0)
         ACE_DEBUG ((LM_DEBUG,
@@ -92,8 +88,7 @@ main (int argc, char *argv[])
 
       // Check whether a primary has been set
       retval = iorm->is_primary_set (&prop,
-                                     merged.in ()
-                                     ACE_ENV_ARG_PARAMETER);
+                                     merged.in ());
 
       if (retval)
         ACE_DEBUG ((LM_DEBUG,
@@ -111,8 +106,7 @@ main (int argc, char *argv[])
       // Get the primary
       CORBA::Object_var prim =
         iorm->get_primary (&prop,
-                           merged.in ()
-                           ACE_ENV_ARG_PARAMETER);
+                           merged.in ());
 
       // Check whether we got back the right primary
       if (prim->_is_equivalent (name2.in ()))
@@ -150,8 +144,7 @@ main (int argc, char *argv[])
 
       // Set the property
       retval = iorm->set_property (&prop,
-                                   merged.in ()
-                                   ACE_ENV_ARG_PARAMETER);
+                                   merged.in ());
 
       /// Extract the property
       FT::TagFTGroupTaggedComponent ftc;
@@ -159,8 +152,7 @@ main (int argc, char *argv[])
 
       retval =
         tmp_prop.get_tagged_component (merged.in (),
-                                       ftc
-                                       ACE_ENV_ARG_PARAMETER);
+                                       ftc);
 
 
       ACE_DEBUG ((LM_DEBUG,
@@ -179,37 +171,33 @@ main (int argc, char *argv[])
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("\tWe have set the property\n")));
     }
-  ACE_CATCH (TAO_IOP::NotFound, userex)
+  catch (const TAO_IOP::NotFound& userex)
     {
-      ACE_PRINT_EXCEPTION (userex,
-                           ACE_TEXT ("Unexpected NotFound Exception!\n"));
+      userex._tao_print_exception (
+        ACE_TEXT (
+          "Unexpected NotFound Exception!\n"));
       return -1;
     }
-  ACE_CATCH (TAO_IOP::Duplicate, userex)
+  catch (const TAO_IOP::Duplicate& userex)
     {
-      ACE_PRINT_EXCEPTION (userex,
-                           "Unexpected Duplicate Exception!\n");
+      userex._tao_print_exception ("Unexpected Duplicate Exception!\n");
       return -1;
     }
-  ACE_CATCH (TAO_IOP::Invalid_IOR, userex)
+  catch (const TAO_IOP::Invalid_IOR& userex)
     {
-      ACE_PRINT_EXCEPTION (userex,
-                           "Unexpected Invalid_IOR Exception!\n");
+      userex._tao_print_exception ("Unexpected Invalid_IOR Exception!\n");
       return -1;
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex,
-                           "Unexpected system Exception!!\n");
+      sysex._tao_print_exception ("Unexpected system Exception!!\n");
       return -1;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected ACE_CATCHANY Exception!\n");
+      ex._tao_print_exception ("Unexpected CORBA Exception!\n");
       return -1;
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG, "IORManipulation Tests Successfully Completed!\n"));
   ACE_DEBUG ((LM_DEBUG, "---------------------------------------------\n"));
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
index 1d5b35d58c5..32392aefe58 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
@@ -17,7 +17,6 @@ PushConsumer_impl::PushConsumer_impl(CORBA::ORB_ptr orb)
 
 void
 PushConsumer_impl::push (const RtecEventComm::EventSet & event
-             ACE_ENV_ARG_DECL_NOT_USED
              )
              ACE_THROW_SPEC ((
              CORBA::SystemException
@@ -42,12 +41,11 @@ PushConsumer_impl::disconnect_push_consumer (void)
                        ))
 {
   PortableServer::Current_var current =
-    resolve_init<PortableServer::Current>(orb_.in(), "POACurrent" ACE_ENV_ARG_PARAMETER);
+    resolve_init<PortableServer::Current>(orb_.in(), "POACurrent");
 
   PortableServer::POA_var poa = current->get_POA();
 
   PortableServer::ObjectId_var oid = current->get_object_id();
 
-  poa->deactivate_object(oid.in ()
-                         ACE_ENV_ARG_PARAMETER);
+  poa->deactivate_object(oid.in ());
 }
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h
index 11c5601a36e..950766fe295 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h
@@ -22,14 +22,12 @@ public:
 
     virtual void push (
         const RtecEventComm::EventSet & data
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
     virtual void disconnect_push_consumer (
-        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
index dfb6f713cff..28deb58d382 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
@@ -43,7 +43,7 @@ PushSupplier_impl::~PushSupplier_impl()
   reactor_task_.wait();
 }
 
-int PushSupplier_impl::init(RtecEventChannelAdmin::EventChannel_ptr channel ACE_ENV_ARG_DECL)
+int PushSupplier_impl::init(RtecEventChannelAdmin::EventChannel_ptr channel)
 {
 
   ACE_DEBUG((LM_DEBUG, "for_suppliers\n"));
@@ -70,7 +70,7 @@ int PushSupplier_impl::init(RtecEventChannelAdmin::EventChannel_ptr channel ACE_
 
     ACE_DEBUG((LM_DEBUG, "connect_push_supplier\n"));
   consumer_->connect_push_supplier(supplier.in(),
-    qos   ACE_ENV_ARG_PARAMETER);
+    qos);
 
   ACE_DEBUG((LM_DEBUG, "push_consumer connected\n"));
 
@@ -88,7 +88,6 @@ int PushSupplier_impl::init(RtecEventChannelAdmin::EventChannel_ptr channel ACE_
 
 
 void  PushSupplier_impl::disconnect_push_supplier (
-        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -98,14 +97,13 @@ void  PushSupplier_impl::disconnect_push_supplier (
   reactor_task_.reactor_->end_reactor_event_loop();
 
   PortableServer::Current_var current =
-    resolve_init<PortableServer::Current>(orb_.in(), "POACurrent" ACE_ENV_ARG_PARAMETER);
+    resolve_init<PortableServer::Current>(orb_.in(), "POACurrent");
 
   PortableServer::POA_var poa = current->get_POA();
 
   PortableServer::ObjectId_var oid = current->get_object_id();
 
-  poa->deactivate_object (oid.in ()
-                          ACE_ENV_ARG_PARAMETER);
+  poa->deactivate_object (oid.in ());
 }
 
 int PushSupplier_impl::handle_timeout (const ACE_Time_Value &current_time,
@@ -114,8 +112,7 @@ int PushSupplier_impl::handle_timeout (const ACE_Time_Value &current_time,
   ACE_UNUSED_ARG(act);
   ACE_UNUSED_ARG(current_time);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY {
+  try{
     RtecEventComm::EventSet event (1);
     event.length (1);
     event[0].header.type   = ACE_ES_EVENT_UNDEFINED;
@@ -127,14 +124,13 @@ int PushSupplier_impl::handle_timeout (const ACE_Time_Value &current_time,
     event[0].header.ec_send_time = time_val.sec () * 10000000 + time_val.usec ()* 10;
     event[0].data.any_value <<= seq_no_;
 
-    consumer_->push(event ACE_ENV_ARG_PARAMETER);
+    consumer_->push(event);
     ACE_DEBUG((LM_DEBUG, "sending data %d\n", seq_no_));
     ++seq_no_;
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION, "A CORBA Exception occurred.");
+    ex._tao_print_exception ("A CORBA Exception occurred.");
   }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h
index dd9897ca66c..28f36099c86 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h
@@ -27,10 +27,9 @@ public:
   PushSupplier_impl(CORBA::ORB_ptr orb);
   ~PushSupplier_impl();
 
-  int init(RtecEventChannelAdmin::EventChannel_ptr ACE_ENV_ARG_DECL);
+  int init(RtecEventChannelAdmin::EventChannel_ptr);
 
     virtual void  disconnect_push_supplier (
-        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp
index 657c5a47d5d..f77a5507f73 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp
@@ -23,7 +23,7 @@ CORBA::ORB_var orb;
 auto_ptr<TAO_FTRTEC::FTEC_Gateway> gateway;
 
 RtecEventChannelAdmin::EventChannel_ptr
-get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL)
+get_event_channel(int argc, ACE_TCHAR** argv)
 {
     FtRtecEventChannelAdmin::EventChannel_var channel;
     ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("hi:n"));
@@ -36,10 +36,8 @@ get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL)
       {
       case 'i':
         {
-          CORBA::Object_var obj = orb->string_to_object(get_opt.opt_arg ()
-                                                        ACE_ENV_ARG_PARAMETER);
-          channel = FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in()
-                                                                ACE_ENV_ARG_PARAMETER);
+          CORBA::Object_var obj = orb->string_to_object(get_opt.opt_arg ());
+          channel = FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in());
         }
         break;
       case 'n':
@@ -65,12 +63,10 @@ get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL)
       name[0].id = CORBA::string_dup("FT_EventService");
 
       CosNaming::NamingContext_var naming_context =
-        resolve_init<CosNaming::NamingContext>(orb.in(), "NameService"
-        ACE_ENV_ARG_PARAMETER);
+        resolve_init<CosNaming::NamingContext>(orb.in(), "NameService");
 
       channel  = resolve<FtRtecEventChannelAdmin::EventChannel>(naming_context.in(),
-        name
-        ACE_ENV_ARG_PARAMETER);
+        name);
     }
 
     if (use_gateway)
@@ -84,20 +80,18 @@ get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL)
 
 int main(int argc, ACE_TCHAR** argv)
 {
-  ACE_TRY_NEW_ENV {
-    orb = CORBA::ORB_init(argc, argv, ""
-      ACE_ENV_ARG_PARAMETER);
+  try{
+    orb = CORBA::ORB_init(argc, argv, "");
 
     RtecEventChannelAdmin::EventChannel_var channel
-      = get_event_channel(argc, argv ACE_ENV_ARG_PARAMETER);
+      = get_event_channel(argc, argv);
 
 
     if (CORBA::is_nil(channel.in()))
       ACE_ERROR_RETURN((LM_ERROR, "Cannot Find FT_EventService\n"), -1);
 
     PortableServer::POA_var poa =
-      resolve_init<PortableServer::POA>(orb.in(), "RootPOA"
-                            ACE_ENV_ARG_PARAMETER);
+      resolve_init<PortableServer::POA>(orb.in(), "RootPOA");
 
     PortableServer::POAManager_var mgr = poa->the_POAManager();
 
@@ -123,16 +117,15 @@ int main(int argc, ACE_TCHAR** argv)
       push_consumer_impl._this();
 
     supplier->connect_push_consumer(push_consumer.in(),
-      qos   ACE_ENV_ARG_PARAMETER);
+      qos);
 
     orb->run();
 
   }
-  ACE_CATCHANY {
-    ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION, "A CORBA Exception occurred.");
+  catch (const CORBA::Exception& ex){
+    ex._tao_print_exception ("A CORBA Exception occurred.");
     return -1;
   }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
index 06ddb75bf7b..a1971b10bdf 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
@@ -22,7 +22,7 @@ CORBA::ORB_var orb;
 auto_ptr<TAO_FTRTEC::FTEC_Gateway> gateway;
 
 RtecEventChannelAdmin::EventChannel_ptr
-get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL)
+get_event_channel(int argc, ACE_TCHAR** argv)
 {
     FtRtecEventChannelAdmin::EventChannel_var channel;
     ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("hi:nt:?"));
@@ -35,10 +35,8 @@ get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL)
       {
       case 'i':
         {
-          CORBA::Object_var obj = orb->string_to_object(get_opt.opt_arg ()
-                                                        ACE_ENV_ARG_PARAMETER);
-          channel = FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in()
-                                                                ACE_ENV_ARG_PARAMETER);
+          CORBA::Object_var obj = orb->string_to_object(get_opt.opt_arg ());
+          channel = FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in());
         }
         break;
       case 'n':
@@ -69,12 +67,10 @@ get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL)
       name[0].id = CORBA::string_dup("FT_EventService");
 
       CosNaming::NamingContext_var naming_context =
-        resolve_init<CosNaming::NamingContext>(orb.in(), "NameService"
-        ACE_ENV_ARG_PARAMETER);
+        resolve_init<CosNaming::NamingContext>(orb.in(), "NameService");
 
       channel  = resolve<FtRtecEventChannelAdmin::EventChannel>(naming_context.in(),
-        name
-        ACE_ENV_ARG_PARAMETER);
+        name);
     }
 
     if (use_gateway)
@@ -90,29 +86,26 @@ get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL)
 
 int main(int argc, ACE_TCHAR** argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY {
-    orb = CORBA::ORB_init(argc, argv, ""
-                          ACE_ENV_ARG_PARAMETER);
+  try{
+    orb = CORBA::ORB_init(argc, argv, "");
 
 
     RtecEventChannelAdmin::EventChannel_var channel
-      = get_event_channel(argc, argv ACE_ENV_ARG_PARAMETER);
+      = get_event_channel(argc, argv);
 
 
     if (CORBA::is_nil(channel.in()))
        return -1;
 
     PortableServer::POA_var poa =
-      resolve_init<PortableServer::POA>(orb.in(), "RootPOA"
-                            ACE_ENV_ARG_PARAMETER);
+      resolve_init<PortableServer::POA>(orb.in(), "RootPOA");
 
     PortableServer::POAManager_var mgr = poa->the_POAManager();
 
     mgr->activate();
 
     PushSupplier_impl push_supplier(orb.in());
-    if (push_supplier.init(channel.in() ACE_ENV_ARG_PARAMETER) == -1)
+    if (push_supplier.init(channel.in()) == -1)
       return -1;
 
     RtecEventComm::PushSupplier_var
@@ -122,10 +115,9 @@ int main(int argc, ACE_TCHAR** argv)
     orb->run();
 
   }
-  ACE_CATCHANY {
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION, "A CORBA Exception occurred.");
+  catch (const CORBA::Exception& ex){
+      ex._tao_print_exception ("A CORBA Exception occurred.");
   }
-  ACE_ENDTRY;
 
 
   return 0;
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp
index f5e313c8dea..4732914e80b 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp
@@ -32,8 +32,7 @@ AMI_Test_i::AMI_Test_i (CORBA::ORB_ptr orb)
 CORBA::Long
 AMI_Test_i::foo (CORBA::Long_out out_l,
                  CORBA::Long in_l,
-                 const char* in_str
-                 ACE_ENV_ARG_DECL)
+                 const char* in_str)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    A::DidTheRightThing))
 {
@@ -76,8 +75,7 @@ AMI_Test_i::yadda (void)
 
 
 void
-AMI_Test_i::yadda (CORBA::Long yadda
-                   ACE_ENV_ARG_DECL_NOT_USED)
+AMI_Test_i::yadda (CORBA::Long yadda)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.h b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.h
index 4bd216bae5a..9788a022b3b 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.h
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.h
@@ -33,8 +33,7 @@ public:
   // The AMI_Test methods.
   CORBA::Long foo (CORBA::Long_out out_l,
                    CORBA::Long in_l,
-                   const char* in_str
-                   ACE_ENV_ARG_DECL)
+                   const char* in_str)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      A::DidTheRightThing));
 
@@ -44,8 +43,7 @@ public:
   CORBA::Long yadda (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void yadda (CORBA::Long yadda
-              ACE_ENV_ARG_DECL)
+  void yadda (CORBA::Long yadda)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp
index 28e9425c44a..51a2e8454ca 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp
@@ -101,8 +101,7 @@ public:
   Handler (void) {};
 
   void foo (CORBA::Long result,
-            CORBA::Long out_l
-            ACE_ENV_ARG_DECL_NOT_USED)
+            CORBA::Long out_l)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       if (debug)
@@ -116,27 +115,23 @@ public:
       number_of_replies--;
     };
 
-   void foo_excep (::Messaging::ExceptionHolder * excep_holder
-                  ACE_ENV_ARG_DECL)
+   void foo_excep (::Messaging::ExceptionHolder * excep_holder)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
 
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <foo_excep> called: \n"));
-      ACE_TRY
+      try
         {
           excep_holder->raise_exception ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Caught exception:");
+          ex._tao_print_exception ("Caught exception:");
         }
-      ACE_ENDTRY;
     };
 
-  void get_yadda (CORBA::Long result
-                  ACE_ENV_ARG_DECL_NOT_USED)
+  void get_yadda (CORBA::Long result)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
@@ -144,8 +139,7 @@ public:
                   result));
     };
 
-  void get_yadda_excep (::Messaging::ExceptionHolder *
-                        ACE_ENV_ARG_DECL_NOT_USED)
+  void get_yadda_excep (::Messaging::ExceptionHolder *)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
@@ -159,8 +153,7 @@ public:
                   "Callback method <set_yadda> called: \n"));
     };
 
-  void set_yadda_excep (::Messaging::ExceptionHolder *
-                        ACE_ENV_ARG_DECL_NOT_USED)
+  void set_yadda_excep (::Messaging::ExceptionHolder *)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
@@ -176,11 +169,10 @@ int
 main (int argc, char *argv[])
 {
   ACE_START_TEST (ACE_TEXT ("HTIOP_AMI_client"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -188,10 +180,10 @@ main (int argc, char *argv[])
       ACE_OS::socket_init ();
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior);
 
       A::AMI_Test_var server =
-        A::AMI_Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        A::AMI_Test::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -204,7 +196,7 @@ main (int argc, char *argv[])
       // Activate POA to handle the call back.
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -212,7 +204,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -268,17 +260,15 @@ main (int argc, char *argv[])
 
       root_poa->destroy (1,  // ethernalize objects
                          0  // wait for completion
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   ACE_END_TEST;
   return 0;
@@ -291,13 +281,13 @@ Client::Client (A::AMI_Test_ptr server,
                 :  ami_test_var_ (A::AMI_Test::_duplicate (server)),
      niterations_ (niterations)
 {
-  the_handler_var_ = handler._this (/* ACE_ENV_SINGLE_ARG_PARAMETER */);
+  the_handler_var_ = handler._this (/* */);
 }
 
 int
 Client::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Long number = 931232;
 
@@ -305,8 +295,7 @@ Client::svc (void)
         {
           ami_test_var_->sendc_foo (the_handler_var_.in (),
                                     number,
-                                    "Let's talk AMI."
-                                    ACE_ENV_ARG_PARAMETER);
+                                    "Let's talk AMI.");
         }
       if (debug)
         {
@@ -315,11 +304,9 @@ Client::svc (void)
                       niterations));
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "MT_Client: exception raised");
+      ex._tao_print_exception ("MT_Client: exception raised");
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp
index 2518bebee9b..05bfe8816c1 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp
@@ -61,14 +61,13 @@ int
 main (int argc, char *argv[])
 {
   ACE_START_TEST (ACE_TEXT ("HTIOP_AMI_server"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -76,7 +75,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -92,7 +91,7 @@ main (int argc, char *argv[])
         ami_test_i._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (ami_test_var.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (ami_test_var.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -115,19 +114,17 @@ main (int argc, char *argv[])
 
       root_poa->destroy (1,  // ethernalize objects
                          0  // wait for completion
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 
       orb->destroy ();
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   ACE_END_TEST;
   return 0;
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
index f0181ed1358..5dc1c8454f4 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
@@ -79,8 +79,7 @@ public:
   // Destructor.
 
   void foo (CORBA::Long ami_return_val,
-            CORBA::Long out_l
-            ACE_ENV_ARG_DECL_NOT_USED)
+            CORBA::Long out_l)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       if (debug)
@@ -92,34 +91,31 @@ public:
         }
     };
 
-  void foo_excep (::Messaging::ExceptionHolder * excep_holder
-                  ACE_ENV_ARG_DECL)
+  void foo_excep (::Messaging::ExceptionHolder * excep_holder)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
 
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <foo_excep> called: \n"
                                   "Testing proper exception handling ...\n"));
-      ACE_TRY
+      try
         {
           excep_holder->raise_exception ();
         }
-      ACE_CATCH (A::DidTheRightThing, ex)
+      catch (const A::DidTheRightThing& ex)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "... exception received successfully\n"));
                     }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "... caught the wrong exception -> ERROR\n"));
         }
-      ACE_ENDTRY;
     };
 
 
-  void get_yadda (CORBA::Long result
-                  ACE_ENV_ARG_DECL_NOT_USED)
+  void get_yadda (CORBA::Long result)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
@@ -127,8 +123,7 @@ public:
                   result));
     };
 
-  void get_yadda_excep (::Messaging::ExceptionHolder *
-                  ACE_ENV_ARG_DECL_NOT_USED)
+  void get_yadda_excep (::Messaging::ExceptionHolder *)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
@@ -142,8 +137,7 @@ public:
                   "Callback method <set_yadda> called: \n"));
     };
 
-  void set_yadda_excep (::Messaging::ExceptionHolder *
-                  ACE_ENV_ARG_DECL_NOT_USED)
+  void set_yadda_excep (::Messaging::ExceptionHolder *)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
@@ -157,18 +151,17 @@ main (int argc, char *argv[])
 {
   ACE_START_TEST (ACE_TEXT ("HTIOP_AMI_simple_client"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object_var =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa_var =
-        PortableServer::POA::_narrow (object_var.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object_var.in ());
 
       PortableServer::POAManager_var poa_manager_var =
         poa_var->the_POAManager ();
@@ -179,10 +172,10 @@ main (int argc, char *argv[])
         return 1;
 
       // We reuse the object_var smart pointer!
-      object_var = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+      object_var = orb->string_to_object (ior);
 
       A::AMI_Test_var ami_test_var =
-        A::AMI_Test::_narrow (object_var.in () ACE_ENV_ARG_PARAMETER);
+        A::AMI_Test::_narrow (object_var.in ());
 
       if (CORBA::is_nil (ami_test_var.in ()))
         {
@@ -204,8 +197,7 @@ main (int argc, char *argv[])
 
       ami_test_var->sendc_foo (A::AMI_AMI_TestHandler::_nil (),
                                0,
-                               ""
-                               ACE_ENV_ARG_PARAMETER);
+                               "");
 
 
       // Trigger the DidTheRightThing exception on the server side
@@ -215,8 +207,7 @@ main (int argc, char *argv[])
 
       ami_test_var->sendc_foo (the_handler_var.in (),
                                0,
-                               "Let's talk AMI."
-                               ACE_ENV_ARG_PARAMETER);
+                               "Let's talk AMI.");
 
       CORBA::Long l = 931247;
 
@@ -228,20 +219,16 @@ main (int argc, char *argv[])
 
           ami_test_var->sendc_foo (the_handler_var.in (),
                                    l,
-                                   "Let's talk AMI."
-                                   ACE_ENV_ARG_PARAMETER);
+                                   "Let's talk AMI.");
         }
 
       // Begin test of attributes
-      ami_test_var->sendc_get_yadda (the_handler_var.in ()
-                                     ACE_ENV_ARG_PARAMETER);
+      ami_test_var->sendc_get_yadda (the_handler_var.in ());
 
       ami_test_var->sendc_set_yadda (the_handler_var.in (),
-                                     4711
-                                     ACE_ENV_ARG_PARAMETER);
+                                     4711);
 
-      ami_test_var->sendc_get_yadda (the_handler_var.in ()
-                                     ACE_ENV_ARG_PARAMETER);
+      ami_test_var->sendc_get_yadda (the_handler_var.in ());
 
       // End test of attributes
 
@@ -264,8 +251,7 @@ main (int argc, char *argv[])
 
       CORBA::Long number = ami_test_var->foo (l,
                                               l,
-                                              "Let's talk SMI."
-                                              ACE_ENV_ARG_PARAMETER);
+                                              "Let's talk SMI.");
 
       if (debug)
         {
@@ -282,17 +268,15 @@ main (int argc, char *argv[])
 
       poa_var->destroy (1,  // ethernalize objects
                         0  // wait for completion
-                        ACE_ENV_ARG_PARAMETER);
+                        );
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   ACE_END_TEST;
   return 0;
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
index 3ca60704965..4b27b3a0722 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
@@ -46,12 +46,12 @@ main (int argc, char *argv[])
   PortableServer::POA_var root_poa = PortableServer::POA::_nil();
   Callback_i *servant = 0;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+      orb = CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -59,7 +59,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -72,8 +72,7 @@ main (int argc, char *argv[])
       pol <<= BiDirPolicy::BOTH;
       policies[0] =
         orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
-                            pol
-                            ACE_ENV_ARG_PARAMETER);
+                            pol);
 
       // Create POA as child of RootPOA with the above policies.  This POA
       // will receive request in the same connection in which it sent
@@ -81,8 +80,7 @@ main (int argc, char *argv[])
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("childPOA",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
+                              policies);
 
       // Creation of childPOA is over. Destroy the Policy objects.
       for (CORBA::ULong i = 0;
@@ -98,10 +96,10 @@ main (int argc, char *argv[])
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior);
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        Simple_Server::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -118,12 +116,11 @@ main (int argc, char *argv[])
         servant->_this ();
 
       // Send the calback object to the server
-      server->callback_object (callback.in ()
-                               ACE_ENV_ARG_PARAMETER);
+      server->callback_object (callback.in ());
 
       // A  method to kickstart callbacks from the server
       CORBA::Long r =
-        server->test_method (1 ACE_ENV_ARG_PARAMETER);
+        server->test_method (1);
 
       if (r != 0)
         {
@@ -134,16 +131,14 @@ main (int argc, char *argv[])
 
       orb->run ();
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   if (!CORBA::is_nil(root_poa.in()))
     root_poa->destroy (1,1);
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
index 665f5ae15e7..d0f7a2ef9ae 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
@@ -43,13 +43,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -57,7 +57,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -70,8 +70,7 @@ main (int argc, char *argv[])
       pol <<= BiDirPolicy::BOTH;
       policies[0] =
         orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
-                            pol
-                            ACE_ENV_ARG_PARAMETER);
+                            pol);
 
       // Create POA as child of RootPOA with the above policies.  This POA
       // will receive request in the same connection in which it sent
@@ -79,8 +78,7 @@ main (int argc, char *argv[])
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("childPOA",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
+                              policies);
 
       // Creation of childPOA is over. Destroy the Policy objects.
       for (CORBA::ULong i = 0;
@@ -102,17 +100,15 @@ main (int argc, char *argv[])
         PortableServer::string_to_ObjectId ("simple_server");
 
       child_poa->activate_object_with_id (id.in (),
-                                          server_impl
-                                          ACE_ENV_ARG_PARAMETER);
+                                          server_impl);
 
       server_impl->_remove_ref();
 
       CORBA::Object_var obj =
-        child_poa->id_to_reference (id.in ()
-                                    ACE_ENV_ARG_PARAMETER);
+        child_poa->id_to_reference (id.in ());
 
       CORBA::String_var ior =
-        orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (obj.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -147,15 +143,13 @@ main (int argc, char *argv[])
         }
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
index 0555b1d3a0d..3b18b67811b 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
@@ -18,11 +18,11 @@ Callback_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n"));
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 void
-Callback_i::callback_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+Callback_i::callback_method ( /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -34,7 +34,7 @@ Callback_i::callback_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_A
 
 CORBA::Long
 Simple_Server_i::test_method (CORBA::Boolean do_callback
-                              ACE_ENV_ARG_DECL_NOT_USED )
+ )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (do_callback)
@@ -47,7 +47,7 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback
 
 void
 Simple_Server_i::callback_object (Callback_ptr callback
-                                  ACE_ENV_ARG_DECL_NOT_USED )
+ )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Store the callback object
@@ -88,5 +88,5 @@ void
 Simple_Server_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h
index 7958d4fb10f..33333f74968 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h
@@ -58,12 +58,10 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Long test_method (CORBA::Boolean do_callback
-                           ACE_ENV_ARG_DECL_NOT_USED)
+  CORBA::Long test_method (CORBA::Boolean do_callback)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void callback_object (Callback_ptr callback
-                        ACE_ENV_ARG_DECL_NOT_USED)
+  void callback_object (Callback_ptr callback)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void shutdown (void)
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp
index df3567c792c..2b00e7b4331 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp
@@ -22,6 +22,6 @@ void
 Hello::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
   ACE_DEBUG ((LM_DEBUG,"in shutdown\n"));
 }
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp
index 13471720090..3d935510fa1 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp
@@ -41,20 +41,20 @@ main (int argc, char *argv[])
 {
   ACE_START_TEST (ACE_TEXT ("Hello_client"));
 
-  ACE_TRY_NEW_ENV
+  try
     {
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object(ior);
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
@@ -75,13 +75,11 @@ main (int argc, char *argv[])
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   ACE_END_TEST;
   return 0;
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp
index b70a2cfd393..ebdf3be3ad7 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp
@@ -45,20 +45,20 @@ main (int argc, char *argv[])
 {
   ACE_START_TEST (ACE_TEXT ("Hello_server"));
 
-  ACE_TRY_NEW_ENV
+  try
     {
       ACE_DEBUG ((LM_DEBUG, "Begin of Hello_Server test\n"));
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       //------ Get Root POA & POA Manager references
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -71,19 +71,19 @@ main (int argc, char *argv[])
       //------- Get IOR Table reference to support CORBALOC URLs
 
       obj =
-        orb->resolve_initial_references("IORTable" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("IORTable");
 
       IORTable::Table_var ior_table =
-        IORTable::Table::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+        IORTable::Table::_narrow(obj.in());
 
 
       //------- Get NameService Root Context
 
       obj =
-        orb->resolve_initial_references("NameService" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("NameService");
 
       CosNaming::NamingContextExt_var root_nc =
-        CosNaming::NamingContextExt::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+        CosNaming::NamingContextExt::_narrow(obj.in());
 
       //-------- Prepare Servant
 
@@ -100,7 +100,7 @@ main (int argc, char *argv[])
         hello_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (hello.in ());
 
       //--------- Publish IOR using various means
 
@@ -115,7 +115,7 @@ main (int argc, char *argv[])
         }
 
       if (!CORBA::is_nil(ior_table.in()))
-        ior_table->bind("HelloObj", ior.in() ACE_ENV_ARG_PARAMETER);
+        ior_table->bind("HelloObj", ior.in());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -133,7 +133,7 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1);
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - Root poa destroyed\n"));
 
@@ -143,14 +143,12 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "server exiting\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_END_TEST;
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   ACE_END_TEST;
   return 0;
diff --git a/TAO/orbsvcs/tests/IOR_MCast/client.cpp b/TAO/orbsvcs/tests/IOR_MCast/client.cpp
index d0a2253a051..7beeedd4301 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/client.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/client.cpp
@@ -5,27 +5,25 @@
 int main (int argc, char *argv [])
 {
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
 
       ior_mcast_Client_i client;
 
       int init_result;
-      init_result = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      init_result = client.init (argc, argv);
 
       return 0;
     }
-  ACE_CATCH (CORBA::SystemException, ex)
+  catch (const CORBA::SystemException& ex)
     {
       //
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "client");
+      ex._tao_print_exception ("client");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp
index 72cb2e61691..7edf3b20760 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp
@@ -15,21 +15,20 @@ ior_mcast_Client_i::~ior_mcast_Client_i (void)
 
 int
 ior_mcast_Client_i::init (int& argc,
-                          char *argv[]
-                          ACE_ENV_ARG_DECL)
+                          char *argv[])
 {
 
-  ACE_TRY
+  try
     {
       // First initialize the ORB, that will remove some arguments...
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
                          "" /* the ORB name, it can be anything! */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 
       CORBA::Object_var mcast_server_object =
-        orb->resolve_initial_references ("MCASTServer" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("MCASTServer");
 
       if (CORBA::is_nil (mcast_server_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -37,7 +36,7 @@ ior_mcast_Client_i::init (int& argc,
                           -1);
 
       MCast::Server_var mcast_srvr =
-        MCast::Server::_narrow (mcast_server_object.in () ACE_ENV_ARG_PARAMETER);
+        MCast::Server::_narrow (mcast_server_object.in ());
 
       if (CORBA::is_nil (mcast_srvr.in ()))
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -60,16 +59,15 @@ ior_mcast_Client_i::init (int& argc,
                       "The server has been successfully contacted!\n"));
         }
     }
-  ACE_CATCH (CORBA::SystemException, ex)
+  catch (const CORBA::SystemException& ex)
     {
-      ACE_PRINT_EXCEPTION (ex, "client");
+      ex._tao_print_exception ("client");
       return -1;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "client");
+      ex._tao_print_exception ("client");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h
index f88141b0eaf..46ca60befd4 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h
+++ b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h
@@ -24,7 +24,7 @@ class ior_mcast_Client_i
   int run (void);
   // Execute the client example code.
 
-  int init (int& argc, char *argv[] ACE_ENV_ARG_DECL);
+  int init (int& argc, char *argv[]);
   // Initialize the client communication endpoint with the server.
 
  private:
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server.cpp b/TAO/orbsvcs/tests/IOR_MCast/server.cpp
index eabe5f473dd..a8cd25a9b2b 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/server.cpp
@@ -4,23 +4,20 @@
 
 int main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       Server_i svr_i;
 
-      const int init_result = svr_i.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      const int init_result = svr_i.init (argc, argv);
 
       if (init_result != 0)
         return 1;
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CORBA exception raised in server!");
+      ex._tao_print_exception ("CORBA exception raised in server!");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
index 30c6212b5c6..dcb6b1ce180 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
@@ -29,28 +29,27 @@ Server_i::~Server_i (void)
 
 int
 Server_i::init (int &argc,
-                char **&argv
-                ACE_ENV_ARG_DECL)
+                char **&argv)
 {
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_TRY
+  try
     {
       // First initialize the ORB, that will remove some arguments...
       this->orb_ =
         CORBA::ORB_init (this->argc_,
                          this->argv_,
                          "" /* the ORB name, it can be anything! */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 
       // Get a reference to the RootPOA.
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("RootPOA");
 
       // Narrow down to the correct reference.
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       // Set a POA Manager.
       PortableServer::POAManager_var poa_manager =
@@ -69,10 +68,10 @@ Server_i::init (int &argc,
         server_i._this ();
 
       CORBA::Object_var table_object =
-        this->orb_->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("IORTable");
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
+        IORTable::Table::_narrow (table_object.in ());
 
       if (CORBA::is_nil (adapter.in ()))
         {
@@ -81,9 +80,8 @@ Server_i::init (int &argc,
       else
         {
           ior =
-            this->orb_->object_to_string (mcast_server.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-          adapter->bind ("MCASTServer", ior.in () ACE_ENV_ARG_PARAMETER);
+            this->orb_->object_to_string (mcast_server.in ());
+          adapter->bind ("MCASTServer", ior.in ());
         }
 
       // Enable such that the server can listen for multicast requests
@@ -94,7 +92,7 @@ Server_i::init (int &argc,
                       "ERROR: Unable to enable multicast "
                       "on specified address.\n"));
 
-          ACE_TRY_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
 
       // Run the ORB
@@ -104,12 +102,11 @@ Server_i::init (int &argc,
       poa->destroy (1, 1);
       this->orb_->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "client");
+      ex._tao_print_exception ("client");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server_i.h b/TAO/orbsvcs/tests/IOR_MCast/server_i.h
index 35844172cac..d55765506e6 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server_i.h
+++ b/TAO/orbsvcs/tests/IOR_MCast/server_i.h
@@ -20,7 +20,7 @@ public:
   Server_i (void);
   ~Server_i (void);
 
-  int init (int &argc, char **&argv ACE_ENV_ARG_DECL);
+  int init (int &argc, char **&argv);
   // Initialize the server multicast.
 
 private:
diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
index 9de2488801a..9fbfff745b2 100644
--- a/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
@@ -8,12 +8,12 @@
 
 int main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var ns_obj =
-        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil (ns_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -21,8 +21,7 @@ int main (int argc, char *argv[])
                           1);
 
       CosNaming::NamingContext_var inc =
-        CosNaming::NamingContext::_narrow (ns_obj.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (ns_obj.in ());
 
       if (CORBA::is_nil (inc.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -33,16 +32,15 @@ int main (int argc, char *argv[])
       name.length (1);
       name[0].id = CORBA::string_dup ("yourself");
 
-      inc->bind (name, ns_obj.in () ACE_ENV_ARG_PARAMETER);
+      inc->bind (name, ns_obj.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Test Successful\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Test");
+      ex._tao_print_exception ("Test");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
index 9633238aa85..a3441b53d83 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
@@ -60,20 +60,18 @@ Airplane_Client_i::get_planes (size_t count)
 {
   for (size_t i = 0; i < count; i++)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
+      try
         {
           CORBA::String_var response =
             this->server_->get_plane ();
 
           ACE_DEBUG ((LM_DEBUG, "Plane %d is %s\n", i, response.in ()));
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           ACE_ERROR ((LM_ERROR, "Plane %d exception:\n", i));
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "get_planes");
+          ex._tao_print_exception ("get_planes");
         }
-      ACE_ENDTRY;
     }
 }
 
@@ -103,14 +101,12 @@ Airplane_Client_i::init (int argc, char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
-                                    "internet"
-                                    ACE_ENV_ARG_PARAMETER);
+                                    "internet");
 
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
@@ -123,20 +119,19 @@ Airplane_Client_i::init (int argc, char **argv)
                           -1);
 
       CORBA::Object_var server_object =
-        this->orb_->string_to_object (this->server_key_ ACE_ENV_ARG_PARAMETER);
+        this->orb_->string_to_object (this->server_key_);
 
-      this->server_ = Paper_Airplane_Server::_narrow (server_object.in() ACE_ENV_ARG_PARAMETER);
+      this->server_ = Paper_Airplane_Server::_narrow (server_object.in());
 
       if (CORBA::is_nil (server_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
           "Error: invalid server key <%s>\n", this->server_key_), -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Airplane_Client_i::init");
+      ex._tao_print_exception ("Airplane_Client_i::init");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
index 05d69d7f205..5c3ab7d7763 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
@@ -13,10 +13,9 @@ main (int argc, char *argv[])
 
   ACE_DEBUG ((LM_DEBUG, "\n\tPaper Airplane Server\n\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      int retval = server.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      int retval = server.init (argc, argv);
 
       if (retval == -1)
         return -1;
@@ -28,15 +27,14 @@ main (int argc, char *argv[])
 
       return retval;
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      userex._tao_print_exception ("User Exception");
     }
-  ACE_ENDTRY;
 
   return 1;
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
index 46c5be55077..cad3a9ab157 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
@@ -61,16 +61,16 @@ Airplane_Server_i::parse_args (void)
 }
 
 int
-Airplane_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
+Airplane_Server_i::init (int argc, char** argv)
 {
   // Since the Implementation Repository keys off of the POA name, we need
   // to use the SERVER_NAME as the POA's name.
   const char *poa_name = SERVER_NAME;
 
-  ACE_TRY
+  try
     {
       // Initialize the ORB
-      this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
+      this->orb_ = CORBA::ORB_init (argc, argv, 0);
 
       // Save pointers to the command line arguments
       this->argc_ = argc;
@@ -84,12 +84,11 @@ Airplane_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
 
       // Get the POA from the ORB.
       CORBA::Object_var obj =
-        this->orb_->resolve_initial_references ("RootPOA"
-                                                ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("RootPOA");
       ACE_ASSERT(! CORBA::is_nil (obj.in ()));
 
       // Narrow the object to a POA.
-      root_poa_ = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+      root_poa_ = PortableServer::POA::_narrow (obj.in ());
 
       // Get the POA_Manager.
       this->poa_manager_ = this->root_poa_->the_POAManager ();
@@ -101,19 +100,15 @@ Airplane_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
       policies.length (2);
 
       policies[0] =
-        this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK
+        this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID);
 
       policies[1] =
-        this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT
-                                          ACE_ENV_ARG_PARAMETER);
+        this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT);
 
       this->airplane_poa_ =
         this->root_poa_->create_POA (poa_name,
                               this->poa_manager_.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
+                              policies);
 
       // Creation of the new POA is over, so destroy the Policy_ptr's.
       for (CORBA::ULong i = 0; i < policies.length (); ++i)
@@ -128,31 +123,30 @@ Airplane_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
         PortableServer::string_to_ObjectId ("server");
 
       this->airplane_poa_->activate_object_with_id (server_id.in (),
-                                                    this->server_impl_
-                                                    ACE_ENV_ARG_PARAMETER);
+                                                    this->server_impl_);
 
-      obj = this->airplane_poa_->id_to_reference (server_id.in () ACE_ENV_ARG_PARAMETER);
+      obj = this->airplane_poa_->id_to_reference (server_id.in ());
       CORBA::String_var ior =
-        this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
+        this->orb_->object_to_string (obj.in ());
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG, "The ImRified IOR is: <%s>\n", ior.in ()));
 
       TAO_Root_POA* tmp_poa = dynamic_cast<TAO_Root_POA*>(airplane_poa_.in());
-      obj = tmp_poa->id_to_reference_i (server_id.in (), false ACE_ENV_ARG_PARAMETER);
+      obj = tmp_poa->id_to_reference_i (server_id.in (), false);
       CORBA::String_var plain_ior =
-        this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
+        this->orb_->object_to_string (obj.in ());
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG, "The plain IOR is: <%s>\n", plain_ior.in ()));
 
       // Note : The IORTable will only be used for those clients who try to
       // invoke indirectly using a simple object_key reference
       // like "corbaloc::localhost:8888/airplane_server".
-      obj = this->orb_->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
+      obj = this->orb_->resolve_initial_references ("IORTable");
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+        IORTable::Table::_narrow (obj.in ());
       ACE_ASSERT(! CORBA::is_nil (adapter.in ()));
-      adapter->bind (poa_name, plain_ior.in () ACE_ENV_ARG_PARAMETER);
+      adapter->bind (poa_name, plain_ior.in ());
 
       this->poa_manager_->activate ();
 
@@ -162,12 +156,11 @@ Airplane_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
           ACE_OS::fclose (this->ior_output_file_);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Airplane_Server_i::init");
-      ACE_RE_THROW;
+      ex._tao_print_exception ("Airplane_Server_i::init");
+      throw;
     }
-  ACE_ENDTRY;
 
 
   return 0;
@@ -176,12 +169,12 @@ Airplane_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
 int
 Airplane_Server_i::run (void)
 {
-  ACE_TRY
+  try
     {
       ACE_Time_Value tv(60);
       ACE_Time_Value tvStart = ACE_OS::gettimeofday();
 
-      this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
+      this->orb_->run (tv);
 
       ACE_Time_Value tvEnd = ACE_OS::gettimeofday();
 
@@ -191,12 +184,11 @@ Airplane_Server_i::run (void)
       if (tvEnd - tvStart > tv - ACE_Time_Value(5))
         return 1;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Airplane_Server_i::run");
-      ACE_RE_THROW;
+      ex._tao_print_exception ("Airplane_Server_i::run");
+      throw;
     }
-  ACE_ENDTRY;
 
 
   return 0;
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h
index ea00f591a58..78b8f0c6873 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h
@@ -39,7 +39,7 @@ public:
   ~Airplane_Server_i (void);
 
   /// Initialize the Server state - parsing arguments and waiting
-  int init (int argc, char **argv ACE_ENV_ARG_DECL);
+  int init (int argc, char **argv);
 
   /// Run the orb
   int run (void);
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
index 4335b7e83cb..c99c34d25cd 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
@@ -96,14 +96,12 @@ Nestea_Client_i::init (int argc, char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
-                                    "internet"
-                                    ACE_ENV_ARG_PARAMETER);
+                                    "internet");
 
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
@@ -116,20 +114,19 @@ Nestea_Client_i::init (int argc, char **argv)
                           -1);
 
       CORBA::Object_var server_object =
-        this->orb_->string_to_object (this->server_key_ ACE_ENV_ARG_PARAMETER);
+        this->orb_->string_to_object (this->server_key_);
 
-      this->server_ = Nestea_Bookshelf::_narrow (server_object.in() ACE_ENV_ARG_PARAMETER);
+      this->server_ = Nestea_Bookshelf::_narrow (server_object.in());
 
       if (CORBA::is_nil (server_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
           "Error: invalid server key <%s>\n", this->server_key_), -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Nestea_Client_i::init");
+      ex._tao_print_exception ("Nestea_Client_i::init");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
index 55793984a58..654899816c0 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
@@ -34,8 +34,7 @@ Nestea_i::~Nestea_i (void)
 // Add <cans> number of cans to the bookshelf.
 
 void
-Nestea_i::drink (CORBA::Long cans
-                 ACE_ENV_ARG_DECL_NOT_USED)
+Nestea_i::drink (CORBA::Long cans)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level)
@@ -50,8 +49,7 @@ Nestea_i::drink (CORBA::Long cans
 // Removes <cans> number of cans from the bookshelf.
 
 void
-Nestea_i::crush (CORBA::Long cans
-                 ACE_ENV_ARG_DECL_NOT_USED)
+Nestea_i::crush (CORBA::Long cans)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level)
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.h b/TAO/orbsvcs/tests/ImplRepo/nestea_i.h
index baf6ef4d8a9..5a7ea6eb25d 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.h
@@ -45,13 +45,11 @@ public:
   virtual ~Nestea_i (void);
 
   /// Add <cans> number of cans to the bookshelf.
-  virtual void drink (CORBA::Long cans
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void drink (CORBA::Long cans)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Removes <cans> number of cans from the bookshelf.
-  virtual void crush (CORBA::Long cans
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void crush (CORBA::Long cans)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Returns the number of cans in the bookshelf.
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
index 34b63ca6ea7..65735e280f7 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
@@ -11,10 +11,9 @@ main (int argc, char *argv[])
 
   ACE_DEBUG ((LM_DEBUG, "\n\tNestea Bookshelf Server\n\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      int retval = server.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      int retval = server.init (argc, argv);
 
       if (retval == -1)
         return -1;
@@ -23,17 +22,16 @@ main (int argc, char *argv[])
           server.run ();
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      userex._tao_print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG, "Nestea Bookshelf Server says goodnight\n"));
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
index cffa76eae74..89a8efd1587 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
@@ -86,17 +86,17 @@ static void printEnvVars() {
 }
 
 int
-Nestea_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
+Nestea_Server_i::init (int argc, char** argv)
 {
   printEnvVars();
   // Since the Implementation Repository keys off of the POA name, we need
   // to use the SERVER_NAME as the POA's name.
   const char *poa_name = SERVER_NAME;
 
-  ACE_TRY
+  try
     {
       // Initialize the ORB
-      this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
+      this->orb_ = CORBA::ORB_init (argc, argv, 0);
 
       // Save pointers to the command line arguments
       this->argc_ = argc;
@@ -110,11 +110,10 @@ Nestea_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
 
       // Get the POA from the ORB.
       CORBA::Object_var obj =
-        this->orb_->resolve_initial_references ("RootPOA"
-                                                ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("RootPOA");
       ACE_ASSERT(! CORBA::is_nil (obj.in ()));
 
-      this->root_poa_ = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+      this->root_poa_ = PortableServer::POA::_narrow (obj.in ());
 
       this->poa_manager_ = this->root_poa_->the_POAManager ();
 
@@ -125,19 +124,15 @@ Nestea_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
       policies.length (2);
 
       policies[0] =
-        this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK
+        this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID);
 
       policies[1] =
-        this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT
-                                          ACE_ENV_ARG_PARAMETER);
+        this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT);
 
       this->nestea_poa_ =
         this->root_poa_->create_POA (poa_name,
                               this->poa_manager_.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
+                              policies);
 
       // Creation of the new POA is over, so destroy the Policy_ptr's.
       for (CORBA::ULong i = 0; i < policies.length (); ++i)
@@ -154,27 +149,26 @@ Nestea_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
         PortableServer::string_to_ObjectId ("server");
 
       this->nestea_poa_->activate_object_with_id (server_id.in (),
-                                                  this->server_impl_
-                                                  ACE_ENV_ARG_PARAMETER);
+                                                  this->server_impl_);
 
-      obj = this->nestea_poa_->id_to_reference (server_id.in () ACE_ENV_ARG_PARAMETER);
+      obj = this->nestea_poa_->id_to_reference (server_id.in ());
       CORBA::String_var ior =
-        this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
+        this->orb_->object_to_string (obj.in ());
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG, "The IOR is: <%s>\n", ior.in ()));
 
       TAO_Root_POA* tmp_poa = dynamic_cast<TAO_Root_POA*>(nestea_poa_.in());
-      obj = tmp_poa->id_to_reference_i (server_id.in (), false ACE_ENV_ARG_PARAMETER);
+      obj = tmp_poa->id_to_reference_i (server_id.in (), false);
       CORBA::String_var rawior =
-        this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
+        this->orb_->object_to_string (obj.in ());
 
-      obj = this->orb_->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
+      obj = this->orb_->resolve_initial_references ("IORTable");
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+        IORTable::Table::_narrow (obj.in ());
       ACE_ASSERT(! CORBA::is_nil (adapter.in ()));
 
-      adapter->bind (poa_name, rawior.in() ACE_ENV_ARG_PARAMETER);
+      adapter->bind (poa_name, rawior.in());
 
       this->poa_manager_->activate ();
 
@@ -184,12 +178,11 @@ Nestea_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
           ACE_OS::fclose (this->ior_output_file_);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Nestea_i::init");
-      ACE_RE_THROW;
+      ex._tao_print_exception ("Nestea_i::init");
+      throw;
     }
-  ACE_ENDTRY;
 
 
   return 0;
@@ -200,22 +193,21 @@ Nestea_Server_i::run (void)
 {
   int status = 0;
 
-  ACE_TRY
+  try
     {
       ACE_Time_Value tv(SELF_DESTRUCT_SECS);
 
-      this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
+      this->orb_->run (tv);
 
       this->root_poa_->destroy(1, 1);
       this->orb_->destroy();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       status = -1;
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Nestea_i::run");
-      ACE_RE_THROW;
+      ex._tao_print_exception ("Nestea_i::run");
+      throw;
     }
-  ACE_ENDTRY;
 
   return status;
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h
index a7e2e4e1aea..aca9cd69859 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h
@@ -39,7 +39,7 @@ public:
   ~Nestea_Server_i (void);
 
   /// Initialize the Server state - parsing arguments and waiting
-  int init (int argc, char **argv ACE_ENV_ARG_DECL);
+  int init (int argc, char **argv);
 
   /// Run the orb
   int run (void);
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp
index 38766d2d780..e643162f41b 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp
@@ -9,13 +9,13 @@ using namespace CORBA;
 
 int main(int argc, char* argv[]) {
 
-  ACE_TRY_NEW_ENV
+  try
   {
 
-    ORB_var orb = ORB_init(argc, argv, 0 ACE_ENV_ARG_PARAMETER);
+    ORB_var orb = ORB_init(argc, argv, 0);
 
-    Object_var obj = orb->resolve_initial_references("Test" ACE_ENV_ARG_PARAMETER);
-    test_var test = test::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+    Object_var obj = orb->resolve_initial_references("Test");
+    test_var test = test::_narrow(obj.in());
     ACE_ASSERT(! is_nil(test.in()));
 
     Long n = test->get();
@@ -27,10 +27,9 @@ int main(int argc, char* argv[]) {
 
     return 0;
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "client:");
+    ex._tao_print_exception ("client:");
   }
-  ACE_ENDTRY;
   return -1;
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp
index c18c843e2d1..feb6d972b2e 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp
@@ -5,12 +5,11 @@
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       Server_i server;
 
-      int retval = server.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      int retval = server.init (argc, argv);
 
       if (retval == -1)
         return -1;
@@ -19,17 +18,16 @@ main (int argc, char *argv[])
           server.run ();
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "Server: System Exception");
+      sysex._tao_print_exception ("Server: System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "Server: User Exception");
+      userex._tao_print_exception ("Server: User Exception");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp
index 622fec14c14..8994cabe3ed 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp
@@ -25,8 +25,8 @@ public:
   }
   virtual CORBA::Long get (void) ACE_THROW_SPEC ((CORBA::SystemException)) {
     ++n_;
-    CORBA::Object_var obj = orb_->resolve_initial_references("POACurrent" ACE_ENV_ARG_PARAMETER);
-    PortableServer::Current_var cur = PortableServer::Current::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+    CORBA::Object_var obj = orb_->resolve_initial_references("POACurrent");
+    PortableServer::Current_var cur = PortableServer::Current::_narrow(obj.in());
     ACE_ASSERT(! CORBA::is_nil(cur.in()));
     PortableServer::POA_var poa = cur->get_POA();
     CORBA::String_var poaname = poa->the_name();
@@ -91,36 +91,36 @@ namespace
 }
 
 int
-Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
+Server_i::init (int argc, char** argv)
 {
-  ACE_TRY
+  try
   {
-    this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
+    this->orb_ = CORBA::ORB_init (argc, argv, 0);
 
     int retval = this->parse_args (argc, argv);
     if (retval != 0)
       return retval;
 
     CORBA::Object_var obj =
-      this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+      this->orb_->resolve_initial_references ("RootPOA");
     this->root_poa_ =
-      PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+      PortableServer::POA::_narrow (obj.in ());
     ACE_ASSERT(! CORBA::is_nil(this->root_poa_.in()));
 
     PortableServer::POAManager_var poa_manager =
       this->root_poa_->the_POAManager ();
 
-    obj = this->orb_->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
+    obj = this->orb_->resolve_initial_references ("IORTable");
     IORTable::Table_var ior_table =
-      IORTable::Table::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+      IORTable::Table::_narrow (obj.in ());
     ACE_ASSERT(! CORBA::is_nil(ior_table.in()));
 
     // If -orbuseimr 1 is specified then all persistent poas will be
     // registered with the imr.
     CORBA::PolicyList policies (2);
     policies.length (2);
-    policies[0] = this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER);
-    policies[1] = this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER);
+    policies[0] = this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID);
+    policies[1] = this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT);
 
     test_i* test_svt;
     ACE_NEW_RETURN (test_svt, test_i(orb_.in()), -1);
@@ -138,28 +138,26 @@ Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
       PortableServer::POA_var poa =
         this->root_poa_->create_POA (name.c_str(),
         poa_manager.in (),
-        policies
-        ACE_ENV_ARG_PARAMETER);
+        policies);
 
-      poa->activate_object_with_id (server_id.in (), test_svt ACE_ENV_ARG_PARAMETER);
+      poa->activate_object_with_id (server_id.in (), test_svt);
 
       TAO_Root_POA* tmp_poa = dynamic_cast<TAO_Root_POA*>(poa.in());
-      obj = tmp_poa->id_to_reference_i (server_id.in (), false ACE_ENV_ARG_PARAMETER);
+      obj = tmp_poa->id_to_reference_i (server_id.in (), false);
 
-      CORBA::String_var ior = this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
+      CORBA::String_var ior = this->orb_->object_to_string (obj.in ());
 
-      ior_table->bind (name.c_str(), ior.in () ACE_ENV_ARG_PARAMETER);
+      ior_table->bind (name.c_str(), ior.in ());
     }
 
     policies[0]->destroy();
     policies[1]->destroy();
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Server_i::init");
-    ACE_RE_THROW;
+    ex._tao_print_exception ("Server_i::init");
+    throw;
   }
-  ACE_ENDTRY;
 
 
   return 0;
@@ -168,7 +166,7 @@ Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
 int
 Server_i::run (void)
 {
-  ACE_TRY
+  try
   {
     PortableServer::POAManager_var poa_manager =
       this->root_poa_->the_POAManager ();
@@ -193,12 +191,11 @@ Server_i::run (void)
     this->root_poa_->destroy(1, 1);
     this->orb_->destroy();
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Server_i::run");
-    ACE_RE_THROW;
+    ex._tao_print_exception ("Server_i::run");
+    throw;
   }
-  ACE_ENDTRY;
 
 
   return 0;
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h
index 8e947b72b69..24d8dc97c8d 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h
@@ -15,7 +15,7 @@ public:
   Server_i (void);
   ~Server_i (void);
 
-  int init (int argc, char **argv ACE_ENV_ARG_DECL);
+  int init (int argc, char **argv);
 
   int run (void);
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp
index 8cca55aa007..18febaffa5f 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp
@@ -12,12 +12,10 @@ main (int argc, char *argv[])
 {
   IFR_DII_Client client;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       if (client.init (argc,
-                       argv
-                       ACE_ENV_ARG_PARAMETER)
+                       argv)
            == -1)
         {
           return 1;
@@ -32,13 +30,11 @@ main (int argc, char *argv[])
            }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Client Exception");
+      ex._tao_print_exception ("Client Exception");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
index 0c1248fbf1b..f145d8e2e30 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
@@ -23,13 +23,11 @@ IFR_DII_Client::~IFR_DII_Client (void)
 
 int
 IFR_DII_Client::init (int argc,
-                      char *argv[]
-                      ACE_ENV_ARG_DECL)
+                      char *argv[])
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                0
-                                ACE_ENV_ARG_PARAMETER);
+                                0);
 
   // In a reall application, we would get the scoped or
   // local name from the Interface Repository and use that
@@ -38,7 +36,7 @@ IFR_DII_Client::init (int argc,
   // we just use the IOR which is stored in a file by the server.
   this->target_ =
     this->orb_->string_to_object ("file://iorfile"
-                                  ACE_ENV_ARG_PARAMETER);
+                                  );
 
 
   if (CORBA::is_nil (this->target_.in ()))
@@ -139,11 +137,9 @@ int
 IFR_DII_Client::lookup_interface_def (void)
 {
   CORBA::Object_var obj =
-    this->orb_->resolve_initial_references ("InterfaceRepository"
-                                            ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references ("InterfaceRepository");
 
-  this->repo_ = CORBA::Repository::_narrow (obj.in ()
-                                            ACE_ENV_ARG_PARAMETER);
+  this->repo_ = CORBA::Repository::_narrow (obj.in ());
 
   // Is there a contained object of some kind at any level in the
   // repository called "warehouse"?
@@ -152,7 +148,7 @@ IFR_DII_Client::lookup_interface_def (void)
                               -1,            // Unlimited level recursion.
                               CORBA::dk_all, // Any type of contained object.
                               1              // Exclude parents of interfaces.
-                              ACE_ENV_ARG_PARAMETER);
+                              );
 
   CORBA::ULong length = candidates->length ();
   CORBA::Container_var candidate;
@@ -171,8 +167,7 @@ IFR_DII_Client::lookup_interface_def (void)
   for (CORBA::ULong i = 0; i < length; ++i)
     {
       candidate =
-        CORBA::Container::_narrow (candidates[i]
-                                   ACE_ENV_ARG_PARAMETER);
+        CORBA::Container::_narrow (candidates[i]);
 
       // Is this contained item itself a container?
       if (!CORBA::is_nil (candidate.in ()))
@@ -180,7 +175,7 @@ IFR_DII_Client::lookup_interface_def (void)
           // Does this container contain any interfaces?
           interfaces = candidate->contents (CORBA::dk_Interface,
                                             1     // Exclude parents.
-                                            ACE_ENV_ARG_PARAMETER);
+                                            );
 
           n_interfaces = interfaces->length ();
 
@@ -205,8 +200,7 @@ IFR_DII_Client::lookup_interface_def (void)
       if (!ACE_OS::strcmp (name.in (), this->interface_name.in ()))
         {
           this->target_def_ =
-            CORBA::InterfaceDef::_narrow (interfaces[j]
-                                          ACE_ENV_ARG_PARAMETER);
+            CORBA::InterfaceDef::_narrow (interfaces[j]);
         }
     }
   return 0;
@@ -219,7 +213,7 @@ IFR_DII_Client::get_operation_def (void)
   CORBA::ContainedSeq_var operations =
     this->target_def_->contents (CORBA::dk_Operation,
                                  0  // Do not exclude inherited operations.
-                                 ACE_ENV_ARG_PARAMETER);
+                                 );
 
   CORBA::ULong n_operations = operations->length ();
   CORBA::String_var operation_name;
@@ -233,8 +227,7 @@ IFR_DII_Client::get_operation_def (void)
       if (!ACE_OS::strcmp (operation_name.in (), this->op_name.in ()))
         {
           this->op_ =
-            CORBA::OperationDef::_narrow (operations[i]
-                                          ACE_ENV_ARG_PARAMETER);
+            CORBA::OperationDef::_narrow (operations[i]);
 
           break;
         }
@@ -244,8 +237,7 @@ IFR_DII_Client::get_operation_def (void)
 void
 IFR_DII_Client::create_dii_request (void)
 {
-  this->req_ = this->target_->_request (this->op_name.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+  this->req_ = this->target_->_request (this->op_name.in ());
 
   this->result_ = this->op_->result ();
 
@@ -298,8 +290,7 @@ IFR_DII_Client::create_dii_request (void)
                 // The servant will return 0.0 if the title is not found.
                 this->req_->arguments ()->add_value (params[i].name.in (),
                                                      any,
-                                                     CORBA::ARG_OUT
-                                                     ACE_ENV_ARG_PARAMETER);
+                                                     CORBA::ARG_OUT);
               }
 
             break;
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h
index d0f3245c5eb..d236e868046 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h
@@ -19,8 +19,7 @@ public:
   ~IFR_DII_Client (void);
 
   int init (int argc,
-            char *argv[]
-            ACE_ENV_ARG_DECL);
+            char *argv[]);
   // Initialize the client.
 
   int run (void);
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
index 70347fee4ef..a9ac55839ef 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
@@ -41,20 +41,17 @@ write_ior_to_file (const char *ior)
 int
 main (int argc, char *argv[])
 {
-        ACE_TRY_NEW_ENV
+        try
           {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            ""
-                                            ACE_ENV_ARG_PARAMETER);
+                                            "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -67,8 +64,7 @@ main (int argc, char *argv[])
         servant_impl._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (servant.in ()
-                               ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (servant.in ());
 
       int write_result = write_ior_to_file (ior.in ());
 
@@ -83,16 +79,13 @@ main (int argc, char *argv[])
       orb->run ();
 
       root_poa->destroy (1,
-                         1
-                         ACE_ENV_ARG_PARAMETER);
+                         1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "server exception:");
+      ex._tao_print_exception ("server exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp
index 45214149850..86bd5e8b464 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp
@@ -14,8 +14,7 @@ ACE_RCSID (Application_Test,
 CORBA::Boolean
 inventory_i::getCDinfo (const char * artist,
                         char *& title,
-                        CORBA::Float_out price
-                        ACE_ENV_ARG_DECL_NOT_USED)
+                        CORBA::Float_out price)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean in_stock = 0;
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.h b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.h
index 2e3a4164285..35a178c0d4b 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.h
@@ -12,8 +12,7 @@ class inventory_i : public POA_warehouse::inventory
 public:
   CORBA::Boolean getCDinfo (const char * artist,
                             char *& title,
-                            CORBA::Float_out price
-                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                            CORBA::Float_out price)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp
index 74e4560bb97..3397a80f770 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp
@@ -12,11 +12,10 @@ main (int argc, char *argv[])
 {
   IDL3_Client client;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       if (client.init (argc,
-                       argv
-                       ACE_ENV_ARG_PARAMETER)
+                       argv)
            == -1)
         {
           return 1;
@@ -31,13 +30,11 @@ main (int argc, char *argv[])
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Client Exception");
+      ex._tao_print_exception ("Client Exception");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
index e2f2a8d3ed8..5fff9b9379b 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
@@ -258,17 +258,14 @@ IDL3_Client::~IDL3_Client (void)
 
 int
 IDL3_Client::init (int argc,
-                   char *argv[]
-                   ACE_ENV_ARG_DECL)
+                   char *argv[])
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                0
-                                ACE_ENV_ARG_PARAMETER);
+                                0);
 
   CORBA::Object_var obj =
-    this->orb_->resolve_initial_references ("InterfaceRepository"
-                                            ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references ("InterfaceRepository");
 
   if (CORBA::is_nil (obj.in ()))
     {
@@ -278,8 +275,7 @@ IDL3_Client::init (int argc,
     }
 
   this->repo_ =
-    CORBA::ComponentIR::Repository::_narrow (obj.in ()
-                                             ACE_ENV_ARG_PARAMETER);
+    CORBA::ComponentIR::Repository::_narrow (obj.in ());
 
   if (CORBA::is_nil (this->repo_.in ()))
     {
@@ -307,8 +303,7 @@ IDL3_Client::run (void)
     }
 
   status = this->valuetype_test (VALUETYPE_ID,
-                                 "value"
-                                 ACE_ENV_ARG_PARAMETER);
+                                 "value");
 
   if (status != 0)
     {
@@ -323,8 +318,7 @@ IDL3_Client::run (void)
     }
 
   status = this->valuetype_test (EVENTTYPE_ID,
-                                 "event"
-                                 ACE_ENV_ARG_PARAMETER);
+                                 "event");
 
   if (status != 0)
     {
@@ -364,8 +358,7 @@ int
 IDL3_Client::component_test (void)
 {
   CORBA::Contained_var result =
-    this->repo_->lookup_id (COMPONENT_ID
-                            ACE_ENV_ARG_PARAMETER);
+    this->repo_->lookup_id (COMPONENT_ID);
 
   if (CORBA::is_nil (result.in ()))
     {
@@ -407,8 +400,7 @@ IDL3_Client::component_test (void)
     }
 
   CORBA::ComponentIR::ComponentDef_var comp_def =
-    CORBA::ComponentIR::ComponentDef::_narrow (result.in ()
-                                               ACE_ENV_ARG_PARAMETER);
+    CORBA::ComponentIR::ComponentDef::_narrow (result.in ());
 
   CORBA::TypeCode_var comp_tc =
     comp_def->type ();
@@ -454,24 +446,21 @@ IDL3_Client::component_test (void)
       return -1;
     }
 
-  int status = this->component_attribute_test (desc
-                                               ACE_ENV_ARG_PARAMETER);
+  int status = this->component_attribute_test (desc);
 
   if (status != 0)
     {
       return -1;
     }
 
-  status = this->component_inheritance_test (comp_def
-                                             ACE_ENV_ARG_PARAMETER);
+  status = this->component_inheritance_test (comp_def);
 
   if (status != 0)
     {
       return -1;
     }
 
-  status = this->component_port_test (comp_def
-                                      ACE_ENV_ARG_PARAMETER);
+  status = this->component_port_test (comp_def);
 
   if (status != 0)
     {
@@ -485,8 +474,7 @@ int
 IDL3_Client::home_test (void)
 {
   CORBA::Contained_var result =
-    this->repo_->lookup_id (HOME_ID
-                            ACE_ENV_ARG_PARAMETER);
+    this->repo_->lookup_id (HOME_ID);
 
   if (CORBA::is_nil (result.in ()))
     {
@@ -500,8 +488,7 @@ IDL3_Client::home_test (void)
     }
 
   CORBA::ComponentIR::HomeDef_var home =
-    CORBA::ComponentIR::HomeDef::_narrow (result.in ()
-                                          ACE_ENV_ARG_PARAMETER);
+    CORBA::ComponentIR::HomeDef::_narrow (result.in ());
 
   if (CORBA::is_nil (result.in ()))
     {
@@ -568,8 +555,7 @@ IDL3_Client::home_test (void)
       return -1;
     }
 
-  int status = this->home_inheritance_test (home
-                                            ACE_ENV_ARG_PARAMETER);
+  int status = this->home_inheritance_test (home);
 
   if (status != 0)
     {
@@ -592,16 +578,14 @@ IDL3_Client::home_test (void)
       return -1;
     }
 
-  status = this->home_factory_test (home_desc
-                                    ACE_ENV_ARG_PARAMETER);
+  status = this->home_factory_test (home_desc);
 
   if (status != 0)
     {
       return -1;
     }
 
-  status = this->home_finder_test (home_desc
-                                   ACE_ENV_ARG_PARAMETER);
+  status = this->home_finder_test (home_desc);
 
   if (status != 0)
     {
@@ -613,12 +597,10 @@ IDL3_Client::home_test (void)
 
 int
 IDL3_Client::valuetype_test (const char *repo_id,
-                             const char *prefix
-                             ACE_ENV_ARG_DECL)
+                             const char *prefix)
 {
   CORBA::Contained_var result =
-    this->repo_->lookup_id (repo_id
-                            ACE_ENV_ARG_PARAMETER);
+    this->repo_->lookup_id (repo_id);
 
   if (CORBA::is_nil (result.in ()))
     {
@@ -633,8 +615,7 @@ IDL3_Client::valuetype_test (const char *repo_id,
     }
 
   CORBA::ExtValueDef_var evd =
-    CORBA::ExtValueDef::_narrow (result.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+    CORBA::ExtValueDef::_narrow (result.in ());
 
   if (CORBA::is_nil (evd.in ()))
     {
@@ -651,8 +632,7 @@ IDL3_Client::valuetype_test (const char *repo_id,
     evd->describe_ext_value ();
 
   int status = this->valuetype_attribute_test (desc,
-                                               prefix
-                                               ACE_ENV_ARG_PARAMETER);
+                                               prefix);
 
   if (status != 0)
     {
@@ -660,8 +640,7 @@ IDL3_Client::valuetype_test (const char *repo_id,
     }
 
   status = this->valuetype_inheritance_test (evd,
-                                             prefix
-                                             ACE_ENV_ARG_PARAMETER);
+                                             prefix);
 
   if (status != 0)
     {
@@ -669,8 +648,7 @@ IDL3_Client::valuetype_test (const char *repo_id,
     }
 
   status = this->valuetype_operation_test (desc,
-                                           prefix
-                                           ACE_ENV_ARG_PARAMETER);
+                                           prefix);
 
   if (status != 0)
     {
@@ -678,8 +656,7 @@ IDL3_Client::valuetype_test (const char *repo_id,
     }
 
   status = this->valuetype_member_test (desc,
-                                        prefix
-                                        ACE_ENV_ARG_PARAMETER);
+                                        prefix);
 
   if (status != 0)
     {
@@ -687,8 +664,7 @@ IDL3_Client::valuetype_test (const char *repo_id,
     }
 
   status = this->valuetype_factory_test (desc,
-                                         prefix
-                                         ACE_ENV_ARG_PARAMETER);
+                                         prefix);
 
   if (status != 0)
     {
@@ -701,7 +677,6 @@ IDL3_Client::valuetype_test (const char *repo_id,
 int
 IDL3_Client::component_attribute_test (
     CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var &desc
-    ACE_ENV_ARG_DECL
   )
 {
   if (desc->attributes.length () != ATTRS_LEN)
@@ -785,7 +760,6 @@ IDL3_Client::component_attribute_test (
 int
 IDL3_Client::component_inheritance_test (
     CORBA::ComponentIR::ComponentDef_var &comp_def
-    ACE_ENV_ARG_DECL
   )
 {
   CORBA::ComponentIR::ComponentDef_var comp_base =
@@ -859,7 +833,6 @@ IDL3_Client::component_inheritance_test (
 int
 IDL3_Client::component_port_test (
     CORBA::ComponentIR::ComponentDef_var &comp_def
-    ACE_ENV_ARG_DECL
   )
 {
   CORBA::Contained::Description_var desc =
@@ -879,16 +852,14 @@ IDL3_Client::component_port_test (
       return -1;
     }
 
-  int status = this->provides_test (cd->provided_interfaces
-                                    ACE_ENV_ARG_PARAMETER);
+  int status = this->provides_test (cd->provided_interfaces);
 
   if (status != 0)
     {
       return -1;
     }
 
-  status = this->uses_test (cd->used_interfaces
-                                    ACE_ENV_ARG_PARAMETER);
+  status = this->uses_test (cd->used_interfaces);
 
   if (status != 0)
     {
@@ -899,8 +870,7 @@ IDL3_Client::component_port_test (
                                   EMITS_LEN,
                                   "emits",
                                   EMITS_NAMES,
-                                  EMITS_IDS
-                                  ACE_ENV_ARG_PARAMETER);
+                                  EMITS_IDS);
 
   if (status != 0)
     {
@@ -911,8 +881,7 @@ IDL3_Client::component_port_test (
                                   PUBLISHES_LEN,
                                   "publishes",
                                   PUBLISHES_NAMES,
-                                  PUBLISHES_IDS
-                                  ACE_ENV_ARG_PARAMETER);
+                                  PUBLISHES_IDS);
 
   if (status != 0)
     {
@@ -923,8 +892,7 @@ IDL3_Client::component_port_test (
                                   CONSUMES_LEN,
                                   "consumes",
                                   CONSUMES_NAMES,
-                                  CONSUMES_IDS
-                                  ACE_ENV_ARG_PARAMETER);
+                                  CONSUMES_IDS);
 
   if (status != 0)
     {
@@ -935,8 +903,7 @@ IDL3_Client::component_port_test (
 }
 
 int
-IDL3_Client::provides_test (CORBA::ComponentIR::ProvidesDescriptionSeq &pds
-                            ACE_ENV_ARG_DECL_NOT_USED)
+IDL3_Client::provides_test (CORBA::ComponentIR::ProvidesDescriptionSeq &pds)
 {
   if (pds.length () != PROVIDES_LEN)
     {
@@ -989,8 +956,7 @@ IDL3_Client::provides_test (CORBA::ComponentIR::ProvidesDescriptionSeq &pds
 }
 
 int
-IDL3_Client::uses_test (CORBA::ComponentIR::UsesDescriptionSeq &uds
-                        ACE_ENV_ARG_DECL_NOT_USED)
+IDL3_Client::uses_test (CORBA::ComponentIR::UsesDescriptionSeq &uds)
 {
   if (uds.length () != USES_LEN)
     {
@@ -1063,8 +1029,7 @@ IDL3_Client::event_port_test (CORBA::ComponentIR::EventPortDescriptionSeq &eds,
                               CORBA::ULong seq_length,
                               const char *port_type,
                               const char **names,
-                              const char **ids
-                              ACE_ENV_ARG_DECL_NOT_USED)
+                              const char **ids)
 {
   if (eds.length () != seq_length)
     {
@@ -1121,8 +1086,7 @@ IDL3_Client::event_port_test (CORBA::ComponentIR::EventPortDescriptionSeq &eds,
 
 int
 IDL3_Client::valuetype_inheritance_test (CORBA::ExtValueDef_var &vd,
-                                         const char *prefix
-                                         ACE_ENV_ARG_DECL)
+                                         const char *prefix)
 {
   CORBA::ValueDef_var bvd = vd->base_value ();
 
@@ -1199,7 +1163,6 @@ int
 IDL3_Client::valuetype_attribute_test (
     CORBA::ExtValueDef::ExtFullValueDescription_var &desc,
     const char *prefix
-    ACE_ENV_ARG_DECL
   )
 {
   if (desc->attributes.length () != ATTRS_LEN)
@@ -1289,7 +1252,6 @@ int
 IDL3_Client::valuetype_operation_test (
     CORBA::ExtValueDef::ExtFullValueDescription_var &desc,
     const char *prefix
-    ACE_ENV_ARG_DECL
   )
 {
   CORBA::ULong ops_length = desc->operations.length ();
@@ -1406,7 +1368,6 @@ int
 IDL3_Client::valuetype_member_test (
     CORBA::ExtValueDef::ExtFullValueDescription_var &desc,
     const char *prefix
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   CORBA::ULong length = desc->members.length ();
@@ -1466,7 +1427,6 @@ int
 IDL3_Client::valuetype_factory_test (
     CORBA::ExtValueDef::ExtFullValueDescription_var &desc,
     const char *prefix
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   CORBA::ULong length = desc->initializers.length ();
@@ -1570,8 +1530,7 @@ IDL3_Client::valuetype_factory_test (
 }
 
 int
-IDL3_Client::home_inheritance_test (CORBA::ComponentIR::HomeDef_var &hd
-                                    ACE_ENV_ARG_DECL)
+IDL3_Client::home_inheritance_test (CORBA::ComponentIR::HomeDef_var &hd)
 {
   CORBA::ComponentIR::HomeDef_var bhd =
     hd->base_home ();
@@ -1642,8 +1601,7 @@ IDL3_Client::home_inheritance_test (CORBA::ComponentIR::HomeDef_var &hd
 }
 
 int
-IDL3_Client::home_factory_test (CORBA::ComponentIR::HomeDescription *hd
-                                ACE_ENV_ARG_DECL_NOT_USED)
+IDL3_Client::home_factory_test (CORBA::ComponentIR::HomeDescription *hd)
 {
   CORBA::ULong length = hd->factories.length ();
 
@@ -1740,8 +1698,7 @@ IDL3_Client::home_factory_test (CORBA::ComponentIR::HomeDescription *hd
 }
 
 int
-IDL3_Client::home_finder_test (CORBA::ComponentIR::HomeDescription *hd
-                               ACE_ENV_ARG_DECL_NOT_USED)
+IDL3_Client::home_finder_test (CORBA::ComponentIR::HomeDescription *hd)
 {
   CORBA::ULong length = hd->finders.length ();
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h
index 2368de601eb..cf1d3dafaaa 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h
@@ -38,8 +38,7 @@ public:
   // Destructor
 
   int init (int argc,
-            char *argv[]
-            ACE_ENV_ARG_DECL);
+            char *argv[]);
   // Initialize the ORB and get the IFR object reference.
 
   int run (void);
@@ -55,69 +54,54 @@ private:
 
   // Also tests eventtype.
   int valuetype_test (const char *repo_id,
-                      const char *prefix
-                      ACE_ENV_ARG_DECL);
+                      const char *prefix);
 
   int component_attribute_test (
       CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var &
-      ACE_ENV_ARG_DECL
     );
 
-  int component_inheritance_test (CORBA::ComponentIR::ComponentDef_var &
-                                  ACE_ENV_ARG_DECL);
+  int component_inheritance_test (CORBA::ComponentIR::ComponentDef_var &);
 
-  int component_port_test (CORBA::ComponentIR::ComponentDef_var &
-                           ACE_ENV_ARG_DECL);
+  int component_port_test (CORBA::ComponentIR::ComponentDef_var &);
 
-  int provides_test (CORBA::ComponentIR::ProvidesDescriptionSeq &
-                     ACE_ENV_ARG_DECL);
+  int provides_test (CORBA::ComponentIR::ProvidesDescriptionSeq &);
 
-  int uses_test (CORBA::ComponentIR::UsesDescriptionSeq &
-                 ACE_ENV_ARG_DECL);
+  int uses_test (CORBA::ComponentIR::UsesDescriptionSeq &);
 
   int event_port_test (CORBA::ComponentIR::EventPortDescriptionSeq &,
                        CORBA::ULong seq_length,
                        const char *port_type,
                        const char **names,
-                       const char **ids
-                       ACE_ENV_ARG_DECL);
+                       const char **ids);
 
   int valuetype_inheritance_test (CORBA::ExtValueDef_var &,
-                                  const char *prefix
-                                  ACE_ENV_ARG_DECL);
+                                  const char *prefix);
 
   int valuetype_attribute_test (
       CORBA::ExtValueDef::ExtFullValueDescription_var &,
       const char *prefix
-      ACE_ENV_ARG_DECL
     );
 
   int valuetype_operation_test (
       CORBA::ExtValueDef::ExtFullValueDescription_var &,
       const char *prefix
-      ACE_ENV_ARG_DECL
     );
 
   int valuetype_member_test (
       CORBA::ExtValueDef::ExtFullValueDescription_var &,
       const char *prefix
-      ACE_ENV_ARG_DECL
     );
 
   int valuetype_factory_test (
       CORBA::ExtValueDef::ExtFullValueDescription_var &,
       const char *prefix
-      ACE_ENV_ARG_DECL
     );
 
-  int home_inheritance_test (CORBA::ComponentIR::HomeDef_var &
-                             ACE_ENV_ARG_DECL);
+  int home_inheritance_test (CORBA::ComponentIR::HomeDef_var &);
 
-  int home_factory_test (CORBA::ComponentIR::HomeDescription *
-                         ACE_ENV_ARG_DECL);
+  int home_factory_test (CORBA::ComponentIR::HomeDescription *);
 
-  int home_finder_test (CORBA::ComponentIR::HomeDescription *
-                        ACE_ENV_ARG_DECL);
+  int home_finder_test (CORBA::ComponentIR::HomeDescription *);
 
 private:
   bool debug_;
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp
index 1eba54b811a..b4946c34c67 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp
@@ -12,7 +12,7 @@ ACE_RCSID (IFR_Inheritance_Test,
 
 void printContents( const CORBA::ContainedSeq& cont )
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       for( unsigned int i=0; i<cont.length(); i++ )
         {
@@ -20,7 +20,7 @@ void printContents( const CORBA::ContainedSeq& cont )
             {
               CORBA::InterfaceDef_var intDef =
                 CORBA::InterfaceDef::_narrow (cont[i]
-                ACE_ENV_ARG_PARAMETER );
+ );
 
               CORBA::InterfaceDef::FullInterfaceDescription* desc =
                 intDef->describe_interface ();
@@ -41,36 +41,32 @@ void printContents( const CORBA::ContainedSeq& cont )
             {
               CORBA::ModuleDef_var moduleDef =
                 CORBA::ModuleDef::_narrow (cont[i]
-                                           ACE_ENV_ARG_PARAMETER );
+ );
 
               CORBA::ContainedSeq_var moduleContents =
                 moduleDef->contents (CORBA::dk_all,1
-                                     ACE_ENV_ARG_PARAMETER );
+ );
               printContents (moduleContents.in ());
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "printContents");
+      ex._tao_print_exception ("printContents");
       ACE_OS::exit(-1); // the test has failed!
     }
-  ACE_ENDTRY;
 }
 
 
 int  main(int argc, char** argv)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var      orb = CORBA::ORB_init (argc,
                                     argv,
-                                    0
-                                    ACE_ENV_ARG_PARAMETER);
+                                    0);
       CORBA::Object_var object =
-        orb->resolve_initial_references ("InterfaceRepository"
-                                         ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("InterfaceRepository");
 
       if (CORBA::is_nil (object.in ()))
         {
@@ -83,8 +79,7 @@ int  main(int argc, char** argv)
         }
 
       CORBA::Repository_var  ifr =
-        CORBA::Repository::_narrow (object.in ()
-                                    ACE_ENV_ARG_PARAMETER);
+        CORBA::Repository::_narrow (object.in ());
 
       if (CORBA::is_nil (ifr.in ()))
         {
@@ -93,21 +88,18 @@ int  main(int argc, char** argv)
                             -1);
         }
 
-     CORBA::ContainedSeq_var  cont = ifr->contents (CORBA::dk_all, 0
-                                                    ACE_ENV_ARG_PARAMETER);
+     CORBA::ContainedSeq_var  cont = ifr->contents (CORBA::dk_all, 0);
 
      printContents (cont.in ());
 
      orb->shutdown ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "main");
+      ex._tao_print_exception ("main");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
index 2e0af0e1929..407c0d4c9be 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
@@ -58,12 +58,11 @@ int
 Admin_Client::init (int argc,
                     char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       this->orb_ = CORBA::ORB_init (argc,
                                     argv,
-                                    0
-                                    ACE_ENV_ARG_PARAMETER);
+                                    0);
 
       int retval = this->parse_args (argc,
                                      argv);
@@ -72,8 +71,7 @@ Admin_Client::init (int argc,
         return retval;
 
       CORBA::Object_var object =
-        this->orb_->resolve_initial_references ("InterfaceRepository"
-                                                ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("InterfaceRepository");
 
       if (CORBA::is_nil (object.in ()))
         {
@@ -86,8 +84,7 @@ Admin_Client::init (int argc,
         }
 
       this->repo_ =
-        CORBA::Repository::_narrow (object.in ()
-                                    ACE_ENV_ARG_PARAMETER);
+        CORBA::Repository::_narrow (object.in ());
 
       if (CORBA::is_nil (this->repo_.in ()))
         {
@@ -96,13 +93,11 @@ Admin_Client::init (int argc,
                             -1);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Admin_Client::init");
+      ex._tao_print_exception ("Admin_Client::init");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -110,7 +105,7 @@ Admin_Client::init (int argc,
 int
 Admin_Client::run (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       if (this->all_tests_ == 1)
         {
@@ -130,18 +125,15 @@ Admin_Client::run (void)
           for (CORBA::ULong j = 0; j < this->iterations_; ++j)
             {
               (this->*test_array_[this->which_test_])(
-                  ACE_ENV_SINGLE_ARG_PARAMETER
                 );
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Admin_Client::run");
+      ex._tao_print_exception ("Admin_Client::run");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -208,12 +200,11 @@ Admin_Client::array_test (void)
     }
 
   CORBA::IDLType_var atype =
-    this->repo_->create_string (7 ACE_ENV_ARG_PARAMETER);
+    this->repo_->create_string (7);
 
   CORBA::ArrayDef_var avar =
     this->repo_->create_array (5,
-                               atype.in ()
-                               ACE_ENV_ARG_PARAMETER);
+                               atype.in ());
 
   CORBA::ULong bound = avar->length ();
 
@@ -267,8 +258,7 @@ Admin_Client::array_test (void)
   ACE_ASSERT (dk == CORBA::dk_String);
 
   CORBA::StringDef_var pvar =
-    CORBA::StringDef::_narrow (tdef.in ()
-                               ACE_ENV_ARG_PARAMETER);
+    CORBA::StringDef::_narrow (tdef.in ());
   bound = pvar->bound ();
 
   if (this->debug_)
@@ -281,10 +271,8 @@ Admin_Client::array_test (void)
   ACE_ASSERT (bound == 7);
 
   CORBA::PrimitiveDef_var pdef =
-    this->repo_->get_primitive (CORBA::pk_short
-                                ACE_ENV_ARG_PARAMETER);
-  avar->element_type_def (pdef.in ()
-                          ACE_ENV_ARG_PARAMETER);
+    this->repo_->get_primitive (CORBA::pk_short);
+  avar->element_type_def (pdef.in ());
 
   if (this->debug_)
     {
@@ -317,8 +305,7 @@ Admin_Client::array_test (void)
   ACE_ASSERT (dk == CORBA::dk_Primitive);
 
   CORBA::PrimitiveDef_var zvar =
-    CORBA::PrimitiveDef::_narrow (tdef.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+    CORBA::PrimitiveDef::_narrow (tdef.in ());
   CORBA::PrimitiveKind pkind = zvar->kind ();
 
   if (this->debug_)
@@ -355,8 +342,7 @@ Admin_Client::enum_test (void)
     this->repo_->create_enum ("IDL:my_enum:1.0",
                               "my_enum",
                               "1.0",
-                              members
-                              ACE_ENV_ARG_PARAMETER);
+                              members);
 
   CORBA::String_var str = evar->id ();
 
@@ -518,7 +504,7 @@ Admin_Client::enum_test (void)
 
   for (i = 0; i < count; ++i)
     {
-      str = td->type->member_name (i ACE_ENV_ARG_PARAMETER);
+      str = td->type->member_name (i);
 
       if (this->debug_)
         {
@@ -539,8 +525,7 @@ Admin_Client::enum_test (void)
   members[2] = CORBA::string_dup ("DUALITY");
   members[3] = CORBA::string_dup ("TRINITY");
 
-  evar->members (members
-                 ACE_ENV_ARG_PARAMETER);
+  evar->members (members);
 
   if (this->debug_)
     {
@@ -570,8 +555,7 @@ Admin_Client::enum_test (void)
       ACE_ASSERT (ACE_OS::strcmp (fellows[i], members[i]) == 0);
     }
 
-  evar->name ("another_enum"
-              ACE_ENV_ARG_PARAMETER);
+  evar->name ("another_enum");
   str = evar->name ();
 
   if (this->debug_)
@@ -617,19 +601,17 @@ Admin_Client::alias_test (void)
   // This test also tests WstringDef and SequenceDef.
 
   CORBA::IDLType_var sq_elem =
-    this->repo_->create_wstring (7 ACE_ENV_ARG_PARAMETER);
+    this->repo_->create_wstring (7);
 
   CORBA::SequenceDef_var sq_var =
     this->repo_->create_sequence (5,
-                                  sq_elem.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+                                  sq_elem.in ());
 
   CORBA::AliasDef_var a_var =
     this->repo_->create_alias ("IDL:my_alias:1.0",
                                "my_alias",
                                "1.0",
-                               sq_var.in ()
-                               ACE_ENV_ARG_PARAMETER);
+                               sq_var.in ());
 
   CORBA::String_var str = a_var->id ();
 
@@ -681,8 +663,7 @@ Admin_Client::alias_test (void)
                   ACE_TEXT ("AliasDef::version (set)\n")));
     }
 
-  a_var->version ("1.1"
-                  ACE_ENV_ARG_PARAMETER);
+  a_var->version ("1.1");
 
   str = a_var->version ();
 
@@ -832,8 +813,7 @@ Admin_Client::alias_test (void)
     a_var->original_type_def ();
 
   CORBA::SequenceDef_var seq_var =
-    CORBA::SequenceDef::_narrow (i_var.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+    CORBA::SequenceDef::_narrow (i_var.in ());
 
   length = seq_var->bound ();
 
@@ -863,8 +843,7 @@ Admin_Client::native_test (void)
   CORBA::NativeDef_var nvar =
     this->repo_->create_native ("IDL:my_native:1.0",
                                 "my_native",
-                                "1.0"
-                                ACE_ENV_ARG_PARAMETER);
+                                "1.0");
 
   CORBA::String_var str = nvar->id ();
 
@@ -940,13 +919,11 @@ Admin_Client::struct_test (void)
   members.length (3);
 
   members[0].name = CORBA::string_dup ("ub_string");
-  members[0].type_def = this->repo_->get_primitive (CORBA::pk_string
-                                                    ACE_ENV_ARG_PARAMETER);
+  members[0].type_def = this->repo_->get_primitive (CORBA::pk_string);
   members[0].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
 
   members[1].name = CORBA::string_dup ("bd_string");
-  members[1].type_def = this->repo_->create_string (5
-                                                    ACE_ENV_ARG_PARAMETER);
+  members[1].type_def = this->repo_->create_string (5);
   members[1].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
 
   CORBA::EnumMemberSeq e_members (2);
@@ -961,8 +938,7 @@ Admin_Client::struct_test (void)
     this->repo_->create_enum ("IDL:my_enum:1.0",
                               "my_enum",
                               "1.0",
-                              e_members
-                              ACE_ENV_ARG_PARAMETER);
+                              e_members);
   members[2].type_def = CORBA::EnumDef::_duplicate (e_var.in ());
   members[2].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
 
@@ -970,8 +946,7 @@ Admin_Client::struct_test (void)
     this->repo_->create_struct ("IDL:my_struct:1.0",
                                 "my_struct",
                                 "1.0",
-                                members
-                                ACE_ENV_ARG_PARAMETER);
+                                members);
 
   // This also tests the members() function.
   CORBA::TypeCode_var tc = svar->type ();
@@ -992,7 +967,7 @@ Admin_Client::struct_test (void)
 
   for (i = 0; i < length; ++i)
     {
-      str = tc->member_name (i ACE_ENV_ARG_PARAMETER);
+      str = tc->member_name (i);
 
       if (this->debug_)
         {
@@ -1040,19 +1015,16 @@ Admin_Client::struct_test (void)
 
   members.length (2);
   members[0].name = CORBA::string_dup ("long_mem");
-  members[0].type_def = this->repo_->get_primitive (CORBA::pk_long
-                                                    ACE_ENV_ARG_PARAMETER);
+  members[0].type_def = this->repo_->get_primitive (CORBA::pk_long);
   members[0].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
 
   members[1].name = CORBA::string_dup ("array_mem");
   members[1].type_def =
     this->repo_->create_array (5,
-                               members[0].type_def.in ()
-                               ACE_ENV_ARG_PARAMETER);
+                               members[0].type_def.in ());
   members[1].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
 
-  svar->members (members
-                 ACE_ENV_ARG_PARAMETER);
+  svar->members (members);
 
   if (this->debug_)
     {
@@ -1069,8 +1041,7 @@ Admin_Client::struct_test (void)
   CORBA::EnumDef_var e_def_var = svar->create_enum ("IDL:my_def_enum:1.0",
                                                     "my_enum",
                                                     "1.0",
-                                                    def_members
-                                                    ACE_ENV_ARG_PARAMETER);
+                                                    def_members);
 
   CORBA::StructMemberSeq_var out_members =
     svar->members ();
@@ -1102,8 +1073,7 @@ Admin_Client::struct_test (void)
         }
     }
 
-  CORBA::Contained_var fox = this->repo_->lookup ("::my_struct::my_enum"
-                                                  ACE_ENV_ARG_PARAMETER);
+  CORBA::Contained_var fox = this->repo_->lookup ("::my_struct::my_enum");
 
   str = fox->absolute_name ();
 
@@ -1116,8 +1086,7 @@ Admin_Client::struct_test (void)
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "::my_struct::my_enum") == 0);
 
-  fox = svar->lookup ("my_enum"
-                      ACE_ENV_ARG_PARAMETER);
+  fox = svar->lookup ("my_enum");
 
   str = fox->absolute_name ();
 
@@ -1132,8 +1101,7 @@ Admin_Client::struct_test (void)
 
   CORBA::Container_var outer = fox->defined_in ();
   CORBA::Contained_var schizo =
-    CORBA::Contained::_narrow (outer.in ()
-                               ACE_ENV_ARG_PARAMETER);
+    CORBA::Contained::_narrow (outer.in ());
 
   str = schizo->absolute_name ();
 
@@ -1149,8 +1117,7 @@ Admin_Client::struct_test (void)
 
   CORBA::ContainedSeq_var contents =
     this->repo_->contents (CORBA::dk_all,
-                           0
-                           ACE_ENV_ARG_PARAMETER);
+                           0);
 
   length = contents->length ();
 
@@ -1164,8 +1131,7 @@ Admin_Client::struct_test (void)
   ACE_ASSERT (length == 2);
 
   contents = svar->contents (CORBA::dk_all,
-                             0
-                             ACE_ENV_ARG_PARAMETER);
+                             0);
 
   length = contents->length ();
 
@@ -1205,8 +1171,7 @@ Admin_Client::struct_test (void)
   contents = this->repo_->lookup_name ("my_enum",
                                        -1,
                                        CORBA::dk_all,
-                                       0
-                                       ACE_ENV_ARG_PARAMETER);
+                                       0);
 
   length = contents->length ();
 
@@ -1240,8 +1205,7 @@ Admin_Client::struct_test (void)
   CORBA::Container::DescriptionSeq_var cont_desc =
     this->repo_->describe_contents (CORBA::dk_all,
                                     0,
-                                    -1
-                                    ACE_ENV_ARG_PARAMETER);
+                                    -1);
 
   length = cont_desc->length ();
 
@@ -1281,8 +1245,7 @@ Admin_Client::struct_test (void)
         }
     }
 
-  svar->name ("your_struct"
-              ACE_ENV_ARG_PARAMETER);
+  svar->name ("your_struct");
 
   if (this->debug_)
     {
@@ -1291,8 +1254,7 @@ Admin_Client::struct_test (void)
     }
 
   contents = svar->contents (CORBA::dk_all,
-                             0
-                             ACE_ENV_ARG_PARAMETER);
+                             0);
 
   length = contents->length ();
 
@@ -1360,31 +1322,27 @@ Admin_Client::union_test (void)
     this->repo_->create_enum ("IDL:disc_enum:1.0",
                               "disc_enum",
                               "1.0",
-                              d_members
-                              ACE_ENV_ARG_PARAMETER);
+                              d_members);
 
   CORBA::StructMemberSeq s_members (1);
   s_members.length (1);
   s_members[0].name = CORBA::string_dup ("string_in_struct");
   s_members[0].type_def =
-    this->repo_->create_string (6
-                                ACE_ENV_ARG_PARAMETER);
+    this->repo_->create_string (6);
   s_members[0].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
 
   CORBA::StructDef_var s_var =
     this->repo_->create_struct ("IDL:struct_in_union:1.0",
                                 "struct_in_union",
                                 "1.0",
-                                s_members
-                                ACE_ENV_ARG_PARAMETER);
+                                s_members);
 
   CORBA::UnionMemberSeq u_members (4);
   u_members.length (4);
 
   u_members[0].name = CORBA::string_dup ("longval");
   u_members[0].type_def =
-    this->repo_->get_primitive (CORBA::pk_long
-                                ACE_ENV_ARG_PARAMETER);
+    this->repo_->get_primitive (CORBA::pk_long);
   u_members[0].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
   CORBA::TypeCode_var d_type = d_var->type ();
   TAO_OutputCDR maker2;
@@ -1400,8 +1358,7 @@ Admin_Client::union_test (void)
 
   u_members[1].name = CORBA::string_dup ("longval");
   u_members[1].type_def =
-    this->repo_->get_primitive (CORBA::pk_long
-                                ACE_ENV_ARG_PARAMETER);
+    this->repo_->get_primitive (CORBA::pk_long);
   u_members[1].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
   TAO_OutputCDR maker0;
   maker0.write_ulong (2);  // TWO
@@ -1431,8 +1388,7 @@ Admin_Client::union_test (void)
 
   u_members[3].name = CORBA::string_dup ("stringval");
   u_members[3].type_def =
-    this->repo_->create_string (17
-                                ACE_ENV_ARG_PARAMETER);
+    this->repo_->create_string (17);
   u_members[3].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
   u_members[3].label <<= CORBA::Any::from_octet (0);   // default case (ONE)
 
@@ -1441,8 +1397,7 @@ Admin_Client::union_test (void)
                                "my_union",
                                "1.0",
                                d_var.in (),
-                               u_members
-                               ACE_ENV_ARG_PARAMETER);
+                               u_members);
 
   CORBA::TypeCode_var disc_tc =
     u_var->discriminator_type ();
@@ -1490,8 +1445,7 @@ Admin_Client::union_test (void)
 
   for (CORBA::ULong i = 0; i < length; ++i)
     {
-      str = tc->member_name (i
-                             ACE_ENV_ARG_PARAMETER);
+      str = tc->member_name (i);
 
       if (this->debug_)
         {
@@ -1504,8 +1458,7 @@ Admin_Client::union_test (void)
       // Multiple labels for first member shifts index by 1.
       ACE_ASSERT (ACE_OS::strcmp (str.in (), u_members[i + 1].name) == 0);
 
-      CORBA::Any_var label = tc->member_label (i
-                                               ACE_ENV_ARG_PARAMETER);
+      CORBA::Any_var label = tc->member_label (i);
 
       TAO_InputCDR cdr (static_cast<ACE_Message_Block *> (0));
       CORBA::ULong val;
@@ -1565,14 +1518,12 @@ Admin_Client::exception_test (void)
   members.length (3);
 
   members[0].name = CORBA::string_dup ("ub_string");
-  members[0].type_def = this->repo_->get_primitive (CORBA::pk_string
-                                                    ACE_ENV_ARG_PARAMETER);
+  members[0].type_def = this->repo_->get_primitive (CORBA::pk_string);
   members[0].type =
     members[0].type_def->type ();
 
   members[1].name = CORBA::string_dup ("bd_string");
-  members[1].type_def = this->repo_->create_string (5
-                                                    ACE_ENV_ARG_PARAMETER);
+  members[1].type_def = this->repo_->create_string (5);
   members[1].type = members[1].type_def->type ();
 
   CORBA::EnumMemberSeq e_members (2);
@@ -1586,8 +1537,7 @@ Admin_Client::exception_test (void)
     this->repo_->create_enum ("IDL:my_enum:1.0",
                               "my_enum",
                               "1.0",
-                              e_members
-                              ACE_ENV_ARG_PARAMETER);
+                              e_members);
 
   members[2].type_def = CORBA::EnumDef::_duplicate (e_var.in ());
 
@@ -1598,8 +1548,7 @@ Admin_Client::exception_test (void)
     this->repo_->create_exception ("IDL:my_exception:1.0",
                                    "my_exception",
                                    "1.0",
-                                   members
-                                   ACE_ENV_ARG_PARAMETER);
+                                   members);
 
   CORBA::TypeCode_var tc = exvar->type ();
 
@@ -1619,7 +1568,7 @@ Admin_Client::exception_test (void)
 
   for (i = 0; i < length; ++i)
     {
-      str = tc->member_name (i ACE_ENV_ARG_PARAMETER);
+      str = tc->member_name (i);
 
       if (this->debug_)
         {
@@ -1676,22 +1625,19 @@ Admin_Client::exception_test (void)
 
   members.length (2);
   members[0].name = CORBA::string_dup ("long_mem");
-  members[0].type_def = this->repo_->get_primitive (CORBA::pk_long
-                                                    ACE_ENV_ARG_PARAMETER);
+  members[0].type_def = this->repo_->get_primitive (CORBA::pk_long);
   members[0].type =
     members[0].type_def->type ();
 
   members[1].name = CORBA::string_dup ("array_mem");
   CORBA::ArrayDef_ptr a_ptr =
     this->repo_->create_array (5,
-                               members[0].type_def.in ()
-                               ACE_ENV_ARG_PARAMETER);
+                               members[0].type_def.in ());
   members[1].type_def = a_ptr;
   members[1].type =
     members[1].type_def->type ();
 
-  exvar->members (members
-                  ACE_ENV_ARG_PARAMETER);
+  exvar->members (members);
 
   if (this->debug_)
     {
@@ -1708,8 +1654,7 @@ Admin_Client::exception_test (void)
   CORBA::EnumDef_var e_def_var = exvar->create_enum ("IDL:my_def_enum:1.0",
                                                      "my_enum",
                                                      "1.0",
-                                                     def_members
-                                                     ACE_ENV_ARG_PARAMETER);
+                                                     def_members);
 
   CORBA::StructMemberSeq_var out_members =
     exvar->members ();
@@ -1774,8 +1719,7 @@ Admin_Client::exception_test (void)
         }
     }
 
-  CORBA::Contained_var fox = this->repo_->lookup ("::my_exception::my_enum"
-                                                  ACE_ENV_ARG_PARAMETER);
+  CORBA::Contained_var fox = this->repo_->lookup ("::my_exception::my_enum");
 
   str = fox->absolute_name ();
 
@@ -1788,8 +1732,7 @@ Admin_Client::exception_test (void)
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "::my_exception::my_enum") == 0);
 
-  fox = exvar->lookup ("my_enum"
-                       ACE_ENV_ARG_PARAMETER);
+  fox = exvar->lookup ("my_enum");
 
   str = fox->absolute_name ();
 
@@ -1804,8 +1747,7 @@ Admin_Client::exception_test (void)
 
   CORBA::ContainedSeq_var contents =
     this->repo_->contents (CORBA::dk_all,
-                           0
-                           ACE_ENV_ARG_PARAMETER);
+                           0);
 
   length = contents->length ();
 
@@ -1819,8 +1761,7 @@ Admin_Client::exception_test (void)
   ACE_ASSERT (length == 2);
 
   contents = exvar->contents (CORBA::dk_all,
-                              0
-                              ACE_ENV_ARG_PARAMETER);
+                              0);
 
   length = contents->length ();
 
@@ -1854,8 +1795,7 @@ Admin_Client::exception_test (void)
   contents = this->repo_->lookup_name ("my_enum",
                                        -1,
                                        CORBA::dk_all,
-                                       0
-                                       ACE_ENV_ARG_PARAMETER);
+                                       0);
 
   length = contents->length ();
 
@@ -1888,8 +1828,7 @@ Admin_Client::exception_test (void)
   CORBA::Container::DescriptionSeq_var cont_desc =
     this->repo_->describe_contents (CORBA::dk_all,
                                     0,
-                                    -1
-                                    ACE_ENV_ARG_PARAMETER);
+                                    -1);
 
   length = cont_desc->length ();
 
@@ -1968,8 +1907,7 @@ Admin_Client::exception_test (void)
         }
     }
 
-  exvar->name ("your_exception"
-               ACE_ENV_ARG_PARAMETER);
+  exvar->name ("your_exception");
 
   if (this->debug_)
     {
@@ -1978,8 +1916,7 @@ Admin_Client::exception_test (void)
     }
 
   contents = exvar->contents (CORBA::dk_all,
-                              0
-                              ACE_ENV_ARG_PARAMETER);
+                              0);
 
   length = contents->length ();
   const char *tmp = "::your_exception";
@@ -2022,8 +1959,7 @@ Admin_Client::constant_test (void)
     }
 
   CORBA::IDLType_var ivar =
-    this->repo_->get_primitive (CORBA::pk_string
-                                ACE_ENV_ARG_PARAMETER);
+    this->repo_->get_primitive (CORBA::pk_string);
 
   CORBA::Any any;
   const char *s = "hello";
@@ -2034,8 +1970,7 @@ Admin_Client::constant_test (void)
                                   "my_constant",
                                   "1.0",
                                   ivar.in (),
-                                  any
-                                  ACE_ENV_ARG_PARAMETER);
+                                  any);
 
   CORBA::TypeCode_var tc = cvar->type ();
   CORBA::TCKind kind = tc->kind ();
@@ -2078,15 +2013,12 @@ Admin_Client::constant_test (void)
 
   ACE_ASSERT (ACE_OS::strcmp (out_s, s) == 0);
 
-  ivar = this->repo_->get_primitive (CORBA::pk_double
-                                     ACE_ENV_ARG_PARAMETER);
-  cvar->type_def (ivar.in ()
-                  ACE_ENV_ARG_PARAMETER);
+  ivar = this->repo_->get_primitive (CORBA::pk_double);
+  cvar->type_def (ivar.in ());
 
   CORBA::Double double_val = -1223.42256;
   any <<= double_val;
-  cvar->value (any
-               ACE_ENV_ARG_PARAMETER);
+  cvar->value (any);
 
   if (this->debug_)
     {
@@ -2109,10 +2041,8 @@ Admin_Client::constant_test (void)
 
   ACE_ASSERT (out_double_val == double_val);
 
-  ivar = this->repo_->get_primitive (CORBA::pk_short
-                                     ACE_ENV_ARG_PARAMETER);
-  cvar->type_def (ivar.in ()
-                  ACE_ENV_ARG_PARAMETER);
+  ivar = this->repo_->get_primitive (CORBA::pk_short);
+  cvar->type_def (ivar.in ());
 
   if (this->debug_)
     {
@@ -2124,8 +2054,7 @@ Admin_Client::constant_test (void)
   CORBA::Short short_val = -65;
   any <<= short_val;
 
-  cvar->value (any
-               ACE_ENV_ARG_PARAMETER);
+  cvar->value (any);
   out_any = cvar->value ();
 
   CORBA::Short out_short_val;
@@ -2140,10 +2069,8 @@ Admin_Client::constant_test (void)
 
   ACE_ASSERT (out_short_val == short_val);
 
-  ivar = this->repo_->get_primitive (CORBA::pk_float
-                                     ACE_ENV_ARG_PARAMETER);
-  cvar->type_def (ivar.in ()
-                  ACE_ENV_ARG_PARAMETER);
+  ivar = this->repo_->get_primitive (CORBA::pk_float);
+  cvar->type_def (ivar.in ());
 
   if (this->debug_)
     {
@@ -2155,8 +2082,7 @@ Admin_Client::constant_test (void)
   CORBA::Float float_val = 2.33f;
   any <<= float_val;
 
-  cvar->value (any
-               ACE_ENV_ARG_PARAMETER);
+  cvar->value (any);
   out_any = cvar->value ();
 
   CORBA::Float out_float_val;
@@ -2171,10 +2097,8 @@ Admin_Client::constant_test (void)
 
   ACE_ASSERT (out_float_val == float_val);
 
-  ivar = this->repo_->get_primitive (CORBA::pk_ulonglong
-                                     ACE_ENV_ARG_PARAMETER);
-  cvar->type_def (ivar.in ()
-                  ACE_ENV_ARG_PARAMETER);
+  ivar = this->repo_->get_primitive (CORBA::pk_ulonglong);
+  cvar->type_def (ivar.in ());
 
   if (this->debug_)
     {
@@ -2186,8 +2110,7 @@ Admin_Client::constant_test (void)
   CORBA::ULongLong ull_val = 1234567890;
   any <<= ull_val;
 
-  cvar->value (any
-               ACE_ENV_ARG_PARAMETER);
+  cvar->value (any);
   out_any = cvar->value ();
 
   CORBA::ULongLong out_ull_val;
@@ -2231,20 +2154,17 @@ Admin_Client::interface_test (void)
     this->repo_->create_interface ("IDL:gp_iface:1.0",
                                    "gp_iface",
                                    "1.0",
-                                   in_bases
-                                   ACE_ENV_ARG_PARAMETER);
+                                   in_bases);
 
   CORBA::PrimitiveDef_var p_long =
-    this->repo_->get_primitive (CORBA::pk_long
-                                ACE_ENV_ARG_PARAMETER);
+    this->repo_->get_primitive (CORBA::pk_long);
 
   CORBA::AttributeDef_var gp_attr =
     gp_ivar->create_attribute ("IDL:gp_iface/gp_attr:1.0",
                                "gp_attr",
                                "1.0",
                                p_long.in (),
-                               CORBA::ATTR_NORMAL
-                               ACE_ENV_ARG_PARAMETER);
+                               CORBA::ATTR_NORMAL);
 
   in_bases.length (1);
   in_bases[0] = CORBA::InterfaceDef::_duplicate (gp_ivar.in ());
@@ -2253,19 +2173,17 @@ Admin_Client::interface_test (void)
     this->repo_->create_interface ("IDL:p_iface:1.0",
                                    "p_iface",
                                    "1.0",
-                                   in_bases
-                                   ACE_ENV_ARG_PARAMETER);
+                                   in_bases);
 
   CORBA::StringDef_var p_string =
-    this->repo_->create_string (5 ACE_ENV_ARG_PARAMETER);
+    this->repo_->create_string (5);
 
   CORBA::AttributeDef_var p_attr =
     p_ivar->create_attribute ("IDL:p_iface/p_attr:1.0",
                               "p_attr",
                               "1.0",
                               p_string.in (),
-                              CORBA::ATTR_READONLY
-                              ACE_ENV_ARG_PARAMETER);
+                              CORBA::ATTR_READONLY);
 
   const char *names[] = {"inarg", "inoutarg", "outarg"};
 
@@ -2285,8 +2203,7 @@ Admin_Client::interface_test (void)
     this->repo_->create_exception ("IDL:if_exception:1.0",
                                    "if_exception",
                                    "1.0",
-                                   members
-                                   ACE_ENV_ARG_PARAMETER);
+                                   members);
 
   CORBA::ExceptionDefSeq get_seq (1);
   get_seq.length (1);
@@ -2312,8 +2229,7 @@ Admin_Client::interface_test (void)
                               CORBA::OP_NORMAL,
                               par_seq,
                               get_seq,
-                              con_seq
-                              ACE_ENV_ARG_PARAMETER);
+                              con_seq);
 
   CORBA::Contained::Description_var desc =
     p_op->describe ();
@@ -2385,8 +2301,7 @@ Admin_Client::interface_test (void)
       ACE_ASSERT (od->parameters[i].mode == modes[i]);
     }
 
-  CORBA::Boolean is_it = p_ivar->is_a ("IDL:p_iface:1.0"
-                                       ACE_ENV_ARG_PARAMETER);
+  CORBA::Boolean is_it = p_ivar->is_a ("IDL:p_iface:1.0");
 
   if (this->debug_)
     {
@@ -2397,8 +2312,7 @@ Admin_Client::interface_test (void)
 
   ACE_ASSERT (is_it == 1);
 
-  is_it = p_ivar->is_a ("IDL:gp_iface:1.0"
-                        ACE_ENV_ARG_PARAMETER);
+  is_it = p_ivar->is_a ("IDL:gp_iface:1.0");
 
   if (this->debug_)
     {
@@ -2409,8 +2323,7 @@ Admin_Client::interface_test (void)
 
   ACE_ASSERT (is_it == 1);
 
-  is_it = gp_ivar->is_a ("IDL:p_iface:1.0"
-                         ACE_ENV_ARG_PARAMETER);
+  is_it = gp_ivar->is_a ("IDL:p_iface:1.0");
 
   if (this->debug_)
     {
@@ -2522,8 +2435,7 @@ Admin_Client::interface_test (void)
     this->repo_->create_interface ("IDL:iface:1.0",
                                    "iface",
                                    "1.0",
-                                   in_bases
-                                   ACE_ENV_ARG_PARAMETER);
+                                   in_bases);
 
   desc = ivar->describe ();
 
@@ -2588,8 +2500,7 @@ Admin_Client::interface_test (void)
     }
 
   CORBA::ContainedSeq_var contents = ivar->contents (CORBA::dk_all,
-                                                     0
-                                                     ACE_ENV_ARG_PARAMETER);
+                                                     0);
 
   length = contents->length ();
 
@@ -2618,8 +2529,7 @@ Admin_Client::interface_test (void)
         contents[i]->defined_in ();
 
       CORBA::Contained_var cd =
-        CORBA::Contained::_narrow (cr.in ()
-                                   ACE_ENV_ARG_PARAMETER);
+        CORBA::Contained::_narrow (cr.in ());
 
       str = cd->name ();
 
@@ -2663,8 +2573,7 @@ Admin_Client::move_test (void)
     this->repo_->create_enum ("IDL:o_enum:1.0",
                               "o_enum",
                               "1.0",
-                              e_members
-                              ACE_ENV_ARG_PARAMETER);
+                              e_members);
 
   e_members[0] = CORBA::string_dup ("TEN");
   e_members[1] = CORBA::string_dup ("ELEVEN");
@@ -2673,8 +2582,7 @@ Admin_Client::move_test (void)
     this->repo_->create_enum ("IDL:i_enum:1.0",
                               "i_enum",
                               "1.0",
-                              e_members
-                              ACE_ENV_ARG_PARAMETER);
+                              e_members);
 
   CORBA::StructMemberSeq s_members (2);
   s_members.length (2);
@@ -2683,8 +2591,7 @@ Admin_Client::move_test (void)
 
   s_members[0].name = s_names[0];
   s_members[0].type_def =
-    this->repo_->get_primitive (CORBA::pk_string
-                                ACE_ENV_ARG_PARAMETER);
+    this->repo_->get_primitive (CORBA::pk_string);
   s_members[0].type =
     s_members[0].type_def->type ();
 
@@ -2697,8 +2604,7 @@ Admin_Client::move_test (void)
     this->repo_->create_struct ("IDL:o_struct:1.0",
                                 "o_struct",
                                 "1.0",
-                                s_members
-                                ACE_ENV_ARG_PARAMETER);
+                                s_members);
 
   CORBA::UnionMemberSeq u_members (2);
   u_members.length (2);
@@ -2721,16 +2627,14 @@ Admin_Client::move_test (void)
   u_members[1].label = any;
 
   CORBA::PrimitiveDef_var d_var =
-    this->repo_->get_primitive (CORBA::pk_long
-                                ACE_ENV_ARG_PARAMETER);
+    this->repo_->get_primitive (CORBA::pk_long);
 
   CORBA::UnionDef_var u_var =
     this->repo_->create_union ("IDL:the_union:1.0",
                                "the_union",
                                "1.0",
                                d_var.in (),
-                               u_members
-                               ACE_ENV_ARG_PARAMETER);
+                               u_members);
 
   CORBA::UnionMemberSeq_var out_u_members =
     u_var->members ();
@@ -2766,8 +2670,7 @@ Admin_Client::move_test (void)
 
   CORBA::ContainedSeq_var out_contents =
     u_var->contents (CORBA::dk_all,
-                     1
-                     ACE_ENV_ARG_PARAMETER);
+                     1);
 
   length = out_contents->length ();
 
@@ -2782,8 +2685,7 @@ Admin_Client::move_test (void)
 
   e_var->move (u_var.in (),
                u_names[0],
-               "1.0"
-               ACE_ENV_ARG_PARAMETER);
+               "1.0");
 
   if (this->debug_)
     {
@@ -2827,8 +2729,7 @@ Admin_Client::move_test (void)
     }
 
   out_contents = u_var->contents (CORBA::dk_all,
-                                  1
-                                  ACE_ENV_ARG_PARAMETER);
+                                  1);
 
   length = out_contents->length ();
 
@@ -2865,13 +2766,11 @@ Admin_Client::move_test (void)
 
   e_var2->move (s_var.in (),
                 s_names[1],
-                "1.0"
-                ACE_ENV_ARG_PARAMETER);
+                "1.0");
 
   s_var->move (u_var.in (),
                u_names[1],
-               "1.0"
-                ACE_ENV_ARG_PARAMETER);
+               "1.0");
 
   if (this->debug_)
     {
@@ -2881,8 +2780,7 @@ Admin_Client::move_test (void)
     }
 
   out_contents = this->repo_->contents (CORBA::dk_all,
-                                        1
-                                        ACE_ENV_ARG_PARAMETER);
+                                        1);
 
   length = out_contents->length ();
 
@@ -2924,8 +2822,7 @@ Admin_Client::move_test (void)
     }
 
   out_contents = u_var->contents (CORBA::dk_all,
-                                  1
-                                  ACE_ENV_ARG_PARAMETER);
+                                  1);
 
   length = out_contents->length ();
 
@@ -2961,14 +2858,12 @@ Admin_Client::move_test (void)
 
       if (i == 1)
         {
-          s_tmp = CORBA::StructDef::_narrow (out_contents[i]
-                                             ACE_ENV_ARG_PARAMETER);
+          s_tmp = CORBA::StructDef::_narrow (out_contents[i]);
         }
     }
 
   out_contents = s_tmp->contents (CORBA::dk_all,
-                                  0
-                                  ACE_ENV_ARG_PARAMETER);
+                                  0);
 
   length = out_contents->length ();
 
@@ -3052,20 +2947,17 @@ Admin_Client::module_test (void)
   CORBA::ModuleDef_var outer =
     this->repo_->create_module ("IDL:outer:1.0",
                                 "outer",
-                                "1.0"
-                                ACE_ENV_ARG_PARAMETER);
+                                "1.0");
 
   CORBA::ModuleDef_var middle =
     outer->create_module ("IDL:outer/middle:1.0",
                           "middle",
-                          "1.0"
-                          ACE_ENV_ARG_PARAMETER);
+                          "1.0");
 
   CORBA::ModuleDef_var inner =
     middle->create_module ("IDL:outer/middle/inner:1.0",
                            "inner",
-                           "1.0"
-                           ACE_ENV_ARG_PARAMETER);
+                           "1.0");
 
   CORBA::InterfaceDefSeq in_bases (1);
   in_bases.length (0);
@@ -3074,8 +2966,7 @@ Admin_Client::module_test (void)
     outer->create_interface ("IDL:p_iface:1.0",
                              "p_iface",
                              "1.0",
-                             in_bases
-                             ACE_ENV_ARG_PARAMETER);
+                             in_bases);
 
   in_bases.length (1);
   in_bases[0] = CORBA::InterfaceDef::_duplicate (p_iface.in ());
@@ -3084,23 +2975,19 @@ Admin_Client::module_test (void)
     inner->create_interface ("IDL:iface:1.0",
                              "iface",
                              "1.0",
-                             in_bases
-                             ACE_ENV_ARG_PARAMETER);
+                             in_bases);
 
   CORBA::PrimitiveDef_var p_void =
-    this->repo_->get_primitive (CORBA::pk_void
-                                ACE_ENV_ARG_PARAMETER);
+    this->repo_->get_primitive (CORBA::pk_void);
   CORBA::PrimitiveDef_var p_long =
-    this->repo_->get_primitive (CORBA::pk_long
-                                ACE_ENV_ARG_PARAMETER);
+    this->repo_->get_primitive (CORBA::pk_long);
 
   CORBA::AttributeDef_var attr =
     p_iface->create_attribute ("IDL:iface/attr:1.0",
                                "attr",
                                "1.0",
                                p_void.in (),
-                               CORBA::ATTR_NORMAL
-                               ACE_ENV_ARG_PARAMETER);
+                               CORBA::ATTR_NORMAL);
 
   CORBA::ULong length = 3;
   CORBA::ULong i = 0;
@@ -3131,8 +3018,7 @@ Admin_Client::module_test (void)
     this->repo_->create_exception ("IDL:if_exception:1.0",
                                    "if_exception",
                                    "1.0",
-                                   members
-                                   ACE_ENV_ARG_PARAMETER);
+                                   members);
 
   CORBA::ExceptionDefSeq get_seq (1);
   get_seq.length (1);
@@ -3146,14 +3032,12 @@ Admin_Client::module_test (void)
                              CORBA::OP_NORMAL,
                              par_seq,
                              get_seq,
-                             con_seq
-                             ACE_ENV_ARG_PARAMETER);
+                             con_seq);
 
   CORBA::String_var str;
 
   CORBA::Contained_var result =
-    inner->lookup ("::outer::middle::inner::iface::op"
-                   ACE_ENV_ARG_PARAMETER);
+    inner->lookup ("::outer::middle::inner::iface::op");
 
   str = result->absolute_name ();
 
@@ -3171,8 +3055,7 @@ Admin_Client::module_test (void)
 
   ACE_ASSERT (cmp_result == 0);
 
-  result = middle->lookup ("inner::iface::op"
-                           ACE_ENV_ARG_PARAMETER);
+  result = middle->lookup ("inner::iface::op");
 
   str = result->absolute_name ();
 
@@ -3194,8 +3077,7 @@ Admin_Client::module_test (void)
     this->repo_->lookup_name ("op",
                               -1,
                               CORBA::dk_all,
-                              0
-                              ACE_ENV_ARG_PARAMETER);
+                              0);
 
   length = cseq->length ();
 
@@ -3231,8 +3113,7 @@ Admin_Client::module_test (void)
   cseq = middle->lookup_name ("attr",
                               3,
                               CORBA::dk_Attribute,
-                              0
-                              ACE_ENV_ARG_PARAMETER);
+                              0);
 
   length = cseq->length ();
 
@@ -3264,8 +3145,7 @@ Admin_Client::module_test (void)
 
   iface->move (outer.in (),
                "iface",
-               "1.0"
-               ACE_ENV_ARG_PARAMETER);
+               "1.0");
 
   if (this->debug_)
     {
@@ -3276,8 +3156,7 @@ Admin_Client::module_test (void)
   cseq = this->repo_->lookup_name ("op",
                                    -1,
                                    CORBA::dk_all,
-                                   0
-                                   ACE_ENV_ARG_PARAMETER);
+                                   0);
 
   length = cseq->length ();
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
index d147c4c45bd..a251edf0f60 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
@@ -28,12 +28,11 @@ int
 Latency_Query_Client::init (int argc,
                             char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       this->orb_ = CORBA::ORB_init (argc,
                                     argv,
-                                    0
-                                    ACE_ENV_ARG_PARAMETER);
+                                    0);
 
       int retval = this->parse_args (argc,
                                      argv);
@@ -44,8 +43,7 @@ Latency_Query_Client::init (int argc,
         }
 
       CORBA::Object_var object =
-        this->orb_->resolve_initial_references ("InterfaceRepository"
-                                                ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("InterfaceRepository");
 
       if (CORBA::is_nil (object.in ()))
         {
@@ -58,8 +56,7 @@ Latency_Query_Client::init (int argc,
         }
 
       this->repo_ =
-        CORBA::Repository::_narrow (object.in ()
-                                    ACE_ENV_ARG_PARAMETER);
+        CORBA::Repository::_narrow (object.in ());
 
       if (CORBA::is_nil (this->repo_.in ()))
         {
@@ -75,13 +72,11 @@ Latency_Query_Client::init (int argc,
           return retval;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Latency_Query_Client::init:");
+      ex._tao_print_exception ("Latency_Query_Client::init:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -92,7 +87,7 @@ Latency_Query_Client::run (void)
 //  CORBA::DefinitionKind dk;
   CORBA::AttributeMode am;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       for (int j = 0; j < 100; ++j)
         {
@@ -144,13 +139,11 @@ Latency_Query_Client::run (void)
                                                  stats.samples_count ());
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                          "Latency_Query_Client::run:");
+      ex._tao_print_exception ("Latency_Query_Client::run:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -200,13 +193,11 @@ Latency_Query_Client::parse_args (int argc,
 int
 Latency_Query_Client::populate_ifr (void)
 {
-  CORBA::Contained_var irobj = this->repo_->lookup_id ("IDL:dummy/attr:1.0"
-                                                       ACE_ENV_ARG_PARAMETER);
+  CORBA::Contained_var irobj = this->repo_->lookup_id ("IDL:dummy/attr:1.0");
 
   if (! CORBA::is_nil (irobj.in ()))
     {
-      this->attr_ = CORBA::AttributeDef::_narrow (irobj.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
+      this->attr_ = CORBA::AttributeDef::_narrow (irobj.in ());
 
       if (CORBA::is_nil (this->attr_.in ()))
         {
@@ -226,20 +217,17 @@ Latency_Query_Client::populate_ifr (void)
     this->repo_->create_interface ("IDL:dummy:1.0",
                                    "dummy",
                                    "1.0",
-                                   in_bases
-                                   ACE_ENV_ARG_PARAMETER);
+                                   in_bases);
 
   CORBA::PrimitiveDef_var p_long =
-    this->repo_->get_primitive (CORBA::pk_long
-                                ACE_ENV_ARG_PARAMETER);
+    this->repo_->get_primitive (CORBA::pk_long);
 
   this->attr_ =
     iface->create_attribute ("IDL:dummt/attr:1.0",
                              "attr",
                              "1.0",
                              p_long.in (),
-                             CORBA::ATTR_NORMAL
-                             ACE_ENV_ARG_PARAMETER);
+                             CORBA::ATTR_NORMAL);
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
index 989aca924bf..0461fce43bb 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
@@ -21,12 +21,11 @@ int
 Ptest::init (int argc,
                     char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       this->orb_ = CORBA::ORB_init (argc,
                                     argv,
-                                    0
-                                    ACE_ENV_ARG_PARAMETER);
+                                    0);
 
       int retval = this->parse_args (argc,
                                      argv);
@@ -35,8 +34,7 @@ Ptest::init (int argc,
         return retval;
 
       CORBA::Object_var object =
-        this->orb_->resolve_initial_references ("InterfaceRepository"
-                                                ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("InterfaceRepository");
 
       if (CORBA::is_nil (object.in ()))
         {
@@ -49,8 +47,7 @@ Ptest::init (int argc,
         }
 
       this->repo_ =
-        CORBA::Repository::_narrow (object.in ()
-                                    ACE_ENV_ARG_PARAMETER);
+        CORBA::Repository::_narrow (object.in ());
 
       if (CORBA::is_nil (this->repo_.in ()))
         {
@@ -59,13 +56,11 @@ Ptest::init (int argc,
                             -1);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Ptest::init");
+      ex._tao_print_exception ("Ptest::init");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -73,8 +68,7 @@ Ptest::init (int argc,
 int
 Ptest::run (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       if (this->query_ == 1)
         {
@@ -85,13 +79,11 @@ Ptest::run (void)
           this->populate ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Ptest::run");
+      ex._tao_print_exception ("Ptest::run");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -140,22 +132,19 @@ Ptest::populate (void)
   CORBA::StructMemberSeq members (2);
   members.length (2);
   members[0].name = CORBA::string_dup ("long_mem");
-  members[0].type_def = this->repo_->get_primitive (CORBA::pk_long
-                                                    ACE_ENV_ARG_PARAMETER);
+  members[0].type_def = this->repo_->get_primitive (CORBA::pk_long);
   members[0].type = members[0].type_def->type ();
 
   members[1].name = CORBA::string_dup ("array_mem");
   members[1].type_def = this->repo_->create_array (5,
-                                                   members[0].type_def.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
+                                                   members[0].type_def.in ());
   members[1].type = members[1].type_def->type ();
 
 
   CORBA::StructDef_var svar = this->repo_->create_struct ("IDL:my_struct:1.0",
                                                           "my_struct",
                                                           "1.0",
-                                                          members
-                                                          ACE_ENV_ARG_PARAMETER);
+                                                          members);
 
   CORBA::EnumMemberSeq def_members (2);
   def_members.length (2);
@@ -166,8 +155,7 @@ Ptest::populate (void)
   CORBA::EnumDef_var e_def_var = svar->create_enum ("IDL:my_def_enum:1.0",
                                                     "my_enum",
                                                     "1.0",
-                                                    def_members
-                                                    ACE_ENV_ARG_PARAMETER);
+                                                    def_members);
 }
 
 void
@@ -190,8 +178,7 @@ Ptest::query (void)
 
   CORBA::ContainedSeq_var contents =
     this->repo_->contents (CORBA::dk_all,
-                           0
-                           ACE_ENV_ARG_PARAMETER);
+                           0);
 
   CORBA::ULong length = contents->length ();
 
@@ -207,8 +194,7 @@ Ptest::query (void)
   CORBA::ULong i = 0;
 
   CORBA::StructDef_var svar =
-    CORBA::StructDef::_narrow (contents[i]
-                               ACE_ENV_ARG_PARAMETER);
+    CORBA::StructDef::_narrow (contents[i]);
 
   ACE_ASSERT (!CORBA::is_nil (svar.in ()));
 
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp
index b86d36f0440..d3a1efe5515 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp
@@ -24,8 +24,7 @@ int main (int argc, char *argv [])
 {
   int result = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
 
       NContextExt_Client_i client;
@@ -35,12 +34,11 @@ int main (int argc, char *argv [])
 
       result = client.run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "client");
+      ex._tao_print_exception ("client");
       return 1;
     }
-  ACE_ENDTRY;
 
   return result;
 }
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
index 8d88b5cca1e..739d31e0330 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
@@ -151,7 +151,7 @@ int
 NContextExt_Client_i::run (void)
 {
 
-  ACE_TRY_EX (OuterBlock)
+  try
     {
       CosNaming::Name name;
 
@@ -163,30 +163,24 @@ NContextExt_Client_i::run (void)
 
       // Get the stringified form of the name
        CORBA::String_var str_name =
-        this->naming_context_->to_string (name
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (OuterBlock);
+        this->naming_context_->to_string (name);
 
       CORBA::Object_var factory_object;
 
-      ACE_TRY_EX (InnerBlock)
+      try
         {
           // Resolve the name using the stringified form of the name
           factory_object =
-            this->naming_context_->resolve_str (str_name.in ()
-                                                ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (InnerBlock);
+            this->naming_context_->resolve_str (str_name.in ());
         }
-      ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+      catch (const CosNaming::NamingContext::NotFound& ex)
         {
         }
-      ACE_ENDTRY;
 
       // Narrow
       Web_Server::Iterator_Factory_var factory =
-        Web_Server::Iterator_Factory::_narrow (factory_object.in () ACE_ENV_ARG_PARAMETER);
+        Web_Server::Iterator_Factory::_narrow (factory_object.in ());
 
-      ACE_TRY_CHECK_EX (OuterBlock);
 
       // Create bindings
       CosNaming::BindingIterator_var iter;
@@ -194,16 +188,12 @@ NContextExt_Client_i::run (void)
 
       this->naming_context_->list (2,
                                    bindings_list.out (),
-                                   iter.out ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (OuterBlock);
+                                   iter.out ());
 
       // Convert the stringified name back as CosNaming::Name and print
       // them out.
       CosNaming::Name *nam =
-        this->naming_context_->to_name (str_name.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (OuterBlock);
+        this->naming_context_->to_name (str_name.in ());
 
       // Declare a CosNaming::Name variable and assign length to it.
       CosNaming::Name nm;
@@ -227,9 +217,7 @@ NContextExt_Client_i::run (void)
 
       CORBA::String_var url_string =
         this->naming_context_->to_url (address.in (),
-                                       obj_name.in()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (OuterBlock);
+                                       obj_name.in());
 
       if (this->view_ == 0)
         {
@@ -240,22 +228,21 @@ NContextExt_Client_i::run (void)
                               url_string);
         }
     }
-  ACE_CATCH (CORBA::NO_MEMORY, ex)
+  catch (const CORBA::NO_MEMORY& ex)
     {
-      ACE_PRINT_EXCEPTION (ex, "A system exception oc client side");
+      ex._tao_print_exception ("A system exception oc client side");
       return -1;
     }
-  ACE_CATCH (CORBA::SystemException, ex)
+  catch (const CORBA::SystemException& ex)
     {
-      ACE_PRINT_EXCEPTION (ex, "A system exception oc client side");
+      ex._tao_print_exception ("A system exception oc client side");
       return -1;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "client");
+      ex._tao_print_exception ("client");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -266,8 +253,7 @@ NContextExt_Client_i::init (int argc, char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
 
       // First initialize the ORB, that will remove some arguments...
@@ -275,7 +261,7 @@ NContextExt_Client_i::init (int argc, char **argv)
         CORBA::ORB_init (this->argc_,
                          this->argv_,
                          "" /* the ORB name, it can be anything! */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 
       // There must be at least one argument, the file that has to be
       // retrieved
@@ -284,7 +270,7 @@ NContextExt_Client_i::init (int argc, char **argv)
 
       // Get a reference to the Naming Service
       CORBA::Object_var naming_context_object =
-        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil (naming_context_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -293,20 +279,18 @@ NContextExt_Client_i::init (int argc, char **argv)
 
       // Narrow to get the correct reference
       this->naming_context_ =
-        CosNaming::NamingContextExt::_narrow (naming_context_object.in ()
-                                              ACE_ENV_ARG_PARAMETER);
+        CosNaming::NamingContextExt::_narrow (naming_context_object.in ());
 
       if (CORBA::is_nil (this->naming_context_.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot narrow Naming Service\n"),
                           1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "client");
+      ex._tao_print_exception ("client");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp
index 0c5e9f31e86..47a13d574c1 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp
@@ -29,37 +29,32 @@ void
 Basic::remove_member (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       PortableGroup::Location location (1);
       location.length (1);
       location[0].id = CORBA::string_dup (this->location_);
       this->lm_->remove_member (this->object_group_.in (),
-                                location
-                                ACE_ENV_ARG_PARAMETER);
+                                location);
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Removed Member at Location <%s>\n",
                       this->location_));
 
     }
-  ACE_CATCH (PortableGroup::ObjectNotFound, ex)
+  catch (const PortableGroup::ObjectNotFound& ex)
     {
-      ACE_PRINT_EXCEPTION (ex,
-                           "Caught exception in remove_member");
-      ACE_TRY_THROW (CORBA::INTERNAL ());
+      ex._tao_print_exception ("Caught exception in remove_member");
+      throw CORBA::INTERNAL ();
     }
-  ACE_CATCH (PortableGroup::MemberNotFound, ex)
+  catch (const PortableGroup::MemberNotFound& ex)
     {
-      ACE_PRINT_EXCEPTION (ex,
-                           "Caught exception in remove_member");
-      ACE_TRY_THROW (CORBA::INTERNAL ());
+      ex._tao_print_exception ("Caught exception in remove_member");
+      throw CORBA::INTERNAL ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught while destroying member\n");
+      ex._tao_print_exception ("Exception caught while destroying member\n");
     }
-  ACE_ENDTRY;
 
 }
 
@@ -67,5 +62,5 @@ void
 Basic::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
index d91fc041946..3c25251db36 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
@@ -17,22 +17,20 @@ LB_server::LB_server (int argc, char **argv)
 int
 LB_server::destroy (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->lm_->delete_object (this->fcid_.in ()
-                                ACE_ENV_ARG_PARAMETER);
+      this->lm_->delete_object (this->fcid_.in ());
 
-      this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      this->root_poa_->destroy (1, 1);
 
       this->orb_->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught while destroying LB_server\n");
+      ex._tao_print_exception (
+        "Exception caught while destroying LB_server\n");
       return -1;
     }
-  ACE_ENDTRY;
   return 1;
 
 }
@@ -76,25 +74,22 @@ LB_server::write_ior_to_file (const char *ior)
 int
 LB_server::start_orb_and_poa (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialise the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
-                                    "" ACE_ENV_ARG_PARAMETER);
+                                    "");
 
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references("RootPOA"
-                                               ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize the POA.\n"),
                           1);
 
-      this->root_poa_ = PortableServer::POA::_narrow (poa_object.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
+      this->root_poa_ = PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
         this->root_poa_->the_POAManager ();
@@ -102,11 +97,10 @@ LB_server::start_orb_and_poa (void)
       poa_manager->activate ();
 
       CORBA::Object_var obj =
-        this->orb_->resolve_initial_references ("LoadManager" ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("LoadManager");
 
       this->lm_ =
-        CosLoadBalancing::LoadManager::_narrow (obj.in ()
-                                                ACE_ENV_ARG_PARAMETER);
+        CosLoadBalancing::LoadManager::_narrow (obj.in ());
 
       if (CORBA::is_nil (this->lm_.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -114,13 +108,11 @@ LB_server::start_orb_and_poa (void)
                           1);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception raised initialising ORB or POA");
+      ex._tao_print_exception ("Exception raised initialising ORB or POA");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 1;
 
@@ -129,7 +121,7 @@ LB_server::start_orb_and_poa (void)
 int
 LB_server::create_object_group (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       const char *repository_id = "IDL:Test/Basic:1.0";
 
@@ -148,22 +140,19 @@ LB_server::create_object_group (void)
 
       this->object_group_ = this->lm_->create_object (repository_id,
                                                       criteria,
-                                                      this->fcid_.out ()
-                                                      ACE_ENV_ARG_PARAMETER);
+                                                      this->fcid_.out ());
 
       CORBA::String_var ior =
-        this->orb_->object_to_string (this->object_group_.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        this->orb_->object_to_string (this->object_group_.in ());
 
       this->write_ior_to_file (ior.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception raised while creating object group");
+      ex._tao_print_exception (
+        "Exception raised while creating object group");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 1;
 
@@ -172,7 +161,7 @@ LB_server::create_object_group (void)
 int
 LB_server::register_servant (Basic *servant, const char *loc)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       Test::Basic_var basic =
         servant->_this ();
@@ -184,16 +173,13 @@ LB_server::register_servant (Basic *servant, const char *loc)
 
       this->lm_->add_member (this->object_group_.in (),
                              location,
-                             basic.in ()
-                             ACE_ENV_ARG_PARAMETER);
+                             basic.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception raised while registering servant");
+      ex._tao_print_exception ("Exception raised while registering servant");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 1;
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp
index a87be7e3a74..212ed2b2c70 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp
@@ -36,19 +36,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior);
 
       Test::Basic_var basic =
-        Test::Basic::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER);
+        Test::Basic::_narrow (tmp.in ());
 
       if (CORBA::is_nil (basic.in ()))
         {
@@ -73,13 +73,11 @@ main (int argc, char *argv[])
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in client.cpp:");
+      ex._tao_print_exception ("Exception caught in client.cpp:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp
index 240e4e281a1..426e83d82b1 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp
@@ -8,7 +8,7 @@ ACE_RCSID (Application_Controlled,
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       const char *location1 = "MyLocation 1";
       const char *location2 = "MyLocation 2";
@@ -99,13 +99,11 @@ main (int argc, char *argv[])
         return 1;
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "lb_server exception");
+      ex._tao_print_exception ("lb_server exception");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp
index 265df58ad6a..988512a3743 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp
@@ -16,8 +16,7 @@ CORBA::Object_ptr
 Factory::create_object (
     const char * /*type_id*/,
     const PortableGroup::Criteria & /*the_criteria*/,
-    PortableGroup::GenericFactory::FactoryCreationId_out fcid
-    ACE_ENV_ARG_DECL)
+    PortableGroup::GenericFactory::FactoryCreationId_out fcid)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::NoFactory,
                    PortableGroup::ObjectNotCreated,
@@ -60,8 +59,7 @@ Factory::create_object (
   this->poa_ =
     servant->_default_POA ();
 
-  this->oid_ = this->poa_->servant_to_id (servant
-                                          ACE_ENV_ARG_PARAMETER);
+  this->oid_ = this->poa_->servant_to_id (servant);
 
   return servant->_this ();
 
@@ -70,8 +68,7 @@ Factory::create_object (
 void
 Factory::delete_object (
     const PortableGroup::GenericFactory::FactoryCreationId &
-      fcid
-    ACE_ENV_ARG_DECL)
+      fcid)
   ACE_THROW_SPEC ((CORBA::SystemException,
 		   PortableGroup::ObjectNotFound))
 {
@@ -84,19 +81,18 @@ Factory::delete_object (
       if (this->factory_map_.find (my_fcid, entry) == 0)
         {
 	  if (this->factory_map_.unbind (my_fcid) != 0)
-	    ACE_THROW (CORBA::INTERNAL ());
+	    throw CORBA::INTERNAL ();
 	}
     }
   else
-    ACE_THROW (PortableGroup::ObjectNotFound ());
+    throw PortableGroup::ObjectNotFound ();
 
   if (my_fcid == this->fcid_)
     {
-      this->poa_->deactivate_object (this->oid_.in ()
-		                     ACE_ENV_ARG_PARAMETER);
+      this->poa_->deactivate_object (this->oid_.in ());
     }
   else
     {
-      ACE_THROW (PortableGroup::ObjectNotFound ());
+      throw PortableGroup::ObjectNotFound ();
     }
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h
index 68473814908..925b241a31e 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h
@@ -31,8 +31,7 @@ public:
       const char * type_id,
       const PortableGroup::Criteria & the_criteria,
       PortableGroup::GenericFactory::FactoryCreationId_out
-        factory_creation_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        factory_creation_id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::NoFactory,
                      PortableGroup::ObjectNotCreated,
@@ -46,8 +45,7 @@ public:
 
   virtual void delete_object (
       const PortableGroup::GenericFactory::FactoryCreationId &
-        factory_creation_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        factory_creation_id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectNotFound));
 private:
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
index a8060cbfeb3..d51850a5df6 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
@@ -24,7 +24,7 @@ LB_server::orb (void)
 int
 LB_server::run (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       ACE_Time_Value period (0, 10);
       while (1)
@@ -32,13 +32,11 @@ LB_server::run (void)
           this->orb_->perform_work (&period);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught while running LB_server\n");
+      ex._tao_print_exception ("Exception caught while running LB_server\n");
       return -1;
     }
-  ACE_ENDTRY;
   return 1;
 
 }
@@ -47,22 +45,20 @@ LB_server::run (void)
 int
 LB_server::destroy (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->lm_->delete_object (this->fcid_.in ()
-                                ACE_ENV_ARG_PARAMETER);
+      this->lm_->delete_object (this->fcid_.in ());
 
-      this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      this->root_poa_->destroy (1, 1);
 
       this->orb_->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught while destroying LB_server\n");
+      ex._tao_print_exception (
+        "Exception caught while destroying LB_server\n");
       return -1;
     }
-  ACE_ENDTRY;
   return 1;
 
 }
@@ -88,25 +84,22 @@ LB_server::write_ior_to_file (const char *ior)
 int
 LB_server::start_orb_and_poa (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialise the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
-                                    "" ACE_ENV_ARG_PARAMETER);
+                                    "");
 
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references("RootPOA"
-                                               ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize the POA.\n"),
                           1);
 
-      this->root_poa_ = PortableServer::POA::_narrow (poa_object.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
+      this->root_poa_ = PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
         this->root_poa_->the_POAManager ();
@@ -114,11 +107,10 @@ LB_server::start_orb_and_poa (void)
       poa_manager->activate ();
 
       CORBA::Object_var obj =
-        this->orb_->resolve_initial_references ("LoadManager" ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("LoadManager");
 
       this->lm_ =
-        CosLoadBalancing::LoadManager::_narrow (obj.in ()
-                                                ACE_ENV_ARG_PARAMETER);
+        CosLoadBalancing::LoadManager::_narrow (obj.in ());
 
       if (CORBA::is_nil (this->lm_.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -126,13 +118,11 @@ LB_server::start_orb_and_poa (void)
                           1);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception raised initialising ORB or POA");
+      ex._tao_print_exception ("Exception raised initialising ORB or POA");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 1;
 
@@ -141,7 +131,7 @@ LB_server::start_orb_and_poa (void)
 int
 LB_server::create_object_group (const char *loc_1, const char *loc_2)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       const char *repository_id = "IDL:Test/Simple:1.0";
 
@@ -212,23 +202,20 @@ LB_server::create_object_group (const char *loc_1, const char *loc_2)
 
       this->object_group_ = this->lm_->create_object (repository_id,
                                                       criteria,
-                                                      this->fcid_.out ()
-                                                      ACE_ENV_ARG_PARAMETER);
+                                                      this->fcid_.out ());
 
       CORBA::String_var ior =
-        this->orb_->object_to_string (this->object_group_.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        this->orb_->object_to_string (this->object_group_.in ());
 
       this->write_ior_to_file (ior.in ());
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception raised while creating object group");
+      ex._tao_print_exception (
+        "Exception raised while creating object group");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 1;
 
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp
index 0d207c0e676..6d9c534531c 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp
@@ -38,19 +38,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior);
 
       Test::Simple_var simple =
-        Test::Simple::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER);
+        Test::Simple::_narrow (tmp.in ());
 
       if (CORBA::is_nil (simple.in ()))
         {
@@ -69,13 +69,11 @@ main (int argc, char *argv[])
       orb->destroy ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in client.cpp:");
+      ex._tao_print_exception ("Exception caught in client.cpp:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp
index 02087ce3b0e..b776dcc513a 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp
@@ -38,37 +38,32 @@ void
 Basic::remove_member (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       PortableGroup::Location location (1);
       location.length (1);
       location[0].id = CORBA::string_dup (this->location_);
       this->lm_->remove_member (this->object_group_.in (),
-                                location
-                                ACE_ENV_ARG_PARAMETER);
+                                location);
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Removed Member at Location <%s>\n",
                       this->location_));
 
     }
-  ACE_CATCH (PortableGroup::ObjectNotFound, ex)
+  catch (const PortableGroup::ObjectNotFound& ex)
     {
-      ACE_PRINT_EXCEPTION (ex,
-                           "Caught exception in remove_member");
-      ACE_TRY_THROW (CORBA::INTERNAL ());
+      ex._tao_print_exception ("Caught exception in remove_member");
+      throw CORBA::INTERNAL ();
     }
-  ACE_CATCH (PortableGroup::MemberNotFound, ex)
+  catch (const PortableGroup::MemberNotFound& ex)
     {
-      ACE_PRINT_EXCEPTION (ex,
-                           "Caught exception in remove_member");
-      ACE_TRY_THROW (CORBA::INTERNAL ());
+      ex._tao_print_exception ("Caught exception in remove_member");
+      throw CORBA::INTERNAL ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught while destroying member\n");
+      ex._tao_print_exception ("Exception caught while destroying member\n");
     }
-  ACE_ENDTRY;
 
 }
 
@@ -76,5 +71,5 @@ void
 Basic::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp
index 4df551249ec..897fcb345a1 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp
@@ -18,25 +18,22 @@ LB_server::LB_server (int argc, char **argv)
 int
 LB_server::destroy (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->lm_->delete_object (this->basic_fcid_.in ()
-                                ACE_ENV_ARG_PARAMETER);
+      this->lm_->delete_object (this->basic_fcid_.in ());
 
-      this->lm_->delete_object (this->simple_fcid_.in ()
-                                ACE_ENV_ARG_PARAMETER);
+      this->lm_->delete_object (this->simple_fcid_.in ());
 
-      this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      this->root_poa_->destroy (1, 1);
 
       this->orb_->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught while destroying LB_server\n");
+      ex._tao_print_exception (
+        "Exception caught while destroying LB_server\n");
       return -1;
     }
-  ACE_ENDTRY;
   return 1;
 
 }
@@ -68,25 +65,22 @@ LB_server::load_manager (void)
 int
 LB_server::start_orb_and_poa (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialise the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
-                                    "" ACE_ENV_ARG_PARAMETER);
+                                    "");
 
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references("RootPOA"
-                                               ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize the POA.\n"),
                           1);
 
-      this->root_poa_ = PortableServer::POA::_narrow (poa_object.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
+      this->root_poa_ = PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
         this->root_poa_->the_POAManager ();
@@ -94,11 +88,10 @@ LB_server::start_orb_and_poa (void)
       poa_manager->activate ();
 
       CORBA::Object_var obj =
-        this->orb_->resolve_initial_references ("LoadManager" ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("LoadManager");
 
       this->lm_ =
-        CosLoadBalancing::LoadManager::_narrow (obj.in ()
-                                                ACE_ENV_ARG_PARAMETER);
+        CosLoadBalancing::LoadManager::_narrow (obj.in ());
 
       if (CORBA::is_nil (this->lm_.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -106,13 +99,11 @@ LB_server::start_orb_and_poa (void)
                           1);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception raised initialising ORB or POA");
+      ex._tao_print_exception ("Exception raised initialising ORB or POA");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 1;
 
@@ -121,7 +112,7 @@ LB_server::start_orb_and_poa (void)
 int
 LB_server::create_basic_object_group (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       const char *repository_id = "IDL:Test/Basic:1.0";
 
@@ -140,21 +131,18 @@ LB_server::create_basic_object_group (void)
 
       this->basic_object_group_ = this->lm_->create_object (repository_id,
                                                             criteria,
-                                                            this->basic_fcid_.out ()
-                                                            ACE_ENV_ARG_PARAMETER);
+                                                            this->basic_fcid_.out ());
 
       CORBA::String_var ior =
-        this->orb_->object_to_string (this->basic_object_group_.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        this->orb_->object_to_string (this->basic_object_group_.in ());
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception raised while creating object group");
+      ex._tao_print_exception (
+        "Exception raised while creating object group");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 1;
 
@@ -163,7 +151,7 @@ LB_server::create_basic_object_group (void)
 int
 LB_server::create_simple_object_group (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       const char *repository_id = "IDL:Test/Simple:1.0";
 
@@ -182,21 +170,18 @@ LB_server::create_simple_object_group (void)
 
       this->simple_object_group_ = this->lm_->create_object (repository_id,
                                                              criteria,
-                                                             this->simple_fcid_.out ()
-                                                             ACE_ENV_ARG_PARAMETER);
+                                                             this->simple_fcid_.out ());
 
       CORBA::String_var ior =
-        this->orb_->object_to_string (this->simple_object_group_.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        this->orb_->object_to_string (this->simple_object_group_.in ());
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception raised while creating object group");
+      ex._tao_print_exception (
+        "Exception raised while creating object group");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 1;
 
@@ -205,7 +190,7 @@ LB_server::create_simple_object_group (void)
 int
 LB_server::remove_basic_member (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       PortableGroup::Location location (1);
       location.length (1);
@@ -215,18 +200,15 @@ LB_server::remove_basic_member (void)
       const char *loc = "MyLocation 1";
 
       this->lm_->remove_member (this->basic_object_group_.in (),
-                                location
-                                ACE_ENV_ARG_PARAMETER);
+                                location);
 
       printf("Removed Basic Member at location %s\n\n", loc);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception raised while deleting servant");
+      ex._tao_print_exception ("Exception raised while deleting servant");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 1;
 }
@@ -234,7 +216,7 @@ LB_server::remove_basic_member (void)
 int
 LB_server::remove_simple_member (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       PortableGroup::Location location (1);
       location.length (1);
@@ -244,18 +226,15 @@ LB_server::remove_simple_member (void)
       const char *loc = "MyLocation 1";
 
       this->lm_->remove_member (this->simple_object_group_.in (),
-                                location
-                                ACE_ENV_ARG_PARAMETER);
+                                location);
 
       printf("Removed Simple Member at location %s\n\n", loc);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception raised while deleting servant");
+      ex._tao_print_exception ("Exception raised while deleting servant");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 1;
 }
@@ -263,7 +242,7 @@ LB_server::remove_simple_member (void)
 int
 LB_server::register_basic_servant (Basic *servant, const char *loc)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       Test::Basic_var basic =
         servant->_this ();
@@ -275,21 +254,18 @@ LB_server::register_basic_servant (Basic *servant, const char *loc)
 
       this->lm_->add_member (this->basic_object_group_.in (),
                              location,
-                             basic.in ()
-                             ACE_ENV_ARG_PARAMETER);
+                             basic.in ());
 
       CORBA::Short number = 0;
       number = servant->number ();
 
       printf("Added Basic member %d at location %s\n", number, loc);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception raised while registering servant");
+      ex._tao_print_exception ("Exception raised while registering servant");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 1;
 }
@@ -297,7 +273,7 @@ LB_server::register_basic_servant (Basic *servant, const char *loc)
 int
 LB_server::register_simple_servant (Simple *servant, const char *loc)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       Test::Simple_var simple =
         servant->_this ();
@@ -309,21 +285,18 @@ LB_server::register_simple_servant (Simple *servant, const char *loc)
 
       this->lm_->add_member (this->simple_object_group_.in (),
                              location,
-                             simple.in ()
-                             ACE_ENV_ARG_PARAMETER);
+                             simple.in ());
 
       CORBA::Short number = 0;
       number = servant->number ();
 
       printf("Added Simple member %d at location %s\n", number, loc);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception raised while registering servant");
+      ex._tao_print_exception ("Exception raised while registering servant");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 1;
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp
index f1594dd2f56..ca076d4782c 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp
@@ -38,37 +38,32 @@ void
 Simple::remove_member (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       PortableGroup::Location location (1);
       location.length (1);
       location[0].id = CORBA::string_dup (this->location_);
       this->lm_->remove_member (this->object_group_.in (),
-                                location
-                                ACE_ENV_ARG_PARAMETER);
+                                location);
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Removed Member at Location <%s>\n",
                       this->location_));
 
     }
-  ACE_CATCH (PortableGroup::ObjectNotFound, ex)
+  catch (const PortableGroup::ObjectNotFound& ex)
     {
-      ACE_PRINT_EXCEPTION (ex,
-                           "Caught exception in remove_member");
-      ACE_TRY_THROW (CORBA::INTERNAL ());
+      ex._tao_print_exception ("Caught exception in remove_member");
+      throw CORBA::INTERNAL ();
     }
-  ACE_CATCH (PortableGroup::MemberNotFound, ex)
+  catch (const PortableGroup::MemberNotFound& ex)
     {
-      ACE_PRINT_EXCEPTION (ex,
-                           "Caught exception in remove_member");
-      ACE_TRY_THROW (CORBA::INTERNAL ());
+      ex._tao_print_exception ("Caught exception in remove_member");
+      throw CORBA::INTERNAL ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught while destroying member\n");
+      ex._tao_print_exception ("Exception caught while destroying member\n");
     }
-  ACE_ENDTRY;
 
 }
 
@@ -76,5 +71,5 @@ void
 Simple::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp
index 88e26146e35..942f5f24287 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp
@@ -9,7 +9,7 @@ ACE_RCSID (Manage_object_group,
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       const char *location1 = "MyLocation 1";
 
@@ -111,7 +111,7 @@ main (int argc, char *argv[])
           return 1;
         }
 
-      lb_server.orb ()->shutdown (0 ACE_ENV_ARG_PARAMETER);
+      lb_server.orb ()->shutdown (0);
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
@@ -119,13 +119,11 @@ main (int argc, char *argv[])
         return 1;
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "lb_server exception");
+      ex._tao_print_exception ("lb_server exception");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp
index 589a654f033..5ac1c2611ca 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp
@@ -40,15 +40,14 @@ parse_args (int argc, char *argv[])
 }
 
 void
-check_loads (const CosLoadBalancing::LoadList & loads
-             ACE_ENV_ARG_DECL)
+check_loads (const CosLoadBalancing::LoadList & loads)
 {
   if (loads.length () != 1)
     {
       ACE_ERROR ((LM_ERROR,
                   "ERROR: Load list length is not equal to one.\n"));
 
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   if (loads[0].id != LOAD_ID
@@ -57,30 +56,26 @@ check_loads (const CosLoadBalancing::LoadList & loads
       ACE_ERROR ((LM_ERROR,
                   "ERROR: Returned load is not a CPU load.\n"));
 
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 }
 
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
+                         "");
 
       // Obtain a reference to the LoadManager.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("LoadManager"
-					 ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("LoadManager");
 
       CosLoadBalancing::LoadManager_var lm =
-        CosLoadBalancing::LoadManager::_narrow (obj.in ()
-                                                ACE_ENV_ARG_PARAMETER);
+        CosLoadBalancing::LoadManager::_narrow (obj.in ());
 
       CosLoadBalancing::Location the_location (1);
       the_location.length (1);
@@ -99,15 +94,13 @@ main (int argc, char *argv[])
       // Try a few times until a load is capable of being retrieved.
       for (int i = 0; i < MAX_RETRIES && retrieved_load == 0; ++i)
         {
-          ACE_TRY_EX (foo)
+          try
             {
-              loads = lm->get_loads (the_location
-                                     ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK_EX (foo);
+              loads = lm->get_loads (the_location);
 
               retrieved_load = 1;
             }
-          ACE_CATCHANY
+          catch (const CORBA::Exception& ex)
             {
               ACE_DEBUG ((LM_DEBUG, ".")); // Show some progress.
 
@@ -115,7 +108,6 @@ main (int argc, char *argv[])
               // LoadManager.
               ACE_OS::sleep (2);
             }
-          ACE_ENDTRY;
         }
 
       if (retrieved_load == 0)
@@ -127,13 +119,11 @@ main (int argc, char *argv[])
         ACE_DEBUG ((LM_INFO,
                     " DONE\n"));
 
-      ::check_loads (loads.in ()
-                     ACE_ENV_ARG_PARAMETER);
+      ::check_loads (loads.in ());
 
       // Attempt to get loads directly from the LoadMonitor.
       CosLoadBalancing::LoadMonitor_var monitor =
-        lm->get_load_monitor (the_location
-                              ACE_ENV_ARG_PARAMETER);
+        lm->get_load_monitor (the_location);
 
       CosLoadBalancing::Location_var cpu_mon_location =
         monitor->the_location ();
@@ -143,7 +133,7 @@ main (int argc, char *argv[])
           ACE_ERROR ((LM_ERROR,
                       "ERROR: Mismatched CPU load monitor location\n"));
 
-          ACE_TRY_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
 
       ACE_DEBUG ((LM_INFO,
@@ -154,16 +144,13 @@ main (int argc, char *argv[])
       ACE_DEBUG ((LM_INFO,
                   " DONE\n"));
 
-      ::check_loads (loads.in ()
-                     ACE_ENV_ARG_PARAMETER);
+      ::check_loads (loads.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-			   "CPU Load Monitor test:");
+      ex._tao_print_exception ("CPU Load Monitor test:");
       return -1;
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_INFO, "CPU Load Monitor test passed.\n\n"));
 
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
index 319d340157e..d946d3c9594 100644
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
@@ -30,14 +30,12 @@ BasicLog_Test::~BasicLog_Test (void)
 int
 BasicLog_Test::init (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB
       orb_ = CORBA::ORB_init (argc,
                               argv,
-                              "internet"
-                              ACE_ENV_ARG_PARAMETER);
+                              "internet");
 
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
@@ -56,12 +54,11 @@ BasicLog_Test::init (int argc, char *argv[])
                            "services.\n"),
                           -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "init");
+      ex._tao_print_exception ("init");
       return -1;
     }
-  ACE_ENDTRY;
 
   ACE_RETURN(0);
 
@@ -95,7 +92,7 @@ BasicLog_Test::init_factory (void)
 
   // Narrow the factory and check the success
   factory_ =
-    DsLogAdmin::BasicLogFactory::_narrow (logging_obj.in () ACE_ENV_ARG_PARAMETER);
+    DsLogAdmin::BasicLogFactory::_narrow (logging_obj.in ());
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -110,8 +107,7 @@ BasicLog_Test::init_factory (void)
   */
   // If debugging, get the factory's IOR
   CORBA::String_var str =
-    orb_->object_to_string (basicLog_.in()
-                            ACE_ENV_ARG_PARAMETER); //Init the Client
+    orb_->object_to_string (basicLog_.in()); //Init the Client
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -125,7 +121,7 @@ int
 BasicLog_Test::test_CreateLog (CORBA::ULongLong maxSize)
 {
 
-  ACE_TRY_NEW_ENV
+  try
     {
       DsLogAdmin::LogId id;
       basicLog_ = factory_->create(DsLogAdmin::wrap, maxSize, id);
@@ -135,27 +131,26 @@ BasicLog_Test::test_CreateLog (CORBA::ULongLong maxSize)
                   "The logger id is %d\n",
                   id));
     }
-/*  ACE_CATCH(DsLogAdmin::NoResources, resourceX)
+/*  catch (const DsLogAdmin::NoResources& resourceX)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "no resources creating basic log.\n"),
                         -1);
     }
 */
-  ACE_CATCH(DsLogAdmin::InvalidThreshold, threshold)
+  catch (const DsLogAdmin::InvalidThreshold& threshold)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "invalid threshold creating basic log.\n"),
                         -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,"test_CreateLog");
+      ex._tao_print_exception ("test_CreateLog");
       ACE_ERROR_RETURN ((LM_ERROR,
                          "Caught exception creating log.\n"),
                         -1);
     }
-  ACE_ENDTRY;
 
   ACE_RETURN(0);
 }
@@ -163,7 +158,7 @@ BasicLog_Test::test_CreateLog (CORBA::ULongLong maxSize)
 int
 BasicLog_Test::test_LogAction ()
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       DsLogAdmin::LogId id = basicLog_->id ();
 
@@ -196,7 +191,7 @@ BasicLog_Test::test_LogAction ()
 #endif
 
       // make sure that it is full and when writing
-      this->write_records (0 ACE_ENV_ARG_PARAMETER);
+      this->write_records (0);
 
       ACE_DEBUG ((LM_DEBUG,
                   "Wrote records instead should have thrown exception"));
@@ -204,7 +199,7 @@ BasicLog_Test::test_LogAction ()
       basicLog_->set_log_full_action (DsLogAdmin::wrap);
       ACE_ERROR_RETURN((LM_ERROR,"Testing log action halt failed\n"),-1);
     }
-  ACE_CATCH(DsLogAdmin::LogFull, xLogFull)
+  catch (const DsLogAdmin::LogFull& xLogFull)
     {
       ACE_DEBUG ((LM_DEBUG,"Correctly caught exception LogFull\n"));
 
@@ -233,26 +228,23 @@ BasicLog_Test::test_LogAction ()
         ACE_ERROR_RETURN((LM_ERROR,
                           "Setting log full action to wrap failed\n"),-1);
 
-      ACE_TRY_EX (SECOND)
+      try
         {
-          int i = this->write_records (0 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (SECOND);
+          int i = this->write_records (0);
 
           ACE_DEBUG ((LM_DEBUG,"Test to wrap worked. %d written.\n",i));
         }
-      ACE_CATCH (DsLogAdmin::LogFull, xLogFull)
+      catch (const DsLogAdmin::LogFull& xLogFull)
         {
           ACE_DEBUG ((LM_ERROR,"Caught exception LogFull.  Fail testing wrapping of the log.\n"));
           return -1;
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "test_LogAction");
+          ex._tao_print_exception ("test_LogAction");
           return -1;
         }
-      ACE_ENDTRY;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -279,8 +271,7 @@ int BasicLog_Test::display_records ()
 
 }
 */
-int BasicLog_Test::write_records (CORBA::ULongLong numberOfRecords
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+int BasicLog_Test::write_records (CORBA::ULongLong numberOfRecords)
 {
   CORBA::ULongLong numOfRecs = numberOfRecords;
   if (numOfRecs == 0)
@@ -356,42 +347,38 @@ int BasicLog_Test::write_records (CORBA::ULongLong numberOfRecords
 int
 BasicLog_Test::test_adminState()
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   basicLog_->set_administrative_state(DsLogAdmin::locked);
-  ACE_TRY
+  try
     {
-      this->write_records(0 ACE_ENV_ARG_PARAMETER);
+      this->write_records(0);
 
       ACE_ERROR_RETURN((LM_ERROR,"Setting administrative state to lock failed.  DsLogAdmin::LogLocked not thrown.\n"),-1);
 
     }
-  ACE_CATCH(DsLogAdmin::LogLocked, xLocked)
+  catch (const DsLogAdmin::LogLocked& xLocked)
     {
       ACE_DEBUG ((LM_DEBUG,"Setting administrative state to lock succeeded.  DsLogAdmin::LogLocked was caught.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       basicLog_->set_administrative_state(DsLogAdmin::unlocked);
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "test_adminState");
+      ex._tao_print_exception ("test_adminState");
       ACE_ERROR_RETURN((LM_ERROR,"Setting administrative state to lock failed. Exception throw.\n"),-1);
     }
-  ACE_ENDTRY;
 
   basicLog_->set_administrative_state(DsLogAdmin::unlocked);
-  ACE_TRY_EX(SECOND)
+  try
     {
-      this->write_records(0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (SECOND);
+      this->write_records(0);
       ACE_DEBUG ((LM_DEBUG,"Setting administrative state to succeeded.  DsLogAdmin::LogLocked not thrown.\n"));
       ACE_RETURN(0);
 
     }
-  ACE_CATCH(DsLogAdmin::LogLocked, xLocked)
+  catch (const DsLogAdmin::LogLocked& xLocked)
     {
       ACE_DEBUG ((LM_DEBUG,"Setting administrative state to lock faild.  DsLogAdmin::LogLocked was caught.\n"));
     }
-  ACE_ENDTRY;
   ACE_RETURN(0);
 }
 
@@ -399,9 +386,8 @@ BasicLog_Test::test_adminState()
 int
 BasicLog_Test::test_logSize (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       basicLog_->set_max_size (1);
 
@@ -410,79 +396,72 @@ BasicLog_Test::test_logSize (void)
                          "DsLogAdmin::InvalidParam not thrown.\n"),
                        -1);
     }
-  ACE_CATCH(DsLogAdmin::InvalidParam, xParam)
+  catch (const DsLogAdmin::InvalidParam& xParam)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Setting max size less than current size succeeded.\n"
                   "DsLogAdmin::InvalidParam caught.\n"));
     }
-  ACE_ENDTRY;
 
-  ACE_TRY_EX(SECOND)
+  try
     {
       basicLog_->set_max_size (10000);
 
       CORBA::ULongLong nrecords = basicLog_->get_n_records ();
-      int i = this->write_records (0 ACE_ENV_ARG_PARAMETER);
+      int i = this->write_records (0);
 
-      ACE_TRY_CHECK_EX (SECOND);
       ACE_DEBUG ((LM_DEBUG,
                   "Increasing max size succeeded. Old record count, %d."
                   "New record count, %d\n",
                   ACE_U64_TO_U32(nrecords),
                   i));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "test_logSize");
+      ex._tao_print_exception ("test_logSize");
       ACE_ERROR_RETURN ((LM_ERROR,
                          "Increasing max size failed. Exception thrown.\n"),
                         -1);
     }
-  ACE_ENDTRY;
   ACE_RETURN(0);
 }
 
 int
 BasicLog_Test::test_logCompaction(CORBA::ULong lifeExpectancy)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   CORBA::ULongLong old_n_records = basicLog_->get_n_records ();
   if (old_n_records <= 0)
     {
-      ACE_TRY
+      try
         {
-          this->write_records (0 ACE_ENV_ARG_PARAMETER);
+          this->write_records (0);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "test_logCompaction");
+          ex._tao_print_exception ("test_logCompaction");
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Caught exception trying to write records "
                              "for test_logCompaction.\n"),
                             -1);
         }
-      ACE_ENDTRY;
     }
 
   CORBA::ULong old_max_life = basicLog_->get_max_record_life ();
 
-  ACE_TRY_EX(SECOND)
+  try
     {
       basicLog_->set_max_record_life (lifeExpectancy);
       // @@: need to modify set_max_record_life
-      ACE_TRY_CHECK_EX (SECOND);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "test_logCompaction");
+      ex._tao_print_exception ("test_logCompaction");
       ACE_ERROR_RETURN ((LM_ERROR,
                          "Caught exception setting max record life "
                          "test_logCompaction.\n"),
                         -1);
     }
-  ACE_ENDTRY;
 
   ACE_OS::sleep (lifeExpectancy + 1); // make sure the records have aged.
   CORBA::ULongLong new_n_records = basicLog_->get_n_records ();
@@ -560,15 +539,14 @@ void
 BasicLog_Test::resolve_naming_service (void)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references (naming_sevice_name_
-                                            ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references (naming_sevice_name_);
 
   // Need to check return value for errors.
   if (CORBA::is_nil (naming_obj.in ()))
-    ACE_THROW (CORBA::UNKNOWN ());
+    throw CORBA::UNKNOWN ();
 
   this->naming_context_ =
-    CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
+    CosNaming::NamingContext::_narrow (naming_obj.in ());
 }
 
 void
@@ -579,16 +557,16 @@ BasicLog_Test::resolve_basic_factory (void)
   name[0].id = CORBA::string_dup (basic_log_factory_name_);
 
   CORBA::Object_var obj =
-    this->naming_context_->resolve (name ACE_ENV_ARG_PARAMETER);
+    this->naming_context_->resolve (name);
 
   this->factory_ =
-    DsLogAdmin::BasicLogFactory::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+    DsLogAdmin::BasicLogFactory::_narrow (obj.in ());
 }
 
 void
 BasicLog_Test::destroy_log()
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       if (!CORBA::is_nil(basicLog_.in ()))
         {
@@ -597,11 +575,10 @@ BasicLog_Test::destroy_log()
           basicLog_ = DsLogAdmin::BasicLog::_nil ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Destroying log");
+      ex._tao_print_exception ("Destroying log");
     }
-  ACE_ENDTRY;
 }
 
 int
@@ -611,27 +588,26 @@ BasicLog_Test::test_log_destroy (void)
   ACE_DEBUG ((LM_ERROR, "Testing destroy log\n"));
   this->basicLog_->destroy ();
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->write_records (1 ACE_ENV_ARG_PARAMETER);
+      this->write_records (1);
       ACE_DEBUG ((LM_INFO, "Wrote to log\n"));
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+  catch (const CORBA::OBJECT_NOT_EXIST& ex)
     {
       ACE_DEBUG ((LM_ERROR,
                   "Test of destroy log succeeded: "
                   "caught CORBA::OBJECT_NOT_EXIST exception.\n"));
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Destroying log");
+      ex._tao_print_exception ("Destroying log");
       ACE_DEBUG ((LM_ERROR,
                   "Test of destroy log failed: "
                   "caught unexpected exception.\n"));
       return -1;
     }
-  ACE_ENDTRY;
   ACE_ERROR_RETURN ((LM_ERROR,
                      "Test of destroy log failed: no exception thrown.\n"),
                     -1);
@@ -666,7 +642,6 @@ BasicLog_Test::test_week_mask (void)
 
 int BasicLog_Test::delete_records (CORBA::ULongLong /* numberOfRecords */)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
 #ifndef ACE_LACKS_LONGLONG_T
   ACE_DEBUG ((LM_INFO,
@@ -687,7 +662,7 @@ int BasicLog_Test::delete_records (CORBA::ULongLong /* numberOfRecords */)
               ACE_U64_TO_U32 (nrecords)));
 
   CORBA::Long retVal =
-    basicLog_->delete_records ("EXTENDED_TCL", "id >= 0" ACE_ENV_ARG_PARAMETER);
+    basicLog_->delete_records ("EXTENDED_TCL", "id >= 0");
 
   ACE_DEBUG ((LM_DEBUG,
               "Number of records in Log after delete = %d\n",
@@ -725,12 +700,11 @@ BasicLog_Test::test_capacity_alarm_threshold (void)
 
   basicLog_->set_capacity_alarm_thresholds (list);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   list.length (1);
   list[0] = 200;
 
-  ACE_TRY
+  try
     {
       basicLog_->set_capacity_alarm_thresholds (list);
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -738,34 +712,31 @@ BasicLog_Test::test_capacity_alarm_threshold (void)
                          "DsLogAdmin::InvalidThreshold not thrown.\n"),
                         -1);
     }
-  ACE_CATCH(DsLogAdmin::InvalidThreshold, xParam)
+  catch (const DsLogAdmin::InvalidThreshold& xParam)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Setting an invalid alarm threshold succeeded.  "
                   "DsLogAdmin::InvalidThreshold caught.\n"));
     }
-  ACE_ENDTRY;
 
   list.length (2);
   list[0] = 70;
   list[1] = 20;
 
-  ACE_TRY_EX(SECOND)
+  try
     {
       basicLog_->set_capacity_alarm_thresholds (list);
-      ACE_TRY_CHECK_EX (SECOND);
       ACE_ERROR_RETURN ((LM_ERROR,
                          "Setting an invalid alarm threshold failed.  "
                          "DsLogAdmin::InvalidThreshold not thrown.\n"),
                        -1);
     }
-  ACE_CATCH(DsLogAdmin::InvalidThreshold, xParam)
+  catch (const DsLogAdmin::InvalidThreshold& xParam)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Setting an invalid alarm threshold succeeded.  "
                   "DsLogAdmin::InvalidThreshold caught.\n"));
     }
-  ACE_ENDTRY;
 
   list.length (2);
   list[0] = 20;
@@ -779,7 +750,7 @@ BasicLog_Test::test_capacity_alarm_threshold (void)
               "The number of records is %d\n",
               ACE_U64_TO_U32(nrecords)));
 
-  this->write_records (0 ACE_ENV_ARG_PARAMETER);
+  this->write_records (0);
 
   return 0;
 
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h
index 03f8ca751af..2948bc6de75 100644
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h
@@ -117,7 +117,7 @@ private:
     parse_args(int argc, char *argv[]);
   // command line argument parser
 
-  int write_records(CORBA::ULongLong numberOfRecordsToWrite ACE_ENV_ARG_DECL_NOT_USED);
+  int write_records(CORBA::ULongLong numberOfRecordsToWrite);
   // writes enough records to fill the log. Default write enough to fill log. Hopefully, not infinite.
 
   void
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp
index 18ef2957365..1043b523d26 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp
@@ -15,7 +15,7 @@ McastHello::McastHello (CORBA::ORB_ptr orb,
 }
 
 void
-McastHello::send_forty_two (CORBA::Long forty_two ACE_ENV_ARG_DECL_NOT_USED)
+McastHello::send_forty_two (CORBA::Long forty_two)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->small_request_status_ == 0 &&
@@ -28,7 +28,7 @@ McastHello::send_forty_two (CORBA::Long forty_two ACE_ENV_ARG_DECL_NOT_USED)
 }
 
 void
-McastHello::send_large_octet_array (const Test::Octets &payload ACE_ENV_ARG_DECL_NOT_USED)
+McastHello::send_large_octet_array (const Test::Octets &payload)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean valid_payload = 1;
@@ -58,7 +58,7 @@ void
 McastHello::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 CORBA::Boolean
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h
index f1ed7f37cb7..09a94708ee8 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h
+++ b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h
@@ -18,7 +18,7 @@ public:
               int instance);
 
   // = The skeleton methods
-  virtual void send_forty_two (CORBA::Long forty_two ACE_ENV_ARG_DECL)
+  virtual void send_forty_two (CORBA::Long forty_two)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void shutdown (void)
@@ -28,8 +28,7 @@ public:
   CORBA::Boolean get_status ();
 
   // Silence the builds
-  void send_large_octet_array (const Test::Octets &
-                               ACE_ENV_ARG_DECL_NOT_USED)
+  void send_large_octet_array (const Test::Octets &)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/client.cpp b/TAO/orbsvcs/tests/Miop/McastHello/client.cpp
index ffcb507da30..e707d2165ad 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/client.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastHello/client.cpp
@@ -40,16 +40,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object(ior);
 
 
       /* Do an unchecked narrow since there's no way to do an is_a on
@@ -69,7 +69,7 @@ main (int argc, char *argv[])
                             1);
         }
 
-      hello->send_forty_two (42 ACE_ENV_ARG_PARAMETER);
+      hello->send_forty_two (42);
 
       Test::Octets payload (MAX_MIOP_OCTET_SEQUENCE);
       payload.length (MAX_MIOP_OCTET_SEQUENCE);
@@ -79,19 +79,17 @@ main (int argc, char *argv[])
           payload[j] = j % 256;
         }
 
-      hello->send_large_octet_array (payload ACE_ENV_ARG_PARAMETER);
+      hello->send_large_octet_array (payload);
 
       hello->shutdown ();
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp
index 29b8d804f0b..ab309c7fb80 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp
@@ -52,16 +52,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA");
 
       PortableGroup::GOA_var root_poa =
-        PortableGroup::GOA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableGroup::GOA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -79,7 +79,7 @@ main (int argc, char *argv[])
 
 
       CORBA::Object_var group1 =
-        orb->string_to_object (ior.in () ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior.in ());
 
       // Output the Group IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -92,15 +92,13 @@ main (int argc, char *argv[])
       ACE_OS::fclose (output_file);
 
       PortableServer::ObjectId_var id =
-        root_poa->create_id_for_reference (group1.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+        root_poa->create_id_for_reference (group1.in ());
 
       // Create and activate an instance of our servant.
       McastHello server_impl (orb.in (), 0);
 
       root_poa->activate_object_with_id (id.in (),
-                                         &server_impl
-                                         ACE_ENV_ARG_PARAMETER);
+                                         &server_impl);
 
 
       poa_manager->activate ();
@@ -109,7 +107,7 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1);
 
       orb->destroy ();
 
@@ -121,13 +119,11 @@ main (int argc, char *argv[])
       else
         ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - Success!\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
index d4ec6de24c1..5d0e88a9fcb 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
@@ -67,7 +67,6 @@ AdminProperties_Task::svc (void)
 
  ACE_DEBUG ((LM_DEBUG, "\n1 supplier sending %d events...\n", event_count));
 
- ACE_DECLARE_NEW_CORBA_ENV;
 
  for (int i = 0 ; i < event_count; ++i)
    {
@@ -75,24 +74,24 @@ AdminProperties_Task::svc (void)
 
      event.remainder_of_body <<= (CORBA::Long)i;
 
-     ACE_TRY
+     try
         {
           ACE_DEBUG((LM_DEBUG, "+"));
-          this->supplier_->send_event (event ACE_ENV_ARG_PARAMETER);
+          this->supplier_->send_event (event);
         }
-      ACE_CATCH (CORBA::IMP_LIMIT, impl_limit)
+      catch (const CORBA::IMP_LIMIT& impl_limit)
         {
           if (TAO_debug_level > 0)
             ACE_DEBUG ((LM_DEBUG, "\nEvent %d was not send due to Impl Limit reached\n", i));
 
           ++ this->client_->rejections_;
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Error: Exception sending event\n");
+          ex._tao_print_exception (
+            "Error: Exception sending event\n");
           return 1;
         }
-      ACE_ENDTRY;
    }
 
 return 0;
@@ -108,7 +107,7 @@ AdminProperties_StructuredPushConsumer::AdminProperties_StructuredPushConsumer (
 
 void
 AdminProperties_StructuredPushConsumer::push_structured_event (const CosNotification::StructuredEvent & /*notification*/
-                                                               ACE_ENV_ARG_DECL_NOT_USED)
+                                                               )
   ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected))
 {
   ++events_received_;
@@ -214,7 +213,7 @@ AdminProperties::parse_args(int argc, char *argv[])
 }
 
 void
-AdminProperties::create_channel(bool reject ACE_ENV_ARG_DECL)
+AdminProperties::create_channel(bool reject)
 {
   CosNotifyChannelAdmin::ChannelID id;
 
@@ -240,8 +239,7 @@ AdminProperties::create_channel(bool reject ACE_ENV_ARG_DECL)
 
   this->ec_ = notify_factory_->create_channel (this->initial_qos_,
                                                this->initial_admin_,
-                                               id
-                                               ACE_ENV_ARG_PARAMETER);
+                                               id);
 
   ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
 
@@ -249,14 +247,12 @@ AdminProperties::create_channel(bool reject ACE_ENV_ARG_DECL)
   CosNotifyChannelAdmin::AdminID adminid;
 
   this->supplier_admin_ = ec_->new_for_suppliers (this->ifgop_,
-                                                  adminid
-                                                  ACE_ENV_ARG_PARAMETER);
+                                                  adminid);
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
 
   this->consumer_admin_ = ec_->new_for_consumers (this->ifgop_,
-                                                  adminid
-                                                  ACE_ENV_ARG_PARAMETER);
+                                                  adminid);
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
 }
@@ -265,14 +261,14 @@ void
 AdminProperties::run_test (void)
 {
   bool reject = true;
-  this->create_channel(reject ACE_ENV_ARG_PARAMETER);
-  this->test_max_queue_length (reject ACE_ENV_ARG_PARAMETER);
+  this->create_channel(reject);
+  this->test_max_queue_length (reject);
 
   this->ec_->destroy();
 
   reject = false;
-  this->create_channel(reject ACE_ENV_ARG_PARAMETER);
-  this->test_max_queue_length (reject ACE_ENV_ARG_PARAMETER);
+  this->create_channel(reject);
+  this->test_max_queue_length (reject);
 
    this->test_max_clients ();
 
@@ -280,19 +276,19 @@ AdminProperties::run_test (void)
 }
 
 void
-AdminProperties::test_max_queue_length (bool reject ACE_ENV_ARG_DECL)
+AdminProperties::test_max_queue_length (bool reject)
 {
   // Create the consumer
   AdminProperties_StructuredPushConsumer *consumer;
   ACE_NEW (consumer, AdminProperties_StructuredPushConsumer (this));
-  consumer->init (root_poa_.in () ACE_ENV_ARG_PARAMETER);
-  consumer->connect (this->consumer_admin_.in () ACE_ENV_ARG_PARAMETER);
+  consumer->init (root_poa_.in ());
+  consumer->connect (this->consumer_admin_.in ());
 
   // Create the supplier
   TAO_Notify_Tests_StructuredPushSupplier *supplier = 0;
   ACE_NEW (supplier, TAO_Notify_Tests_StructuredPushSupplier ());
-  supplier->init (root_poa_.in () ACE_ENV_ARG_PARAMETER);
-  supplier->connect (this->supplier_admin_.in () ACE_ENV_ARG_PARAMETER);
+  supplier->init (root_poa_.in ());
+  supplier->connect (this->supplier_admin_.in ());
 
   AdminProperties_Task supplier_task;
 
@@ -376,7 +372,7 @@ AdminProperties::create_suppliers (void)
 
   int index = 0;
 
-  ACE_TRY
+  try
     {
       TAO_Notify_Tests_StructuredPushSupplier *supplier;
 
@@ -384,25 +380,22 @@ AdminProperties::create_suppliers (void)
         {
           ACE_NEW (supplier,
                    TAO_Notify_Tests_StructuredPushSupplier ());
-          supplier->init (root_poa_.in () ACE_ENV_ARG_PARAMETER);
+          supplier->init (root_poa_.in ());
 
-          supplier->connect (this->supplier_admin_.in ()
-                             ACE_ENV_ARG_PARAMETER);
+          supplier->connect (this->supplier_admin_.in ());
 
           this->suppliers_connected_count_++;
         }
     }
-  ACE_CATCH (CORBA::IMP_LIMIT, impl_limit)
+  catch (const CORBA::IMP_LIMIT& impl_limit)
     {
       if (TAO_debug_level)
         ACE_DEBUG ((LM_DEBUG, "\nImpl Limit excpetion when connecting supplier\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-        "\nError: Exception in connecting supplier\n");
+      ex._tao_print_exception ("\nError: Exception in connecting supplier\n");
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -415,31 +408,30 @@ AdminProperties::create_consumers (void)
 
   int index = 0;
 
-  ACE_TRY
+  try
     {
       TAO_Notify_Tests_StructuredPushConsumer *consumer;
 
       for (index = 0; index < this->consumers_; ++index)
         {
           ACE_NEW (consumer, TAO_Notify_Tests_StructuredPushConsumer ());
-          consumer->init (root_poa_.in () ACE_ENV_ARG_PARAMETER);
+          consumer->init (root_poa_.in ());
 
-          consumer->connect (this->consumer_admin_.in () ACE_ENV_ARG_PARAMETER);
+          consumer->connect (this->consumer_admin_.in ());
 
           this->consumers_connected_count_++;
         }
     }
-  ACE_CATCH (CORBA::IMP_LIMIT, impl_limit)
+  catch (const CORBA::IMP_LIMIT& impl_limit)
     {
       if (TAO_debug_level)
         ACE_DEBUG ((LM_DEBUG, "\nImpl Limit exception when connecting consumer\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-        "\nError: Exception in connecting consumer \n");
+        ex._tao_print_exception (
+          "\nError: Exception in connecting consumer \n");
     }
-  ACE_ENDTRY;
 }
 
 /***************************************************************************/
@@ -449,17 +441,16 @@ main (int argc, char* argv[])
 {
   AdminProperties test;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      test.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      test.init (argc, argv);
 
       test.run_test ();
     }
-  ACE_CATCH (CORBA::Exception, se)
+  catch (const CORBA::Exception& se)
     {
-      ACE_PRINT_EXCEPTION (se, "Error: ");
+      se._tao_print_exception ("Error: ");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h
index f1a5eb3d8e4..91f171853f5 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h
@@ -32,7 +32,6 @@ public:
 
   // = StructuredPushSupplier methods
   virtual void push_structured_event (const CosNotification::StructuredEvent & notification
-                                      ACE_ENV_ARG_DECL
                                       )
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
@@ -107,13 +106,13 @@ public:
 private:
   void create_suppliers (void);
   void create_consumers (void);
-  void create_channel(bool reject ACE_ENV_ARG_DECL);
+  void create_channel(bool reject);
 
   /// Test MaxSuppliers and MaxConsumers
   void test_max_clients (void);
 
   /// Test MaxQueueLength properties
-  void test_max_queue_length (bool reject ACE_ENV_ARG_DECL);
+  void test_max_queue_length (bool reject);
 
   // Data Members
   CosNotifyChannelAdmin::EventChannel_var ec_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
index f1cda8b802c..bcbe39449ed 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
@@ -77,13 +77,11 @@ ConnectDisconnect::on_entity_destroyed (void)
 
 int
 ConnectDisconnect::init (int argc,
-                         char* argv []
-                         ACE_ENV_ARG_DECL)
+                         char* argv [])
 {
   // Initialize the base class.
   Notify_Test_Client::init (argc,
-                            argv
-                            ACE_ENV_ARG_PARAMETER);
+                            argv);
 
   // Create all participants.
   this->create_EC ();
@@ -92,15 +90,13 @@ ConnectDisconnect::init (int argc,
 
   this->supplier_admin_ =
     ec_->new_for_suppliers (this->ifgop_,
-                            adminid
-                            ACE_ENV_ARG_PARAMETER);
+                            adminid);
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
 
   this->consumer_admin_ =
     ec_->new_for_consumers (this->ifgop_,
-                            adminid
-                            ACE_ENV_ARG_PARAMETER);
+                            adminid);
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
 
@@ -190,8 +186,7 @@ ConnectDisconnect::create_EC (void)
 
   this->ec_ = notify_factory_->create_channel (this->initial_qos_,
                                                this->initial_admin_,
-                                               id
-                                               ACE_ENV_ARG_PARAMETER);
+                                               id);
 
   ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
 }
@@ -209,28 +204,22 @@ ConnectDisconnect::run_test (void)
           ACE_NEW (this->any_consumer_[i],
                    CD_PushConsumer (this,
                                     i));
-          this->any_consumer_[i]->init (root_poa_.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-          this->any_consumer_[i]->connect (this->consumer_admin_.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+          this->any_consumer_[i]->init (root_poa_.in ());
+          this->any_consumer_[i]->connect (this->consumer_admin_.in ());
 
           // Create and connect Structured consumers.
           ACE_NEW (this->structured_consumer_[i],
                    CD_StructuredPushConsumer (this,
                                               i));
-          this->structured_consumer_[i]->init (root_poa_.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-          this->structured_consumer_[i]->connect (this->consumer_admin_.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
+          this->structured_consumer_[i]->init (root_poa_.in ());
+          this->structured_consumer_[i]->connect (this->consumer_admin_.in ());
 
           // Create and connect Sequence consumers.
           ACE_NEW (this->sequence_consumer_[i],
                    CD_SequencePushConsumer (this,
                                             i));
-          this->sequence_consumer_[i]->init (root_poa_.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-          this->sequence_consumer_[i]->connect (this->consumer_admin_.in ()
-                                                ACE_ENV_ARG_PARAMETER);
+          this->sequence_consumer_[i]->init (root_poa_.in ());
+          this->sequence_consumer_[i]->connect (this->consumer_admin_.in ());
         }
 
       for (i = 0; i < this->suppliers_; ++i)
@@ -238,28 +227,22 @@ ConnectDisconnect::run_test (void)
           ACE_NEW (this->any_supplier_[i],
                    CD_PushSupplier (this,
                                     i));
-          this->any_supplier_[i]->init (root_poa_.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-          this->any_supplier_[i]->connect (this->supplier_admin_.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+          this->any_supplier_[i]->init (root_poa_.in ());
+          this->any_supplier_[i]->connect (this->supplier_admin_.in ());
 
           // Create and connect Structured suppliers.
           ACE_NEW (this->structured_supplier_[i],
                    CD_StructuredPushSupplier (this,
                                               i));
-          this->structured_supplier_[i]->init (root_poa_.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-          this->structured_supplier_[i]->connect (this->supplier_admin_.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
+          this->structured_supplier_[i]->init (root_poa_.in ());
+          this->structured_supplier_[i]->connect (this->supplier_admin_.in ());
 
           // Create and connect Sequence suppliers.
           ACE_NEW (this->sequence_supplier_[i],
                    CD_SequencePushSupplier (this,
                                             i));
-          this->sequence_supplier_[i]->init (root_poa_.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-          this->sequence_supplier_[i]->connect (this->supplier_admin_.in ()
-                                                ACE_ENV_ARG_PARAMETER);
+          this->sequence_supplier_[i]->init (root_poa_.in ());
+          this->sequence_supplier_[i]->connect (this->supplier_admin_.in ());
         }
 
       for (i = 0; i < this->consumers_; ++i)
@@ -269,12 +252,10 @@ ConnectDisconnect::run_test (void)
 
           // Disconnect Structured Consumers.
           this->structured_consumer_[i]->disconnect (
-                                             ACE_ENV_SINGLE_ARG_PARAMETER
                                            );
 
           // Disconnect Sequence Consumers.
           this->sequence_consumer_[i]->disconnect (
-                                         ACE_ENV_SINGLE_ARG_PARAMETER
                                      );
         }
 
@@ -285,12 +266,10 @@ ConnectDisconnect::run_test (void)
 
           // Disconnect Structured Suppliers.
           this->structured_supplier_[i]->disconnect (
-                                             ACE_ENV_SINGLE_ARG_PARAMETER
                                            );
 
           // Disconnect Sequence Suppliers.
           this->sequence_supplier_[i]->disconnect (
-                                           ACE_ENV_SINGLE_ARG_PARAMETER
                                          );
         }
     }
@@ -318,7 +297,6 @@ ConnectDisconnect::check_results (void)
     }
 
   // Destroy the channel.
-  ACE_DECLARE_NEW_CORBA_ENV;
   this->ec_->destroy ();
 
   return 0;
@@ -336,20 +314,19 @@ main (int argc, char* argv[])
       return 1;
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      client.init (argc, argv);
 
       client.run_test ();
 
       client.end_test ();
     }
-  ACE_CATCH (CORBA::Exception, se)
+  catch (const CORBA::Exception& se)
     {
-      ACE_PRINT_EXCEPTION (se, "Error: ");
+      se._tao_print_exception ("Error: ");
       return 1;
     }
-  ACE_ENDTRY;
 
   return client.check_results ();
 }
diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h
index 57e225f4215..d7900b95b72 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h
@@ -73,8 +73,7 @@ public:
                   char *argv[]);
 
   int init (int argc,
-            char *argv []
-            ACE_ENV_ARG_DECL);
+            char *argv []);
   // initialization.
 
   void run_test (void);
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
index 0e804e5125a..788c8e2e44d 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
@@ -17,7 +17,6 @@ Event_StructuredPushConsumer::Event_StructuredPushConsumer (Events *test_client)
 void
 Event_StructuredPushConsumer::push_structured_event (
     const CosNotification::StructuredEvent & notification
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosEventComm::Disconnected))
@@ -58,13 +57,11 @@ Events::~Events (void)
 
 int
 Events::init (int argc,
-                   char* argv []
-                   ACE_ENV_ARG_DECL)
+                   char* argv [])
 {
   // Initialize the base class.
   Notify_Test_Client::init (argc,
-                            argv
-                            ACE_ENV_ARG_PARAMETER);
+                            argv);
 
   // Create all participents.
   this->create_EC ();
@@ -80,8 +77,7 @@ Events::init (int argc,
     {
       this->supplier_admin_ =
         this->ec_->new_for_suppliers (this->ifgop_,
-                                      adminid
-                                      ACE_ENV_ARG_PARAMETER);
+                                      adminid);
     }
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
@@ -95,8 +91,7 @@ Events::init (int argc,
     {
       this->consumer_admin_ =
         this->ec_->new_for_consumers (this->ifgop_,
-                                      adminid
-                                      ACE_ENV_ARG_PARAMETER);
+                                      adminid);
     }
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
@@ -104,28 +99,22 @@ Events::init (int argc,
   ACE_NEW_RETURN (this->consumer_,
                   Event_StructuredPushConsumer (this),
                   -1);
-  this->consumer_->init (root_poa_.in ()
-                         ACE_ENV_ARG_PARAMETER);
-  this->consumer_->connect (this->consumer_admin_.in ()
-                            ACE_ENV_ARG_PARAMETER);
+  this->consumer_->init (root_poa_.in ());
+  this->consumer_->connect (this->consumer_admin_.in ());
 
   Event_StructuredPushConsumer* consumer2 = 0;
   ACE_NEW_RETURN (consumer2,
                   Event_StructuredPushConsumer (this),
                   -1);
-  consumer2->init (root_poa_.in ()
-                   ACE_ENV_ARG_PARAMETER);
-  consumer2->connect (this->consumer_admin_.in ()
-                      ACE_ENV_ARG_PARAMETER);
+  consumer2->init (root_poa_.in ());
+  consumer2->connect (this->consumer_admin_.in ());
 
   ACE_NEW_RETURN (this->supplier_,
                   Event_StructuredPushSupplier (this),
                   -1);
-  this->supplier_->init (root_poa_.in ()
-                         ACE_ENV_ARG_PARAMETER);
+  this->supplier_->init (root_poa_.in ());
 
-  this->supplier_->connect (this->supplier_admin_.in ()
-                            ACE_ENV_ARG_PARAMETER);
+  this->supplier_->connect (this->supplier_admin_.in ());
 
   consumer_start( 0 );
 
@@ -182,8 +171,7 @@ Events::create_EC (void)
 
   this->ec_ = notify_factory_->create_channel (this->initial_qos_,
                                                this->initial_admin_,
-                                               id
-                                               ACE_ENV_ARG_PARAMETER);
+                                               id);
 
   /****************************************************************/
   /*
@@ -200,7 +188,7 @@ Events::create_EC (void)
 
   admin[1].value <<= (CORBA::Long)2;
 
-  ec_->set_admin (admin ACE_ENV_ARG_PARAMETER);
+  ec_->set_admin (admin);
   */
 
   /****************************************************************/
@@ -219,7 +207,6 @@ Events::on_event_received (void)
 
   if (this->result_count_ == 2 * this->event_count_)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
       this->end_test ();
     }
 }
@@ -271,8 +258,7 @@ Events::run_test (void)
       qos[0].name = CORBA::string_dup (CosNotification::Priority);
       qos[0].value <<= (CORBA::Short)prio++;
 
-      this->supplier_->send_event (event
-                                   ACE_ENV_ARG_PARAMETER);
+      this->supplier_->send_event (event);
     }
 }
 
@@ -286,7 +272,6 @@ int
 Events::check_results (void)
 {
   // Destroy the channel.
-  ACE_DECLARE_NEW_CORBA_ENV;
   this->ec_->destroy ();
 
   if (this->result_count_ == 2 * this->event_count_)
@@ -315,22 +300,20 @@ main (int argc, char* argv[])
       return 1;
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       events.init (argc,
-                   argv
-                   ACE_ENV_ARG_PARAMETER);
+                   argv);
 
       events.run_test ();
 
-      events.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
+      events.ORB_run( );
     }
-  ACE_CATCH (CORBA::Exception, se)
+  catch (const CORBA::Exception& se)
     {
-      ACE_PRINT_EXCEPTION (se, "Error: ");
+      se._tao_print_exception ("Error: ");
       return 1;
     }
-  ACE_ENDTRY;
 
   return events.check_results ();
 }
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.h b/TAO/orbsvcs/tests/Notify/Basic/Events.h
index 208b36eef8d..f4e6c2b8217 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Events.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Events.h
@@ -37,7 +37,6 @@ public:
   // = StructuredPushSupplier methods.
   virtual void push_structured_event (
       const CosNotification::StructuredEvent & notification
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventComm::Disconnected));
@@ -74,8 +73,7 @@ public:
                   char *argv[]) ;
 
   int init (int argc,
-            char *argv []
-            ACE_ENV_ARG_DECL);
+            char *argv []);
   // Initialization.
 
   void on_event_received (void);
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp
index 4d0d9928cd3..cb5ac5e0900 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp
@@ -17,13 +17,11 @@ Filter::~Filter (void)
 }
 
 int
-Filter::init (int argc, char* argv []
-                   ACE_ENV_ARG_DECL)
+Filter::init (int argc, char* argv [])
 {
   // Initialized the base class.
   Notify_Test_Client::init (argc,
-                            argv
-                            ACE_ENV_ARG_PARAMETER);
+                            argv);
 
   // Create all participents.
   this->create_EC ();
@@ -32,15 +30,13 @@ Filter::init (int argc, char* argv []
 
   this->supplier_admin_ =
     this->ec_->new_for_suppliers (this->ifgop_,
-                                  adminid
-                                  ACE_ENV_ARG_PARAMETER);
+                                  adminid);
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
 
   this->consumer_admin_ =
     this->ec_->new_for_consumers (this->ifgop_,
-                                  adminid
-                                  ACE_ENV_ARG_PARAMETER);
+                                  adminid);
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
 
@@ -57,15 +53,15 @@ Filter::run_test (void)
     ACE_DEBUG ((LM_DEBUG, " Obtaining FilterAdmin interface from ConsumerAdmin\n"));
 
   CosNotifyFilter::FilterAdmin_var ca_filter_admin =
-    CosNotifyFilter::FilterAdmin::_narrow (consumer_admin_.in () ACE_ENV_ARG_PARAMETER);
+    CosNotifyFilter::FilterAdmin::_narrow (consumer_admin_.in ());
 
-  this->run_filter_test (consumer_admin_.in () ACE_ENV_ARG_PARAMETER);
+  this->run_filter_test (consumer_admin_.in ());
 
   this->ec_->destroy ();
 }
 
 void
-Filter::run_filter_test (CosNotifyFilter::FilterAdmin_ptr filter_admin ACE_ENV_ARG_DECL)
+Filter::run_filter_test (CosNotifyFilter::FilterAdmin_ptr filter_admin)
 {
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, " Calling remove_all_filters\n"));
@@ -73,40 +69,40 @@ Filter::run_filter_test (CosNotifyFilter::FilterAdmin_ptr filter_admin ACE_ENV_A
   // Clear all filters.
   filter_admin->remove_all_filters ();
 
-  this->verify_filter_count (filter_admin, 0 ACE_ENV_ARG_PARAMETER);
+  this->verify_filter_count (filter_admin, 0);
 
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Adding a filter \n"));
 
-  CosNotifyFilter::FilterID id_1 = this->add_filter (filter_admin ACE_ENV_ARG_PARAMETER);
+  CosNotifyFilter::FilterID id_1 = this->add_filter (filter_admin);
 
-  this->verify_filter_count (filter_admin, 1 ACE_ENV_ARG_PARAMETER);
+  this->verify_filter_count (filter_admin, 1);
 
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Adding another filter \n"));
 
-  this->add_filter (filter_admin ACE_ENV_ARG_PARAMETER);
+  this->add_filter (filter_admin);
 
-  this->verify_filter_count (filter_admin, 2 ACE_ENV_ARG_PARAMETER);
+  this->verify_filter_count (filter_admin, 2);
 
   if (TAO_debug_level)
     {
       ACE_DEBUG ((LM_DEBUG, "Calling print_filters \n"));
-      this->print_filters (filter_admin ACE_ENV_ARG_PARAMETER);
+      this->print_filters (filter_admin);
     }
 
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Calling remove_filter\n"));
 
   // remove the filter.
-  filter_admin->remove_filter (id_1 ACE_ENV_ARG_PARAMETER);
+  filter_admin->remove_filter (id_1);
 
-  this->verify_filter_count (filter_admin, 1 ACE_ENV_ARG_PARAMETER);
+  this->verify_filter_count (filter_admin, 1);
 
   if (TAO_debug_level)
     {
       ACE_DEBUG ((LM_DEBUG, "Calling print_filters \n"));
-      this->print_filters (filter_admin ACE_ENV_ARG_PARAMETER);
+      this->print_filters (filter_admin);
     }
 
   if (TAO_debug_level)
@@ -117,17 +113,17 @@ Filter::run_filter_test (CosNotifyFilter::FilterAdmin_ptr filter_admin ACE_ENV_A
   if (TAO_debug_level)
     {
       ACE_DEBUG ((LM_DEBUG, "Calling print_filters \n"));
-      this->print_filters (filter_admin ACE_ENV_ARG_PARAMETER);
+      this->print_filters (filter_admin);
     }
 
   // Make sure all filters are removed -
-  this->verify_filter_count (filter_admin, 0 ACE_ENV_ARG_PARAMETER);
+  this->verify_filter_count (filter_admin, 0);
 
   ACE_DEBUG ((LM_DEBUG, "Filters test has run successfully\n"));
 }
 
 void
-Filter::verify_filter_count (CosNotifyFilter::FilterAdmin_ptr filter_admin, CORBA::ULong expected_count ACE_ENV_ARG_DECL)
+Filter::verify_filter_count (CosNotifyFilter::FilterAdmin_ptr filter_admin, CORBA::ULong expected_count)
 {
   expected_count = expected_count; // if we don;t do this, we get a warning on linux about arg not used.
   CosNotifyFilter::FilterIDSeq_var filter_seq = filter_admin->get_all_filters ();
@@ -135,11 +131,11 @@ Filter::verify_filter_count (CosNotifyFilter::FilterAdmin_ptr filter_admin, CORB
 }
 
 CosNotifyFilter::FilterID
-Filter::add_filter (CosNotifyFilter::FilterAdmin_ptr filter_admin ACE_ENV_ARG_DECL)
+Filter::add_filter (CosNotifyFilter::FilterAdmin_ptr filter_admin)
 {
   // setup a filter at the filter admin
   CosNotifyFilter::Filter_var filter =
-    this->ffact_->create_filter ("ETCL" ACE_ENV_ARG_PARAMETER);
+    this->ffact_->create_filter ("ETCL");
 
   ACE_ASSERT (!CORBA::is_nil (filter.in ()));
 
@@ -151,9 +147,9 @@ Filter::add_filter (CosNotifyFilter::FilterAdmin_ptr filter_admin ACE_ENV_ARG_DE
   constraint_list[0].event_types.length (0);
   constraint_list[0].constraint_expr = CORBA::string_dup (test_filter_string);
 
-  filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
+  filter->add_constraints (constraint_list);
 
-  CosNotifyFilter::FilterID id = filter_admin->add_filter (filter.in () ACE_ENV_ARG_PARAMETER);
+  CosNotifyFilter::FilterID id = filter_admin->add_filter (filter.in ());
 
   // Print the ID
   if (TAO_debug_level)
@@ -163,7 +159,7 @@ Filter::add_filter (CosNotifyFilter::FilterAdmin_ptr filter_admin ACE_ENV_ARG_DE
 }
 
 void
-Filter::print_filters (CosNotifyFilter::FilterAdmin_ptr filter_admin ACE_ENV_ARG_DECL)
+Filter::print_filters (CosNotifyFilter::FilterAdmin_ptr filter_admin)
 {
   CosNotifyFilter::FilterIDSeq_var filter_seq = filter_admin->get_all_filters ();
 
@@ -183,8 +179,7 @@ Filter::create_EC (void)
 
   this->ec_ = notify_factory_->create_channel (this->initial_qos_,
                                                this->initial_admin_,
-                                               id
-                                               ACE_ENV_ARG_PARAMETER);
+                                               id);
 
   ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
 }
@@ -201,20 +196,18 @@ main (int argc, char* argv[])
       return 1;
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       events.init (argc,
-                   argv
-                   ACE_ENV_ARG_PARAMETER);
+                   argv);
 
       events.run_test ();
     }
-  ACE_CATCH (CORBA::Exception, se)
+  catch (const CORBA::Exception& se)
     {
-      ACE_PRINT_EXCEPTION (se, "Error: ");
+      se._tao_print_exception ("Error: ");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Filter.h b/TAO/orbsvcs/tests/Notify/Basic/Filter.h
index ac36162682b..9c1ed4432d3 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Filter.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Filter.h
@@ -35,8 +35,7 @@ public:
   virtual ~Filter (void);
 
   int init (int argc,
-            char *argv []
-            ACE_ENV_ARG_DECL);
+            char *argv []);
   // initialization.
 
   void run_test (void);
@@ -47,16 +46,16 @@ protected:
   // Create EC
 
   /// Run some tests to check the filters.
-  void run_filter_test (CosNotifyFilter::FilterAdmin_ptr ACE_ENV_ARG_DECL);
+  void run_filter_test (CosNotifyFilter::FilterAdmin_ptr);
 
   /// Print the filter ids.
-  void print_filters (CosNotifyFilter::FilterAdmin_ptr filter_seq ACE_ENV_ARG_DECL);
+  void print_filters (CosNotifyFilter::FilterAdmin_ptr filter_seq);
 
   /// Verify filter count.
-  void verify_filter_count (CosNotifyFilter::FilterAdmin_ptr filter_admin, CORBA::ULong expected_count ACE_ENV_ARG_DECL);
+  void verify_filter_count (CosNotifyFilter::FilterAdmin_ptr filter_admin, CORBA::ULong expected_count);
 
   /// Add a filter.
-  CosNotifyFilter::FilterID add_filter (CosNotifyFilter::FilterAdmin_ptr filter_admin ACE_ENV_ARG_DECL);
+  CosNotifyFilter::FilterID add_filter (CosNotifyFilter::FilterAdmin_ptr filter_admin);
 
   /// The default filter factory.
   CosNotifyFilter::FilterFactory_var ffact_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
index 89225a9b9be..ebaebc1f8b4 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
@@ -80,17 +80,14 @@ IdAssignment::parse_args (int argc,
 
 void
 IdAssignment::init (int argc,
-                    char *argv[]
-                    ACE_ENV_ARG_DECL)
+                    char *argv[])
 {
   CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                         argv,
-                                        ""
-                                        ACE_ENV_ARG_PARAMETER);
+                                        "");
 
   CORBA::Object_var rootObj =
-    orb->resolve_initial_references ("NameService"
-                                     ACE_ENV_ARG_PARAMETER);
+    orb->resolve_initial_references ("NameService");
 
   if (CORBA::is_nil (rootObj.in ()))
     {
@@ -100,15 +97,13 @@ IdAssignment::init (int argc,
 
     }
   CosNaming::NamingContext_var rootNC =
-    CosNaming::NamingContext::_narrow (rootObj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+    CosNaming::NamingContext::_narrow (rootObj.in ());
 
   CosNaming::Name name (1);
   name.length (1);
   name[0].id = CORBA::string_dup ("NotifyEventChannelFactory");
 
-  CORBA::Object_var obj = rootNC->resolve (name
-                                           ACE_ENV_ARG_PARAMETER);
+  CORBA::Object_var obj = rootNC->resolve (name);
 
   if (CORBA::is_nil (obj.in ()))
     {
@@ -120,7 +115,6 @@ IdAssignment::init (int argc,
   this->notify_factory_ =
     CosNotifyChannelAdmin::EventChannelFactory::_narrow (
         obj.in()
-        ACE_ENV_ARG_PARAMETER
       );
 
 }
@@ -134,20 +128,17 @@ IdAssignment::create_ec (void)
   CosNotifyChannelAdmin::EventChannel_var ec =
     this->notify_factory_->create_channel (initial_qos,
                                            initial_admin,
-                                           id
-                                           ACE_ENV_ARG_PARAMETER);
+                                           id);
 
   return id;
 }
 
 
 void
-IdAssignment::destroy_ec(CosNotifyChannelAdmin::ChannelID id
-                          ACE_ENV_ARG_DECL)
+IdAssignment::destroy_ec(CosNotifyChannelAdmin::ChannelID id)
 {
   CosNotifyChannelAdmin::EventChannel_var ec =
-    this->notify_factory_->get_event_channel (id
-                                              ACE_ENV_ARG_PARAMETER);
+    this->notify_factory_->get_event_channel (id);
 
 
   if (CORBA::is_nil (ec.in()))
@@ -161,16 +152,14 @@ IdAssignment::destroy_ec(CosNotifyChannelAdmin::ChannelID id
 }
 
 CosNotifyChannelAdmin::AdminID
-IdAssignment::create_supplier_admin (CosNotifyChannelAdmin::ChannelID channel_id
-                                     ACE_ENV_ARG_DECL)
+IdAssignment::create_supplier_admin (CosNotifyChannelAdmin::ChannelID channel_id)
 {
   CosNotifyChannelAdmin::AdminID adminid;
   CosNotifyChannelAdmin::InterFilterGroupOperator ifgop =
     CosNotifyChannelAdmin::OR_OP;
 
   CosNotifyChannelAdmin::EventChannel_var ec =
-    this->notify_factory_->get_event_channel (channel_id
-                                              ACE_ENV_ARG_PARAMETER);
+    this->notify_factory_->get_event_channel (channel_id);
 
 
   if (CORBA::is_nil (ec.in ()))
@@ -182,8 +171,7 @@ IdAssignment::create_supplier_admin (CosNotifyChannelAdmin::ChannelID channel_id
 
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin =
     ec->new_for_suppliers (ifgop,
-                           adminid
-                           ACE_ENV_ARG_PARAMETER);
+                           adminid);
 
   if (CORBA::is_nil (supplier_admin.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -197,16 +185,14 @@ IdAssignment::create_supplier_admin (CosNotifyChannelAdmin::ChannelID channel_id
 }
 
 CosNotifyChannelAdmin::AdminID
-IdAssignment::create_consumer_admin (CosNotifyChannelAdmin::ChannelID channel_id
-                                     ACE_ENV_ARG_DECL)
+IdAssignment::create_consumer_admin (CosNotifyChannelAdmin::ChannelID channel_id)
 {
   CosNotifyChannelAdmin::AdminID adminid;
   CosNotifyChannelAdmin::InterFilterGroupOperator ifgop =
     CosNotifyChannelAdmin::OR_OP;
 
   CosNotifyChannelAdmin::EventChannel_var ec =
-    this->notify_factory_->get_event_channel (channel_id
-                                              ACE_ENV_ARG_PARAMETER);
+    this->notify_factory_->get_event_channel (channel_id);
 
 
   if (CORBA::is_nil (ec.in ()))
@@ -218,8 +204,7 @@ IdAssignment::create_consumer_admin (CosNotifyChannelAdmin::ChannelID channel_id
 
   CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin =
     ec->new_for_consumers (ifgop,
-                           adminid
-                           ACE_ENV_ARG_PARAMETER);
+                           adminid);
 
   if (CORBA::is_nil (consumer_admin.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -237,12 +222,10 @@ void
 IdAssignment::destroy_consumer_admin (
     CosNotifyChannelAdmin::ChannelID channel_id,
     CosNotifyChannelAdmin::AdminID admin_id
-    ACE_ENV_ARG_DECL
   )
 {
   CosNotifyChannelAdmin::EventChannel_var ec =
-    this->notify_factory_->get_event_channel (channel_id
-                                              ACE_ENV_ARG_PARAMETER);
+    this->notify_factory_->get_event_channel (channel_id);
 
 
   if (CORBA::is_nil (ec.in ()))
@@ -253,8 +236,7 @@ IdAssignment::destroy_consumer_admin (
     }
 
   CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->get_consumeradmin (admin_id
-                           ACE_ENV_ARG_PARAMETER);
+    ec->get_consumeradmin (admin_id);
 
   if (CORBA::is_nil (consumer_admin.in()))
     {
@@ -274,12 +256,10 @@ void
 IdAssignment::destroy_supplier_admin (
     CosNotifyChannelAdmin::ChannelID channel_id,
     CosNotifyChannelAdmin::AdminID admin_id
-    ACE_ENV_ARG_DECL
   )
 {
   CosNotifyChannelAdmin::EventChannel_var ec =
-    this->notify_factory_->get_event_channel (channel_id
-                                              ACE_ENV_ARG_PARAMETER);
+    this->notify_factory_->get_event_channel (channel_id);
 
 
   if (CORBA::is_nil (ec.in ()))
@@ -289,8 +269,7 @@ IdAssignment::destroy_supplier_admin (
     }
 
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin =
-    ec->get_supplieradmin (admin_id
-                           ACE_ENV_ARG_PARAMETER);
+    ec->get_supplieradmin (admin_id);
 
   if (CORBA::is_nil (supplier_admin.in ()))
     ACE_ERROR ((LM_ERROR,
@@ -337,8 +316,7 @@ IdAssignment::run_test(void)
                ++cons_count)
             {
               consumer_admin_id [cons_count] =
-                this->create_consumer_admin (ec_id [ec_count]
-                                             ACE_ENV_ARG_PARAMETER);
+                this->create_consumer_admin (ec_id [ec_count]);
             }
 
           // Connect <supplier_admin_count_> number of suppliers
@@ -348,16 +326,14 @@ IdAssignment::run_test(void)
                ++supp_count)
             {
               supplier_admin_id [supp_count] =
-                this->create_supplier_admin (ec_id [ec_count]
-                                             ACE_ENV_ARG_PARAMETER);
+                this->create_supplier_admin (ec_id [ec_count]);
             }
         }
 
       // Destroy the ec, the admins should destroy too.
       for (ec_count = 0; ec_count < this->ec_count_; ++ec_count)
         {
-          this->destroy_ec (ec_id[ec_count]
-                            ACE_ENV_ARG_PARAMETER);
+          this->destroy_ec (ec_id[ec_count]);
         }
 
     } // for
@@ -381,8 +357,7 @@ IdAssignment::run_test(void)
                ++cons_count)
             {
               consumer_admin_id[cons_count] =
-                this->create_consumer_admin (ec_id[ec_count]
-                                             ACE_ENV_ARG_PARAMETER);
+                this->create_consumer_admin (ec_id[ec_count]);
             }
 
           // Connect <supplier_admin_count_> number of suppliers
@@ -390,8 +365,7 @@ IdAssignment::run_test(void)
           for (supp_count = 0; supp_count < this->supplier_admin_count_; ++supp_count)
             {
               supplier_admin_id[supp_count] =
-                this->create_supplier_admin (ec_id[ec_count]
-                                             ACE_ENV_ARG_PARAMETER);
+                this->create_supplier_admin (ec_id[ec_count]);
             }
 
           // Destroy the admins.
@@ -402,8 +376,7 @@ IdAssignment::run_test(void)
                ++cons_count)
             {
               this->destroy_consumer_admin (ec_id[ec_count],
-                                            consumer_admin_id[cons_count]
-                                            ACE_ENV_ARG_PARAMETER);
+                                            consumer_admin_id[cons_count]);
             }
 
           // Destroy supplier admins
@@ -412,8 +385,7 @@ IdAssignment::run_test(void)
                ++supp_count)
             {
               this->destroy_supplier_admin (ec_id[ec_count],
-                                            supplier_admin_id[supp_count]
-                                            ACE_ENV_ARG_PARAMETER);
+                                            supplier_admin_id[supp_count]);
             }
 
         }
@@ -421,8 +393,7 @@ IdAssignment::run_test(void)
       // Destroy the ec,
       for (ec_count = 0; ec_count < this->ec_count_; ++ec_count)
         {
-          this->destroy_ec (ec_id[ec_count]
-                            ACE_ENV_ARG_PARAMETER);
+          this->destroy_ec (ec_id[ec_count]);
         }
 
     } // for
@@ -432,8 +403,7 @@ IdAssignment::run_test(void)
 
 int main (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       IdAssignment test;
 
@@ -441,17 +411,15 @@ int main (int argc, char* argv[])
                        argv);
 
       test.init (argc,
-                 argv
-                 ACE_ENV_ARG_PARAMETER);
+                 argv);
 
       test.run_test ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Error: ");
+      ex._tao_print_exception ("Error: ");
       return 1;
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
               "IdAssignment test suceeded\n"));
diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h
index 77506312d60..5a7d1afdc15 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h
@@ -27,30 +27,24 @@ public:
   int parse_args (int argc,
                   char *argv[]);
   void init (int argc,
-             char *argv[]
-             ACE_ENV_ARG_DECL);
+             char *argv[]);
   void run_test (void);
 
 private:
   CosNotifyChannelAdmin::ChannelID create_ec (void);
-  void destroy_ec (CosNotifyChannelAdmin::ChannelID id
-                   ACE_ENV_ARG_DECL);
+  void destroy_ec (CosNotifyChannelAdmin::ChannelID id);
 
   CosNotifyChannelAdmin::AdminID create_supplier_admin (
       CosNotifyChannelAdmin::ChannelID channel_id
-      ACE_ENV_ARG_DECL
     );
   CosNotifyChannelAdmin::AdminID create_consumer_admin (
       CosNotifyChannelAdmin::ChannelID channel_id
-      ACE_ENV_ARG_DECL
     );
 
   void destroy_consumer_admin (CosNotifyChannelAdmin::ChannelID channel_id,
-                               CosNotifyChannelAdmin::AdminID admin_id
-                               ACE_ENV_ARG_DECL);
+                               CosNotifyChannelAdmin::AdminID admin_id);
   void destroy_supplier_admin (CosNotifyChannelAdmin::ChannelID channel_id,
-                               CosNotifyChannelAdmin::AdminID admin_id
-                               ACE_ENV_ARG_DECL);
+                               CosNotifyChannelAdmin::AdminID admin_id);
 
   // = Data members.
   CosNotifyChannelAdmin::EventChannelFactory_var notify_factory_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
index d6c97bdd122..7a824f69f10 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
@@ -62,17 +62,14 @@ LifeCycle::parse_args (int argc,
 
 void
 LifeCycle::init (int argc,
-                     char* argv[]
-                     ACE_ENV_ARG_DECL)
+                     char* argv[])
 {
   CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                         argv,
-                                        ""
-                                        ACE_ENV_ARG_PARAMETER);
+                                        "");
 
   CORBA::Object_var rootObj =
-    orb->resolve_initial_references ("NameService"
-                                     ACE_ENV_ARG_PARAMETER);
+    orb->resolve_initial_references ("NameService");
 
   if (CORBA::is_nil (rootObj.in ()))
     {
@@ -82,20 +79,17 @@ LifeCycle::init (int argc,
     }
 
   CosNaming::NamingContext_var rootNC =
-    CosNaming::NamingContext::_narrow (rootObj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+    CosNaming::NamingContext::_narrow (rootObj.in ());
 
   CosNaming::Name name (1);
   name.length (1);
   name[0].id = CORBA::string_dup ("NotifyEventChannelFactory");
 
-  CORBA::Object_var obj = rootNC->resolve (name
-                                           ACE_ENV_ARG_PARAMETER);
+  CORBA::Object_var obj = rootNC->resolve (name);
 
   notify_factory_ =
     CosNotifyChannelAdmin::EventChannelFactory::_narrow (
         obj.in()
-        ACE_ENV_ARG_PARAMETER
       );
 
   if (CORBA::is_nil (notify_factory_.in ()))
@@ -135,8 +129,7 @@ LifeCycle::create_ec (void)
 
   this->ec_ = notify_factory_->create_channel (initial_qos,
                                                initial_admin,
-                                               id
-                                               ACE_ENV_ARG_PARAMETER);
+                                               id);
 
   if (CORBA::is_nil (ec_.in ())) {
     ACE_ERROR ((LM_ERROR,
@@ -157,8 +150,7 @@ LifeCycle::create_supplier_admin (void)
           CosNotifyChannelAdmin::OR_OP;
 
   supplier_admin_ = this->ec_->new_for_suppliers (ifgop,
-                                                  adminid
-                                                  ACE_ENV_ARG_PARAMETER);
+                                                  adminid);
 
   if (CORBA::is_nil (supplier_admin_.in ()))
     {
@@ -179,7 +171,7 @@ LifeCycle::create_consumer_admin (void)
   CosNotifyChannelAdmin::InterFilterGroupOperator ifgop =
     CosNotifyChannelAdmin::OR_OP;
 
-  consumer_admin_ = ec_->new_for_consumers (ifgop, adminid ACE_ENV_ARG_PARAMETER);
+  consumer_admin_ = ec_->new_for_consumers (ifgop, adminid);
 
   if (CORBA::is_nil (consumer_admin_.in()))
     {
@@ -227,8 +219,7 @@ LifeCycle::destroy_ec (void)
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       LifeCycle test;
 
@@ -236,17 +227,15 @@ main (int argc, char *argv[])
                        argv);
 
       test.init (argc,
-                 argv
-                 ACE_ENV_ARG_PARAMETER);
+                 argv);
 
       test.run_test ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Error: ");
+      ex._tao_print_exception ("Error: ");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.h b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.h
index e3c7c60af8c..9d4b39b17d8 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.h
@@ -23,8 +23,7 @@ public:
   ~LifeCycle (void);
 
   void init (int argc,
-             char *argv[]
-             ACE_ENV_ARG_DECL);
+             char *argv[]);
   void run_test (void);
   int parse_args (int argc,
                   char *argv[]);
diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
index 2e248a84c05..3497a62013f 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
@@ -16,7 +16,6 @@ MultiTypes_PushConsumer::MultiTypes_PushConsumer (MultiTypes* client)
 
 void
 MultiTypes_PushConsumer::push (const CORBA::Any & /*data*/
-                               ACE_ENV_ARG_DECL_NOT_USED
                                )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
@@ -35,7 +34,6 @@ MultiTypes_StructuredPushConsumer::MultiTypes_StructuredPushConsumer (MultiTypes
 
 void
 MultiTypes_StructuredPushConsumer::push_structured_event (const CosNotification::StructuredEvent & /*notification*/
-                                      ACE_ENV_ARG_DECL_NOT_USED
                                       )
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
@@ -56,7 +54,6 @@ MultiTypes_SequencePushConsumer::MultiTypes_SequencePushConsumer (MultiTypes* cl
 // Since this should *never* happen, I'm not fixing it now.
 void
 MultiTypes_SequencePushConsumer::push_structured_events (const CosNotification::EventBatch & /*notifications*/
-                                                         ACE_ENV_ARG_DECL_NOT_USED
                                                          )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
@@ -95,7 +92,6 @@ MultiTypes::on_received_event (MultiTypes_PushConsumer* consumer)
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "PushConsumer received event #%d\n", any_event_count_.value ()));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   if (disconnect_on_last_event_ == 1)
   {
@@ -114,7 +110,6 @@ MultiTypes::on_received_event (MultiTypes_StructuredPushConsumer* consumer)
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "StructuredPushConsumer received event #%d\n", struct_event_count_.value ()));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   if (disconnect_on_last_event_ == 1)
   {
@@ -133,7 +128,6 @@ MultiTypes::on_received_event (MultiTypes_SequencePushConsumer* consumer)
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "SequencePushConsumer received event #%d\n", seq_event_count_.value ()));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   if (disconnect_on_last_event_ == 1)
   {
@@ -147,13 +141,11 @@ MultiTypes::on_received_event (MultiTypes_SequencePushConsumer* consumer)
 
 int
 MultiTypes::init (int argc,
-                         char* argv []
-                         ACE_ENV_ARG_DECL)
+                         char* argv [])
 {
   // Initialize the base class.
   Notify_Test_Client::init (argc,
-                            argv
-                            ACE_ENV_ARG_PARAMETER);
+                            argv);
 
   // Create all participants.
   this->create_EC ();
@@ -162,15 +154,13 @@ MultiTypes::init (int argc,
 
   this->supplier_admin_ =
     ec_->new_for_suppliers (this->ifgop_,
-                            adminid
-                            ACE_ENV_ARG_PARAMETER);
+                            adminid);
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
 
   this->consumer_admin_ =
     ec_->new_for_consumers (this->ifgop_,
-                            adminid
-                            ACE_ENV_ARG_PARAMETER);
+                            adminid);
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
 
@@ -184,31 +174,31 @@ MultiTypes::init (int argc,
   sequence_supplier_ = new TAO_Notify_Tests_SequencePushSupplier ();
 
   // Init and connect all consumers.
-  structured_consumer_->init (root_poa_.in () ACE_ENV_ARG_PARAMETER);
+  structured_consumer_->init (root_poa_.in ());
 
-  structured_consumer_->connect (this->consumer_admin_.in () ACE_ENV_ARG_PARAMETER);
+  structured_consumer_->connect (this->consumer_admin_.in ());
 
-  any_consumer_->init (root_poa_.in () ACE_ENV_ARG_PARAMETER);
+  any_consumer_->init (root_poa_.in ());
 
-  any_consumer_->connect (this->consumer_admin_.in () ACE_ENV_ARG_PARAMETER);
+  any_consumer_->connect (this->consumer_admin_.in ());
 
 
-  sequence_consumer_->init (root_poa_.in () ACE_ENV_ARG_PARAMETER);
+  sequence_consumer_->init (root_poa_.in ());
 
-  sequence_consumer_->connect (this->consumer_admin_.in () ACE_ENV_ARG_PARAMETER);
+  sequence_consumer_->connect (this->consumer_admin_.in ());
 
   // Init and connect all suppliers.
-  any_supplier_->init (root_poa_.in () ACE_ENV_ARG_PARAMETER);
+  any_supplier_->init (root_poa_.in ());
 
-  any_supplier_->connect (this->supplier_admin_.in () ACE_ENV_ARG_PARAMETER);
+  any_supplier_->connect (this->supplier_admin_.in ());
 
-  structured_supplier_->init (root_poa_.in () ACE_ENV_ARG_PARAMETER);
+  structured_supplier_->init (root_poa_.in ());
 
-  structured_supplier_->connect (this->supplier_admin_.in () ACE_ENV_ARG_PARAMETER);
+  structured_supplier_->connect (this->supplier_admin_.in ());
 
-  sequence_supplier_->init (root_poa_.in () ACE_ENV_ARG_PARAMETER);
+  sequence_supplier_->init (root_poa_.in ());
 
-  sequence_supplier_->connect (this->supplier_admin_.in () ACE_ENV_ARG_PARAMETER);
+  sequence_supplier_->connect (this->supplier_admin_.in ());
 
   consumer_start( 0 );
 
@@ -229,8 +219,7 @@ MultiTypes::create_EC (void)
 
   this->ec_ = notify_factory_->create_channel (this->initial_qos_,
                                                this->initial_admin_,
-                                               id
-                                               ACE_ENV_ARG_PARAMETER);
+                                               id);
 
   ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
 }
@@ -244,7 +233,7 @@ MultiTypes::run_test (void)
 
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Sending Any Event..\n"));
-  any_supplier_->send_event (any ACE_ENV_ARG_PARAMETER);
+  any_supplier_->send_event (any);
 
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Waiting for consumers to receive the 1 event..\n"));
@@ -265,7 +254,7 @@ MultiTypes::run_test (void)
 
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Sending Structured Event..\n"));
-  structured_supplier_->send_event (event ACE_ENV_ARG_PARAMETER);
+  structured_supplier_->send_event (event);
 
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Waiting for consumers to receive the 1 event..\n"));
@@ -292,7 +281,7 @@ MultiTypes::run_test (void)
 
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Sending Sequence Event..\n"));
-  sequence_supplier_->send_events (events ACE_ENV_ARG_PARAMETER);
+  sequence_supplier_->send_events (events);
 
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Waiting for consumers to receive the 2 events..\n"));
@@ -309,7 +298,7 @@ MultiTypes::run_test (void)
 
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Sending LAST Any Event, Consumers will attempt disconnect..\n"));
-  any_supplier_->send_event (any ACE_ENV_ARG_PARAMETER);
+  any_supplier_->send_event (any);
 
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Waiting for consumers to receive the 1 event..\n"));
@@ -345,7 +334,6 @@ int
 MultiTypes::check_results (void)
 {
   // Destroy the channel.
-  ACE_DECLARE_NEW_CORBA_ENV;
   this->ec_->destroy ();
 
   return 0;
@@ -363,22 +351,20 @@ main (int argc, char* argv[])
       return 1;
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       client.init (argc,
-                   argv
-                   ACE_ENV_ARG_PARAMETER);
+                   argv);
 
       client.run_test ();
 
       client.end_test ();
     }
-  ACE_CATCH (CORBA::Exception, se)
+  catch (const CORBA::Exception& se)
     {
-      ACE_PRINT_EXCEPTION (se, "Error: ");
+      se._tao_print_exception ("Error: ");
       return 1;
     }
-  ACE_ENDTRY;
 
   return client.check_results ();
 }
diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h
index 5ce121020b8..4b8fa5ed939 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h
@@ -40,7 +40,6 @@ public:
 
   void push (
              const CORBA::Any & data
-             ACE_ENV_ARG_DECL
              )
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
@@ -60,7 +59,6 @@ public:
 
   // = StructuredPushSupplier methods
   virtual void push_structured_event (const CosNotification::StructuredEvent & notification
-                                      ACE_ENV_ARG_DECL
                                       )
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
@@ -79,7 +77,6 @@ public:
   // = SequencePushConsumer methods
   virtual void push_structured_events (
         const CosNotification::EventBatch & notifications
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -108,8 +105,7 @@ public:
                   char *argv[]);
 
   int init (int argc,
-            char *argv []
-            ACE_ENV_ARG_DECL);
+            char *argv []);
   // initialization.
 
   void run_test (void);
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
index dfd1065d18f..67ada03200b 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
@@ -18,7 +18,6 @@ SequencePushConsumer::SequencePushConsumer (Sequence *test_client)
 void
 SequencePushConsumer::push_structured_events (
     const CosNotification::EventBatch &batch
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosEventComm::Disconnected))
@@ -62,8 +61,7 @@ Sequence::~Sequence (void)
 
 int
 Sequence::init (int argc,
-                   char* argv []
-                   ACE_ENV_ARG_DECL)
+                   char* argv [])
 {
   if (TAO_debug_level)
     {
@@ -82,8 +80,7 @@ Sequence::init (int argc,
 
   // Initialize the base class.
   Notify_Test_Client::init (argc,
-                            argv
-                            ACE_ENV_ARG_PARAMETER);
+                            argv);
 
   // Create all participents.
   this->create_EC ();
@@ -92,25 +89,21 @@ Sequence::init (int argc,
 
   this->supplier_admin_ =
     this->ec_->new_for_suppliers (this->ifgop_,
-                                  adminid
-                                  ACE_ENV_ARG_PARAMETER);
+                                  adminid);
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
 
   this->consumer_admin_ =
     this->ec_->new_for_consumers (this->ifgop_,
-                                  adminid
-                                  ACE_ENV_ARG_PARAMETER);
+                                  adminid);
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
 
   ACE_NEW_RETURN (this->consumer_,
                   SequencePushConsumer (this),
                   -1);
-  this->consumer_->init (root_poa_.in ()
-                         ACE_ENV_ARG_PARAMETER);
-  this->consumer_->connect (this->consumer_admin_.in ()
-                            ACE_ENV_ARG_PARAMETER);
+  this->consumer_->init (root_poa_.in ());
+  this->consumer_->connect (this->consumer_admin_.in ());
 
   CosNotification::QoSProperties properties (3);
   properties.length (3);
@@ -127,11 +120,9 @@ Sequence::init (int argc,
   ACE_NEW_RETURN (this->supplier_,
                   SequencePushSupplier (this),
                   -1);
-  this->supplier_->init (root_poa_.in ()
-                         ACE_ENV_ARG_PARAMETER);
+  this->supplier_->init (root_poa_.in ());
 
-  this->supplier_->connect (this->supplier_admin_.in ()
-                            ACE_ENV_ARG_PARAMETER);
+  this->supplier_->connect (this->supplier_admin_.in ());
 
   consumer_start( 0 );
 
@@ -210,8 +201,7 @@ Sequence::create_EC (void)
 
   this->ec_ = notify_factory_->create_channel (this->initial_qos_,
                                                this->initial_admin_,
-                                               id
-                                               ACE_ENV_ARG_PARAMETER);
+                                               id);
   ACE_ASSERT (!CORBA::is_nil (this->ec_.in ()));
 }
 
@@ -225,7 +215,6 @@ Sequence::on_event_received (void)
 
   if (this->events_received_.value () == this->event_count_)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
       this->end_test ();
     }
 }
@@ -291,8 +280,7 @@ Sequence::run_test (void)
           if (TAO_debug_level)
             ACE_DEBUG ((LM_DEBUG, "Sending batch with %d events\n", batch.length ()));
 
-          this->supplier_->send_events (batch
-                                        ACE_ENV_ARG_PARAMETER);
+          this->supplier_->send_events (batch);
 
           // reset
           batch.length (this->supplier_batch_size_);
@@ -305,8 +293,7 @@ Sequence::run_test (void)
     {
       batch.length (batch_index); // set the correct length
 
-      this->supplier_->send_events (batch
-                                    ACE_ENV_ARG_PARAMETER);
+      this->supplier_->send_events (batch);
     }
 
 }
@@ -321,7 +308,6 @@ int
 Sequence::check_results (void)
 {
   // Destroy the channel.
-  ACE_DECLARE_NEW_CORBA_ENV;
   this->ec_->destroy ();
 
   if (this->events_received_.value () == this->event_count_)
@@ -350,22 +336,20 @@ main (int argc, char* argv[])
       return 1;
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       events.init (argc,
-                   argv
-                   ACE_ENV_ARG_PARAMETER);
+                   argv);
 
       events.run_test ();
 
-      events.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
+      events.ORB_run( );
     }
-  ACE_CATCH (CORBA::Exception, se)
+  catch (const CORBA::Exception& se)
     {
-      ACE_PRINT_EXCEPTION (se, "Error: ");
+      se._tao_print_exception ("Error: ");
       return 1;
     }
-  ACE_ENDTRY;
 
   return events.check_results ();
 }
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
index 03b4806efa1..f54484b6de3 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
@@ -36,7 +36,6 @@ public:
   // = SequencePushConsumer methods
   virtual void push_structured_events (
         const CosNotification::EventBatch & notifications
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -75,8 +74,7 @@ public:
                   char *argv[]) ;
 
   int init (int argc,
-            char *argv []
-            ACE_ENV_ARG_DECL);
+            char *argv []);
   // Initialization.
 
   void on_event_received (void);
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
index 8097219f16c..faa27ba5776 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
@@ -15,8 +15,7 @@ Event_AnyPushConsumer::Event_AnyPushConsumer (Simple_Test *test_client)
 }
 
 void
-Event_AnyPushConsumer::push (const CORBA::Any & data
-                             ACE_ENV_ARG_DECL_NOT_USED)
+Event_AnyPushConsumer::push (const CORBA::Any & data)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosEventComm::Disconnected))
 {
@@ -55,13 +54,11 @@ Simple_Test::~Simple_Test (void)
 
 int
 Simple_Test::init (int argc,
-                   char* argv []
-                   ACE_ENV_ARG_DECL)
+                   char* argv [])
 {
   // Initialized the base class.
   Notify_Test_Client::init (argc,
-                            argv
-                            ACE_ENV_ARG_PARAMETER);
+                            argv);
 
   // Create all participents.
   this->create_EC ();
@@ -70,43 +67,35 @@ Simple_Test::init (int argc,
 
   supplier_admin_ =
     this->ec_->new_for_suppliers (this->ifgop_,
-                                  adminid
-                                  ACE_ENV_ARG_PARAMETER);
+                                  adminid);
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
 
   consumer_admin_ =
     this->ec_->new_for_consumers (this->ifgop_,
-                                  adminid
-                                  ACE_ENV_ARG_PARAMETER);
+                                  adminid);
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
 
   ACE_NEW_RETURN (this->consumer_,
                   Event_AnyPushConsumer (this),
                   -1);
-  this->consumer_->init (root_poa_.in ()
-                         ACE_ENV_ARG_PARAMETER);
-  this->consumer_->connect (this->consumer_admin_.in ()
-                            ACE_ENV_ARG_PARAMETER);
+  this->consumer_->init (root_poa_.in ());
+  this->consumer_->connect (this->consumer_admin_.in ());
 
   Event_AnyPushConsumer* consumer2;
   ACE_NEW_RETURN (consumer2,
                   Event_AnyPushConsumer (this),
                   -1);
-  consumer2->init (root_poa_.in ()
-                   ACE_ENV_ARG_PARAMETER);
-  consumer2->connect (this->consumer_admin_.in ()
-                      ACE_ENV_ARG_PARAMETER);
+  consumer2->init (root_poa_.in ());
+  consumer2->connect (this->consumer_admin_.in ());
 
   ACE_NEW_RETURN (this->supplier_,
                   Event_AnyPushSupplier (this),
                   -1);
-  this->supplier_->init (root_poa_.in ()
-                         ACE_ENV_ARG_PARAMETER);
+  this->supplier_->init (root_poa_.in ());
 
-  this->supplier_->connect (this->supplier_admin_.in ()
-                            ACE_ENV_ARG_PARAMETER);
+  this->supplier_->connect (this->supplier_admin_.in ());
 
   consumer_start( 0 );
 
@@ -157,8 +146,7 @@ Simple_Test::create_EC (void)
 
   this->ec_ = notify_factory_->create_channel (this->initial_qos_,
                                                this->initial_admin_,
-                                               id
-                                               ACE_ENV_ARG_PARAMETER);
+                                               id);
 
   ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
 }
@@ -175,7 +163,6 @@ Simple_Test::on_event_received (void)
 
   if (this->result_count_ == 2 * this->event_count_)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
       this->end_test ();
     }
 }
@@ -189,8 +176,7 @@ Simple_Test::run_test (void)
     {
       data <<= (CORBA::Long)i;
 
-      this->supplier_->send_event (data
-                                   ACE_ENV_ARG_PARAMETER);
+      this->supplier_->send_event (data);
     }
 }
 
@@ -204,7 +190,6 @@ int
 Simple_Test::check_results (void)
 {
   // Destroy the channel
-  ACE_DECLARE_NEW_CORBA_ENV;
   this->ec_->destroy ();
 
   if (this->result_count_ == 2 * this->event_count_)
@@ -233,22 +218,20 @@ main (int argc, char* argv[])
       return 1;
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       events.init (argc,
-                   argv
-                   ACE_ENV_ARG_PARAMETER);
+                   argv);
 
       events.run_test ();
 
-      events.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
+      events.ORB_run( );
     }
-  ACE_CATCH (CORBA::Exception, se)
+  catch (const CORBA::Exception& se)
     {
-      ACE_PRINT_EXCEPTION (se, "Error: ");
+      se._tao_print_exception ("Error: ");
       return 1;
     }
-  ACE_ENDTRY;
 
   return events.check_results ();
 }
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.h b/TAO/orbsvcs/tests/Notify/Basic/Simple.h
index b4ce9ede15f..ed80e117075 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Simple.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.h
@@ -38,7 +38,6 @@ public:
   // = PushSupplier methods
   virtual void push (
       const CORBA::Any & data
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventComm::Disconnected));
@@ -75,8 +74,7 @@ public:
                   char *argv[]) ;
 
   int init (int argc,
-            char *argv []
-            ACE_ENV_ARG_DECL);
+            char *argv []);
   // initialization.
 
   void on_event_received (void);
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
index 90e572856b7..6725fe62063 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
@@ -16,7 +16,6 @@ void
 Updates_StructuredPushConsumer::offer_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        ACE_ENV_ARG_DECL_NOT_USED
       )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
@@ -43,7 +42,6 @@ void
 Updates_StructuredPushSupplier::subscription_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNotifyComm::InvalidEventType))
@@ -66,13 +64,11 @@ Updates::~Updates ()
 
 int
 Updates::init (int argc,
-               char* argv []
-               ACE_ENV_ARG_DECL)
+               char* argv [])
 {
   // Initialize base class.
   Notify_Test_Client::init (argc,
-                            argv
-                            ACE_ENV_ARG_PARAMETER);
+                            argv);
 
   // Create all participents.
   this->create_EC ();
@@ -81,35 +77,29 @@ Updates::init (int argc,
 
   supplier_admin_ =
     ec_->new_for_suppliers (this->ifgop_,
-                            adminid
-                            ACE_ENV_ARG_PARAMETER);
+                            adminid);
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
 
   consumer_admin_ =
     ec_->new_for_consumers (this->ifgop_,
-                            adminid
-                            ACE_ENV_ARG_PARAMETER);
+                            adminid);
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
 
   ACE_NEW_RETURN (consumer_,
                   Updates_StructuredPushConsumer (this),
                   -1);
-  consumer_->init (root_poa_.in ()
-                   ACE_ENV_ARG_PARAMETER);
+  consumer_->init (root_poa_.in ());
 
-  consumer_->connect (this->consumer_admin_.in ()
-                      ACE_ENV_ARG_PARAMETER);
+  consumer_->connect (this->consumer_admin_.in ());
 
   ACE_NEW_RETURN (supplier_,
                  Updates_StructuredPushSupplier (this),
                  -1);
-  supplier_->init (root_poa_.in ()
-                   ACE_ENV_ARG_PARAMETER);
+  supplier_->init (root_poa_.in ());
 
-  supplier_->connect (this->supplier_admin_.in ()
-                      ACE_ENV_ARG_PARAMETER);
+  supplier_->connect (this->supplier_admin_.in ());
 
   return 0;
 }
@@ -121,8 +111,7 @@ Updates::create_EC (void)
 
   ec_ = notify_factory_->create_channel (initial_qos_,
                                          initial_admin_,
-                                         id
-                                         ACE_ENV_ARG_PARAMETER);
+                                         id);
 
   ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
 }
@@ -231,7 +220,6 @@ Updates::test_subscription_change (void)
 
     this->consumer_->get_proxy_supplier ()->subscription_change (added,
                                                                  removed
-                                                                 ACE_ENV_ARG_PARAMETER
                                                                  );
 
     this->wait_for_updates (3, 0); // The supplier should receive Added (RED, GREEN, BLUE)
@@ -268,7 +256,6 @@ Updates::test_subscription_change (void)
 
     this->consumer_->get_proxy_supplier ()->subscription_change (added,
                                                                  removed
-                                                                 ACE_ENV_ARG_PARAMETER
                                                                  );
 
     this->wait_for_updates (1, 0); // The supplier should receive Added (PURPLE).
@@ -303,7 +290,6 @@ Updates::test_subscription_change (void)
 
     this->consumer_->get_proxy_supplier ()->subscription_change (added,
                                                                  removed
-                                                                 ACE_ENV_ARG_PARAMETER
                                                                  );
 
     this->wait_for_updates (0, 4);
@@ -352,7 +338,6 @@ Updates::test_offer_change (void)
 
     this->supplier_->get_proxy_consumer ()->offer_change (added,
                                                           removed
-                                                          ACE_ENV_ARG_PARAMETER
                                                           );
 
     this->wait_for_updates (3, 0); // The consumer should receive Added (RED, GREEN, BLUE)
@@ -389,7 +374,6 @@ Updates::test_offer_change (void)
 
     this->supplier_->get_proxy_consumer ()->offer_change (added,
                                                           removed
-                                                          ACE_ENV_ARG_PARAMETER
                                                                  );
 
     this->wait_for_updates (1, 0); // The consumer should receive Added (PURPLE).
@@ -424,7 +408,6 @@ Updates::test_offer_change (void)
 
     this->supplier_->get_proxy_consumer ()->offer_change (added,
                                                           removed
-                                                          ACE_ENV_ARG_PARAMETER
                                                           );
 
     this->wait_for_updates (0, 4);
@@ -450,20 +433,18 @@ main (int argc, char* argv[])
 {
   Updates updates;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       updates.init (argc,
-                    argv
-                    ACE_ENV_ARG_PARAMETER);
+                    argv);
 
       updates.run_test ();
     }
-  ACE_CATCH (CORBA::SystemException, se)
+  catch (const CORBA::SystemException& se)
     {
-      ACE_PRINT_EXCEPTION (se, "Error: ");
+      se._tao_print_exception ("Error: ");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.h b/TAO/orbsvcs/tests/Notify/Basic/Updates.h
index 9e6e2d89b84..e5a222c600a 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Updates.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.h
@@ -35,8 +35,7 @@ public:
   // Contructor.
 
   virtual void offer_change (const CosNotification::EventTypeSeq & added,
-                             const CosNotification::EventTypeSeq & removed
-                             ACE_ENV_ARG_DECL)
+                             const CosNotification::EventTypeSeq & removed)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNotifyComm::InvalidEventType));
   // Offer change is conveyed here.
@@ -59,7 +58,6 @@ public:
   virtual void subscription_change (
       const CosNotification::EventTypeSeq & added,
       const CosNotification::EventTypeSeq & removed
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNotifyComm::InvalidEventType));
@@ -78,7 +76,7 @@ public:
   Updates (void);
   virtual ~Updates ();
 
-  int init (int argc, char *argv [] ACE_ENV_ARG_DECL);
+  int init (int argc, char *argv []);
   // initialization.
 
   void run_test (void);
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp
index a331251bff0..701d0cfebde 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp
@@ -26,8 +26,7 @@ Notify_Structured_Push_Consumer::Notify_Structured_Push_Consumer (
 
 void
 Notify_Structured_Push_Consumer::_connect (
-                CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                ACE_ENV_ARG_DECL)
+                CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::StructuredPushConsumer_var objref =
@@ -36,12 +35,11 @@ Notify_Structured_Push_Consumer::_connect (
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     consumer_admin->obtain_notification_push_supplier (
       CosNotifyChannelAdmin::STRUCTURED_EVENT,
-      proxy_id_
-      ACE_ENV_ARG_PARAMETER);
+      proxy_id_);
 
   this->proxy_ =
     CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (
-      proxysupplier.in () ACE_ENV_ARG_PARAMETER);
+      proxysupplier.in ());
 
   CosNotification::QoSProperties properties (2);
   properties.length (2);
@@ -68,8 +66,7 @@ Notify_Structured_Push_Consumer::_connect (
   properties[1].value <<= this->blocking_timeout_;
 
   this->proxy_->set_qos (properties);
-  this->proxy_->connect_structured_push_consumer (objref.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
+  this->proxy_->connect_structured_push_consumer (objref.in ());
 
   // give ownership to POA
   this->_remove_ref ();
@@ -79,7 +76,7 @@ Notify_Structured_Push_Consumer::_connect (
 void
 Notify_Structured_Push_Consumer::push_structured_event (
   const CosNotification::StructuredEvent& event
-  ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+ /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG((LM_DEBUG, "-"));
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h
index 502c28c924d..9b9e143af85 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h
@@ -32,13 +32,11 @@ public:
                         unsigned int expected,
                         Notify_Test_Client& client);
 
-  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                ACE_ENV_ARG_DECL)
+  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
-  void push_structured_event (const CosNotification::StructuredEvent&
-                              ACE_ENV_ARG_DECL)
+  void push_structured_event (const CosNotification::StructuredEvent&)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   ACE_CString name_;
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp
index f6ae74bdfe1..0b836c4bd63 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp
@@ -71,14 +71,12 @@ Consumer_Client::parse_args (int argc, char *argv[])
 
 
 static CosNotifyChannelAdmin::ConsumerAdmin_ptr
-create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::ConsumerAdmin_var admin =
     ec->new_for_consumers (CosNotifyChannelAdmin::OR_OP,
-                           adminid
-                           ACE_ENV_ARG_PARAMETER);
+                           adminid);
 
 
   return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ());
@@ -87,8 +85,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 
 static void
 create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
-                  Notify_Test_Client* client
-                  ACE_ENV_ARG_DECL)
+                  Notify_Test_Client* client)
 {
   // startup the consumer
   ACE_NEW_THROW_EX (consumer_1,
@@ -98,9 +95,9 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
     expected,
     *client),
     CORBA::NO_MEMORY ());
-  consumer_1->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
+  consumer_1->init (client->root_poa ());
 
-  consumer_1->_connect (admin ACE_ENV_ARG_PARAMETER);
+  consumer_1->_connect (admin);
 }
 
 // ******************************************************************
@@ -110,33 +107,33 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
 int main (int argc, char* argv[])
 {
   int status = 0;
-  ACE_TRY_NEW_ENV
+  try
   {
     Consumer_Client client;
 
-    status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+    status = client.init (argc, argv);
     if (status != 0)
       ACE_ERROR_RETURN ((LM_ERROR, "Error: Client init failed.\n"),1);
 
     CosNotifyChannelAdmin::EventChannel_var ec =
-      client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER);
+      client.create_event_channel ("MyEventChannel", 1);
 
     CORBA::ORB_ptr orb = client.orb ();
     CORBA::Object_var object =
-      orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+      orb->string_to_object (ior);
 
-    sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+    sig_var sig = sig::_narrow (object.in ());
 
     if (CORBA::is_nil (sig.in ()))
       ACE_ERROR_RETURN ((LM_ERROR, "Error: Narrow failed.\n"),1);
 
     CosNotifyChannelAdmin::ConsumerAdmin_var admin =
-      create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
+      create_consumeradmin (ec.in ());
 
     if (CORBA::is_nil (admin.in ()))
       ACE_ERROR_RETURN ((LM_ERROR, "Error: nil ConsumerAdmin.\n"),1);
 
-    create_consumers (admin.in (), &client ACE_ENV_ARG_PARAMETER);
+    create_consumers (admin.in (), &client);
 
     sig->go ();
 
@@ -149,12 +146,11 @@ int main (int argc, char* argv[])
 
     sig->done ();
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: ");
+    e._tao_print_exception ("Error: ");
     status = 1;
   }
-  ACE_ENDTRY;
 
   return status;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
index 61dc86833e9..4a3896ba229 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
@@ -111,14 +111,12 @@ Supplier_Client::parse_args (int argc, char *argv[])
 
 
 static CosNotifyChannelAdmin::SupplierAdmin_ptr
-create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::SupplierAdmin_var admin =
     ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP,
-    adminid
-    ACE_ENV_ARG_PARAMETER);
+    adminid);
 
 
   return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ());
@@ -126,7 +124,7 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 
 
 static void
-SendEvent (int id ACE_ENV_ARG_DECL_NOT_USED)
+SendEvent (int id)
 {
   CosNotification::StructuredEvent event;
 
@@ -138,30 +136,28 @@ SendEvent (int id ACE_ENV_ARG_DECL_NOT_USED)
   event.filterable_data[0].name = CORBA::string_dup ("id");
   event.filterable_data[0].value <<= id;
 
-  ACE_TRY_NEW_ENV
+  try
   {
-    supplier_1->send_event (event ACE_ENV_ARG_PARAMETER);
+    supplier_1->send_event (event);
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: ");
+    e._tao_print_exception ("Error: ");
   }
-  ACE_ENDTRY;
 }
 
 static void
 create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
-                  PortableServer::POA_ptr poa
-                  ACE_ENV_ARG_DECL)
+                  PortableServer::POA_ptr poa)
 {
   // startup the supplier
   ACE_NEW_THROW_EX (supplier_1,
     TAO_Notify_Tests_StructuredPushSupplier (),
     CORBA::NO_MEMORY ());
 
-  supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
+  supplier_1->init (poa);
 
-  supplier_1->connect (admin ACE_ENV_ARG_PARAMETER);
+  supplier_1->connect (admin);
 }
 
 
@@ -173,15 +169,15 @@ int main (int argc, char* argv[])
 {
   int status = 0;
   ACE_Auto_Ptr< sig_i > sig_impl;
-  ACE_TRY_NEW_ENV
+  try
   {
     Supplier_Client client;
-    status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+    status = client.init (argc, argv);
 
     if (status == 0)
     {
       CosNotifyChannelAdmin::EventChannel_var ec =
-        client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER);
+        client.create_event_channel ("MyEventChannel", 0);
 
       CORBA::ORB_ptr orb = client.orb ();
 
@@ -190,7 +186,7 @@ int main (int argc, char* argv[])
       sig_var sig = sig_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (sig.in ());
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
@@ -207,10 +203,10 @@ int main (int argc, char* argv[])
       }
 
       CosNotifyChannelAdmin::SupplierAdmin_var admin =
-        create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
+        create_supplieradmin (ec.in ());
       if (!CORBA::is_nil (admin.in ()))
       {
-        create_suppliers (admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER);
+        create_suppliers (admin.in (), client.root_poa ());
 
         sig_impl->wait_for_startup();
 
@@ -218,7 +214,7 @@ int main (int argc, char* argv[])
         for (int i = 0; i < max_events; ++i)
         {
           ACE_DEBUG((LM_DEBUG, "+"));
-          SendEvent (i ACE_ENV_ARG_PARAMETER);
+          SendEvent (i);
         }
         ACE_DEBUG((LM_DEBUG, "\nSupplier sent %d events.\n", max_events));
 
@@ -232,12 +228,11 @@ int main (int argc, char* argv[])
       }
     }
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: ");
+    e._tao_print_exception ("Error: ");
     status = 1;
   }
-  ACE_ENDTRY;
 
   return status;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Destroy/main.cpp b/TAO/orbsvcs/tests/Notify/Destroy/main.cpp
index 014e77822a6..ba8579a41f5 100644
--- a/TAO/orbsvcs/tests/Notify/Destroy/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/Destroy/main.cpp
@@ -7,11 +7,11 @@
 int
 ACE_TMAIN (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize the base class.
       Notify_Test_Client client;
-      client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      client.init (argc, argv);
 
       CosNotifyChannelAdmin::EventChannelFactory_ptr ecf = client.notify_factory ();
 
@@ -23,12 +23,11 @@ ACE_TMAIN (int argc, char *argv[])
 
       ACE_DEBUG((LM_DEBUG, "ECF destroyed.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_TEXT("Error: \n"));
+      ex._tao_print_exception (ACE_TEXT("Error: \n"));
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp
index 45fcfbd5e78..67bfc2552e9 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp
@@ -41,8 +41,7 @@ Notify_Sequence_Push_Consumer::Notify_Sequence_Push_Consumer (
 
 void
 Notify_Sequence_Push_Consumer::_connect (
-                CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                ACE_ENV_ARG_DECL)
+                CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::SequencePushConsumer_var consumer =
@@ -51,12 +50,11 @@ Notify_Sequence_Push_Consumer::_connect (
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     consumer_admin->obtain_notification_push_supplier (
       CosNotifyChannelAdmin::SEQUENCE_EVENT,
-      proxy_id_
-      ACE_ENV_ARG_PARAMETER);
+      proxy_id_);
 
   this->proxy_ =
     CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow (
-      proxysupplier.in () ACE_ENV_ARG_PARAMETER);
+      proxysupplier.in ());
 
   CosNotification::QoSProperties properties (4);
   properties.length (4);
@@ -73,8 +71,7 @@ Notify_Sequence_Push_Consumer::_connect (
   properties[idx].value <<= BATCH_SIZE;
 
   this->proxy_->set_qos (properties);
-  this->proxy_->connect_sequence_push_consumer (consumer.in ()
-                                                ACE_ENV_ARG_PARAMETER);
+  this->proxy_->connect_sequence_push_consumer (consumer.in ());
 
   // give ownership to POA
   this->_remove_ref ();
@@ -83,8 +80,7 @@ Notify_Sequence_Push_Consumer::_connect (
 
 void
 Notify_Sequence_Push_Consumer::push_structured_events (
-                          const CosNotification::EventBatch& events
-                          ACE_ENV_ARG_DECL_NOT_USED)
+                          const CosNotification::EventBatch& events)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ++count_;
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.h
index e49cb83cab3..4c60891d68c 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.h
@@ -30,13 +30,11 @@ public:
                                  Notify_Test_Client& client,
                                  int sent);
 
-  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                ACE_ENV_ARG_DECL)
+  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
-  void push_structured_events (const CosNotification::EventBatch&
-                               ACE_ENV_ARG_DECL)
+  void push_structured_events (const CosNotification::EventBatch&)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   ACE_CString name_;
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp
index e119d4728d0..8db3752f153 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp
@@ -25,8 +25,7 @@ Notify_Structured_Push_Consumer::Notify_Structured_Push_Consumer (
 
 void
 Notify_Structured_Push_Consumer::_connect (
-  CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-  ACE_ENV_ARG_DECL)
+  CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::StructuredPushConsumer_var objref =
@@ -35,12 +34,11 @@ Notify_Structured_Push_Consumer::_connect (
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     consumer_admin->obtain_notification_push_supplier (
     CosNotifyChannelAdmin::STRUCTURED_EVENT,
-    proxy_id_
-    ACE_ENV_ARG_PARAMETER);
+    proxy_id_);
 
   this->proxy_ =
     CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (
-    proxysupplier.in () ACE_ENV_ARG_PARAMETER);
+    proxysupplier.in ());
 
   CosNotification::QoSProperties properties (2);
   properties.length (2);
@@ -50,8 +48,7 @@ Notify_Structured_Push_Consumer::_connect (
   properties[1].value <<= this->max_events_per_consumer_;
 
   this->proxy_->set_qos (properties);
-  this->proxy_->connect_structured_push_consumer (objref.in ()
-    ACE_ENV_ARG_PARAMETER);
+  this->proxy_->connect_structured_push_consumer (objref.in ());
 
   // give ownership to POA
   this->_remove_ref ();
@@ -61,7 +58,7 @@ Notify_Structured_Push_Consumer::_connect (
 void
 Notify_Structured_Push_Consumer::push_structured_event (
   const CosNotification::StructuredEvent& event
-  ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+ /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG((LM_DEBUG, "-"));
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h
index 6eac74346e4..347d20ba278 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h
@@ -31,13 +31,11 @@ public:
                         CORBA::Long max_events_per_consumer,
                         Notify_Test_Client& client);
 
-  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                ACE_ENV_ARG_DECL)
+  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
-  void push_structured_event (const CosNotification::StructuredEvent&
-                              ACE_ENV_ARG_DECL)
+  void push_structured_event (const CosNotification::StructuredEvent&)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   ACE_CString name_;
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
index 2da610b8bb1..2985122fb7a 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
@@ -97,14 +97,12 @@ Consumer_Client::parse_args (int argc, char *argv[])
 
 
 static CosNotifyChannelAdmin::ConsumerAdmin_ptr
-create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::ConsumerAdmin_var admin =
     ec->new_for_consumers (CosNotifyChannelAdmin::OR_OP,
-    adminid
-    ACE_ENV_ARG_PARAMETER);
+    adminid);
 
 
   return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ());
@@ -113,17 +111,16 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 
 static void
 create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
-                  Notify_Test_Client* client
-                  ACE_ENV_ARG_DECL)
+                  Notify_Test_Client* client)
 {
   // startup the consumer
   ACE_NEW_THROW_EX (consumer_1,
     Notify_Sequence_Push_Consumer ("consumer1", discard_policy, *client, sent),
     CORBA::NO_MEMORY ());
 
-  consumer_1->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
+  consumer_1->init (client->root_poa ());
 
-  consumer_1->_connect (admin ACE_ENV_ARG_PARAMETER);
+  consumer_1->_connect (admin);
 }
 
 // ******************************************************************
@@ -133,48 +130,47 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
 int main (int argc, char* argv[])
 {
   int status = 0;
-  ACE_TRY_NEW_ENV
+  try
   {
     Consumer_Client client;
 
-    status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+    status = client.init (argc, argv);
     ACE_UNUSED_ARG(status);
     ACE_ASSERT(status == 0);
 
     CosNotifyChannelAdmin::EventChannel_var ec =
-      client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER);
+      client.create_event_channel ("MyEventChannel", 1);
 
     CORBA::ORB_ptr orb = client.orb ();
     CORBA::Object_var object =
-      orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+      orb->string_to_object (ior);
 
-    sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+    sig_var sig = sig::_narrow (object.in ());
     ACE_ASSERT(! CORBA::is_nil (sig.in ()));
 
     CosNotifyChannelAdmin::ConsumerAdmin_var admin =
-      create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
+      create_consumeradmin (ec.in ());
     ACE_ASSERT(!CORBA::is_nil (admin.in ()));
 
-    create_consumers (admin.in (), &client ACE_ENV_ARG_PARAMETER);
+    create_consumers (admin.in (), &client);
 
     // Tell the supplier to go
     sig->go ();
 
     ACE_DEBUG((LM_DEBUG, "Consumer waiting for events...\n"));
 
-    client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
+    client.ORB_run( );
 
     ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
     consumer_1->disconnect();
 
     sig->done ();
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: ");
+    e._tao_print_exception ("Error: ");
     status = 1;
   }
-  ACE_ENDTRY;
 
   return status;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
index 3bb8d6146fc..af6a7107fc7 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
@@ -136,14 +136,12 @@ Supplier_Client::parse_args (int argc, char *argv[])
 
 
 static CosNotifyChannelAdmin::SupplierAdmin_ptr
-create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::SupplierAdmin_var admin =
     ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP,
-    adminid
-    ACE_ENV_ARG_PARAMETER);
+    adminid);
 
 
   return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ());
@@ -151,7 +149,7 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 
 
 static void
-SendBatch (int batch_id ACE_ENV_ARG_DECL)
+SendBatch (int batch_id)
 {
   CosNotification::EventBatch events;
   events.length(BATCH_SIZE);
@@ -180,22 +178,21 @@ SendBatch (int batch_id ACE_ENV_ARG_DECL)
 
     events[i] = event;
   }
-  supplier_1->send_events (events ACE_ENV_ARG_PARAMETER);
+  supplier_1->send_events (events);
 }
 
 static void
 create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
-                  PortableServer::POA_ptr poa
-                  ACE_ENV_ARG_DECL)
+                  PortableServer::POA_ptr poa)
 {
   // start up the supplier
   ACE_NEW_THROW_EX (supplier_1,
     TAO_Notify_Tests_SequencePushSupplier (),
     CORBA::NO_MEMORY ());
 
-  supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
+  supplier_1->init (poa);
 
-  supplier_1->connect (admin ACE_ENV_ARG_PARAMETER);
+  supplier_1->connect (admin);
 }
 
 
@@ -207,15 +204,15 @@ int main (int argc, char* argv[])
 {
   int status = 0;
   ACE_Auto_Ptr< sig_i > sig_impl;
-  ACE_TRY_NEW_ENV
+  try
   {
     Supplier_Client client;
-    status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+    status = client.init (argc, argv);
 
     if (status == 0)
     {
       CosNotifyChannelAdmin::EventChannel_var ec =
-        client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER);
+        client.create_event_channel ("MyEventChannel", 0);
 
       if (use_deadline_ordering)
       {
@@ -230,7 +227,7 @@ int main (int argc, char* argv[])
       sig_var sig = sig_impl->_this ();
 
       CORBA::String_var ior =
-        client.orb()->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
+        client.orb()->object_to_string (sig.in ());
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
@@ -242,9 +239,9 @@ int main (int argc, char* argv[])
       }
 
       CosNotifyChannelAdmin::SupplierAdmin_var admin =
-        create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
+        create_supplieradmin (ec.in ());
       ACE_ASSERT(!CORBA::is_nil (admin.in ()));
-      create_suppliers (admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER);
+      create_suppliers (admin.in (), client.root_poa ());
 
       sig_impl->wait_for_startup();
 
@@ -252,7 +249,7 @@ int main (int argc, char* argv[])
       for (int i = 0; i < num_events / BATCH_SIZE; ++i)
       {
         ACE_DEBUG((LM_DEBUG, "+"));
-        SendBatch (i ACE_ENV_ARG_PARAMETER);
+        SendBatch (i);
       }
       ACE_DEBUG((LM_DEBUG, "\nSupplier sent %d events.\n", num_events));
 
@@ -265,12 +262,11 @@ int main (int argc, char* argv[])
       ec->destroy();
     }
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: ");
+    e._tao_print_exception ("Error: ");
     status = 1;
   }
-  ACE_ENDTRY;
 
   return status;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
index ad1ca25b5d8..896fcb1b9b9 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
@@ -86,14 +86,12 @@ Consumer_Client::parse_args (int argc, char *argv[])
 
 
 static CosNotifyChannelAdmin::ConsumerAdmin_ptr
-create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::ConsumerAdmin_var admin =
     ec->new_for_consumers (CosNotifyChannelAdmin::OR_OP,
-                           adminid
-                           ACE_ENV_ARG_PARAMETER);
+                           adminid);
 
 
   return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ());
@@ -102,8 +100,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 
 static void
 create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
-                  Notify_Test_Client* client
-                  ACE_ENV_ARG_DECL)
+                  Notify_Test_Client* client)
 {
   ACE_DEBUG ((LM_DEBUG, "Max Events per Consumer = %d...\n", max_events_per_consumer));
 
@@ -115,9 +112,9 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
                                           max_events_per_consumer,
                                           *client),
                     CORBA::NO_MEMORY ());
-  consumer_1->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
+  consumer_1->init (client->root_poa ());
 
-  consumer_1->_connect (admin ACE_ENV_ARG_PARAMETER);
+  consumer_1->_connect (admin);
 }
 
 // ******************************************************************
@@ -127,22 +124,22 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
 int main (int argc, char* argv[])
 {
   int status = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
       Consumer_Client client;
 
-      status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      status = client.init (argc, argv);
 
       if (status == 0)
         {
           CosNotifyChannelAdmin::EventChannel_var ec =
-            client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER);
+            client.create_event_channel ("MyEventChannel", 1);
 
           CORBA::ORB_ptr orb = client.orb ();
           CORBA::Object_var object =
-                              orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+                              orb->string_to_object (ior);
 
-          sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+          sig_var sig = sig::_narrow (object.in ());
 
           if (CORBA::is_nil (sig.in ()))
             {
@@ -153,17 +150,17 @@ int main (int argc, char* argv[])
             }
 
           CosNotifyChannelAdmin::ConsumerAdmin_var admin =
-            create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
+            create_consumeradmin (ec.in ());
 
           if (!CORBA::is_nil (admin.in ()))
             {
-              create_consumers (admin.in (), &client ACE_ENV_ARG_PARAMETER);
+              create_consumers (admin.in (), &client);
               // Tell the supplier to go
               sig->go ();
 
               ACE_DEBUG((LM_DEBUG, "Consumer waiting for events...\n"));
 
-              client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
+              client.ORB_run( );
 
               ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
               consumer_1->disconnect();
@@ -172,12 +169,11 @@ int main (int argc, char* argv[])
             }
         }
     }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
     {
-      ACE_PRINT_EXCEPTION (e, "Error: ");
+      e._tao_print_exception ("Error: ");
       status = 1;
     }
-  ACE_ENDTRY;
 
   return status;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
index 59c61f643f6..12a7edb0518 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
@@ -127,14 +127,12 @@ Supplier_Client::parse_args (int argc, char *argv[])
 
 
 static CosNotifyChannelAdmin::SupplierAdmin_ptr
-create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::SupplierAdmin_var admin =
     ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP,
-    adminid
-    ACE_ENV_ARG_PARAMETER);
+    adminid);
 
 
   return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ());
@@ -142,7 +140,7 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 
 
 static void
-SendEvent (int id ACE_ENV_ARG_DECL)
+SendEvent (int id)
 {
   CosNotification::StructuredEvent event;
 
@@ -163,21 +161,20 @@ SendEvent (int id ACE_ENV_ARG_DECL)
     CORBA::string_dup (CosNotification::Timeout);
   event.header.variable_header[2].value <<= (TimeBase::TimeT) (id * 10000);
 
-  supplier_1->send_event (event ACE_ENV_ARG_PARAMETER);
+  supplier_1->send_event (event);
 }
 
 static void
 create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
-                  PortableServer::POA_ptr poa
-                  ACE_ENV_ARG_DECL)
+                  PortableServer::POA_ptr poa)
 {
   ACE_NEW_THROW_EX (supplier_1,
     TAO_Notify_Tests_StructuredPushSupplier (),
     CORBA::NO_MEMORY ());
 
-  supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
+  supplier_1->init (poa);
 
-  supplier_1->connect (admin ACE_ENV_ARG_PARAMETER);
+  supplier_1->connect (admin);
 }
 
 
@@ -189,15 +186,15 @@ int main (int argc, char* argv[])
 {
   int status = 0;
   ACE_Auto_Ptr< sig_i > sig_impl;
-  ACE_TRY_NEW_ENV
+  try
   {
     Supplier_Client client;
-    status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+    status = client.init (argc, argv);
 
     if (status == 0)
     {
       CosNotifyChannelAdmin::EventChannel_var ec =
-        client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER);
+        client.create_event_channel ("MyEventChannel", 0);
 
       if (use_deadline_ordering)
       {
@@ -215,7 +212,7 @@ int main (int argc, char* argv[])
       if (ior_output_file != 0)
       {
         CORBA::String_var ior =
-          client.orb ()->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
+          client.orb ()->object_to_string (sig.in ());
 
         FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
         ACE_ASSERT (output_file != 0);
@@ -224,10 +221,10 @@ int main (int argc, char* argv[])
       }
 
       CosNotifyChannelAdmin::SupplierAdmin_var admin =
-        create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
+        create_supplieradmin (ec.in ());
       ACE_ASSERT(!CORBA::is_nil (admin.in ()));
 
-      create_suppliers (admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER);
+      create_suppliers (admin.in (), client.root_poa ());
 
       sig_impl->wait_for_startup();
 
@@ -235,7 +232,7 @@ int main (int argc, char* argv[])
       for (int i = 0; i < num_events; ++i)
       {
         ACE_DEBUG((LM_DEBUG, "+"));
-        SendEvent (i + 1 ACE_ENV_ARG_PARAMETER);
+        SendEvent (i + 1);
       }
       ACE_DEBUG((LM_DEBUG, "\nSupplier sent %d events.\n", num_events));
 
@@ -248,12 +245,11 @@ int main (int argc, char* argv[])
       ec->destroy();
     }
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: ");
+    e._tao_print_exception ("Error: ");
     status = 1;
   }
-  ACE_ENDTRY;
 
   return status;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Driver/main.cpp b/TAO/orbsvcs/tests/Notify/Driver/main.cpp
index 81ded8db860..9d3492323f9 100644
--- a/TAO/orbsvcs/tests/Notify/Driver/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/Driver/main.cpp
@@ -8,9 +8,9 @@ ACE_TMAIN (int argc, char *argv[])
 {
   TAO_Notify_Tests_Driver driver;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      int result = driver.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      int result = driver.init (argc, argv);
 
       if (result == -1)
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -19,12 +19,11 @@ ACE_TMAIN (int argc, char *argv[])
 
       driver.run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_TEXT("Error: \n"));
+      ex._tao_print_exception (ACE_TEXT("Error: \n"));
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp
index ce7921b2522..bf73bb28e86 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp
@@ -19,7 +19,7 @@ Notify_Structured_Push_Consumer::Notify_Structured_Push_Consumer (
 void
 Notify_Structured_Push_Consumer::push_structured_event (
   const CosNotification::StructuredEvent& /*event*/
-  ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+ /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG((LM_DEBUG, "-"));
@@ -30,7 +30,7 @@ Notify_Structured_Push_Consumer::push_structured_event (
   {
     ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: too many events received.\n")));
   }
- 
+
   if (this->count_ >= this->expected_)
   {
     this->client_.consumer_done (this);
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.h
index bc4f2933b90..99c00e0bb5c 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.h
@@ -30,8 +30,7 @@ public:
                         unsigned int expected,
                         Notify_Test_Client& client);
 protected:
-  void push_structured_event (const CosNotification::StructuredEvent&
-                              ACE_ENV_ARG_DECL)
+  void push_structured_event (const CosNotification::StructuredEvent&)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   ACE_CString name_;
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
index 28a4cc23c25..2c7065e81b2 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
@@ -71,14 +71,12 @@ Consumer_Client::parse_args (int argc, char *argv[])
 
 
 static CosNotifyChannelAdmin::ConsumerAdmin_ptr
-create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::ConsumerAdmin_var admin =
     ec->new_for_consumers (CosNotifyChannelAdmin::AND_OP,
-    adminid
-    ACE_ENV_ARG_PARAMETER);
+    adminid);
 
 
   return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ());
@@ -87,8 +85,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 
 static void
 create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
-                  Notify_Test_Client* client
-                  ACE_ENV_ARG_DECL)
+                  Notify_Test_Client* client)
 {
   for (unsigned int i = 0; i < consumer_count; i++)
   {
@@ -102,9 +99,9 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
       *client),
       CORBA::NO_MEMORY ());
 
-    consumers[ i ]->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
+    consumers[ i ]->init (client->root_poa ());
 
-    consumers[ i ]->connect (admin ACE_ENV_ARG_PARAMETER);
+    consumers[ i ]->connect (admin);
   }
 }
 
@@ -124,21 +121,21 @@ disconnect_consumers (void)
 int main (int argc, char* argv[])
 {
   int status = 0;
-  ACE_TRY_NEW_ENV
+  try
   {
     Consumer_Client client;
 
-    status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+    status = client.init (argc, argv);
 
     if (status == 0)
     {
       CosNotifyChannelAdmin::EventChannel_var ec =
-        client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER);
+        client.create_event_channel ("MyEventChannel", 1);
 
       CORBA::Object_var object =
-        client.orb ()->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+        client.orb ()->string_to_object (ior);
 
-      sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+      sig_var sig = sig::_narrow (object.in ());
 
       if (CORBA::is_nil (sig.in ()))
       {
@@ -149,16 +146,16 @@ int main (int argc, char* argv[])
       }
 
       CosNotifyChannelAdmin::ConsumerAdmin_var admin =
-        create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
+        create_consumeradmin (ec.in ());
 
       if (!CORBA::is_nil (admin.in ()))
       {
-        create_consumers (admin.in (), &client ACE_ENV_ARG_PARAMETER);
+        create_consumers (admin.in (), &client);
 
         // Tell the supplier to go
         sig->go ();
 
-        client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
+        client.ORB_run( );
 
         disconnect_consumers();
 
@@ -167,12 +164,11 @@ int main (int argc, char* argv[])
       }
     }
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: ");
+    e._tao_print_exception ("Error: ");
     status = 1;
   }
-  ACE_ENDTRY;
 
   return status;
 }
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
index 9632f3db7bb..c70f1d160cf 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
@@ -121,14 +121,12 @@ Consumer_Client::parse_args (int argc, char *argv[])
 
 
 static CosNotifyChannelAdmin::SupplierAdmin_ptr
-create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::SupplierAdmin_var admin =
     ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP,
-    adminid
-    ACE_ENV_ARG_PARAMETER);
+    adminid);
 
 
   return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ());
@@ -136,7 +134,7 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 
 
 static void
-SendEvent (int id ACE_ENV_ARG_DECL_NOT_USED)
+SendEvent (int id)
 {
   ACE_UNUSED_ARG(id);
   CosNotification::StructuredEvent event;
@@ -145,24 +143,22 @@ SendEvent (int id ACE_ENV_ARG_DECL_NOT_USED)
   event.header.fixed_header.event_type.type_name = CORBA::string_dup ("b");
   event.header.fixed_header.event_name = CORBA::string_dup ("test");
 
-  ACE_TRY_NEW_ENV
+  try
   {
     for (unsigned int i = 0; i < supplier_count; i++)
     {
-      suppliers[i]->send_event (event ACE_ENV_ARG_PARAMETER);
+      suppliers[i]->send_event (event);
     }
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: ");
+    e._tao_print_exception ("Error: ");
   }
-  ACE_ENDTRY;
 }
 
 static void
 create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
-                  Notify_Test_Client* client
-                  ACE_ENV_ARG_DECL)
+                  Notify_Test_Client* client)
 {
   for (unsigned int i = 0; i < supplier_count; i++)
   {
@@ -170,9 +166,9 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
       TAO_Notify_Tests_StructuredPushSupplier (),
       CORBA::NO_MEMORY ());
 
-    suppliers[i]->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
+    suppliers[i]->init (client->root_poa ());
 
-    suppliers[i]->connect (admin ACE_ENV_ARG_PARAMETER);
+    suppliers[i]->connect (admin);
   }
 }
 
@@ -192,15 +188,15 @@ disconnect_suppliers (void)
 int main (int argc, char* argv[])
 {
   ACE_Auto_Ptr< sig_i > sig_impl;
-  ACE_TRY_NEW_ENV
+  try
   {
     Consumer_Client client;
-    int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+    int status = client.init (argc, argv);
     ACE_UNUSED_ARG(status);
     ACE_ASSERT(status == 0);
 
     CosNotifyChannelAdmin::EventChannel_var ec =
-      client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER);
+      client.create_event_channel ("MyEventChannel", 0);
 
     CORBA::ORB_ptr orb = client.orb ();
 
@@ -208,7 +204,7 @@ int main (int argc, char* argv[])
     sig_var sig = sig_impl->_this ();
 
     CORBA::String_var ior =
-      orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
+      orb->object_to_string (sig.in ());
 
     if (ior_output_file != 0)
     {
@@ -224,9 +220,9 @@ int main (int argc, char* argv[])
     }
 
     CosNotifyChannelAdmin::SupplierAdmin_var admin =
-      create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
+      create_supplieradmin (ec.in ());
     ACE_ASSERT(!CORBA::is_nil (admin.in ()));
-    create_suppliers (admin.in (), &client ACE_ENV_ARG_PARAMETER);
+    create_suppliers (admin.in (), &client);
 
     sig_impl->wait_for_startup();
 
@@ -234,7 +230,7 @@ int main (int argc, char* argv[])
     for (int i = 0; i < event_count; ++i)
     {
       ACE_DEBUG((LM_DEBUG, "+"));
-      SendEvent (i ACE_ENV_ARG_PARAMETER);
+      SendEvent (i);
     }
     ACE_DEBUG((LM_DEBUG, "\nEach Supplier sent %d events.\n", event_count));
 
@@ -248,11 +244,10 @@ int main (int argc, char* argv[])
 
     return 0;
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: ");
+    e._tao_print_exception ("Error: ");
   }
-  ACE_ENDTRY;
 
   return 1;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp
index a03e57d5a89..b7e195e7b23 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp
@@ -29,8 +29,7 @@ Notify_Sequence_Push_Consumer::Notify_Sequence_Push_Consumer (
 
 void
 Notify_Sequence_Push_Consumer::_connect (
-  CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-  ACE_ENV_ARG_DECL)
+  CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::SequencePushConsumer_var objref =
@@ -39,12 +38,11 @@ Notify_Sequence_Push_Consumer::_connect (
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     consumer_admin->obtain_notification_push_supplier (
     CosNotifyChannelAdmin::SEQUENCE_EVENT,
-    proxy_id_
-    ACE_ENV_ARG_PARAMETER);
+    proxy_id_);
 
   this->proxy_ =
     CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow (
-    proxysupplier.in () ACE_ENV_ARG_PARAMETER);
+    proxysupplier.in ());
 
   CosNotification::QoSProperties properties (3);
   properties.length (3);
@@ -63,7 +61,7 @@ Notify_Sequence_Push_Consumer::_connect (
   }
 
   this->proxy_->set_qos (properties);
-  this->proxy_->connect_sequence_push_consumer (objref.in () ACE_ENV_ARG_PARAMETER);
+  this->proxy_->connect_sequence_push_consumer (objref.in ());
 
   // give ownership to POA
   this->_remove_ref ();
@@ -73,7 +71,7 @@ Notify_Sequence_Push_Consumer::_connect (
 void
 Notify_Sequence_Push_Consumer::push_structured_events (
   const CosNotification::EventBatch& events
-  ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+ /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (count_ == 0)
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h
index a7fe36f0288..5d22ffdc2a2 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h
@@ -31,13 +31,11 @@ public:
                                  int expected_count,
                                  Notify_Test_Client& client);
 
-  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                ACE_ENV_ARG_DECL)
+  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
-  void push_structured_events (const CosNotification::EventBatch&
-                               ACE_ENV_ARG_DECL)
+  void push_structured_events (const CosNotification::EventBatch&)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   ACE_CString name_;
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp
index 59e0dc6c578..28d24e55e39 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp
@@ -30,8 +30,7 @@ Notify_Structured_Push_Consumer::Notify_Structured_Push_Consumer (
 
 void
 Notify_Structured_Push_Consumer::_connect (
-                CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                ACE_ENV_ARG_DECL)
+                CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::StructuredPushConsumer_var objref =
@@ -40,12 +39,11 @@ Notify_Structured_Push_Consumer::_connect (
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     consumer_admin->obtain_notification_push_supplier (
       CosNotifyChannelAdmin::STRUCTURED_EVENT,
-      proxy_id_
-      ACE_ENV_ARG_PARAMETER);
+      proxy_id_);
 
   this->proxy_ =
     CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (
-      proxysupplier.in () ACE_ENV_ARG_PARAMETER);
+      proxysupplier.in ());
 
   if (use_ordering_)
   {
@@ -57,8 +55,7 @@ Notify_Structured_Push_Consumer::_connect (
     this->proxy_->set_qos (properties);
   }
 
-  this->proxy_->connect_structured_push_consumer (objref.in ()
-                                                           ACE_ENV_ARG_PARAMETER);
+  this->proxy_->connect_structured_push_consumer (objref.in ());
 
   // give ownership to POA
   this->_remove_ref ();
@@ -68,7 +65,7 @@ Notify_Structured_Push_Consumer::_connect (
 void
 Notify_Structured_Push_Consumer::push_structured_event (
                           const CosNotification::StructuredEvent& event
-                          ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+ /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG((LM_DEBUG, "-"));
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h
index 01b5b69c922..fb764f049cf 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h
@@ -32,13 +32,11 @@ public:
                         int expected,
                         Notify_Test_Client& client);
 
-  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                ACE_ENV_ARG_DECL)
+  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
-  void push_structured_event (const CosNotification::StructuredEvent&
-                              ACE_ENV_ARG_DECL)
+  void push_structured_event (const CosNotification::StructuredEvent&)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   ACE_CString name_;
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
index 425c1c17145..03626895a55 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
@@ -92,14 +92,12 @@ Consumer_Client::parse_args (int argc, char *argv[])
 
 
 static CosNotifyChannelAdmin::ConsumerAdmin_ptr
-create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::ConsumerAdmin_var admin =
     ec->new_for_consumers (CosNotifyChannelAdmin::OR_OP,
-    adminid
-    ACE_ENV_ARG_PARAMETER);
+    adminid);
 
 
   return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ());
@@ -108,8 +106,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 
 static void
 create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
-                  Notify_Test_Client* client
-                  ACE_ENV_ARG_DECL)
+                  Notify_Test_Client* client)
 {
   ACE_NEW_THROW_EX (consumer_1,
     Notify_Sequence_Push_Consumer ("consumer1",
@@ -119,41 +116,41 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
     *client),
     CORBA::NO_MEMORY ());
 
-  consumer_1->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
+  consumer_1->init (client->root_poa ());
 
-  consumer_1->_connect (admin ACE_ENV_ARG_PARAMETER);
+  consumer_1->_connect (admin);
 }
 
 int main (int argc, char* argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
   {
     Consumer_Client client;
 
-    int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+    int status = client.init (argc, argv);
     ACE_UNUSED_ARG(status);
     ACE_ASSERT(status == 0);
 
     CosNotifyChannelAdmin::EventChannel_var ec =
-      client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER);
+      client.create_event_channel ("MyEventChannel", 1);
 
     CORBA::ORB_ptr orb = client.orb ();
     CORBA::Object_var object =
-      orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+      orb->string_to_object (ior);
 
-    sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+    sig_var sig = sig::_narrow (object.in ());
 
     ACE_ASSERT(! CORBA::is_nil (sig.in ()));
 
     CosNotifyChannelAdmin::ConsumerAdmin_var admin =
-      create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
+      create_consumeradmin (ec.in ());
 
     ACE_ASSERT(!CORBA::is_nil (admin.in ()));
-    create_consumers (admin.in (), &client ACE_ENV_ARG_PARAMETER);
+    create_consumers (admin.in (), &client);
 
     sig->go ();
 
-    client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
+    client.ORB_run( );
 
     ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
     consumer_1->disconnect();
@@ -162,11 +159,10 @@ int main (int argc, char* argv[])
 
     return 0;
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: ");
+    e._tao_print_exception ("Error: ");
   }
-  ACE_ENDTRY;
 
   return 1;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
index 35cf3d385a5..5403daa0e41 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
@@ -132,14 +132,12 @@ Supplier_Client::parse_args (int argc, char *argv[])
 }
 
 static CosNotifyChannelAdmin::SupplierAdmin_ptr
-create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::SupplierAdmin_var admin =
     ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP,
-    adminid
-    ACE_ENV_ARG_PARAMETER);
+    adminid);
 
 
   return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ());
@@ -147,7 +145,7 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 
 
 static void
-SendBatch (int batch_id ACE_ENV_ARG_DECL)
+SendBatch (int batch_id)
 {
   CosNotification::EventBatch events;
   events.length(BATCH_SIZE);
@@ -174,21 +172,20 @@ SendBatch (int batch_id ACE_ENV_ARG_DECL)
 
     events[i] = event;
   }
-  supplier_1->send_events (events ACE_ENV_ARG_PARAMETER);
+  supplier_1->send_events (events);
 }
 
 static void
 create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
-                  PortableServer::POA_ptr poa
-                  ACE_ENV_ARG_DECL)
+                  PortableServer::POA_ptr poa)
 {
   ACE_NEW_THROW_EX (supplier_1,
     TAO_Notify_Tests_SequencePushSupplier (),
     CORBA::NO_MEMORY ());
 
-  supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
+  supplier_1->init (poa);
 
-  supplier_1->connect (admin ACE_ENV_ARG_PARAMETER);
+  supplier_1->connect (admin);
 }
 
 
@@ -199,21 +196,21 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
 int main (int argc, char* argv[])
 {
   ACE_Auto_Ptr< sig_i > sig_impl;
-  ACE_TRY_NEW_ENV
+  try
   {
     Supplier_Client client;
-    int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+    int status = client.init (argc, argv);
     ACE_UNUSED_ARG(status);
     ACE_ASSERT(status == 0);
 
     CosNotifyChannelAdmin::EventChannel_var ec =
-      client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER);
+      client.create_event_channel ("MyEventChannel", 0);
 
     CosNotification::QoSProperties qos (1);
     qos.length (1);
     qos[0].name = CORBA::string_dup (CosNotification::OrderPolicy);
     qos[0].value <<= order_policy;
-    ec->set_qos (qos ACE_ENV_ARG_PARAMETER);
+    ec->set_qos (qos);
 
     CORBA::ORB_ptr orb = client.orb ();
 
@@ -221,7 +218,7 @@ int main (int argc, char* argv[])
     sig_var sig = sig_impl->_this ();
 
     CORBA::String_var ior =
-      orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
+      orb->object_to_string (sig.in ());
 
     if (ior_output_file != 0)
     {
@@ -237,9 +234,9 @@ int main (int argc, char* argv[])
     }
 
     CosNotifyChannelAdmin::SupplierAdmin_var admin =
-      create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
+      create_supplieradmin (ec.in ());
     ACE_ASSERT(!CORBA::is_nil (admin.in ()));
-    create_suppliers (admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER);
+    create_suppliers (admin.in (), client.root_poa ());
 
     sig_impl->wait_for_startup();
 
@@ -247,7 +244,7 @@ int main (int argc, char* argv[])
     for (int i = 0; i < num_events / BATCH_SIZE; ++i)
     {
       ACE_DEBUG((LM_DEBUG, "+"));
-      SendBatch (i ACE_ENV_ARG_PARAMETER);
+      SendBatch (i);
     }
     ACE_DEBUG((LM_DEBUG, "\nSupplier sent %d events.\n", num_events));
 
@@ -261,11 +258,10 @@ int main (int argc, char* argv[])
 
     return 0;
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: ");
+    e._tao_print_exception ("Error: ");
   }
-  ACE_ENDTRY;
 
   return 1;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
index 73a8b9e7d8c..4164884e289 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
@@ -88,14 +88,12 @@ Consumer_Client::parse_args (int argc, char *argv[])
 }
 
 static CosNotifyChannelAdmin::ConsumerAdmin_ptr
-create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::ConsumerAdmin_var admin =
     ec->new_for_consumers (CosNotifyChannelAdmin::OR_OP,
-    adminid
-    ACE_ENV_ARG_PARAMETER);
+    adminid);
 
 
   return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ());
@@ -103,8 +101,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 
 static void
 create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
-                  Notify_Test_Client* client
-                  ACE_ENV_ARG_DECL)
+                  Notify_Test_Client* client)
 {
   // startup the first consumer
   ACE_NEW_THROW_EX (consumer_1,
@@ -114,42 +111,42 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
     expected,
     *client),
     CORBA::NO_MEMORY ());
-  consumer_1->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
+  consumer_1->init (client->root_poa ());
 
-  consumer_1->_connect (admin ACE_ENV_ARG_PARAMETER);
+  consumer_1->_connect (admin);
 }
 
 int main (int argc, char* argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
   {
     Consumer_Client client;
 
-    int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+    int status = client.init (argc, argv);
     ACE_UNUSED_ARG(status);
     ACE_ASSERT(status == 0);
 
     CosNotifyChannelAdmin::EventChannel_var ec =
-      client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER);
+      client.create_event_channel ("MyEventChannel", 1);
 
     CORBA::ORB_ptr orb = client.orb ();
     CORBA::Object_var object =
-      orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+      orb->string_to_object (ior);
 
-    sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+    sig_var sig = sig::_narrow (object.in ());
 
     ACE_ASSERT(! CORBA::is_nil (sig.in ()));
 
     CosNotifyChannelAdmin::ConsumerAdmin_var admin =
-      create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
+      create_consumeradmin (ec.in ());
 
     ACE_ASSERT(!CORBA::is_nil (admin.in ()));
 
-    create_consumers (admin.in (), &client ACE_ENV_ARG_PARAMETER);
+    create_consumers (admin.in (), &client);
 
     sig->go ();
 
-    client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
+    client.ORB_run( );
 
     ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
     consumer_1->disconnect();
@@ -158,11 +155,10 @@ int main (int argc, char* argv[])
 
     return 0;
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: ");
+    e._tao_print_exception ("Error: ");
   }
-  ACE_ENDTRY;
 
   return 1;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
index 9920f3ca97b..ceafea4d1a5 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
@@ -134,14 +134,12 @@ Supplier_Client::parse_args (int argc, char *argv[])
 
 
 static CosNotifyChannelAdmin::SupplierAdmin_ptr
-create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::SupplierAdmin_var admin =
     ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP,
-    adminid
-    ACE_ENV_ARG_PARAMETER);
+    adminid);
 
 
   return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ());
@@ -149,7 +147,7 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 
 
 static void
-SendEvent (int id ACE_ENV_ARG_DECL_NOT_USED)
+SendEvent (int id)
 {
   CosNotification::StructuredEvent event;
 
@@ -167,50 +165,48 @@ SendEvent (int id ACE_ENV_ARG_DECL_NOT_USED)
     CORBA::string_dup (CosNotification::Timeout);
   event.header.variable_header[2].value <<= (TimeBase::TimeT) (num_events - id);
 
-  ACE_TRY_NEW_ENV
+  try
   {
-    supplier_1->send_event (event ACE_ENV_ARG_PARAMETER);
+    supplier_1->send_event (event);
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: ");
+    e._tao_print_exception ("Error: ");
   }
-  ACE_ENDTRY;
 }
 
 static void
 create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
-                  PortableServer::POA_ptr poa
-                  ACE_ENV_ARG_DECL)
+                  PortableServer::POA_ptr poa)
 {
   // startup the supplier
   ACE_NEW_THROW_EX (supplier_1,
     TAO_Notify_Tests_StructuredPushSupplier (),
     CORBA::NO_MEMORY ());
 
-  supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
+  supplier_1->init (poa);
 
-  supplier_1->connect (admin ACE_ENV_ARG_PARAMETER);
+  supplier_1->connect (admin);
 }
 
 int main (int argc, char* argv[])
 {
   ACE_Auto_Ptr< sig_i > sig_impl;
-  ACE_TRY_NEW_ENV
+  try
   {
     Supplier_Client client;
-    int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+    int status = client.init (argc, argv);
     ACE_UNUSED_ARG(status);
     ACE_ASSERT(status == 0);
 
     CosNotifyChannelAdmin::EventChannel_var ec =
-      client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER);
+      client.create_event_channel ("MyEventChannel", 0);
 
     CosNotification::QoSProperties qos (1);
     qos.length (1);
     qos[0].name = CORBA::string_dup (CosNotification::OrderPolicy);
     qos[0].value <<= order_policy;
-    ec->set_qos (qos ACE_ENV_ARG_PARAMETER);
+    ec->set_qos (qos);
 
     CORBA::ORB_ptr orb = client.orb ();
 
@@ -218,7 +214,7 @@ int main (int argc, char* argv[])
     sig_var sig = sig_impl->_this ();
 
     CORBA::String_var ior =
-      orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
+      orb->object_to_string (sig.in ());
 
     if (ior_output_file != 0)
     {
@@ -234,9 +230,9 @@ int main (int argc, char* argv[])
     }
 
     CosNotifyChannelAdmin::SupplierAdmin_var admin =
-      create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
+      create_supplieradmin (ec.in ());
     ACE_ASSERT(!CORBA::is_nil (admin.in ()));
-    create_suppliers (admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER);
+    create_suppliers (admin.in (), client.root_poa ());
 
     sig_impl->wait_for_startup();
 
@@ -244,7 +240,7 @@ int main (int argc, char* argv[])
     for (int i = 0; i < num_events; ++i)
     {
       ACE_DEBUG((LM_DEBUG, "+"));
-      SendEvent (i ACE_ENV_ARG_PARAMETER);
+      SendEvent (i);
     }
     ACE_DEBUG((LM_DEBUG, "\nSupplier sent %d events.\n", num_events));
 
@@ -258,11 +254,10 @@ int main (int argc, char* argv[])
 
     return 0;
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: ");
+    e._tao_print_exception ("Error: ");
   }
-  ACE_ENDTRY;
 
   return 1;
 }
diff --git a/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Saver.cpp b/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Saver.cpp
index db1cbb75260..9e23199a111 100644
--- a/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Saver.cpp
+++ b/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Saver.cpp
@@ -13,8 +13,7 @@ bool
 Test_Saver::begin_object(CORBA::Long id,
       const ACE_CString &type,
       const TAO_Notify::NVPList& attrs,
-      bool changed
-      ACE_ENV_ARG_DECL_NOT_USED)
+      bool changed)
 {
   ACE_OS::fprintf (stdout, "Test_Saver::begin_object type=\"%s\""
                    "  id=%d changed=\"%d\"", type.c_str(), id, changed);
@@ -29,7 +28,7 @@ Test_Saver::begin_object(CORBA::Long id,
 
 void
 Test_Saver::end_object (CORBA::Long id,
-      const ACE_CString &type ACE_ENV_ARG_DECL_NOT_USED)
+      const ACE_CString &type)
 {
   ACE_OS::fprintf (stdout, "Test_Saver::end_object type=\"%s\" id=%d\n",
                    type.c_str(), id);
diff --git a/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Saver.h b/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Saver.h
index 287832cf336..f7c13b36c47 100644
--- a/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Saver.h
+++ b/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Saver.h
@@ -26,12 +26,10 @@ public:
    virtual bool begin_object (CORBA::Long id,
       const ACE_CString &type,
       const TAO_Notify::NVPList& attrs,
-      bool changed
-      ACE_ENV_ARG_DECL);
+      bool changed);
 
     virtual void end_object (CORBA::Long id,
-      const ACE_CString &type
-      ACE_ENV_ARG_DECL);
+      const ACE_CString &type);
 };
 
 
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp
index 1f1757b255d..cdb315860a1 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp
@@ -27,7 +27,7 @@ TAO_Notify_Tests_RT_Application_Command::handle_init (void)
 
   TAO_Notify_Tests_RT_Priority_Mapping* mapping = new TAO_Notify_Tests_RT_Priority_Mapping ();
 
-  mapping->init (orb.in () ACE_ENV_ARG_PARAMETER);
+  mapping->init (orb.in ());
 
   LOOKUP_MANAGER->_register (mapping);
 }
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
index e6595fc4225..74766c7287b 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
@@ -188,12 +188,10 @@ TAO_Notify_Tests_RT_POA_Command::execute_i (void)
 
       // Resolve RTORB
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RTORB"
-                                      ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RTORB");
 
       RTCORBA::RTORB_var rt_orb =
-        RTCORBA::RTORB::_narrow (object.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+        RTCORBA::RTORB::_narrow (object.in ());
 
       // Resolve parent poa.
       PortableServer::POA_var parent_poa;
@@ -201,7 +199,7 @@ TAO_Notify_Tests_RT_POA_Command::execute_i (void)
       LOOKUP_MANAGER->resolve (parent_poa);
 
       // Create the POA.
-      this->create (rt_orb.in (), parent_poa.in () ACE_ENV_ARG_PARAMETER);
+      this->create (rt_orb.in (), parent_poa.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Created RT POA %s\n", this->POA_name_.c_str ()));
     }
@@ -209,16 +207,16 @@ TAO_Notify_Tests_RT_POA_Command::execute_i (void)
     {
       PortableServer::POA_var poa;
 
-      LOOKUP_MANAGER->resolve (poa, this->POA_name_.c_str () ACE_ENV_ARG_PARAMETER);
+      LOOKUP_MANAGER->resolve (poa, this->POA_name_.c_str ());
 
-      poa->destroy (1,0 ACE_ENV_ARG_PARAMETER);
+      poa->destroy (1,0);
 
       ACE_DEBUG ((LM_DEBUG, "Destroyed RT POA %s\n", this->POA_name_.c_str ()));
     }
 }
 
 void
-TAO_Notify_Tests_RT_POA_Command::create (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_RT_POA_Command::create (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_poa)
 {
   /*
     lanes bands priomodel
@@ -248,8 +246,7 @@ TAO_Notify_Tests_RT_POA_Command::create (RTCORBA::RTORB_ptr rt_orb, PortableServ
   // Create a priority model policy.
   priority_model_policy =
     rt_orb->create_priority_model_policy (priority_model_,
-                                          server_priority_
-                                          ACE_ENV_ARG_PARAMETER);
+                                          server_priority_);
 
   if (lanes_.length () != 0)
     {
@@ -269,14 +266,12 @@ TAO_Notify_Tests_RT_POA_Command::create (RTCORBA::RTORB_ptr rt_orb, PortableServ
                                               allow_borrowing,
                                               allow_request_buffering,
                                               max_buffered_requests,
-                                              max_request_buffer_size
-                                              ACE_ENV_ARG_PARAMETER);
+                                              max_request_buffer_size);
 
 
       // Create a thread-pool policy.
       lanes_policy =
-        rt_orb->create_threadpool_policy (threadpool_id
-                                          ACE_ENV_ARG_PARAMETER);
+        rt_orb->create_threadpool_policy (threadpool_id);
 
     }
   else if (thread_pool_static_threads_ > 0)
@@ -297,26 +292,23 @@ TAO_Notify_Tests_RT_POA_Command::create (RTCORBA::RTORB_ptr rt_orb, PortableServ
                                  default_priority,
                                  allow_request_buffering,
                                  max_buffered_requests,
-                                 max_request_buffer_size
-                                 ACE_ENV_ARG_PARAMETER);
+                                 max_request_buffer_size);
 
       thread_pool_policy =
-                rt_orb->create_threadpool_policy (threadpool_id
-                                                  ACE_ENV_ARG_PARAMETER);
+                rt_orb->create_threadpool_policy (threadpool_id);
     }
 
   if (bands_.length () != 0)
     {
       // Create a bands policy.
       bands_policy =
-        rt_orb->create_priority_banded_connection_policy (this->bands_
-                                                          ACE_ENV_ARG_PARAMETER);
+        rt_orb->create_priority_banded_connection_policy (this->bands_);
     }
 
   CORBA::PolicyList poa_policy_list;
 
   CORBA::Policy_var activation_policy =
-    parent_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER);
+    parent_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION);
 
   if (lanes_.length () == 0 && thread_pool_static_threads_ == 0 && bands_.length () == 0)
     {
@@ -371,6 +363,5 @@ TAO_Notify_Tests_RT_POA_Command::create (RTCORBA::RTORB_ptr rt_orb, PortableServ
 
   parent_poa->create_POA (POA_name_.c_str (),
                           poa_manager.in (),
-                          poa_policy_list
-                          ACE_ENV_ARG_PARAMETER);
+                          poa_policy_list);
 }
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h
index bdebc7806cc..cf1ae6b5c80 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h
@@ -53,7 +53,7 @@ public:
 
 protected:
   /// Create the POA with the params parsed.
-  void create (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL);
+  void create (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_poa);
 
 #ifdef HPUX_11
    // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp
index 4d81fcdc42f..7b9cf2c5d67 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp
@@ -11,14 +11,12 @@ TAO_Notify_Tests_RT_Priority_Mapping::~TAO_Notify_Tests_RT_Priority_Mapping (voi
 }
 
 void
-TAO_Notify_Tests_RT_Priority_Mapping::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_RT_Priority_Mapping::init (CORBA::ORB_ptr orb)
 {
-  CORBA::Object_var object = orb->resolve_initial_references ("PriorityMappingManager"
-                                                              ACE_ENV_ARG_PARAMETER);
+  CORBA::Object_var object = orb->resolve_initial_references ("PriorityMappingManager");
 
   RTCORBA::PriorityMappingManager_var mapping_manager =
-    RTCORBA::PriorityMappingManager::_narrow (object.in ()
-                                              ACE_ENV_ARG_PARAMETER);
+    RTCORBA::PriorityMappingManager::_narrow (object.in ());
 
   this->priority_mapping_ = mapping_manager->mapping ();
 }
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.h b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.h
index 0e8d308e656..5d40993f662 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.h
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.h
@@ -35,7 +35,7 @@ public:
   virtual ~TAO_Notify_Tests_RT_Priority_Mapping (void);
 
   /// Init the Mapping manager.
-  void init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL);
+  void init (CORBA::ORB_ptr orb);
 
   virtual CORBA::Boolean
       to_native (CORBA::Short corba_priority,
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
index 36199f3cbd9..0212a144027 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
@@ -68,7 +68,6 @@ void
 StructuredPushConsumer_i::offer_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -135,8 +134,7 @@ StructuredPushConsumer_i::check_serial_number (CORBA::ULong seq)
 
 void
 StructuredPushConsumer_i::push_structured_event (
-        const CosNotification::StructuredEvent & notification
-        ACE_ENV_ARG_DECL)
+        const CosNotification::StructuredEvent & notification)
       ACE_THROW_SPEC ((CORBA::SystemException,
         CosEventComm::Disconnected))
 {
@@ -158,7 +156,7 @@ StructuredPushConsumer_i::push_structured_event (
       ACE_TEXT ("(%P|%t) Structured Consumer failing at event # %d.\n"),
       static_cast<int>(this->received_)
       ));
-    ACE_THROW (CORBA::UNKNOWN());
+    throw CORBA::UNKNOWN();
   }
   if (notification.filterable_data.length () > 0)
   {
@@ -228,7 +226,6 @@ StructuredPushConsumer_i::push_structured_event (
 
 void
 StructuredPushConsumer_i::disconnect_structured_push_consumer (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -290,7 +287,6 @@ void
 SequencePushConsumer_i::offer_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -357,7 +353,6 @@ SequencePushConsumer_i::check_serial_number (CORBA::ULong seq)
 void
 SequencePushConsumer_i::push_structured_events (
       const CosNotification::EventBatch & notifications
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
       CosEventComm::Disconnected))
@@ -391,7 +386,7 @@ SequencePushConsumer_i::push_structured_events (
         static_cast<int>(this->received_),
         static_cast<int>(nevent + 1)
         ));
-      ACE_THROW (CORBA::UNKNOWN());
+      throw CORBA::UNKNOWN();
     }
     const CosNotification::StructuredEvent & notification = notifications[nevent];
     if (notification.filterable_data.length () > 0)
@@ -450,7 +445,6 @@ SequencePushConsumer_i::push_structured_events (
 
 void
 SequencePushConsumer_i::disconnect_sequence_push_consumer (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -512,7 +506,6 @@ void
 AnyPushConsumer_i::offer_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -579,7 +572,6 @@ AnyPushConsumer_i::check_serial_number (CORBA::ULong seq)
 void
 AnyPushConsumer_i::push (
         const CORBA::Any & data
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::SystemException,
         CosEventComm::Disconnected))
@@ -602,7 +594,7 @@ AnyPushConsumer_i::push (
       ACE_TEXT ("(%P|%t) Any Consumer failing at event # %d.\n"),
       static_cast<int>(this->received_)
       ));
-    ACE_THROW (CORBA::UNKNOWN());
+    throw CORBA::UNKNOWN();
   }
   CORBA::ULong seq = 0;
   if (data >>= seq)
@@ -663,7 +655,6 @@ AnyPushConsumer_i::push (
 
 void
 AnyPushConsumer_i::disconnect_push_consumer (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -691,16 +682,15 @@ ReconnectionCallback_i::reconnect_count () const
 void
 ReconnectionCallback_i::reconnect (
     CORBA::Object_ptr reconnection
-    ACE_ENV_ARG_DECL
   ) ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
     ACE_TEXT ("(%P|%t) Consumer received reconnection request\n")
     ));
-  this->ecf_ = CosNotifyChannelAdmin::EventChannelFactory::_narrow (reconnection ACE_ENV_ARG_PARAMETER);
+  this->ecf_ = CosNotifyChannelAdmin::EventChannelFactory::_narrow (reconnection);
   if (!CORBA::is_nil (this->ecf_.in ()))
   {
-    this->consumer_main_.reconnect (this->ecf_.in () ACE_ENV_ARG_PARAMETER);
+    this->consumer_main_.reconnect (this->ecf_.in ());
     this->reconnect_count_ += 1;
   }
   else
@@ -733,9 +723,9 @@ ReconnectionCallback_i::fini (void)
   if (this->id_is_valid_)
   {
     NotifyExt::ReconnectionRegistry_var registry =
-      NotifyExt::ReconnectionRegistry::_narrow (this->ecf_.in () ACE_ENV_ARG_PARAMETER);
+      NotifyExt::ReconnectionRegistry::_narrow (this->ecf_.in ());
 
-    registry->unregister_callback (this->callback_id_ ACE_ENV_ARG_PARAMETER);
+    registry->unregister_callback (this->callback_id_);
     this->id_is_valid_ = false;
   }
 }
@@ -743,23 +733,22 @@ ReconnectionCallback_i::fini (void)
 void
 ReconnectionCallback_i::init (
   PortableServer::POA_ptr poa,
-  CosNotifyChannelAdmin::EventChannelFactory_ptr ecf
-  ACE_ENV_ARG_DECL)
+  CosNotifyChannelAdmin::EventChannelFactory_ptr ecf)
 {
   this->ecf_ = CosNotifyChannelAdmin::EventChannelFactory::_duplicate (ecf);
   PortableServer::ObjectId_var reconnection_callback_id =
-    poa->activate_object (this ACE_ENV_ARG_PARAMETER);
+    poa->activate_object (this);
 
   CORBA::Object_var obj =
-    poa->id_to_reference (reconnection_callback_id.in () ACE_ENV_ARG_PARAMETER);
+    poa->id_to_reference (reconnection_callback_id.in ());
 
   NotifyExt::ReconnectionCallback_var callback =
-    NotifyExt::ReconnectionCallback::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+    NotifyExt::ReconnectionCallback::_narrow (obj.in ());
 
   NotifyExt::ReconnectionRegistry_var registry =
-    NotifyExt::ReconnectionRegistry::_narrow (ecf ACE_ENV_ARG_PARAMETER);
+    NotifyExt::ReconnectionRegistry::_narrow (ecf);
 
-  this->callback_id_ = registry->register_callback (callback.in () ACE_ENV_ARG_PARAMETER);
+  this->callback_id_ = registry->register_callback (callback.in ());
   this->id_is_valid_ = true;
 }
 
@@ -903,9 +892,9 @@ void Consumer_Main::usage(FILE * out)const
     , out);
 }
 
-int Consumer_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
+int Consumer_Main::init (int argc, char *argv[])
 {
-  this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
+  this->orb_ = CORBA::ORB_init(argc, argv, "");
 
   if (0 != this->parse_args(argc, argv))
   {
@@ -913,8 +902,7 @@ int Consumer_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
   }
 
   CORBA::Object_ptr poa_object  =
-    this->orb_->resolve_initial_references("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references("RootPOA");
 
   if (CORBA::is_nil (poa_object))
   {
@@ -924,7 +912,7 @@ int Consumer_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
   }
 
   this->root_poa_ =
-    PortableServer::POA::_narrow (poa_object ACE_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (poa_object);
 
   PortableServer::POAManager_var poa_manager =
     root_poa_->the_POAManager ();
@@ -1005,8 +993,7 @@ int Consumer_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
 
   this->reconnection_callback_.init (
     this->root_poa_.in (),
-    this->ecf_.in ()
-    ACE_ENV_ARG_PARAMETER);
+    this->ecf_.in ());
 
   save_ids ();
   return 0;
@@ -1099,8 +1086,7 @@ Consumer_Main::load_ids()
 
 void
 Consumer_Main::reconnect (
-    CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory
-    ACE_ENV_ARG_DECL)
+    CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->verbose_)
@@ -1151,12 +1137,10 @@ Consumer_Main::resolve_naming_service (void)
   if (CORBA::is_nil (this->naming_context_.in ()))
   {
     CORBA::Object_var naming_obj =
-      this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
-                                              ACE_ENV_ARG_PARAMETER);
+      this->orb_->resolve_initial_references (NAMING_SERVICE_NAME);
 
     this->naming_context_ =
-      CosNaming::NamingContext::_narrow (naming_obj.in ()
-                                         ACE_ENV_ARG_PARAMETER);
+      CosNaming::NamingContext::_narrow (naming_obj.in ());
   }
 
   return !CORBA::is_nil (this->naming_context_.in ());
@@ -1173,13 +1157,11 @@ Consumer_Main::find_notify_factory (void)
     name[0].id = CORBA::string_dup (NOTIFY_FACTORY_NAME);
 
     CORBA::Object_var obj =
-      this->naming_context_->resolve (name
-                                     ACE_ENV_ARG_PARAMETER);
+      this->naming_context_->resolve (name);
 
     this->ecf_ =
       CosNotifyChannelAdmin::EventChannelFactory::_narrow (
                                                       obj.in ()
-                                                      ACE_ENV_ARG_PARAMETER
                                                     );
   }
   return ! CORBA::is_nil (this->ecf_.in ());
@@ -1189,13 +1171,11 @@ int
 Consumer_Main::resolve_notify_factory (void)
 {
   CORBA::Object_var factory_obj =
-    this->orb_->resolve_initial_references (NOTIFY_FACTORY_NAME
-                                            ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references (NOTIFY_FACTORY_NAME);
 
   this->ecf_ =
     CosNotifyChannelAdmin::EventChannelFactory::_narrow (
-      factory_obj.in ()
-      ACE_ENV_ARG_PARAMETER);
+      factory_obj.in ());
   return ! CORBA::is_nil (this->ecf_.in ());
 }
 
@@ -1205,11 +1185,10 @@ Consumer_Main::init_event_channel (void)
   bool ok = false;
   if (this->reconnecting_)
   {
-    ACE_TRY_NEW_ENV
+    try
     {
       this->ec_ = this->ecf_->get_event_channel (
-            this->ec_id_
-            ACE_ENV_ARG_PARAMETER);
+            this->ec_id_);
       ok = ! CORBA::is_nil (this->ec_.in ());
       if (ok && this->verbose_)
       {
@@ -1219,10 +1198,9 @@ Consumer_Main::init_event_channel (void)
           ));
       }
     }
-    ACE_CATCHALL
+    catch (...)
     {
     }
-    ACE_ENDTRY;
   }
 
   // if we don't have a channel yet, and a channel id file was specified
@@ -1237,13 +1215,10 @@ Consumer_Main::init_event_channel (void)
       ACE_OS::fclose (chf);
       this->ec_id_ = ACE_OS::atoi (buffer);
 
-      ACE_DECLARE_NEW_ENV;
-      ACE_TRY_EX (unique_label_1)
+      try
       {
         this->ec_ = this->ecf_->get_event_channel (
-              this->ec_id_
-              ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK_EX (unique_label_1)
+              this->ec_id_);
         ok = ! CORBA::is_nil (this->ec_.in ());
         if (ok)
         {
@@ -1258,10 +1233,9 @@ Consumer_Main::init_event_channel (void)
           this->channel_file_ = "";
         }
       }
-      ACE_CATCHALL
+      catch (...)
       {
       }
-      ACE_ENDTRY;
     }
   }
 
@@ -1305,8 +1279,7 @@ Consumer_Main::init_event_channel (void)
     ec_ = this->ecf_->create_channel (
           qosprops,
           adminprops,
-          this->ec_id_
-          ACE_ENV_ARG_PARAMETER);
+          this->ec_id_);
     ok = ! CORBA::is_nil (ec_.in ());
     if (ok && this->verbose_)
     {
@@ -1339,10 +1312,9 @@ Consumer_Main::init_consumer_admin (void)
   {
     if (this->sa_id_ == default_admin_id)
     {
-      ACE_TRY_EX(TWO)
+      try
       {
         this->sa_ = this->ec_->default_consumer_admin ();
-        ACE_TRY_CHECK_EX(TWO);
         ok = ! CORBA::is_nil (this->sa_.in ());
         this->sa_id_ = default_admin_id;
         if (ok && this->verbose_)
@@ -1358,19 +1330,16 @@ Consumer_Main::init_consumer_admin (void)
             ));
         }
       }
-      ACE_CATCHALL
+      catch (...)
       {
       }
-      ACE_ENDTRY;
     }
     else // not default admin
     {
-      ACE_TRY_EX(ONE)
+      try
       {
         this->sa_ = this->ec_->get_consumeradmin(
-          this->sa_id_
-          ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK_EX(ONE);
+          this->sa_id_);
         ok = ! CORBA::is_nil (this->sa_.in ());
         if (ok && this->verbose_)
         {
@@ -1380,18 +1349,16 @@ Consumer_Main::init_consumer_admin (void)
             ));
         }
       }
-      ACE_CATCHALL
+      catch (...)
       {
       }
-      ACE_ENDTRY;
     }
   }
   else // !reconnecting
   {
-    ACE_TRY_EX(THREE)
+    try
     {
       this->sa_ = this->ec_->default_consumer_admin ();
-      ACE_TRY_CHECK_EX(THREE);
       ok = ! CORBA::is_nil (this->sa_.in ());
       this->sa_id_ = default_admin_id;
       if (ok && this->verbose_)
@@ -1407,17 +1374,15 @@ Consumer_Main::init_consumer_admin (void)
           ));
       }
     }
-    ACE_CATCHALL
+    catch (...)
     {
     }
-    ACE_ENDTRY;
 
     if (!ok)
     {
       this->sa_ = this->ec_->new_for_consumers(
         CosNotifyChannelAdmin::OR_OP,
-        this->sa_id_
-        ACE_ENV_ARG_PARAMETER);
+        this->sa_id_);
       ok = ! CORBA::is_nil (this->sa_.in ());
 
 #ifdef TEST_SET_QOS
@@ -1433,7 +1398,7 @@ Consumer_Main::init_consumer_admin (void)
         qosprops[i].name = CORBA::string_dup(CosNotification::ConnectionReliability);
         qosprops[i++].value <<= CosNotification::Persistent; // Required, or we won't persist much
         qosprops.length(i);
-        this->sa_->set_qos (qosprops ACE_ENV_ARG_PARAMETER);
+        this->sa_->set_qos (qosprops);
       }
 #endif
 
@@ -1461,11 +1426,10 @@ Consumer_Main::init_structured_proxy_supplier (void)
   CosNotifyChannelAdmin::ProxySupplier_var proxy;
   if (this->reconnecting_)
   {
-    ACE_TRY_NEW_ENV
+    try
     {
       proxy = this->sa_->get_proxy_supplier (
                            this->structured_proxy_id_
-                          ACE_ENV_ARG_PARAMETER
                         );
       ok = ! CORBA::is_nil (proxy.in ());
       if (ok && this->verbose_)
@@ -1476,18 +1440,16 @@ Consumer_Main::init_structured_proxy_supplier (void)
           ));
       }
     }
-    ACE_CATCHALL
+    catch (...)
     {
     }
-    ACE_ENDTRY;
   }
 
   if (!ok)
   {
     proxy = this->sa_->obtain_notification_push_supplier(
         CosNotifyChannelAdmin::STRUCTURED_EVENT,
-        this->structured_proxy_id_
-        ACE_ENV_ARG_PARAMETER);
+        this->structured_proxy_id_);
     ok = ! CORBA::is_nil (proxy.in ());
     if (ok && this->verbose_)
     {
@@ -1498,27 +1460,27 @@ Consumer_Main::init_structured_proxy_supplier (void)
     }
   }
   this->structured_proxy_push_supplier_ =
-    CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow(proxy.in () ACE_ENV_ARG_PARAMETER);
+    CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow(proxy.in ());
 
   if (CORBA::is_nil (this->structured_proxy_push_supplier_.in ()))
   {
     ACE_ERROR ((LM_ERROR,
         ACE_TEXT ("(%P|%t) init_structured_proxy_supplier received nil ProxySupplier\n")
         ));
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    throw CORBA::OBJECT_NOT_EXIST ();
   }
 
   if (CORBA::is_nil (this->structured_push_consumer_ref_.in ()))
   {
     PortableServer::ObjectId_var push_consumer_id =
       this->root_poa_->activate_object (
-        &(this->structured_push_consumer_) ACE_ENV_ARG_PARAMETER);
+        &(this->structured_push_consumer_));
 
     CORBA::Object_var obj =
-      this->root_poa_->id_to_reference (push_consumer_id.in () ACE_ENV_ARG_PARAMETER);
+      this->root_poa_->id_to_reference (push_consumer_id.in ());
 
     this->structured_push_consumer_ref_ =
-      CosNotifyComm::StructuredPushConsumer::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+      CosNotifyComm::StructuredPushConsumer::_narrow (obj.in ());
   }
 
   if (CORBA::is_nil (this->structured_push_consumer_ref_.in ()))
@@ -1527,12 +1489,11 @@ Consumer_Main::init_structured_proxy_supplier (void)
       ACE_TEXT ("(%P|%t) Consumer: Error activating structured push consumer\n")
       ));
 
-    ACE_THROW (CORBA::BAD_PARAM());
+    throw CORBA::BAD_PARAM();
   }
 
   this->structured_proxy_push_supplier_->connect_structured_push_consumer (
-    this->structured_push_consumer_ref_.in ()
-    ACE_ENV_ARG_PARAMETER);
+    this->structured_push_consumer_ref_.in ());
   this->structured_push_consumer_.set_connected(true);
 }
 
@@ -1543,11 +1504,10 @@ Consumer_Main::init_sequence_proxy_supplier (void)
   CosNotifyChannelAdmin::ProxySupplier_var proxy;
   if (this->reconnecting_)
   {
-    ACE_TRY_NEW_ENV
+    try
     {
       proxy = this->sa_->get_proxy_supplier(
-        this->sequence_proxy_id_
-        ACE_ENV_ARG_PARAMETER);
+        this->sequence_proxy_id_);
       ok = ! CORBA::is_nil (proxy.in ());
       if (ok && this->verbose_)
       {
@@ -1557,24 +1517,22 @@ Consumer_Main::init_sequence_proxy_supplier (void)
           ));
       }
     }
-    ACE_CATCHALL
+    catch (...)
     {
     }
-    ACE_ENDTRY;
   }
 
   if (!ok)
   {
     proxy = this->sa_->obtain_notification_push_supplier(
         CosNotifyChannelAdmin::SEQUENCE_EVENT,
-        this->sequence_proxy_id_
-        ACE_ENV_ARG_PARAMETER);
+        this->sequence_proxy_id_);
     ok = ! CORBA::is_nil (proxy.in ());
 #ifdef TEST_SET_QOS
     // temporary
     if (ok)
     {
-      set_proxy_qos (proxy.in () ACE_ENV_ARG_PARAMETER);
+      set_proxy_qos (proxy.in ());
     }
 #endif // TEST_SET_QOS
     if (ok && this->verbose_)
@@ -1586,7 +1544,7 @@ Consumer_Main::init_sequence_proxy_supplier (void)
     }
   }
   this->sequence_proxy_push_supplier_ =
-    CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow(proxy.in () ACE_ENV_ARG_PARAMETER);
+    CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow(proxy.in ());
 
   if (CORBA::is_nil (this->sequence_proxy_push_supplier_.in ()))
   {
@@ -1595,20 +1553,20 @@ Consumer_Main::init_sequence_proxy_supplier (void)
         static_cast<int>(this->sequence_proxy_id_)
       ));
 
-    ACE_THROW (CORBA::BAD_PARAM());
+    throw CORBA::BAD_PARAM();
   }
 
   if (CORBA::is_nil (this->sequence_push_consumer_ref_.in ()))
   {
     PortableServer::ObjectId_var push_consumer_id =
       this->root_poa_->activate_object (
-        &(this->sequence_push_consumer_) ACE_ENV_ARG_PARAMETER);
+        &(this->sequence_push_consumer_));
 
     CORBA::Object_var obj =
-      this->root_poa_->id_to_reference (push_consumer_id.in () ACE_ENV_ARG_PARAMETER);
+      this->root_poa_->id_to_reference (push_consumer_id.in ());
 
     this->sequence_push_consumer_ref_ =
-      CosNotifyComm::SequencePushConsumer::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+      CosNotifyComm::SequencePushConsumer::_narrow (obj.in ());
   }
   if (CORBA::is_nil (this->sequence_push_consumer_ref_.in ()))
   {
@@ -1616,20 +1574,18 @@ Consumer_Main::init_sequence_proxy_supplier (void)
       ACE_TEXT ("(%P|%t) Consumer: Error activating sequence push consumer\n")
       ));
 
-    ACE_THROW (CORBA::BAD_PARAM());
+    throw CORBA::BAD_PARAM();
   }
 
   this->sequence_proxy_push_supplier_->connect_sequence_push_consumer (
-    this->sequence_push_consumer_ref_.in ()
-    ACE_ENV_ARG_PARAMETER);
+    this->sequence_push_consumer_ref_.in ());
   this->sequence_push_consumer_.set_connected(true);
 
 }
 
 
 void
-Consumer_Main::set_proxy_qos (CosNotifyChannelAdmin::ProxySupplier_ptr proxy
-  ACE_ENV_ARG_DECL)
+Consumer_Main::set_proxy_qos (CosNotifyChannelAdmin::ProxySupplier_ptr proxy)
 {
   // temporary: be sure we can set qos properties for proxyw
   CosNotification::QoSProperties qosprops(2);
@@ -1641,7 +1597,7 @@ Consumer_Main::set_proxy_qos (CosNotifyChannelAdmin::ProxySupplier_ptr proxy
   qosprops[i].name = CORBA::string_dup(CosNotification::ConnectionReliability);
   qosprops[i++].value <<= CosNotification::Persistent; // Required, or we won't persist much
   qosprops.length(i);
-  proxy->set_qos (qosprops ACE_ENV_ARG_PARAMETER);
+  proxy->set_qos (qosprops);
 }
 
 void
@@ -1651,11 +1607,10 @@ Consumer_Main::init_any_proxy_supplier (void)
   CosNotifyChannelAdmin::ProxySupplier_var proxy;
   if (this->reconnecting_)
   {
-    ACE_TRY_NEW_ENV
+    try
     {
       proxy = this->sa_->get_proxy_supplier(
-        this->any_proxy_id_
-        ACE_ENV_ARG_PARAMETER);
+        this->any_proxy_id_);
       ok = ! CORBA::is_nil (proxy.in ());
       if (ok && this->verbose_)
       {
@@ -1672,30 +1627,28 @@ Consumer_Main::init_any_proxy_supplier (void)
           ));
       }
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
       ACE_ERROR ((LM_ERROR,
         ACE_TEXT ("(%P|%t) Consumer: Get proxy supplier %d threw exception\n"),
         static_cast<int>(this->any_proxy_id_)
         ));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_TEXT ("Error:"));
+      ex._tao_print_exception (ACE_TEXT ("Error:"));
     }
-    ACE_CATCHALL
+    catch (...)
     {
       ACE_ERROR ((LM_ERROR,
         ACE_TEXT ("Error: (%P|%t) Consumer: Get proxy supplier %d threw exception\n"),
         static_cast<int>(this->any_proxy_id_)
         ));
     }
-    ACE_ENDTRY;
   }
 
   if (!ok)
   {
     proxy = this->sa_->obtain_notification_push_supplier(
         CosNotifyChannelAdmin::ANY_EVENT,
-        this->any_proxy_id_
-        ACE_ENV_ARG_PARAMETER);
+        this->any_proxy_id_);
     ok = ! CORBA::is_nil (proxy.in ());
 
     if (ok && this->verbose_)
@@ -1707,7 +1660,7 @@ Consumer_Main::init_any_proxy_supplier (void)
     }
   }
   this->any_proxy_push_supplier_ =
-    CosNotifyChannelAdmin::ProxyPushSupplier::_narrow(proxy.in () ACE_ENV_ARG_PARAMETER);
+    CosNotifyChannelAdmin::ProxyPushSupplier::_narrow(proxy.in ());
 
   if (CORBA::is_nil (this->any_proxy_push_supplier_.in ()))
   {
@@ -1715,19 +1668,19 @@ Consumer_Main::init_any_proxy_supplier (void)
       ACE_TEXT ("(%P|%t) Consumer: Received wrong type of push supplier proxy %d\n"),
         static_cast<int>(this->any_proxy_id_)
       ));
-    ACE_THROW (CORBA::BAD_PARAM());
+    throw CORBA::BAD_PARAM();
   }
   if (CORBA::is_nil (this->any_push_consumer_ref_.in ()))
   {
     PortableServer::ObjectId_var push_consumer_id =
       this->root_poa_->activate_object (
-        &(this->any_push_consumer_) ACE_ENV_ARG_PARAMETER);
+        &(this->any_push_consumer_));
 
     CORBA::Object_var obj =
-      this->root_poa_->id_to_reference (push_consumer_id.in () ACE_ENV_ARG_PARAMETER);
+      this->root_poa_->id_to_reference (push_consumer_id.in ());
 
     this->any_push_consumer_ref_ =
-      CosNotifyComm::PushConsumer::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+      CosNotifyComm::PushConsumer::_narrow (obj.in ());
   }
 
   if (CORBA::is_nil (this->any_push_consumer_ref_.in ()))
@@ -1736,11 +1689,10 @@ Consumer_Main::init_any_proxy_supplier (void)
       ACE_TEXT ("(%P|%t) Consumer:Error activating push consumer\n")
       ));
 
-    ACE_THROW (CORBA::BAD_PARAM());
+    throw CORBA::BAD_PARAM();
   }
   this->any_proxy_push_supplier_->connect_any_push_consumer (
-    this->any_push_consumer_ref_.in ()
-    ACE_ENV_ARG_PARAMETER);
+    this->any_push_consumer_ref_.in ());
 
   this->any_push_consumer_.set_connected(true);
 }
@@ -1791,7 +1743,7 @@ int Consumer_Main::run (void)
     )
   {
     ACE_Time_Value tv(0, 100 * 1000);
-    this->orb_->run(tv ACE_ENV_ARG_PARAMETER);
+    this->orb_->run(tv);
   }
 
   // see if consumers detected errors
@@ -1809,10 +1761,9 @@ main (int argc, char *argv[])
 {
   int result = -1;
   Consumer_Main app;
-  ACE_TRY_NEW_ENV
+  try
   {
-    result = app.init(argc, argv ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK
+    result = app.init(argc, argv);
 
     if (result == 0)
     {
@@ -1823,12 +1774,11 @@ main (int argc, char *argv[])
       app.fini ();
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Error: Consumer::main\t\n");
+    ex._tao_print_exception ("Error: Consumer::main\t\n");
     result = -1;
   }
-  ACE_ENDTRY;
   ACE_DEBUG ((LM_DEBUG,
     ACE_TEXT ("(%P,%t) Consumer exits: code %d\n"),
     result
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h
index 3db09828745..c3bda2e0b63 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h
@@ -30,7 +30,6 @@ public:
   virtual void offer_change (
       const CosNotification::EventTypeSeq & added,
       const CosNotification::EventTypeSeq & removed
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -38,13 +37,11 @@ public:
 
   virtual void push_structured_event (
         const CosNotification::StructuredEvent & notification
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::SystemException,
         CosEventComm::Disconnected));
 
   virtual void disconnect_structured_push_consumer (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -76,7 +73,6 @@ public:
   virtual void offer_change (
       const CosNotification::EventTypeSeq & added,
       const CosNotification::EventTypeSeq & removed
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -84,13 +80,11 @@ public:
 
   virtual void push_structured_events (
         const CosNotification::EventBatch & notifications
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::SystemException,
         CosEventComm::Disconnected));
 
   virtual void disconnect_sequence_push_consumer (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -123,7 +117,6 @@ public:
   virtual void offer_change (
       const CosNotification::EventTypeSeq & added,
       const CosNotification::EventTypeSeq & removed
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -131,13 +124,11 @@ public:
 
   virtual void push (
         const CORBA::Any & data
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::SystemException,
         CosEventComm::Disconnected));
 
   virtual void disconnect_push_consumer (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -171,8 +162,7 @@ public:
 
   void init (
     PortableServer::POA_ptr poa,
-    CosNotifyChannelAdmin::EventChannelFactory_ptr ecf_
-    ACE_ENV_ARG_DECL);
+    CosNotifyChannelAdmin::EventChannelFactory_ptr ecf_);
 
   void fini (void);
 
@@ -180,7 +170,6 @@ public:
 
   virtual void reconnect (
       CORBA::Object_ptr reconnection
-      ACE_ENV_ARG_DECL
     ) ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean is_alive (void)
@@ -203,14 +192,13 @@ class Consumer_Main
   int parse_args (int argc, char *argv[]);
   int parse_single_arg (int argc, char *argv[]);
 
-  int init (int argc, char *argv[] ACE_ENV_ARG_DECL);
+  int init (int argc, char *argv[]);
   int run (void);
   int fini (void);
   void usage (FILE * log) const;
 
   void reconnect (
-      CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory
-      ACE_ENV_ARG_DECL)
+      CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
  private:
@@ -229,7 +217,7 @@ class Consumer_Main
   void init_sequence_proxy_supplier (void);
   void init_any_proxy_supplier (void);
 
-  void set_proxy_qos (CosNotifyChannelAdmin::ProxySupplier_ptr proxy ACE_ENV_ARG_DECL);
+  void set_proxy_qos (CosNotifyChannelAdmin::ProxySupplier_ptr proxy);
 
   void save_ids();
   bool load_ids();
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
index 8bb82aa7548..f2b91f8de26 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
@@ -20,7 +20,6 @@ void
 StructuredPushSupplier_i::subscription_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -36,7 +35,6 @@ StructuredPushSupplier_i::subscription_change (
 
 void
 StructuredPushSupplier_i::disconnect_structured_push_supplier (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -52,7 +50,6 @@ void
 SequencePushSupplier_i::subscription_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -68,7 +65,6 @@ SequencePushSupplier_i::subscription_change (
 
 void
 SequencePushSupplier_i::disconnect_sequence_push_supplier (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -84,7 +80,6 @@ void
 AnyPushSupplier_i::subscription_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -100,7 +95,6 @@ AnyPushSupplier_i::subscription_change (
 
 void
 AnyPushSupplier_i::disconnect_push_supplier (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -128,16 +122,15 @@ ReconnectionCallback_i::reconnect_count () const
 void
 ReconnectionCallback_i::reconnect (
     CORBA::Object_ptr reconnection
-    ACE_ENV_ARG_DECL
   ) ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
     ACE_TEXT ("(%P|%t) Supplier received reconnection request\n")
     ));
-  this->ecf_ = CosNotifyChannelAdmin::EventChannelFactory::_narrow (reconnection ACE_ENV_ARG_PARAMETER);
+  this->ecf_ = CosNotifyChannelAdmin::EventChannelFactory::_narrow (reconnection);
   if (!CORBA::is_nil (this->ecf_.in ()))
   {
-    this->supplier_main_.reconnect (this->ecf_.in () ACE_ENV_ARG_PARAMETER);
+    this->supplier_main_.reconnect (this->ecf_.in ());
     this->reconnect_count_ += 1;
   }
   else
@@ -169,9 +162,9 @@ ReconnectionCallback_i::fini (void)
   if (this->id_is_valid_)
   {
     NotifyExt::ReconnectionRegistry_var registry =
-      NotifyExt::ReconnectionRegistry::_narrow (this->ecf_.in () ACE_ENV_ARG_PARAMETER);
+      NotifyExt::ReconnectionRegistry::_narrow (this->ecf_.in ());
 
-    registry->unregister_callback (this->callback_id_ ACE_ENV_ARG_PARAMETER);
+    registry->unregister_callback (this->callback_id_);
     this->id_is_valid_ = false;
   }
 }
@@ -179,23 +172,22 @@ ReconnectionCallback_i::fini (void)
 void
 ReconnectionCallback_i::init (
   PortableServer::POA_ptr poa,
-  CosNotifyChannelAdmin::EventChannelFactory_ptr ecf
-  ACE_ENV_ARG_DECL)
+  CosNotifyChannelAdmin::EventChannelFactory_ptr ecf)
 {
   this->ecf_ = CosNotifyChannelAdmin::EventChannelFactory::_duplicate (ecf);
   PortableServer::ObjectId_var reconnection_callback_id =
-    poa->activate_object (this ACE_ENV_ARG_PARAMETER);
+    poa->activate_object (this);
 
   CORBA::Object_var obj =
-    poa->id_to_reference (reconnection_callback_id.in () ACE_ENV_ARG_PARAMETER);
+    poa->id_to_reference (reconnection_callback_id.in ());
 
   NotifyExt::ReconnectionCallback_var callback =
-    NotifyExt::ReconnectionCallback::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+    NotifyExt::ReconnectionCallback::_narrow (obj.in ());
 
   NotifyExt::ReconnectionRegistry_var registry =
-    NotifyExt::ReconnectionRegistry::_narrow (ecf ACE_ENV_ARG_PARAMETER);
+    NotifyExt::ReconnectionRegistry::_narrow (ecf);
 
-  this->callback_id_ = registry->register_callback (callback.in () ACE_ENV_ARG_PARAMETER);
+  this->callback_id_ = registry->register_callback (callback.in ());
   this->id_is_valid_ = true;
 }
 
@@ -337,9 +329,9 @@ void Supplier_Main::usage(FILE * log)const
       , log);
 }
 
-int Supplier_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
+int Supplier_Main::init (int argc, char *argv[])
 {
-  this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
+  this->orb_ = CORBA::ORB_init(argc, argv, "");
 
   if (0 != this->parse_args(argc, argv))
   {
@@ -347,8 +339,7 @@ int Supplier_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
   }
 
   CORBA::Object_ptr poa_object  =
-    this->orb_->resolve_initial_references("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references("RootPOA");
 
   if (CORBA::is_nil (poa_object))
   {
@@ -358,7 +349,7 @@ int Supplier_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
   }
 
   this->root_poa_ =
-    PortableServer::POA::_narrow (poa_object ACE_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (poa_object);
 
   PortableServer::POAManager_var poa_manager =
     root_poa_->the_POAManager ();
@@ -412,8 +403,7 @@ int Supplier_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
   }
   this->reconnection_callback_.init (
     this->root_poa_.in (),
-    this->ecf_.in ()
-    ACE_ENV_ARG_PARAMETER);
+    this->ecf_.in ());
 
   save_ids ();
   return 0;
@@ -506,8 +496,7 @@ Supplier_Main::load_ids()
 
 void
 Supplier_Main::reconnect (
-    CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory
-    ACE_ENV_ARG_DECL)
+    CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->ecf_ = CosNotifyChannelAdmin::EventChannelFactory::_duplicate (dest_factory);
@@ -544,12 +533,10 @@ Supplier_Main::resolve_naming_service (void)
   if (CORBA::is_nil (this->naming_context_.in ()))
   {
     CORBA::Object_var naming_obj =
-      this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
-                                              ACE_ENV_ARG_PARAMETER);
+      this->orb_->resolve_initial_references (NAMING_SERVICE_NAME);
 
     this->naming_context_ =
-      CosNaming::NamingContext::_narrow (naming_obj.in ()
-                                         ACE_ENV_ARG_PARAMETER);
+      CosNaming::NamingContext::_narrow (naming_obj.in ());
   }
 
   return !CORBA::is_nil (this->naming_context_.in ());
@@ -566,13 +553,11 @@ Supplier_Main::find_notify_factory (void)
     name[0].id = CORBA::string_dup (NOTIFY_FACTORY_NAME);
 
     CORBA::Object_var obj =
-      this->naming_context_->resolve (name
-                                     ACE_ENV_ARG_PARAMETER);
+      this->naming_context_->resolve (name);
 
     this->ecf_ =
       CosNotifyChannelAdmin::EventChannelFactory::_narrow (
                                                       obj.in ()
-                                                      ACE_ENV_ARG_PARAMETER
                                                     );
   }
   return ! CORBA::is_nil (this->ecf_.in ());
@@ -582,13 +567,11 @@ int
 Supplier_Main::resolve_notify_factory (void)
 {
   CORBA::Object_var factory_obj =
-    this->orb_->resolve_initial_references (NOTIFY_FACTORY_NAME
-                                            ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references (NOTIFY_FACTORY_NAME);
 
   this->ecf_ =
     CosNotifyChannelAdmin::EventChannelFactory::_narrow (
-      factory_obj.in ()
-      ACE_ENV_ARG_PARAMETER);
+      factory_obj.in ());
   return ! CORBA::is_nil (this->ecf_.in ());
 }
 
@@ -598,11 +581,10 @@ Supplier_Main::init_event_channel (void)
   bool ok = false;
   if (this->reconnecting_)
   {
-    ACE_TRY_NEW_ENV
+    try
     {
       this->ec_ = this->ecf_->get_event_channel (
-            this->ec_id_
-            ACE_ENV_ARG_PARAMETER);
+            this->ec_id_);
       ok = ! CORBA::is_nil (this->ec_.in ());
       if (ok && this->verbose_)
       {
@@ -612,10 +594,9 @@ Supplier_Main::init_event_channel (void)
           ));
       }
     }
-    ACE_CATCHALL
+    catch (...)
     {
     }
-    ACE_ENDTRY;
   }
 
   // if we don't have a channel yet, and a channel id file was specified
@@ -630,13 +611,10 @@ Supplier_Main::init_event_channel (void)
       ACE_OS::fclose (chf);
       this->ec_id_ = ACE_OS::atoi (buffer);
 
-      ACE_DECLARE_NEW_ENV;
-      ACE_TRY_EX (unique_label_1)
+      try
       {
         this->ec_ = this->ecf_->get_event_channel (
-              this->ec_id_
-              ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK_EX (unique_label_1)
+              this->ec_id_);
         ok = ! CORBA::is_nil (this->ec_.in ());
         if (ok)
         {
@@ -651,10 +629,9 @@ Supplier_Main::init_event_channel (void)
           this->channel_file_ = "";
         }
       }
-      ACE_CATCHALL
+      catch (...)
       {
       }
-      ACE_ENDTRY;
     }
   }
 
@@ -698,8 +675,7 @@ Supplier_Main::init_event_channel (void)
     ec_ = this->ecf_->create_channel (
           qosprops,
           adminprops,
-          this->ec_id_
-          ACE_ENV_ARG_PARAMETER);
+          this->ec_id_);
     ok = ! CORBA::is_nil (ec_.in ());
     if (ok && this->verbose_)
     {
@@ -730,12 +706,10 @@ Supplier_Main::init_supplier_admin (void)
   bool ok = false;
   if (this->reconnecting_ && this->sa_id_ != default_admin_id)
   {
-    ACE_TRY_EX(ONE)
+    try
     {
       this->sa_ = this->ec_->get_supplieradmin(
-        this->sa_id_
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX(ONE);
+        this->sa_id_);
       ok = ! CORBA::is_nil (this->sa_.in ());
       if (ok && this->verbose_)
       {
@@ -745,18 +719,16 @@ Supplier_Main::init_supplier_admin (void)
           ));
       }
     }
-    ACE_CATCHALL
+    catch (...)
     {
     }
-    ACE_ENDTRY;
   }
 
   if (!ok)
   {
-    ACE_TRY_EX(TWO)
+    try
     {
       this->sa_ = this->ec_->default_supplier_admin ();
-      ACE_TRY_CHECK_EX(TWO);
       ok = ! CORBA::is_nil (this->sa_.in ());
       this->sa_id_ = default_admin_id;
       if (ok && this->verbose_)
@@ -772,18 +744,16 @@ Supplier_Main::init_supplier_admin (void)
           ));
       }
     }
-    ACE_CATCHALL
+    catch (...)
     {
     }
-    ACE_ENDTRY;
   }
 
   if (!ok)
   {
     this->sa_ = this->ec_->new_for_suppliers(
       CosNotifyChannelAdmin::OR_OP,
-      this->sa_id_
-      ACE_ENV_ARG_PARAMETER);
+      this->sa_id_);
     ok = ! CORBA::is_nil (this->sa_.in ());
     if (ok && this->verbose_)
     {
@@ -802,11 +772,10 @@ Supplier_Main::init_structured_proxy_consumer (void)
   CosNotifyChannelAdmin::ProxyConsumer_var proxy;
   if (this->reconnecting_)
   {
-    ACE_TRY_NEW_ENV
+    try
     {
       proxy = this->sa_->get_proxy_consumer (
                           this->structured_proxy_id_
-                          ACE_ENV_ARG_PARAMETER
                         );
       ok = ! CORBA::is_nil (proxy.in ());
       if (ok && this->verbose_)
@@ -817,18 +786,16 @@ Supplier_Main::init_structured_proxy_consumer (void)
           ));
       }
     }
-    ACE_CATCHALL
+    catch (...)
     {
     }
-    ACE_ENDTRY;
   }
 
   if (!ok)
   {
     proxy = this->sa_->obtain_notification_push_consumer(
         CosNotifyChannelAdmin::STRUCTURED_EVENT,
-        this->structured_proxy_id_
-        ACE_ENV_ARG_PARAMETER);
+        this->structured_proxy_id_);
     ok = ! CORBA::is_nil (proxy.in ());
     if (ok && this->verbose_)
     {
@@ -839,26 +806,26 @@ Supplier_Main::init_structured_proxy_consumer (void)
     }
   }
   this->structured_proxy_push_consumer_ =
-    CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow(proxy.in () ACE_ENV_ARG_PARAMETER);
+    CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow(proxy.in ());
 
   if (CORBA::is_nil (this->structured_proxy_push_consumer_.in ()))
   {
     ACE_ERROR ((LM_ERROR,
         ACE_TEXT ("(%P|%t) init_structured_proxy_consumer received nil ProxyConsumer\n")
         ));
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    throw CORBA::OBJECT_NOT_EXIST ();
   }
   if (CORBA::is_nil (this->structured_push_supplier_ref_.in ()))
   {
     PortableServer::ObjectId_var push_supplier_id =
       this->root_poa_->activate_object (
-        &(this->structured_push_supplier_) ACE_ENV_ARG_PARAMETER);
+        &(this->structured_push_supplier_));
 
     CORBA::Object_var obj =
-      this->root_poa_->id_to_reference (push_supplier_id.in () ACE_ENV_ARG_PARAMETER);
+      this->root_poa_->id_to_reference (push_supplier_id.in ());
 
     this->structured_push_supplier_ref_ =
-      CosNotifyComm::StructuredPushSupplier::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+      CosNotifyComm::StructuredPushSupplier::_narrow (obj.in ());
   }
   if (CORBA::is_nil (structured_push_supplier_ref_.in ()))
   {
@@ -867,12 +834,11 @@ Supplier_Main::init_structured_proxy_consumer (void)
         static_cast<int>(this->structured_proxy_id_)
       ));
 
-    ACE_THROW (CORBA::UNKNOWN());
+    throw CORBA::UNKNOWN();
   }
 
   this->structured_proxy_push_consumer_->connect_structured_push_supplier (
-    structured_push_supplier_ref_.in ()
-    ACE_ENV_ARG_PARAMETER);
+    structured_push_supplier_ref_.in ());
 }
 
 void
@@ -882,11 +848,10 @@ Supplier_Main::init_sequence_proxy_consumer (void)
   CosNotifyChannelAdmin::ProxyConsumer_var proxy;
   if (this->reconnecting_)
   {
-    ACE_TRY_NEW_ENV
+    try
     {
       proxy = this->sa_->get_proxy_consumer(
-        this->sequence_proxy_id_
-        ACE_ENV_ARG_PARAMETER);
+        this->sequence_proxy_id_);
       ok = ! CORBA::is_nil (proxy.in ());
       if (ok && this->verbose_)
       {
@@ -896,18 +861,16 @@ Supplier_Main::init_sequence_proxy_consumer (void)
           ));
       }
     }
-    ACE_CATCHALL
+    catch (...)
     {
     }
-    ACE_ENDTRY;
   }
 
   if (!ok)
   {
     proxy = this->sa_->obtain_notification_push_consumer(
         CosNotifyChannelAdmin::SEQUENCE_EVENT,
-        this->sequence_proxy_id_
-        ACE_ENV_ARG_PARAMETER);
+        this->sequence_proxy_id_);
     ok = ! CORBA::is_nil (proxy.in ());
     if (ok && this->verbose_)
     {
@@ -918,7 +881,7 @@ Supplier_Main::init_sequence_proxy_consumer (void)
     }
   }
   this->sequence_proxy_push_consumer_ =
-    CosNotifyChannelAdmin::SequenceProxyPushConsumer::_narrow(proxy.in () ACE_ENV_ARG_PARAMETER);
+    CosNotifyChannelAdmin::SequenceProxyPushConsumer::_narrow(proxy.in ());
 
   if (CORBA::is_nil (this->sequence_proxy_push_consumer_.in ()))
   {
@@ -926,20 +889,20 @@ Supplier_Main::init_sequence_proxy_consumer (void)
       ACE_TEXT ("(%P|%t) Supplier: Received wrong type of push consumer proxy %d\n"),
         static_cast<int>(this->sequence_proxy_id_)
       ));
-    ACE_THROW (CORBA::UNKNOWN());
+    throw CORBA::UNKNOWN();
   }
 
   if (CORBA::is_nil (this->sequence_push_supplier_ref_.in ()))
   {
     PortableServer::ObjectId_var push_supplier_id =
       this->root_poa_->activate_object (
-        &(this->sequence_push_supplier_) ACE_ENV_ARG_PARAMETER);
+        &(this->sequence_push_supplier_));
 
     CORBA::Object_var obj =
-      this->root_poa_->id_to_reference (push_supplier_id.in () ACE_ENV_ARG_PARAMETER);
+      this->root_poa_->id_to_reference (push_supplier_id.in ());
 
     this->sequence_push_supplier_ref_ =
-      CosNotifyComm::SequencePushSupplier::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+      CosNotifyComm::SequencePushSupplier::_narrow (obj.in ());
   }
   if (CORBA::is_nil (sequence_push_supplier_ref_.in ()))
   {
@@ -947,12 +910,11 @@ Supplier_Main::init_sequence_proxy_consumer (void)
       ACE_TEXT ("(%P|%t) Supplier: Received wrong type of push consumer proxy %d\n"),
         static_cast<int>(this->sequence_proxy_id_)
       ));
-    ACE_THROW (CORBA::UNKNOWN());
+    throw CORBA::UNKNOWN();
   }
 
   this->sequence_proxy_push_consumer_->connect_sequence_push_supplier (
-    sequence_push_supplier_ref_.in ()
-    ACE_ENV_ARG_PARAMETER);
+    sequence_push_supplier_ref_.in ());
 }
 
 void
@@ -962,11 +924,10 @@ Supplier_Main::init_any_proxy_consumer (void)
   CosNotifyChannelAdmin::ProxyConsumer_var proxy;
   if (this->reconnecting_)
   {
-    ACE_TRY_NEW_ENV
+    try
     {
       proxy = this->sa_->get_proxy_consumer(
-        this->any_proxy_id_
-        ACE_ENV_ARG_PARAMETER);
+        this->any_proxy_id_);
       ok = ! CORBA::is_nil (proxy.in ());
       if (ok && this->verbose_)
       {
@@ -976,18 +937,16 @@ Supplier_Main::init_any_proxy_consumer (void)
           ));
       }
     }
-    ACE_CATCHALL
+    catch (...)
     {
     }
-    ACE_ENDTRY;
   }
 
   if (!ok)
   {
     proxy = this->sa_->obtain_notification_push_consumer(
         CosNotifyChannelAdmin::ANY_EVENT,
-        this->any_proxy_id_
-        ACE_ENV_ARG_PARAMETER);
+        this->any_proxy_id_);
     ok = ! CORBA::is_nil (proxy.in ());
     if (ok && this->verbose_)
     {
@@ -998,7 +957,7 @@ Supplier_Main::init_any_proxy_consumer (void)
     }
   }
   this->any_proxy_push_consumer_ =
-    CosNotifyChannelAdmin::ProxyPushConsumer::_narrow(proxy.in () ACE_ENV_ARG_PARAMETER);
+    CosNotifyChannelAdmin::ProxyPushConsumer::_narrow(proxy.in ());
 
   if (CORBA::is_nil (this->any_proxy_push_consumer_.in ()))
   {
@@ -1006,20 +965,20 @@ Supplier_Main::init_any_proxy_consumer (void)
       ACE_TEXT ("(%P|%t) Supplier: Received wrong type of push consumer proxy %d\n"),
         static_cast<int>(this->any_proxy_id_)
       ));
-    ACE_THROW (CORBA::UNKNOWN());
+    throw CORBA::UNKNOWN();
   }
 
   if (CORBA::is_nil (this->any_push_supplier_ref_.in ()))
   {
     PortableServer::ObjectId_var push_supplier_id =
       this->root_poa_->activate_object (
-        &(this->any_push_supplier_) ACE_ENV_ARG_PARAMETER);
+        &(this->any_push_supplier_));
 
     CORBA::Object_var obj =
-      this->root_poa_->id_to_reference (push_supplier_id.in () ACE_ENV_ARG_PARAMETER);
+      this->root_poa_->id_to_reference (push_supplier_id.in ());
 
     this->any_push_supplier_ref_ =
-      CosNotifyComm::PushSupplier::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+      CosNotifyComm::PushSupplier::_narrow (obj.in ());
   }
   if (CORBA::is_nil (any_push_supplier_ref_.in ()))
   {
@@ -1027,12 +986,11 @@ Supplier_Main::init_any_proxy_consumer (void)
       ACE_TEXT ("(%P|%t) Supplier: Received wrong type of push consumer proxy %d\n"),
         static_cast<int>(this->sequence_proxy_id_)
       ));
-    ACE_THROW (CORBA::UNKNOWN());
+    throw CORBA::UNKNOWN();
   }
 
   this->any_proxy_push_consumer_->connect_any_push_supplier (
-    any_push_supplier_ref_.in ()
-    ACE_ENV_ARG_PARAMETER);
+    any_push_supplier_ref_.in ());
 }
 
 int Supplier_Main::fini (void)
@@ -1129,8 +1087,7 @@ void Supplier_Main::send_structured_event (void)
       ));
   }
 
-  this->structured_proxy_push_consumer_->push_structured_event (event
-                               ACE_ENV_ARG_PARAMETER);
+  this->structured_proxy_push_consumer_->push_structured_event (event);
 }
 
 void Supplier_Main::send_sequence_event (void)
@@ -1178,8 +1135,7 @@ void Supplier_Main::send_sequence_event (void)
       ));
   }
 
-  this->sequence_proxy_push_consumer_->push_structured_events (event_batch
-                               ACE_ENV_ARG_PARAMETER);
+  this->sequence_proxy_push_consumer_->push_structured_events (event_batch);
 }
 
 void Supplier_Main::send_any_event (void)
@@ -1195,8 +1151,7 @@ void Supplier_Main::send_any_event (void)
       ));
   }
 
-  this->any_proxy_push_consumer_->push (event
-                               ACE_ENV_ARG_PARAMETER);
+  this->any_proxy_push_consumer_->push (event);
 }
 
 int Supplier_Main::run (void)
@@ -1278,10 +1233,9 @@ main (int argc, char *argv[])
 {
   int result = -1;
   Supplier_Main app;
-  ACE_TRY_NEW_ENV
+  try
   {
-    result = app.init(argc, argv ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK
+    result = app.init(argc, argv);
 
     if (result == 0)
     {
@@ -1292,12 +1246,11 @@ main (int argc, char *argv[])
       app.fini ();
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Error: Supplier::main\t\n");
+    ex._tao_print_exception ("Error: Supplier::main\t\n");
     result = -1;
   }
-  ACE_ENDTRY;
   ACE_DEBUG ((LM_DEBUG,
     ACE_TEXT ("(%P,%t) Supplier exits: code %d\n"),
     result
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h
index 4e7659b35f3..a5abbd355d7 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h
@@ -28,14 +28,12 @@ class StructuredPushSupplier_i : public virtual POA_CosNotifyComm::StructuredPus
   virtual void subscription_change (
       const CosNotification::EventTypeSeq & added,
       const CosNotification::EventTypeSeq & removed
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       CosNotifyComm::InvalidEventType));
 
   virtual void disconnect_structured_push_supplier (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
@@ -45,14 +43,12 @@ class SequencePushSupplier_i : public virtual POA_CosNotifyComm::SequencePushSup
   virtual void subscription_change (
       const CosNotification::EventTypeSeq & added,
       const CosNotification::EventTypeSeq & removed
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       CosNotifyComm::InvalidEventType));
 
   virtual void disconnect_sequence_push_supplier (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
@@ -62,14 +58,12 @@ class AnyPushSupplier_i : public virtual POA_CosNotifyComm::PushSupplier
   virtual void subscription_change (
       const CosNotification::EventTypeSeq & added,
       const CosNotification::EventTypeSeq & removed
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       CosNotifyComm::InvalidEventType));
 
   virtual void disconnect_push_supplier (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
@@ -83,8 +77,7 @@ public:
 
   void init (
     PortableServer::POA_ptr poa,
-    CosNotifyChannelAdmin::EventChannelFactory_ptr ecf_
-    ACE_ENV_ARG_DECL);
+    CosNotifyChannelAdmin::EventChannelFactory_ptr ecf_);
 
   void fini (void);
 
@@ -92,7 +85,6 @@ public:
 
   virtual void reconnect (
      CORBA::Object_ptr reconnection
-      ACE_ENV_ARG_DECL
     ) ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean is_alive (void)
@@ -115,14 +107,13 @@ class Supplier_Main
   int parse_args (int argc, char *argv[]);
   int parse_single_arg (int argc, char *argv[]);
 
-  int init (int argc, char *argv[] ACE_ENV_ARG_DECL);
+  int init (int argc, char *argv[]);
   int run (void);
   int fini (void);
   void usage (FILE * log) const;
 
   void reconnect (
-      CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory
-      ACE_ENV_ARG_DECL)
+      CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
  private:
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp
index 89e4f24aae5..4d75d55a852 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp
@@ -24,8 +24,7 @@ Notify_Sequence_Push_Consumer::Notify_Sequence_Push_Consumer (
 
 void
 Notify_Sequence_Push_Consumer::_connect (
-  CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-  ACE_ENV_ARG_DECL)
+  CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::SequencePushConsumer_var objref =
@@ -34,12 +33,11 @@ Notify_Sequence_Push_Consumer::_connect (
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     consumer_admin->obtain_notification_push_supplier (
     CosNotifyChannelAdmin::SEQUENCE_EVENT,
-    proxy_id_
-    ACE_ENV_ARG_PARAMETER);
+    proxy_id_);
 
   this->proxy_ =
     CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow (
-    proxysupplier.in () ACE_ENV_ARG_PARAMETER);
+    proxysupplier.in ());
 
   CosNotification::QoSProperties properties (3);
   properties.length (3);
@@ -49,7 +47,7 @@ Notify_Sequence_Push_Consumer::_connect (
   properties[1].value <<= (TimeBase::TimeT) 1 * 1000 * 10000;
 
   this->proxy_->set_qos (properties);
-  this->proxy_->connect_sequence_push_consumer (objref.in () ACE_ENV_ARG_PARAMETER);
+  this->proxy_->connect_sequence_push_consumer (objref.in ());
 
   // give ownership to POA
   this->_remove_ref ();
@@ -58,8 +56,7 @@ Notify_Sequence_Push_Consumer::_connect (
 
 void
 Notify_Sequence_Push_Consumer::push_structured_events (
-  const CosNotification::EventBatch& events
-  ACE_ENV_ARG_DECL)
+  const CosNotification::EventBatch& events)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG((LM_DEBUG, "{%u}", events.length()));
@@ -72,7 +69,7 @@ Notify_Sequence_Push_Consumer::push_structured_events (
     ACE_ERROR ((LM_ERROR,
       ACE_TEXT ("Sequence Consumer (%P|%t): ERROR: too "
       "many events received.\n")));
-    ACE_THROW (CORBA::INTERNAL ());
+    throw CORBA::INTERNAL ();
   }
   else if (this->count_ >= this->low_)
   {
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.h
index 7a11dd60c37..b73f3c2a9e7 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.h
@@ -30,13 +30,11 @@ public:
                                  unsigned int high,
                                  Notify_Test_Client& client);
 
-  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                ACE_ENV_ARG_DECL)
+  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
-  void push_structured_events (const CosNotification::EventBatch&
-                               ACE_ENV_ARG_DECL)
+  void push_structured_events (const CosNotification::EventBatch&)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   ACE_CString name_;
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
index 5409e3e29c7..34b829f9524 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
@@ -70,21 +70,19 @@ Consumer_Client::parse_args (int argc, char *argv[])
 
 
 static CosNotifyChannelAdmin::ConsumerAdmin_ptr
-create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::ConsumerAdmin_var admin =
     ec->new_for_consumers (CosNotifyChannelAdmin::AND_OP,
-                           adminid
-                           ACE_ENV_ARG_PARAMETER);
+                           adminid);
 
 
   CosNotifyFilter::FilterFactory_var ffact =
     ec->default_filter_factory ();
 
   CosNotifyFilter::Filter_var filter =
-    ffact->create_filter ("EXTENDED_TCL" ACE_ENV_ARG_PARAMETER);
+    ffact->create_filter ("EXTENDED_TCL");
 
   if(CORBA::is_nil(filter.in()))
     {
@@ -100,7 +98,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
   constraint_list[0].constraint_expr = CORBA::string_dup (
    "$.enum < 0");
 
-  filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
+  filter->add_constraints (constraint_list);
 
   // apply filter
   admin->add_filter (filter.in ());
@@ -111,8 +109,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 
 static void
 create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
-                  Notify_Test_Client* client
-                  ACE_ENV_ARG_DECL)
+                  Notify_Test_Client* client)
 {
   // startup the consumer
   Notify_Sequence_Push_Consumer* consumer_1;
@@ -123,9 +120,9 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
                                                    *client),
                     CORBA::NO_MEMORY ());
 
-  consumer_1->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
+  consumer_1->init (client->root_poa ());
 
-  consumer_1->_connect (admin ACE_ENV_ARG_PARAMETER);
+  consumer_1->_connect (admin);
 }
 
 // ******************************************************************
@@ -135,22 +132,22 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
 int main (int argc, char* argv[])
 {
   int status = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
       Consumer_Client client;
 
-      status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      status = client.init (argc, argv);
 
       if (status == 0)
         {
           CosNotifyChannelAdmin::EventChannel_var ec =
-            client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER);
+            client.create_event_channel ("MyEventChannel", 1);
 
           CORBA::ORB_ptr orb = client.orb ();
           CORBA::Object_var object =
-                              orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+                              orb->string_to_object (ior);
 
-          sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+          sig_var sig = sig::_narrow (object.in ());
 
           if (CORBA::is_nil (sig.in ()))
             {
@@ -161,28 +158,27 @@ int main (int argc, char* argv[])
             }
 
           CosNotifyChannelAdmin::ConsumerAdmin_var admin =
-            create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
+            create_consumeradmin (ec.in ());
 
           if (!CORBA::is_nil (admin.in ()))
             {
-              create_consumers (admin.in (), &client ACE_ENV_ARG_PARAMETER);
+              create_consumers (admin.in (), &client);
 
               // Tell the supplier to go
               sig->go ();
 
-              client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
+              client.ORB_run( );
               ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
 
               sig->done ();
             }
         }
     }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
     {
-      ACE_PRINT_EXCEPTION (e, "Error: Consumer exception: ");
+      e._tao_print_exception ("Error: Consumer exception: ");
       status = 1;
     }
-  ACE_ENDTRY;
 
   return status;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
index 38a282be7f0..d752690b91a 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
@@ -112,14 +112,12 @@ Supplier_Client::parse_args (int argc, char *argv[])
 
 
 static CosNotifyChannelAdmin::SupplierAdmin_ptr
-create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::SupplierAdmin_var admin =
     ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP,
-    adminid
-    ACE_ENV_ARG_PARAMETER);
+    adminid);
 
 
   return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ());
@@ -127,7 +125,7 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 
 
 static void
-SendEvents (int id ACE_ENV_ARG_DECL)
+SendEvents (int id)
 {
   static const char* types[] = { "good", "bad", "ugly" };
   CosNotification::EventBatch events;
@@ -169,30 +167,28 @@ SendEvents (int id ACE_ENV_ARG_DECL)
     events[z] = event;
   }
 
-  ACE_TRY_NEW_ENV
+  try
   {
-    supplier_1->send_events (events ACE_ENV_ARG_PARAMETER);
+    supplier_1->send_events (events);
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: Supplier exception: ");
+    e._tao_print_exception ("Error: Supplier exception: ");
   }
-  ACE_ENDTRY;
 }
 
 static void
 create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
-                  PortableServer::POA_ptr poa
-                  ACE_ENV_ARG_DECL)
+                  PortableServer::POA_ptr poa)
 {
   // start up the supplier
   ACE_NEW_THROW_EX (supplier_1,
     TAO_Notify_Tests_SequencePushSupplier (),
     CORBA::NO_MEMORY ());
 
-  supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
+  supplier_1->init (poa);
 
-  supplier_1->connect (admin ACE_ENV_ARG_PARAMETER);
+  supplier_1->connect (admin);
 }
 
 
@@ -204,15 +200,15 @@ int main (int argc, char* argv[])
 {
   ACE_Auto_Ptr< sig_i > sig_impl;
   int status = 0;
-  ACE_TRY_NEW_ENV
+  try
   {
     Supplier_Client client;
-    status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+    status = client.init (argc, argv);
 
     if (status == 0)
     {
       CosNotifyChannelAdmin::EventChannel_var ec =
-        client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER);
+        client.create_event_channel ("MyEventChannel", 0);
 
       CORBA::ORB_ptr orb = client.orb ();
 
@@ -220,7 +216,7 @@ int main (int argc, char* argv[])
       sig_var sig = sig_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (sig.in ());
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
@@ -237,10 +233,10 @@ int main (int argc, char* argv[])
       }
 
       CosNotifyChannelAdmin::SupplierAdmin_var admin =
-        create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
+        create_supplieradmin (ec.in ());
       if (!CORBA::is_nil (admin.in ()))
       {
-        create_suppliers (admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER);
+        create_suppliers (admin.in (), client.root_poa ());
 
         sig_impl->wait_for_startup();
 
@@ -248,7 +244,7 @@ int main (int argc, char* argv[])
         for (int i = 0; i < num_batches; ++i)
         {
           ACE_DEBUG((LM_DEBUG, "+"));
-          SendEvents (i ACE_ENV_ARG_PARAMETER);
+          SendEvents (i);
         }
         ACE_DEBUG((LM_DEBUG, "\nSupplier waiting for consumer...\n"));
 
@@ -262,12 +258,11 @@ int main (int argc, char* argv[])
       }
     }
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: Supplier exception: ");
+    e._tao_print_exception ("Error: Supplier exception: ");
     status = 1;
   }
-  ACE_ENDTRY;
 
   return status;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp
index d2b0eaf5979..7da1dca4809 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp
@@ -29,8 +29,7 @@ Notify_Sequence_Push_Consumer::~Notify_Sequence_Push_Consumer ()
 
 void
 Notify_Sequence_Push_Consumer::_connect (
-                CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                ACE_ENV_ARG_DECL)
+                CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::SequencePushConsumer_var objref =
@@ -39,12 +38,11 @@ Notify_Sequence_Push_Consumer::_connect (
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     consumer_admin->obtain_notification_push_supplier (
       CosNotifyChannelAdmin::SEQUENCE_EVENT,
-      proxy_id_
-      ACE_ENV_ARG_PARAMETER);
+      proxy_id_);
 
   this->proxy_ =
     CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow (
-      proxysupplier.in () ACE_ENV_ARG_PARAMETER);
+      proxysupplier.in ());
 
   CosNotification::QoSProperties properties(3);
   properties.length(3);
@@ -54,8 +52,7 @@ Notify_Sequence_Push_Consumer::_connect (
   properties[1].value <<= (TimeBase::TimeT) 2 * 1000 * 10000;
 
   proxy_->set_qos(properties);
-  proxy_->connect_sequence_push_consumer (objref.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
+  proxy_->connect_sequence_push_consumer (objref.in ());
 
   // give ownership to POA
   this->_remove_ref ();
@@ -64,8 +61,7 @@ Notify_Sequence_Push_Consumer::_connect (
 
 void
 Notify_Sequence_Push_Consumer::push_structured_events(
-                          const CosNotification::EventBatch& events
-                          ACE_ENV_ARG_DECL_NOT_USED)
+                          const CosNotification::EventBatch& events)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG((LM_DEBUG, "{%u}", events.length()));
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.h
index 1318d05545c..66e93b2f84d 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.h
@@ -32,13 +32,11 @@ public:
 
   ~Notify_Sequence_Push_Consumer ();
 
-  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                ACE_ENV_ARG_DECL)
+  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
-  void push_structured_events(const CosNotification::EventBatch&
-                              ACE_ENV_ARG_DECL)
+  void push_structured_events(const CosNotification::EventBatch&)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   ACE_CString name_;
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
index 190f715ac9b..21a4cd4a3b2 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
@@ -75,14 +75,12 @@ Consumer_Client::parse_args (int argc, char *argv[])
 
 
 static CosNotifyChannelAdmin::ConsumerAdmin_ptr
-create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::ConsumerAdmin_var admin =
     ec->new_for_consumers (CosNotifyChannelAdmin::AND_OP,
-    adminid
-    ACE_ENV_ARG_PARAMETER);
+    adminid);
 
 
   return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ());
@@ -91,8 +89,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 
 static void
 create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
-                  Notify_Test_Client* client
-                  ACE_ENV_ARG_DECL)
+                  Notify_Test_Client* client)
 {
   // startup the first consumer
   Notify_Sequence_Push_Consumer* consumer_1;
@@ -102,9 +99,9 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
     high,
     *client),
     CORBA::NO_MEMORY ());
-  consumer_1->init(client->root_poa () ACE_ENV_ARG_PARAMETER);
+  consumer_1->init(client->root_poa ());
 
-  consumer_1->_connect (admin ACE_ENV_ARG_PARAMETER);
+  consumer_1->_connect (admin);
 }
 
 // ******************************************************************
@@ -113,28 +110,27 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
 
 int main (int argc, char* argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
   {
     Consumer_Client client;
 
-    int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+    int status = client.init (argc, argv);
     ACE_ASSERT(status == 0);
     ACE_UNUSED_ARG(status);
 
     CosNotifyChannelAdmin::EventChannel_var ec =
-      client.create_event_channel ("MyEventChannel", 1
-      ACE_ENV_ARG_PARAMETER);
+      client.create_event_channel ("MyEventChannel", 1);
 
     CORBA::ORB_ptr orb = client.orb ();
     CORBA::Object_var object =
-      orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+      orb->string_to_object (ior);
 
-    sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+    sig_var sig = sig::_narrow (object.in ());
 
     ACE_ASSERT(! CORBA::is_nil (sig.in ()));
 
     CosNotifyChannelAdmin::ConsumerAdmin_var admin =
-      create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
+      create_consumeradmin (ec.in ());
 
     if (filter)
     {
@@ -142,7 +138,7 @@ int main (int argc, char* argv[])
         ec->default_filter_factory ();
 
       CosNotifyFilter::Filter_var filter =
-        ffact->create_filter ("TCL" ACE_ENV_ARG_PARAMETER);
+        ffact->create_filter ("TCL");
 
       ACE_ASSERT(! CORBA::is_nil(filter.in()));
 
@@ -152,18 +148,18 @@ int main (int argc, char* argv[])
       constraint_list[0].event_types.length (0);
       constraint_list[0].constraint_expr = CORBA::string_dup(constraintString);
 
-      filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
+      filter->add_constraints (constraint_list);
 
       admin->add_filter(filter.in());
     }
 
     ACE_ASSERT (!CORBA::is_nil (admin.in ()));
-    create_consumers(admin.in (), &client ACE_ENV_ARG_PARAMETER);
+    create_consumers(admin.in (), &client);
 
     // Tell the supplier to go
     sig->go ();
 
-    client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
+    client.ORB_run( );
     ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
 
     sig->done ();
@@ -171,11 +167,10 @@ int main (int argc, char* argv[])
     return 0;
 
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: Consumer exception: ");
+    e._tao_print_exception ("Error: Consumer exception: ");
   }
-  ACE_ENDTRY;
 
   return 1;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
index aa77ad56994..aa75ef1b151 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
@@ -113,14 +113,12 @@ Supplier_Client::parse_args (int argc, char *argv[])
 
 
 static CosNotifyChannelAdmin::SupplierAdmin_ptr
-create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::SupplierAdmin_var admin =
     ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP,
-    adminid
-    ACE_ENV_ARG_PARAMETER);
+    adminid);
 
 
   return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ());
@@ -128,7 +126,7 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 
 
 static void
-SendEvents (int id ACE_ENV_ARG_DECL)
+SendEvents (int id)
 {
   static const char* types[] = { "good", "bad", "ugly" };
   CosNotification::EventBatch events;
@@ -170,30 +168,28 @@ SendEvents (int id ACE_ENV_ARG_DECL)
     events[z] = event;
   }
 
-  ACE_TRY_NEW_ENV
+  try
   {
-    supplier_1->send_events(events ACE_ENV_ARG_PARAMETER);
+    supplier_1->send_events(events);
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: Supplier exception: ");
+    e._tao_print_exception ("Error: Supplier exception: ");
   }
-  ACE_ENDTRY;
 }
 
 static void
 create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
-                  PortableServer::POA_ptr poa
-                  ACE_ENV_ARG_DECL)
+                  PortableServer::POA_ptr poa)
 {
   // startup the first supplier
   ACE_NEW_THROW_EX (supplier_1,
     TAO_Notify_Tests_SequencePushSupplier (),
     CORBA::NO_MEMORY ());
 
-  supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
+  supplier_1->init (poa);
 
-  supplier_1->connect (admin ACE_ENV_ARG_PARAMETER);
+  supplier_1->connect (admin);
 }
 
 
@@ -205,17 +201,16 @@ int main (int argc, char* argv[])
 {
   ACE_Auto_Ptr< sig_i > sig_impl;
   int status = 0;
-  ACE_TRY_NEW_ENV
+  try
   {
     Supplier_Client client;
 
-    status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+    status = client.init (argc, argv);
 
     if (status == 0)
     {
       CosNotifyChannelAdmin::EventChannel_var ec =
-        client.create_event_channel ("MyEventChannel", 0
-        ACE_ENV_ARG_PARAMETER);
+        client.create_event_channel ("MyEventChannel", 0);
 
       CORBA::ORB_ptr orb = client.orb ();
 
@@ -223,7 +218,7 @@ int main (int argc, char* argv[])
       sig_var sig = sig_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (sig.in ());
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
@@ -240,10 +235,10 @@ int main (int argc, char* argv[])
       }
 
       CosNotifyChannelAdmin::SupplierAdmin_var admin =
-        create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
+        create_supplieradmin (ec.in ());
       if (!CORBA::is_nil (admin.in ()))
       {
-        create_suppliers(admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER);
+        create_suppliers(admin.in (), client.root_poa ());
 
         sig_impl->wait_for_startup();
 
@@ -251,7 +246,7 @@ int main (int argc, char* argv[])
         for (int i = 0; i < num_batches; ++i)
         {
           ACE_DEBUG((LM_DEBUG, "+"));
-          SendEvents (i ACE_ENV_ARG_PARAMETER);
+          SendEvents (i);
         }
         ACE_DEBUG((LM_DEBUG, "\nSupplier waiting for consumer completion...\n"));
 
@@ -265,12 +260,11 @@ int main (int argc, char* argv[])
       }
     }
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: Supplier exception: ");
+    e._tao_print_exception ("Error: Supplier exception: ");
     status = 1;
   }
-  ACE_ENDTRY;
 
   return status;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp
index 8d106648c2d..dba87df34f5 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp
@@ -30,7 +30,7 @@ Notify_Push_Consumer::Notify_Push_Consumer (const char* name,
 
 void
 Notify_Push_Consumer::_connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-                                CosNotifyChannelAdmin::EventChannel_ptr notify_channel ACE_ENV_ARG_DECL)
+                                CosNotifyChannelAdmin::EventChannel_ptr notify_channel)
                                 ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG(notify_channel);
@@ -40,14 +40,13 @@ Notify_Push_Consumer::_connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consume
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     consumer_admin->obtain_notification_push_supplier (
     CosNotifyChannelAdmin::STRUCTURED_EVENT,
-    proxy_id_
-    ACE_ENV_ARG_PARAMETER);
+    proxy_id_);
 
   this->proxy_ =
     CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (
-    proxysupplier.in () ACE_ENV_ARG_PARAMETER);
+    proxysupplier.in ());
 
-  this->proxy_->connect_structured_push_consumer (objref.in () ACE_ENV_ARG_PARAMETER);
+  this->proxy_->connect_structured_push_consumer (objref.in ());
 
   // give ownership to POA
   this->_remove_ref ();
@@ -65,8 +64,7 @@ static void validate_expression(bool expr, const char* msg)
 
 void
 Notify_Push_Consumer::push_structured_event (
-  const CosNotification::StructuredEvent& event
-  ACE_ENV_ARG_DECL_NOT_USED)
+  const CosNotification::StructuredEvent& event)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG((LM_DEBUG, "-"));
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.h
index 833b1be664b..d577b7f5002 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.h
@@ -28,11 +28,11 @@ public:
   Notify_Push_Consumer (const char* name, int sent, bool useFilter, Notify_Test_Client& client);
 
   void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-                CosNotifyChannelAdmin::EventChannel_ptr ec ACE_ENV_ARG_DECL)
+                CosNotifyChannelAdmin::EventChannel_ptr ec)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
-  void push_structured_event (const CosNotification::StructuredEvent& ACE_ENV_ARG_DECL)
+  void push_structured_event (const CosNotification::StructuredEvent&)
     ACE_THROW_SPEC ((CORBA::SystemException));
 private:
   ACE_CString name_;
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp
index 3579b78f725..cb54a45d762 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp
@@ -55,34 +55,33 @@ Consumer_Client::parse_args (int argc, char *argv[])
 static void
 create_consumer (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
                  CosNotifyChannelAdmin::EventChannel_ptr ec,
-                 Notify_Test_Client* client
-                 ACE_ENV_ARG_DECL)
+                 Notify_Test_Client* client)
 {
   ACE_NEW_THROW_EX (consumer,
     Notify_Push_Consumer ("Consumer", numEvents, useFilter, *client),
     CORBA::NO_MEMORY ());
 
-  consumer->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
+  consumer->init (client->root_poa ());
 
-  consumer->_connect (admin, ec ACE_ENV_ARG_PARAMETER);
+  consumer->_connect (admin, ec);
 }
 
 int main (int argc, char * argv[])
 {
-  ACE_TRY_NEW_ENV;
+  try
   {
     Consumer_Client client;
 
-    int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+    int status = client.init (argc, argv);
     ACE_UNUSED_ARG(status);
     ACE_ASSERT(status == 0);
 
     CosNotifyChannelAdmin::EventChannel_var ec =
-      client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER);
+      client.create_event_channel ("MyEventChannel", 1);
 
     CosNotifyChannelAdmin::AdminID adminid = 0;
     CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin =
-      ec->new_for_consumers(CosNotifyChannelAdmin::AND_OP, adminid ACE_ENV_ARG_PARAMETER);
+      ec->new_for_consumers(CosNotifyChannelAdmin::AND_OP, adminid);
 
     ACE_ASSERT(! CORBA::is_nil (consumer_admin.in ()));
 
@@ -92,7 +91,7 @@ int main (int argc, char * argv[])
         ec->default_filter_factory ();
 
       CosNotifyFilter::Filter_var filter =
-        ffact->create_filter (GRAMMAR ACE_ENV_ARG_PARAMETER);
+        ffact->create_filter (GRAMMAR);
 
       if (CORBA::is_nil (filter.in ()))
       {
@@ -107,7 +106,7 @@ int main (int argc, char * argv[])
       constraint_list[0].event_types.length (0);
       constraint_list[0].constraint_expr = CORBA::string_dup ("type != 1 and group != 0");
 
-      filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
+      filter->add_constraints (constraint_list);
 
       consumer_admin->add_filter (filter.in ());
     }
@@ -115,19 +114,19 @@ int main (int argc, char * argv[])
     CORBA::ORB_ptr orb = client.orb ();
 
     CORBA::Object_var object =
-      orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+      orb->string_to_object (ior);
 
-    sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+    sig_var sig = sig::_narrow (object.in ());
 
     ACE_ASSERT(! CORBA::is_nil (sig.in ()));
 
-    create_consumer (consumer_admin.in (), ec.in (), &client ACE_ENV_ARG_PARAMETER);
+    create_consumer (consumer_admin.in (), ec.in (), &client);
 
     ACE_DEBUG((LM_DEBUG, "\nConsumer waiting for events...\n"));
 
     sig->go ();
 
-    client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
+    client.ORB_run( );
 
     ACE_DEBUG((LM_DEBUG, "\nConsumer done.\n"));
 
@@ -135,11 +134,10 @@ int main (int argc, char * argv[])
 
     return 0;
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "\nError: Consumer:");
+    e._tao_print_exception ("\nError: Consumer:");
   }
-  ACE_ENDTRY;
 
   return 1;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
index 674f7479170..86542c868f2 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
@@ -65,14 +65,12 @@ private:
 };
 
 static CosNotifyChannelAdmin::SupplierAdmin_ptr
-create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::SupplierAdmin_var admin =
     ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP,
-    adminid
-    ACE_ENV_ARG_PARAMETER);
+    adminid);
 
   return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ());
 }
@@ -99,46 +97,44 @@ send_event (int id)
   // Divide by 3 first so that the type and group aren't synched
   event.filterable_data[2].value <<= static_cast<CORBA::ULong>(id / 3 % 3);
 
-  ACE_TRY_NEW_ENV
+  try
   {
     ACE_DEBUG((LM_DEBUG, "+"));
 
-    supplier->send_event (event ACE_ENV_ARG_PARAMETER);
+    supplier->send_event (event);
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "\nError: Supplier: ");
+    e._tao_print_exception ("\nError: Supplier: ");
   }
-  ACE_ENDTRY;
 
   return 0;
 }
 
 static void create_supplier (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
-                             PortableServer::POA_ptr poa
-                             ACE_ENV_ARG_DECL)
+                             PortableServer::POA_ptr poa)
 {
   ACE_NEW_THROW_EX (supplier,
     TAO_Notify_Tests_StructuredPushSupplier (),
     CORBA::NO_MEMORY ());
 
-  supplier->init (poa ACE_ENV_ARG_PARAMETER);
+  supplier->init (poa);
 
-  supplier->connect (admin ACE_ENV_ARG_PARAMETER);
+  supplier->connect (admin);
 }
 
 int main (int argc, char * argv[])
 {
   ACE_Auto_Ptr< sig_i > sig_impl;
-  ACE_TRY_NEW_ENV;
+  try
   {
     Notify_Test_Client client;
-    int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+    int status = client.init (argc, argv);
     ACE_UNUSED_ARG(status);
     ACE_ASSERT(status == 0);
 
     CosNotifyChannelAdmin::EventChannel_var ec =
-      client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER);
+      client.create_event_channel ("MyEventChannel", 0);
 
     ACE_ASSERT(! CORBA::is_nil(ec.in()));
 
@@ -148,15 +144,15 @@ int main (int argc, char * argv[])
     sig_var sig = sig_impl->_this ();
 
     CosNotifyChannelAdmin::SupplierAdmin_var admin =
-      create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
+      create_supplieradmin (ec.in ());
     ACE_ASSERT(! CORBA::is_nil (admin.in ()));
 
-    create_supplier (admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER);
+    create_supplier (admin.in (), client.root_poa ());
 
     if (ior_file != 0)
     {
       CORBA::String_var ior =
-        client.orb ()->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
+        client.orb ()->object_to_string (sig.in ());
 
       FILE *output_file= ACE_OS::fopen (ior_file, "w");
       ACE_ASSERT (output_file != 0);
@@ -184,11 +180,10 @@ int main (int argc, char * argv[])
 
     return 0;
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: Supplier: ");
+    e._tao_print_exception ("Error: Supplier: ");
   }
-  ACE_ENDTRY;
 
   return 1;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp
index 7ac0f3014aa..32aa61440c0 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp
@@ -77,7 +77,7 @@ Notify_Push_Consumer::Notify_Push_Consumer (const char* name,
 
 void
 Notify_Push_Consumer::_connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-                                CosNotifyChannelAdmin::EventChannel_ptr notify_channel ACE_ENV_ARG_DECL)
+                                CosNotifyChannelAdmin::EventChannel_ptr notify_channel)
                                 ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::StructuredPushConsumer_var objref =
@@ -86,8 +86,7 @@ Notify_Push_Consumer::_connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consume
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     consumer_admin->obtain_notification_push_supplier (
     CosNotifyChannelAdmin::STRUCTURED_EVENT,
-    proxy_id_
-    ACE_ENV_ARG_PARAMETER);
+    proxy_id_);
 
   if (consumerFilter_ != None)
   {
@@ -95,7 +94,7 @@ Notify_Push_Consumer::_connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consume
       notify_channel->default_filter_factory ();
 
     CosNotifyFilter::Filter_var filter =
-      ffact->create_filter ("TCL" ACE_ENV_ARG_PARAMETER);
+      ffact->create_filter ("TCL");
 
     ACE_ASSERT(! CORBA::is_nil (filter.in ()));
 
@@ -105,7 +104,7 @@ Notify_Push_Consumer::_connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consume
     constraint_list[0].event_types.length (0);
     constraint_list[0].constraint_expr = CORBA::string_dup ("group != 1");
 
-    filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
+    filter->add_constraints (constraint_list);
 
     proxysupplier->add_filter (filter.in ());
   }
@@ -113,9 +112,9 @@ Notify_Push_Consumer::_connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consume
 
   this->proxy_ =
     CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (
-    proxysupplier.in () ACE_ENV_ARG_PARAMETER);
+    proxysupplier.in ());
 
-  this->proxy_->connect_structured_push_consumer (objref.in () ACE_ENV_ARG_PARAMETER);
+  this->proxy_->connect_structured_push_consumer (objref.in ());
 
   // give ownership to POA
   this->_remove_ref ();
@@ -133,8 +132,7 @@ static void validate_expression(bool expr, const char* msg)
 
 void
 Notify_Push_Consumer::push_structured_event (
-  const CosNotification::StructuredEvent& event
-  ACE_ENV_ARG_DECL_NOT_USED)
+  const CosNotification::StructuredEvent& event)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG((LM_DEBUG, "-"));
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.h
index 6231ecb69f7..9113d215823 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.h
@@ -31,11 +31,11 @@ public:
     NS_FilterType supplierFilter, Notify_Test_Client& client);
 
   void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-                CosNotifyChannelAdmin::EventChannel_ptr ec ACE_ENV_ARG_DECL)
+                CosNotifyChannelAdmin::EventChannel_ptr ec)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
-  void push_structured_event (const CosNotification::StructuredEvent& ACE_ENV_ARG_DECL)
+  void push_structured_event (const CosNotification::StructuredEvent&)
     ACE_THROW_SPEC ((CORBA::SystemException));
 private:
   ACE_CString name_;
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp
index 81bdb94275d..963ddda3627 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp
@@ -5,8 +5,7 @@ void
 Notify_Push_Supplier::_connect (
                 CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin,
                 CosNotifyChannelAdmin::EventChannel_ptr notify_channel,
-                bool useFilter
-                ACE_ENV_ARG_DECL)
+                bool useFilter)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::StructuredPushSupplier_var objref =
@@ -15,8 +14,7 @@ Notify_Push_Supplier::_connect (
   CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer =
     supplier_admin->obtain_notification_push_consumer (
       CosNotifyChannelAdmin::STRUCTURED_EVENT,
-      proxy_id_
-      ACE_ENV_ARG_PARAMETER);
+      proxy_id_);
 
   if (useFilter)
     {
@@ -24,7 +22,7 @@ Notify_Push_Supplier::_connect (
         notify_channel->default_filter_factory ();
 
       CosNotifyFilter::Filter_var filter =
-        ffact->create_filter ("TCL" ACE_ENV_ARG_PARAMETER);
+        ffact->create_filter ("TCL");
 
       ACE_ASSERT(! CORBA::is_nil (filter.in ()));
 
@@ -34,16 +32,16 @@ Notify_Push_Supplier::_connect (
       constraint_list[0].event_types.length (0);
       constraint_list[0].constraint_expr = CORBA::string_dup ("group != 0");
 
-      filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
+      filter->add_constraints (constraint_list);
 
       proxyconsumer->add_filter (filter.in ());
     }
 
   this->proxy_ =
     CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (
-      proxyconsumer.in () ACE_ENV_ARG_PARAMETER);
+      proxyconsumer.in ());
 
-  this->proxy_->connect_structured_push_supplier (objref.in () ACE_ENV_ARG_PARAMETER);
+  this->proxy_->connect_structured_push_supplier (objref.in ());
 
   // give ownership to POA
   this->_remove_ref ();
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.h b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.h
index 03f5844fb5d..254ae0b88b4 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.h
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.h
@@ -10,8 +10,7 @@ class Notify_Push_Supplier: public TAO_Notify_Tests_StructuredPushSupplier
 public:
   void _connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin,
                 CosNotifyChannelAdmin::EventChannel_ptr notify_channel,
-                bool useFilter
-                ACE_ENV_ARG_DECL)
+                bool useFilter)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp
index 2bb76afe96d..9a06127d352 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp
@@ -71,26 +71,25 @@ Consumer_Client::parse_args (int argc, char *argv[])
 static void
 create_consumer (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
                  CosNotifyChannelAdmin::EventChannel_ptr ec,
-                 Notify_Test_Client* client
-                 ACE_ENV_ARG_DECL)
+                 Notify_Test_Client* client)
 {
   ACE_NEW_THROW_EX (consumer,
     Notify_Push_Consumer ("Consumer", numEvents, consumerFilter,
       supplierFilter, *client),
     CORBA::NO_MEMORY ());
 
-  consumer->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
+  consumer->init (client->root_poa ());
 
-  consumer->_connect (admin, ec ACE_ENV_ARG_PARAMETER);
+  consumer->_connect (admin, ec);
 }
 
 int main (int argc, char * argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
   {
     Consumer_Client client;
 
-    int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+    int status = client.init (argc, argv);
     if (status != 0)
     {
       ACE_ERROR((LM_ERROR, "Error: Unable to init consumer.\n"));
@@ -98,13 +97,13 @@ int main (int argc, char * argv[])
     }
 
     CosNotifyChannelAdmin::EventChannel_var ec =
-      client.create_event_channel ("Struct_Multi_Filter", 1 ACE_ENV_ARG_PARAMETER);
+      client.create_event_channel ("Struct_Multi_Filter", 1);
 
     CosNotifyChannelAdmin::AdminID adminid = 0;
     CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin =
       ec->new_for_consumers ((consumerFilter == OrOp
       ? CosNotifyChannelAdmin::OR_OP : CosNotifyChannelAdmin::AND_OP),
-      adminid ACE_ENV_ARG_PARAMETER);
+      adminid);
 
     ACE_ASSERT(! CORBA::is_nil (consumer_admin.in ()));
 
@@ -114,7 +113,7 @@ int main (int argc, char * argv[])
         ec->default_filter_factory ();
 
       CosNotifyFilter::Filter_var filter =
-        ffact->create_filter (GRAMMAR ACE_ENV_ARG_PARAMETER);
+        ffact->create_filter (GRAMMAR);
 
       if (CORBA::is_nil (filter.in ()))
       {
@@ -129,7 +128,7 @@ int main (int argc, char * argv[])
       constraint_list[0].event_types.length (0);
       constraint_list[0].constraint_expr = CORBA::string_dup ("type != 1");
 
-      filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
+      filter->add_constraints (constraint_list);
 
       consumer_admin->add_filter (filter.in ());
     }
@@ -137,19 +136,19 @@ int main (int argc, char * argv[])
     CORBA::ORB_ptr orb = client.orb ();
 
     CORBA::Object_var object =
-      orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+      orb->string_to_object (ior);
 
-    sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+    sig_var sig = sig::_narrow (object.in ());
 
     ACE_ASSERT(! CORBA::is_nil (sig.in ()));
 
-    create_consumer (consumer_admin.in (), ec.in (), &client ACE_ENV_ARG_PARAMETER);
+    create_consumer (consumer_admin.in (), ec.in (), &client);
 
     ACE_DEBUG((LM_DEBUG, "\nConsumer waiting for events...\n"));
 
     sig->go ();
 
-    client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
+    client.ORB_run( );
 
     ACE_DEBUG((LM_DEBUG, "\nConsumer done.\n"));
 
@@ -157,11 +156,10 @@ int main (int argc, char * argv[])
 
     return 0;
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "\nError: Consumer:");
+    e._tao_print_exception ("\nError: Consumer:");
   }
-  ACE_ENDTRY;
 
   return 1;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
index 92d96729b15..1fa4997d470 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
@@ -106,15 +106,13 @@ Supplier_Client::parse_args (int argc, char *argv[])
 
 
 static CosNotifyChannelAdmin::SupplierAdmin_ptr
-create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::SupplierAdmin_var admin =
     ec->new_for_suppliers ((use_or_operator ? CosNotifyChannelAdmin::OR_OP :
   CosNotifyChannelAdmin::AND_OP),
-    adminid
-    ACE_ENV_ARG_PARAMETER);
+    adminid);
 
   return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ());
 }
@@ -141,44 +139,41 @@ send_event (int id)
   // Divide by 3 first so that the type and group aren't synched
   event.filterable_data[2].value <<= static_cast<CORBA::ULong>(id / 3 % 3);
 
-  ACE_TRY_NEW_ENV
+  try
   {
     ACE_DEBUG((LM_DEBUG, "+"));
 
-    supplier->send_event (event ACE_ENV_ARG_PARAMETER);
+    supplier->send_event (event);
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "\nError: Supplier: ");
+    e._tao_print_exception ("\nError: Supplier: ");
   }
-  ACE_ENDTRY;
 
   return 0;
 }
 
 static void create_supplier (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
                              CosNotifyChannelAdmin::EventChannel_ptr ec,
-                             PortableServer::POA_ptr poa
-                             ACE_ENV_ARG_DECL)
+                             PortableServer::POA_ptr poa)
 {
   ACE_NEW_THROW_EX (supplier,
     Notify_Push_Supplier (),
     CORBA::NO_MEMORY ());
 
-  supplier->init (poa ACE_ENV_ARG_PARAMETER);
+  supplier->init (poa);
 
-  supplier->_connect (admin, ec, useFilters ACE_ENV_ARG_PARAMETER);
+  supplier->_connect (admin, ec, useFilters);
 }
 
 void add_admin_filter (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
-                 CosNotifyChannelAdmin::EventChannel_ptr notify_channel
-                 ACE_ENV_ARG_DECL)
+                 CosNotifyChannelAdmin::EventChannel_ptr notify_channel)
 {
   CosNotifyFilter::FilterFactory_var ffact =
     notify_channel->default_filter_factory ();
 
   CosNotifyFilter::Filter_var filter =
-    ffact->create_filter (GRAMMAR ACE_ENV_ARG_PARAMETER);
+    ffact->create_filter (GRAMMAR);
 
   ACE_ASSERT(!CORBA::is_nil (filter.in ()));
 
@@ -188,23 +183,23 @@ void add_admin_filter (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
   constraint_list[0].event_types.length (0);
   constraint_list[0].constraint_expr = CORBA::string_dup ("type != 0");
 
-  filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
+  filter->add_constraints (constraint_list);
 
-  admin->add_filter (filter.in () ACE_ENV_ARG_PARAMETER);
+  admin->add_filter (filter.in ());
 }
 
 int main (int argc, char * argv[])
 {
   ACE_Auto_Ptr< sig_i > sig_impl;
-  ACE_TRY_NEW_ENV;
+  try
   {
     Supplier_Client client;
-    int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+    int status = client.init (argc, argv);
     ACE_UNUSED_ARG(status);
     ACE_ASSERT(status == 0);
 
     CosNotifyChannelAdmin::EventChannel_var ec =
-      client.create_event_channel ("Struct_Multi_Filter", 0 ACE_ENV_ARG_PARAMETER);
+      client.create_event_channel ("Struct_Multi_Filter", 0);
 
     ACE_ASSERT(! CORBA::is_nil(ec.in()));
 
@@ -214,22 +209,22 @@ int main (int argc, char * argv[])
     sig_var sig = sig_impl->_this ();
 
     CosNotifyChannelAdmin::SupplierAdmin_var admin =
-      create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
+      create_supplieradmin (ec.in ());
 
     if (useFilters)
     {
-      add_admin_filter (admin.in (), ec.in () ACE_ENV_ARG_PARAMETER);
+      add_admin_filter (admin.in (), ec.in ());
     }
 
     ACE_ASSERT(! CORBA::is_nil (admin.in ()));
 
-    create_supplier (admin.in(), ec.in(), client.root_poa() ACE_ENV_ARG_PARAMETER);
+    create_supplier (admin.in(), ec.in(), client.root_poa());
 
     // If the ior_file exists, output the ior to it
     if (ior_file != 0)
     {
       CORBA::String_var ior =
-        client.orb ()->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
+        client.orb ()->object_to_string (sig.in ());
 
       FILE *output_file= ACE_OS::fopen (ior_file, "w");
       ACE_ASSERT (output_file != 0);
@@ -257,11 +252,10 @@ int main (int argc, char * argv[])
 
     return 0;
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: Supplier: ");
+    e._tao_print_exception ("Error: Supplier: ");
   }
-  ACE_ENDTRY;
 
   return 1;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
index 1a316c6d55f..640f8cfd8c6 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
@@ -32,7 +32,6 @@ TAO_Notify_Tests_RT_Test_Filter::constraint_grammar (void)
 
 CosNotifyFilter::ConstraintInfoSeq*
 TAO_Notify_Tests_RT_Test_Filter::add_constraints (const CosNotifyFilter::ConstraintExpSeq& constraint_list
-                                ACE_ENV_ARG_DECL
                                 )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
@@ -86,7 +85,6 @@ TAO_Notify_Tests_RT_Test_Filter::add_constraints (const CosNotifyFilter::Constra
 void
 TAO_Notify_Tests_RT_Test_Filter::modify_constraints (const CosNotifyFilter::ConstraintIDSeq & /*del_list*/,
                                    const CosNotifyFilter::ConstraintInfoSeq & /*modify_list*/
-                                   ACE_ENV_ARG_DECL_NOT_USED
                                    )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
@@ -99,7 +97,6 @@ TAO_Notify_Tests_RT_Test_Filter::modify_constraints (const CosNotifyFilter::Cons
 
 CosNotifyFilter::ConstraintInfoSeq*
 TAO_Notify_Tests_RT_Test_Filter::get_constraints (const CosNotifyFilter::ConstraintIDSeq & /*id_list*/
-                                ACE_ENV_ARG_DECL_NOT_USED
                                 )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNotifyFilter::ConstraintNotFound))
@@ -137,7 +134,7 @@ TAO_Notify_Tests_RT_Test_Filter::destroy (void)
 
 CORBA::Boolean
 TAO_Notify_Tests_RT_Test_Filter::match (const CORBA::Any & /*filterable_data */
-                           ACE_ENV_ARG_DECL)
+                           )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNotifyFilter::UnsupportedFilterableData))
 {
@@ -147,7 +144,6 @@ TAO_Notify_Tests_RT_Test_Filter::match (const CORBA::Any & /*filterable_data */
 
 CORBA::Boolean
 TAO_Notify_Tests_RT_Test_Filter::match_structured (const CosNotification::StructuredEvent & notification
-                                 ACE_ENV_ARG_DECL
                                  )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNotifyFilter::UnsupportedFilterableData))
@@ -165,12 +161,10 @@ TAO_Notify_Tests_RT_Test_Filter::match_structured (const CosNotification::Struct
   CORBA::ORB_ptr orb = poa->orb_core ().orb ();
 
   CORBA::Object_var object =
-    orb->resolve_initial_references ("RTCurrent"
-                                            ACE_ENV_ARG_PARAMETER);
+    orb->resolve_initial_references ("RTCurrent");
 
   RTCORBA::Current_var current =
-    RTCORBA::Current::_narrow (object.in ()
-                               ACE_ENV_ARG_PARAMETER);
+    RTCORBA::Current::_narrow (object.in ());
 
   // Get the ORB_Core's TSS resources.
   TAO_ORB_Core_TSS_Resources *tss =
@@ -247,7 +241,6 @@ TAO_Notify_Tests_RT_Test_Filter::match_structured (const CosNotification::Struct
 CORBA::Boolean
 TAO_Notify_Tests_RT_Test_Filter::match_typed (
                             const CosNotification::PropertySeq & /* filterable_data */
-                            ACE_ENV_ARG_DECL
                             )
   ACE_THROW_SPEC (( CORBA::SystemException,
                     CosNotifyFilter::UnsupportedFilterableData))
@@ -259,7 +252,6 @@ TAO_Notify_Tests_RT_Test_Filter::match_typed (
 CosNotifyFilter::CallbackID
 TAO_Notify_Tests_RT_Test_Filter::attach_callback (
                                 CosNotifyComm::NotifySubscribe_ptr /* callback */
-                                ACE_ENV_ARG_DECL
                                 )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -270,12 +262,11 @@ TAO_Notify_Tests_RT_Test_Filter::attach_callback (
 void
 TAO_Notify_Tests_RT_Test_Filter::detach_callback (
                                 CosNotifyFilter::CallbackID /* callback */
-                                ACE_ENV_ARG_DECL
                                 )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNotifyFilter::CallbackNotFound))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 CosNotifyFilter::CallbackIDSeq *
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h
index be8498014d8..70814b3c6f6 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h
@@ -48,7 +48,7 @@ protected:
                      CORBA::SystemException
                      ));
 
-  virtual CosNotifyFilter::ConstraintInfoSeq * add_constraints (const CosNotifyFilter::ConstraintExpSeq & constraint_list ACE_ENV_ARG_DECL)
+  virtual CosNotifyFilter::ConstraintInfoSeq * add_constraints (const CosNotifyFilter::ConstraintExpSeq & constraint_list)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosNotifyFilter::InvalidConstraint
@@ -56,7 +56,6 @@ protected:
 
   virtual void modify_constraints (const CosNotifyFilter::ConstraintIDSeq & del_list,
                                    const CosNotifyFilter::ConstraintInfoSeq & modify_list
-                                   ACE_ENV_ARG_DECL
                                    )
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
@@ -64,7 +63,7 @@ protected:
                      CosNotifyFilter::ConstraintNotFound
                      ));
 
-  virtual CosNotifyFilter::ConstraintInfoSeq * get_constraints (const CosNotifyFilter::ConstraintIDSeq & id_list ACE_ENV_ARG_DECL)
+  virtual CosNotifyFilter::ConstraintInfoSeq * get_constraints (const CosNotifyFilter::ConstraintIDSeq & id_list)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosNotifyFilter::ConstraintNotFound
@@ -85,30 +84,30 @@ protected:
                      CORBA::SystemException
                      ));
 
-  virtual CORBA::Boolean match (const CORBA::Any & filterable_data ACE_ENV_ARG_DECL)
+  virtual CORBA::Boolean match (const CORBA::Any & filterable_data)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosNotifyFilter::UnsupportedFilterableData
                      ));
 
-  virtual CORBA::Boolean match_structured (const CosNotification::StructuredEvent & filterable_data ACE_ENV_ARG_DECL)
+  virtual CORBA::Boolean match_structured (const CosNotification::StructuredEvent & filterable_data)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosNotifyFilter::UnsupportedFilterableData
                      ));
 
-  virtual CORBA::Boolean match_typed (const CosNotification::PropertySeq & filterable_data ACE_ENV_ARG_DECL)
+  virtual CORBA::Boolean match_typed (const CosNotification::PropertySeq & filterable_data)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosNotifyFilter::UnsupportedFilterableData
                      ));
 
-  virtual CosNotifyFilter::CallbackID attach_callback (CosNotifyComm::NotifySubscribe_ptr callback ACE_ENV_ARG_DECL)
+  virtual CosNotifyFilter::CallbackID attach_callback (CosNotifyComm::NotifySubscribe_ptr callback)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual void detach_callback (CosNotifyFilter::CallbackID callback ACE_ENV_ARG_DECL)
+  virtual void detach_callback (CosNotifyFilter::CallbackID callback)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosNotifyFilter::CallbackNotFound
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
index ac48714aae7..f3afd4cf533 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
@@ -17,7 +17,7 @@ TAO_Notify_Tests_RT_Test_FilterFactory::~TAO_Notify_Tests_RT_Test_FilterFactory
 }
 
 CosNotifyFilter::FilterFactory_ptr
-TAO_Notify_Tests_RT_Test_FilterFactory::create (PortableServer::POA_var& filter_poa ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_RT_Test_FilterFactory::create (PortableServer::POA_var& filter_poa)
 {
   this->filter_poa_ = filter_poa; // save the filter poa.
 
@@ -27,7 +27,7 @@ TAO_Notify_Tests_RT_Test_FilterFactory::create (PortableServer::POA_var& filter_
 }
 
 CosNotifyFilter::Filter_ptr
-TAO_Notify_Tests_RT_Test_FilterFactory::create_filter (const char *constraint_grammar ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_RT_Test_FilterFactory::create_filter (const char *constraint_grammar)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyFilter::InvalidGrammar
@@ -53,21 +53,17 @@ TAO_Notify_Tests_RT_Test_FilterFactory::create_filter (const char *constraint_gr
   PortableServer::ServantBase_var filter_var (filter);
 
   PortableServer::ObjectId_var oid =
-    this->filter_poa_->activate_object (filter
-                                        ACE_ENV_ARG_PARAMETER);
+    this->filter_poa_->activate_object (filter);
 
   CORBA::Object_var obj =
-    this->filter_poa_->id_to_reference (oid.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+    this->filter_poa_->id_to_reference (oid.in ());
 
-  return CosNotifyFilter::Filter::_narrow (obj.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+  return CosNotifyFilter::Filter::_narrow (obj.in ());
 }
 
 CosNotifyFilter::MappingFilter_ptr
 TAO_Notify_Tests_RT_Test_FilterFactory::create_mapping_filter (const char * /*constraint_grammar*/,
                                                   const CORBA::Any & /*default_value*/
-                                                  ACE_ENV_ARG_DECL
                                                   )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h
index b9c5f4d6075..a660b54c952 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h
@@ -46,12 +46,11 @@ public:
 
   ///= TAO_Notify_Tests_FilterFactory methods.
 
-  virtual CosNotifyFilter::FilterFactory_ptr create (PortableServer::POA_var& filter_poa ACE_ENV_ARG_DECL);
+  virtual CosNotifyFilter::FilterFactory_ptr create (PortableServer::POA_var& filter_poa);
 
   ///= CosNotifyFilter::FilterFactory methods
 
   virtual CosNotifyFilter::Filter_ptr create_filter (const char * constraint_grammar
-                                                     ACE_ENV_ARG_DECL
                                                      )
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
@@ -60,7 +59,6 @@ public:
 
   virtual CosNotifyFilter::MappingFilter_ptr create_mapping_filter (const char * constraint_grammar,
                                                                     const CORBA::Any & default_value
-                                                                    ACE_ENV_ARG_DECL
                                                                     )
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
index 65da45fc8b0..508cc88b296 100644
--- a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
@@ -29,7 +29,7 @@ class TestSupplier
   }
 
   virtual void subscription_change( const CosNotification::EventTypeSeq&,
-    const CosNotification::EventTypeSeq& ACE_ENV_ARG_DECL_NOT_USED)
+    const CosNotification::EventTypeSeq&)
     throw (CORBA::SystemException, CosNotifyComm::InvalidEventType)
   {
   }
@@ -41,12 +41,12 @@ class TestConsumer
   virtual void disconnect_structured_push_consumer(void) throw (CORBA::SystemException) {
   }
 
-  virtual void offer_change( const CosNotification::EventTypeSeq&, const CosNotification::EventTypeSeq& ACE_ENV_ARG_DECL_NOT_USED)
+  virtual void offer_change( const CosNotification::EventTypeSeq&, const CosNotification::EventTypeSeq&)
     throw (CORBA::SystemException, CosNotifyComm::InvalidEventType)
   {
   }
 
-  virtual void push_structured_event(const CosNotification::StructuredEvent& ACE_ENV_ARG_DECL_NOT_USED)
+  virtual void push_structured_event(const CosNotification::StructuredEvent&)
     throw (CORBA::SystemException, CosEventComm::Disconnected)
   {
   }
@@ -58,13 +58,12 @@ int main(int ac, char **av)
 
   bool pass1 = false;
   bool pass2 = false;
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
     CORBA::ORB_var orb;
     PortableServer::POA_var poa;
 
-    orb = CORBA::ORB_init(ac, av, "" ACE_ENV_ARG_PARAMETER);
+    orb = CORBA::ORB_init(ac, av, "");
     ACE_ASSERT(! CORBA::is_nil (orb.in ()));
 
     if (ac > 2 && ACE_OS::strcmp (av[1], "-pass") == 0)
@@ -106,9 +105,9 @@ int main(int ac, char **av)
       }
     }
     CORBA::Object_var obj =
-      orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+      orb->resolve_initial_references("RootPOA");
     ACE_ASSERT(! CORBA::is_nil (obj.in ()));
-    poa = PortableServer::POA::_narrow(obj.in () ACE_ENV_ARG_PARAMETER);
+    poa = PortableServer::POA::_narrow(obj.in ());
     ACE_ASSERT(! CORBA::is_nil (poa.in ()));
     PortableServer::POAManager_var mgr = poa->the_POAManager();
     mgr->activate();
@@ -117,24 +116,22 @@ int main(int ac, char **av)
     policies.length (1);
 
     policies[0] =
-      poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                   ACE_ENV_ARG_PARAMETER);
+      poa->create_lifespan_policy (PortableServer::PERSISTENT);
 
     PortableServer::POA_var persistentPOA = poa->create_POA (
                                                     "PersistentPOA",
                                                     mgr.in (),
-                                                    policies
-                                                    ACE_ENV_ARG_PARAMETER);
+                                                    policies);
 
     policies[0]->destroy ();
 
     if (pass1)
     {
       CosNotifyChannelAdmin::EventChannelFactory_var cosecf =
-        TAO_Notify_EventChannelFactory_i::create(persistentPOA.in () ACE_ENV_ARG_PARAMETER);
+        TAO_Notify_EventChannelFactory_i::create(persistentPOA.in ());
 
       NotifyExt::EventChannelFactory_var ecf =
-        NotifyExt::EventChannelFactory::_narrow (cosecf.in () ACE_ENV_ARG_PARAMETER);
+        NotifyExt::EventChannelFactory::_narrow (cosecf.in ());
 
       if (CORBA::is_nil (ecf.in ()))
       {
@@ -176,42 +173,37 @@ int main(int ac, char **av)
 
       CosNotifyChannelAdmin::ChannelID ecid;
       ::CosNotifyChannelAdmin::EventChannel_var ec =
-        ecf->create_channel(qosprops, adminprops, ecid ACE_ENV_ARG_PARAMETER);
+        ecf->create_channel(qosprops, adminprops, ecid);
 
       CosNotifyChannelAdmin::AdminID consumer_admin_id;
       CosNotifyChannelAdmin::ConsumerAdmin_var ca =
         ec->new_for_consumers(CosNotifyChannelAdmin::OR_OP,
-          consumer_admin_id
-          ACE_ENV_ARG_PARAMETER);
+          consumer_admin_id);
 
       CosNotifyChannelAdmin::AdminID supplier_admin_id;
       CosNotifyChannelAdmin::SupplierAdmin_var sa =
         ec->new_for_suppliers(CosNotifyChannelAdmin::OR_OP,
-          supplier_admin_id
-          ACE_ENV_ARG_PARAMETER);
+          supplier_admin_id);
 
       CosNotifyChannelAdmin::ProxyID proxy_id;
       CosNotifyChannelAdmin::ProxySupplier_var ps =
         ca->obtain_notification_push_supplier(
           CosNotifyChannelAdmin::STRUCTURED_EVENT,
-          proxy_id
-          ACE_ENV_ARG_PARAMETER);
+          proxy_id);
 
       CosNotifyChannelAdmin::StructuredProxyPushSupplier_var strps =
         CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow(ps.in());
 
       ps = ca->obtain_notification_push_supplier(
           CosNotifyChannelAdmin::SEQUENCE_EVENT,
-          proxy_id
-          ACE_ENV_ARG_PARAMETER);
+          proxy_id);
 
       CosNotifyChannelAdmin::SequenceProxyPushSupplier_var seqps =
         CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow(ps.in());
 
       ps = ca->obtain_notification_push_supplier(
           CosNotifyChannelAdmin::ANY_EVENT,
-          proxy_id
-          ACE_ENV_ARG_PARAMETER);
+          proxy_id);
 
       CosNotifyChannelAdmin::ProxyPushSupplier_var anyps =
         CosNotifyChannelAdmin::ProxyPushSupplier::_narrow(ps.in());
@@ -219,23 +211,20 @@ int main(int ac, char **av)
       CosNotifyChannelAdmin::ProxyConsumer_var pc =
         sa->obtain_notification_push_consumer(
           CosNotifyChannelAdmin::STRUCTURED_EVENT,
-          proxy_id
-          ACE_ENV_ARG_PARAMETER);
+          proxy_id);
 
       CosNotifyChannelAdmin::StructuredProxyPushConsumer_var strpc = CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow(pc.in());
 
       pc = sa->obtain_notification_push_consumer(
           CosNotifyChannelAdmin::SEQUENCE_EVENT,
-          proxy_id
-          ACE_ENV_ARG_PARAMETER);
+          proxy_id);
 
       CosNotifyChannelAdmin::SequenceProxyPushConsumer_var seqpc = CosNotifyChannelAdmin::SequenceProxyPushConsumer::_narrow(pc.in());
 
       pc =
         sa->obtain_notification_push_consumer(
           CosNotifyChannelAdmin::ANY_EVENT,
-          proxy_id
-          ACE_ENV_ARG_PARAMETER);
+          proxy_id);
 
       CosNotifyChannelAdmin::ProxyPushConsumer_var anypc = CosNotifyChannelAdmin::ProxyPushConsumer::_narrow(pc.in());
 
@@ -243,12 +232,12 @@ int main(int ac, char **av)
         ec->default_filter_factory ();
 
       CosNotifyFilter::Filter_var filter1 =
-        ff->create_filter("EXTENDED_TCL" ACE_ENV_ARG_PARAMETER);
+        ff->create_filter("EXTENDED_TCL");
 
       ACE_ASSERT(! CORBA::is_nil (filter1.in ()));
 
       CosNotifyFilter::Filter_var filter2 =
-        ff->create_filter("EXTENDED_TCL" ACE_ENV_ARG_PARAMETER);
+        ff->create_filter("EXTENDED_TCL");
 
       ACE_ASSERT(! CORBA::is_nil (filter2.in ()));
 
@@ -257,59 +246,51 @@ int main(int ac, char **av)
       constraint_list[0].event_types.length(0);
       constraint_list[0].constraint_expr = CORBA::string_dup("Number == 100");
 
-      filter1->add_constraints(constraint_list ACE_ENV_ARG_PARAMETER);
+      filter1->add_constraints(constraint_list);
 
-      filter2->add_constraints(constraint_list ACE_ENV_ARG_PARAMETER);
+      filter2->add_constraints(constraint_list);
 
-      ca->add_filter (filter1.in() ACE_ENV_ARG_PARAMETER);
+      ca->add_filter (filter1.in());
 
-      sa->add_filter (filter2.in() ACE_ENV_ARG_PARAMETER);
+      sa->add_filter (filter2.in());
 
-      strps->add_filter (filter1.in() ACE_ENV_ARG_PARAMETER);
+      strps->add_filter (filter1.in());
 
-      seqps->add_filter (filter2.in() ACE_ENV_ARG_PARAMETER);
+      seqps->add_filter (filter2.in());
 
-      anyps->add_filter (filter1.in() ACE_ENV_ARG_PARAMETER);
+      anyps->add_filter (filter1.in());
 
-      strpc->add_filter (filter2.in() ACE_ENV_ARG_PARAMETER);
+      strpc->add_filter (filter2.in());
 
-      seqpc->add_filter (filter1.in() ACE_ENV_ARG_PARAMETER);
+      seqpc->add_filter (filter1.in());
 
-      anypc->add_filter (filter1.in() ACE_ENV_ARG_PARAMETER);
-      anypc->add_filter (filter2.in() ACE_ENV_ARG_PARAMETER);
+      anypc->add_filter (filter1.in());
+      anypc->add_filter (filter2.in());
 
       CosNotification::EventTypeSeq added1(1), removed1(0);
       added1.length(1);
       added1[0].domain_name = CORBA::string_dup("nightly_builds");
       added1[0].type_name = CORBA::string_dup("*");
-      ca->subscription_change(added1, removed1 ACE_ENV_ARG_PARAMETER);
+      ca->subscription_change(added1, removed1);
 
       // Connect a PushConsumer and PushSupplier
       TestSupplier test_supplier_svt;
-      PortableServer::ObjectId_var oid1 = persistentPOA->activate_object (&test_supplier_svt
-                                                                          ACE_ENV_ARG_PARAMETER);
-      CORBA::Object_var obj1 = persistentPOA->id_to_reference (oid1.in ()
-                                                               ACE_ENV_ARG_PARAMETER);
-      CosNotifyComm::StructuredPushSupplier_var push_sup = CosNotifyComm::StructuredPushSupplier::_narrow (obj1.in ()
-                                                                                                           ACE_ENV_ARG_PARAMETER);
+      PortableServer::ObjectId_var oid1 = persistentPOA->activate_object (&test_supplier_svt);
+      CORBA::Object_var obj1 = persistentPOA->id_to_reference (oid1.in ());
+      CosNotifyComm::StructuredPushSupplier_var push_sup = CosNotifyComm::StructuredPushSupplier::_narrow (obj1.in ());
 
       TestConsumer test_consumer_svt;
-      PortableServer::ObjectId_var oid2 = persistentPOA->activate_object (&test_consumer_svt
-                                                                          ACE_ENV_ARG_PARAMETER);
-      CORBA::Object_var obj2 = persistentPOA->id_to_reference (oid2.in ()
-                                                               ACE_ENV_ARG_PARAMETER);
-      CosNotifyComm::StructuredPushConsumer_var push_cons = CosNotifyComm::StructuredPushConsumer::_narrow (obj2.in ()
-                                                                                                           ACE_ENV_ARG_PARAMETER);
+      PortableServer::ObjectId_var oid2 = persistentPOA->activate_object (&test_consumer_svt);
+      CORBA::Object_var obj2 = persistentPOA->id_to_reference (oid2.in ());
+      CosNotifyComm::StructuredPushConsumer_var push_cons = CosNotifyComm::StructuredPushConsumer::_narrow (obj2.in ());
       strpc->connect_structured_push_supplier(push_sup.in());
       strps->connect_structured_push_consumer(push_cons.in());
 
       strps->suspend_connection();
 
-      persistentPOA->deactivate_object (oid1.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+      persistentPOA->deactivate_object (oid1.in ());
 
-      persistentPOA->deactivate_object (oid2.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+      persistentPOA->deactivate_object (oid2.in ());
 
       ecf->destroy();
       ////////////////////////////////
@@ -323,10 +304,10 @@ int main(int ac, char **av)
 
       // Create a new ecf, which should load itself from loadtest.xml
       CosNotifyChannelAdmin::EventChannelFactory_var
-        cosecf = TAO_Notify_EventChannelFactory_i::create(persistentPOA.in () ACE_ENV_ARG_PARAMETER);
+        cosecf = TAO_Notify_EventChannelFactory_i::create(persistentPOA.in ());
 
       NotifyExt::EventChannelFactory_var
-        ecf = NotifyExt::EventChannelFactory::_narrow (cosecf.in () ACE_ENV_ARG_PARAMETER);
+        ecf = NotifyExt::EventChannelFactory::_narrow (cosecf.in ());
 
       if (CORBA::is_nil (ecf.in ()))
       {
@@ -339,23 +320,22 @@ int main(int ac, char **av)
       ecf->destroy();
     }
 
-    poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+    poa->destroy (1, 1);
     orb->destroy ();
     poa = PortableServer::POA::_nil ();
     orb = CORBA::ORB::_nil ();
     retval = 0;
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION(ex, "Error: Unexpected exception caught in main. ");
+    ex._tao_print_exception ("Error: Unexpected exception caught in main. ");
     retval = -1;
   }
-  ACE_CATCHALL
+  catch (...)
   {
     ACE_DEBUG ((LM_DEBUG,
       ACE_TEXT ("Error : Unknown exception caught in main.") ));
     retval = -2;
   }
-  ACE_ENDTRY;
   return retval;
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
index 028edce2389..3bc1ad86a3b 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
@@ -95,7 +95,7 @@ TAO_Notify_Tests_Activation_Manager::consumer_count (void)
 }
 
 void
-TAO_Notify_Tests_Activation_Manager::_register (TAO_Notify_Tests_Periodic_Supplier* supplier, const char* obj_name ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_Activation_Manager::_register (TAO_Notify_Tests_Periodic_Supplier* supplier, const char* obj_name)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
 
@@ -112,7 +112,7 @@ TAO_Notify_Tests_Activation_Manager::_register (TAO_Notify_Tests_Periodic_Suppli
 }
 
 void
-TAO_Notify_Tests_Activation_Manager::_register (TAO_Notify_Tests_Periodic_Consumer* consumer, const char* obj_name ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_Activation_Manager::_register (TAO_Notify_Tests_Periodic_Consumer* consumer, const char* obj_name)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
 
@@ -129,7 +129,7 @@ TAO_Notify_Tests_Activation_Manager::_register (TAO_Notify_Tests_Periodic_Consum
 }
 
 void
-TAO_Notify_Tests_Activation_Manager::resolve (TAO_Notify_Tests_Periodic_Supplier*& supplier, const char* obj_name ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_Activation_Manager::resolve (TAO_Notify_Tests_Periodic_Supplier*& supplier, const char* obj_name)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
 
@@ -140,7 +140,7 @@ TAO_Notify_Tests_Activation_Manager::resolve (TAO_Notify_Tests_Periodic_Supplier
 }
 
 void
-TAO_Notify_Tests_Activation_Manager::resolve (TAO_Notify_Tests_Periodic_Consumer*& consumer, const char* obj_name ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_Activation_Manager::resolve (TAO_Notify_Tests_Periodic_Consumer*& consumer, const char* obj_name)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
 
@@ -236,7 +236,7 @@ TAO_Notify_Tests_Activation_Manager::write_ior (void)
 
   // Write IOR to a file, if asked.
   CORBA::String_var str =
-    orb->object_to_string (am_object.in () ACE_ENV_ARG_PARAMETER);
+    orb->object_to_string (am_object.in ());
 
   if (this->ior_output_file_)
     {
@@ -277,9 +277,9 @@ TAO_Notify_Tests_Activation_Manager::signal_peer (void)
   LOOKUP_MANAGER->resolve (orb);
 
   CORBA::Object_var object =
-    orb->string_to_object (this->ior_input_file_.c_str () ACE_ENV_ARG_PARAMETER);
+    orb->string_to_object (this->ior_input_file_.c_str ());
 
-  Notify_Test::Activation_Manager_var peer = Notify_Test::Activation_Manager::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+  Notify_Test::Activation_Manager_var peer = Notify_Test::Activation_Manager::_narrow (object.in ());
 
   if (CORBA::is_nil (peer.in ()))
     {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h
index d166573d437..3e50b89342a 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h
@@ -61,15 +61,15 @@ public:
                      ));
 
   /// Register Supplier
-  void _register (TAO_Notify_Tests_Periodic_Supplier* supplier, const char* obj_name ACE_ENV_ARG_DECL);
+  void _register (TAO_Notify_Tests_Periodic_Supplier* supplier, const char* obj_name);
   /// Register Consumer
-  void _register (TAO_Notify_Tests_Periodic_Consumer* consumer, const char* obj_name ACE_ENV_ARG_DECL);
+  void _register (TAO_Notify_Tests_Periodic_Consumer* consumer, const char* obj_name);
 
   /// Resolve Supplier
-  void resolve (TAO_Notify_Tests_Periodic_Supplier*& supplier, const char* obj_name ACE_ENV_ARG_DECL);
+  void resolve (TAO_Notify_Tests_Periodic_Supplier*& supplier, const char* obj_name);
 
   /// Resolve Consumer
-  void resolve (TAO_Notify_Tests_Periodic_Consumer*& consumer, const char* obj_name ACE_ENV_ARG_DECL);
+  void resolve (TAO_Notify_Tests_Periodic_Consumer*& consumer, const char* obj_name);
 
   // Activate the tasks for each supplier.
   int activate_suppliers (void);
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Command.cpp
index 085a49bbcae..1704b36dcc1 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Command.cpp
@@ -41,16 +41,16 @@ TAO_Notify_Tests_Command::execute (void)
     {
       ACE_DEBUG ((LM_DEBUG, "Executing command: %s\n", this->get_name ()));
 
-      ACE_TRY
+      try
         {
           this->execute_i ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-            ACE_TEXT("Error: Exception running command\n"));
+          ex._tao_print_exception (
+            ACE_TEXT(
+              "Error: Exception running command\n"));
         }
-      ACE_ENDTRY;
     }
 
   if (this->next_)
diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
index af36c757989..f5441eab1bc 100644
--- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
@@ -34,15 +34,14 @@ TAO_Notify_Tests_ConsumerAdmin_Command::handle_create (void)
 {
   CosNotifyChannelAdmin::EventChannel_var ec;
 
-  LOOKUP_MANAGER->resolve (ec, this->factory_.c_str () ACE_ENV_ARG_PARAMETER);
+  LOOKUP_MANAGER->resolve (ec, this->factory_.c_str ());
 
   // create consumer  admin
   CosNotifyChannelAdmin::ConsumerAdmin_var sa =
     ec->new_for_consumers (this->ifgop_,
-                           this->id_
-                           ACE_ENV_ARG_PARAMETER);
+                           this->id_);
 
-  LOOKUP_MANAGER->_register (sa.in(), this->name_.c_str () ACE_ENV_ARG_PARAMETER);
+  LOOKUP_MANAGER->_register (sa.in(), this->name_.c_str ());
 }
 
 
@@ -51,7 +50,7 @@ TAO_Notify_Tests_ConsumerAdmin_Command::handle_subscriptions (void)
 {
   CosNotifyChannelAdmin::ConsumerAdmin_var admin;
 
-  LOOKUP_MANAGER->resolve (admin, this->name_.c_str () ACE_ENV_ARG_PARAMETER);
+  LOOKUP_MANAGER->resolve (admin, this->name_.c_str ());
 
   // Let the user see what we're subscribed for,
   ACE_DEBUG ((LM_DEBUG, "Calling ConsumerAdmin subscription_change : "));
@@ -69,7 +68,7 @@ TAO_Notify_Tests_ConsumerAdmin_Command::handle_subscriptions (void)
 
   ACE_DEBUG ((LM_DEBUG, "\n"));
 
-  admin->subscription_change (this->added_, this->removed_ ACE_ENV_ARG_PARAMETER);
+  admin->subscription_change (this->added_, this->removed_);
 }
 
 void
@@ -77,9 +76,9 @@ TAO_Notify_Tests_ConsumerAdmin_Command::handle_set_qos (void)
 {
   CosNotifyChannelAdmin::ConsumerAdmin_var admin;
 
-  LOOKUP_MANAGER->resolve (admin, this->name_.c_str () ACE_ENV_ARG_PARAMETER);
+  LOOKUP_MANAGER->resolve (admin, this->name_.c_str ());
 
-  admin->set_qos (this->qos_ ACE_ENV_ARG_PARAMETER);
+  admin->set_qos (this->qos_);
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
index 35f62570b7f..0da997d5460 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
@@ -23,27 +23,24 @@ TAO_Notify_Tests_Consumer_T<Consumer_Traits>::get_proxy_supplier (void)
 }
 
 template <class Consumer_Traits> ACE_TYPENAME TAO_Notify_Tests_Consumer_T<Consumer_Traits>::Proxy_Traits_PTR
-TAO_Notify_Tests_Consumer_T<Consumer_Traits>::obtain_proxy (ACE_TYPENAME TAO_Notify_Tests_Consumer_T<Consumer_Traits>::Admin_Traits_PTR admin_ptr ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_Consumer_T<Consumer_Traits>::obtain_proxy (ACE_TYPENAME TAO_Notify_Tests_Consumer_T<Consumer_Traits>::Admin_Traits_PTR admin_ptr)
 {
   Consumer_Traits traits;
 
   CosNotifyChannelAdmin::ProxySupplier_var proxy_supplier =
     admin_ptr->obtain_notification_push_supplier (traits.type_
                                                   , this->proxy_id_
-                                                  ACE_ENV_ARG_PARAMETER
                                                   );
 
 
   ACE_ASSERT (!CORBA::is_nil (proxy_supplier.in ()));
 
-  return Proxy_Traits_INTERFACE::_narrow (proxy_supplier.in ()
-  ACE_ENV_ARG_PARAMETER);
+  return Proxy_Traits_INTERFACE::_narrow (proxy_supplier.in ());
 }
 
 template <class Consumer_Traits> ACE_TYPENAME TAO_Notify_Tests_Consumer_T<Consumer_Traits>::Proxy_Traits_PTR
 TAO_Notify_Tests_Consumer_T<Consumer_Traits>::obtain_proxy (ACE_TYPENAME TAO_Notify_Tests_Consumer_T<Consumer_Traits>::Admin_Ext_Traits_PTR admin_ptr
-                                             , CosNotification::QoSProperties& qos
-                                             ACE_ENV_ARG_DECL)
+                                             , CosNotification::QoSProperties& qos)
 {
   Consumer_Traits traits;
 
@@ -51,17 +48,15 @@ TAO_Notify_Tests_Consumer_T<Consumer_Traits>::obtain_proxy (ACE_TYPENAME TAO_Not
   CosNotifyChannelAdmin::ProxySupplier_var proxy_supplier =
     admin_ptr->obtain_notification_push_supplier_with_qos (traits.type_
                                                            , this->proxy_id_
-                                                           , qos
-                                                           ACE_ENV_ARG_PARAMETER);
+                                                           , qos);
 
   ACE_ASSERT (!CORBA::is_nil (proxy_supplier.in ()));
 
-  return Proxy_Traits_INTERFACE::_narrow (proxy_supplier.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+  return Proxy_Traits_INTERFACE::_narrow (proxy_supplier.in ());
 }
 
 template <class Consumer_Traits> void
-TAO_Notify_Tests_Consumer_T<Consumer_Traits>::subscription_change (CosNotification::EventTypeSeq &added, CosNotification::EventTypeSeq& removed ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_Consumer_T<Consumer_Traits>::subscription_change (CosNotification::EventTypeSeq &added, CosNotification::EventTypeSeq& removed)
 {
   // Let the user see what we're subscribed for,
   ACE_DEBUG ((LM_DEBUG, "Calling Consumer subscription change: "));
@@ -84,7 +79,7 @@ TAO_Notify_Tests_Consumer_T<Consumer_Traits>::subscription_change (CosNotificati
 
   if (proxy_supplier != 0)
     {
-      proxy_supplier->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
+      proxy_supplier->subscription_change (added, removed);
     }
   else
     ACE_DEBUG ((LM_DEBUG, "Proxy Supplier not available, subscription change not made."));
@@ -94,7 +89,7 @@ template <class Consumer_Traits> void
 TAO_Notify_Tests_Consumer_T<Consumer_Traits>::offer_change
    (const CosNotification::EventTypeSeq & /*added*/,
     const CosNotification::EventTypeSeq & /*removed*/
-    ACE_ENV_ARG_DECL_NOT_USED)
+    )
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNotifyComm::InvalidEventType))
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h
index 59aaa305d2c..5bb80446e24 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h
@@ -64,21 +64,19 @@ public:
   Proxy_Traits_PTR get_proxy_supplier (void);
 
   /// Send subscription_change
-  virtual void subscription_change (CosNotification::EventTypeSeq &added, CosNotification::EventTypeSeq& removed ACE_ENV_ARG_DECL);
+  virtual void subscription_change (CosNotification::EventTypeSeq &added, CosNotification::EventTypeSeq& removed);
 
 protected:
   /// Obtain Proxy.
-  virtual Proxy_Traits_PTR obtain_proxy (Admin_Traits_PTR admin_ptr ACE_ENV_ARG_DECL);
+  virtual Proxy_Traits_PTR obtain_proxy (Admin_Traits_PTR admin_ptr);
 
   /// Obtain Proxy with QoS.
   virtual Proxy_Traits_PTR obtain_proxy (Admin_Ext_Traits_PTR admin_ptr
-                                         , CosNotification::QoSProperties& qos
-                                          ACE_ENV_ARG_DECL);
+                                         , CosNotification::QoSProperties& qos);
 
   // = NotifyPublish method
   virtual void offer_change (const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp
index dc9a14014e2..e4550193bd1 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp
@@ -19,15 +19,15 @@ TAO_Notify_Tests_Direct_Consumer::connect (void)
 {
   // Get the POA
   PortableServer::POA_var poa;
-  LOOKUP_MANAGER->resolve (poa, this->poa_name_.c_str () ACE_ENV_ARG_PARAMETER);
+  LOOKUP_MANAGER->resolve (poa, this->poa_name_.c_str ());
 
   // set the POA
-  this->set_poa (poa.in () ACE_ENV_ARG_PARAMETER);
+  this->set_poa (poa.in ());
 
   // Activate the consumer with the default_POA_.
   CosNotifyComm::StructuredPushConsumer_var consumer_ref =
     this->_this ();
 
   // Register the activated object.
-  LOOKUP_MANAGER->_register (consumer_ref.in (), this->name_.c_str () ACE_ENV_ARG_PARAMETER);
+  LOOKUP_MANAGER->_register (consumer_ref.in (), this->name_.c_str ());
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp
index 5fdf0f3424d..a57d98f22ef 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp
@@ -24,27 +24,26 @@ TAO_Notify_Tests_Direct_Supplier::connect (void)
 {
   // Get the POA
   PortableServer::POA_var poa;
-  LOOKUP_MANAGER->resolve (poa, this->poa_name_.c_str () ACE_ENV_ARG_PARAMETER);
+  LOOKUP_MANAGER->resolve (poa, this->poa_name_.c_str ());
 
   // set the POA
-  this->set_poa (poa.in () ACE_ENV_ARG_PARAMETER);
+  this->set_poa (poa.in ());
 
   // Get hold of the reference.
   CosNotifyComm::StructuredPushSupplier_var supplier_ref =
     this->_this ();
 
   // Register the activated object.
-  LOOKUP_MANAGER->_register (supplier_ref.in (), this->name_.c_str () ACE_ENV_ARG_PARAMETER);
+  LOOKUP_MANAGER->_register (supplier_ref.in (), this->name_.c_str ());
 
   // Resolve the target object.
-  LOOKUP_MANAGER->resolve (this->target_object_, this->target_.c_str () ACE_ENV_ARG_PARAMETER);
+  LOOKUP_MANAGER->resolve (this->target_object_, this->target_.c_str ());
 }
 
 void
-TAO_Notify_Tests_Direct_Supplier::send_event (const CosNotification::StructuredEvent& event
-                                   ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_Direct_Supplier::send_event (const CosNotification::StructuredEvent& event)
 {
   ACE_ASSERT (!CORBA::is_nil (this->target_object_.in ()));
 
-  this->target_object_->push_structured_event (event ACE_ENV_ARG_PARAMETER);
+  this->target_object_->push_structured_event (event);
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h
index ece4265d60a..27d044d6987 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h
@@ -40,8 +40,7 @@ public:
   virtual void connect (void);
 
   // Send one event. Bypass sending to the Notify and send directly to taget consumer.
-  virtual void send_event (const CosNotification::StructuredEvent& event
-                           ACE_ENV_ARG_DECL);
+  virtual void send_event (const CosNotification::StructuredEvent& event);
 
 protected:
   /// Target object.
diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
index 460954ed447..c93e280e655 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
@@ -90,18 +90,16 @@ TAO_Notify_Tests_Worker::svc (void)
   ACE_DEBUG ((LM_ERROR, "Activated Worker Thread for commands @ priority:%d \n", priority));
 #endif
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       ACE_DEBUG ((LM_DEBUG, "Running Commands... \n"));
       this->cmd_builder_->execute ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Error: ORB run error\n");
+      ex._tao_print_exception ("Error: ORB run error\n");
     }
-  ACE_ENDTRY;
 
 
   ACE_DEBUG ((LM_DEBUG, "Finished executing commands\n"));
@@ -150,18 +148,16 @@ TAO_Notify_Tests_ORB_Run_Worker::svc (void)
   ACE_DEBUG ((LM_ERROR, "Activated ORB Run Worker Thread to run the ORB @ priority:%d \n", priority));
 #endif
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       ACE_DEBUG ((LM_ERROR, "Running ORB, timeout in %d sec\n", this->run_period_.sec ()));
 
       this->orb_->run ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -233,14 +229,13 @@ TAO_Notify_Tests_Driver::parse_args (int argc, char *argv[])
 }
 
 int
-TAO_Notify_Tests_Driver::init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_Driver::init (int argc, ACE_TCHAR *argv[])
 {
   ACE_Argv_Type_Converter command_line(argc, argv);
 
   this->orb_ = CORBA::ORB_init (command_line.get_argc(),
                                 command_line.get_ASCII_argv(),
-                                ""
-                                ACE_ENV_ARG_PARAMETER);
+                                "");
 
   if (this->parse_args (argc, argv) == -1)
     return -1;
@@ -250,7 +245,7 @@ TAO_Notify_Tests_Driver::init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL)
   if (skip_priority_levels_check_ == 0)
     check_supported_priorities (this->orb_.in());
 
-  LOOKUP_MANAGER->init (this->orb_.in () ACE_ENV_ARG_PARAMETER);
+  LOOKUP_MANAGER->init (this->orb_.in ());
 
   this->cmd_builder_ =
     ACE_Dynamic_Service<TAO_Notify_Tests_Command_Builder>::instance (TAO_Notify_Tests_Name::command_builder);
diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.h b/TAO/orbsvcs/tests/Notify/lib/Driver.h
index 7e8ff3887cc..20cca6001cb 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Driver.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Driver.h
@@ -107,7 +107,7 @@ public:
   ~TAO_Notify_Tests_Driver ();
 
   /// Init
-  int init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL);
+  int init (int argc, ACE_TCHAR *argv[]);
 
   /// Execute the commands.
   void run (void);
diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
index 318b857fb67..83a2da32fa1 100644
--- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
@@ -119,21 +119,18 @@ TAO_Notify_Tests_EventChannel_Command::create_collocated_ecf (void)
 
   LOOKUP_MANAGER->resolve (naming);
 
-  notify_service->init_service (orb.in () ACE_ENV_ARG_PARAMETER);
+  notify_service->init_service (orb.in ());
 
   // Activate the factory
   notify_factory =
-    notify_service->create (poa.in ()
-                            ACE_ENV_ARG_PARAMETER);
+    notify_service->create (poa.in ());
 
   // Register with the Naming Service
   CosNaming::Name_var name =
-    naming->to_name (TAO_Notify_Tests_Name::event_channel_factory
-                     ACE_ENV_ARG_PARAMETER);
+    naming->to_name (TAO_Notify_Tests_Name::event_channel_factory);
 
   naming->rebind (name.in (),
-                  notify_factory.in ()
-                  ACE_ENV_ARG_PARAMETER);
+                  notify_factory.in ());
 }
 
 void
@@ -146,7 +143,7 @@ TAO_Notify_Tests_EventChannel_Command::handle_create (void)
 
   CosNotifyChannelAdmin::EventChannelFactory_var ec_factory;
 
-  LOOKUP_MANAGER->resolve (ec_factory , TAO_Notify_Tests_Name::event_channel_factory ACE_ENV_ARG_PARAMETER);
+  LOOKUP_MANAGER->resolve (ec_factory , TAO_Notify_Tests_Name::event_channel_factory);
 
   CosNotification::QoSProperties qos;
   CosNotification::AdminProperties admin;
@@ -155,10 +152,9 @@ TAO_Notify_Tests_EventChannel_Command::handle_create (void)
   CosNotifyChannelAdmin::EventChannel_var ec =
     ec_factory->create_channel (qos,
                                 admin,
-                                this->id_
-                                ACE_ENV_ARG_PARAMETER);
+                                this->id_);
 
-  LOOKUP_MANAGER->_register (ec.in(), this->name_.c_str () ACE_ENV_ARG_PARAMETER);
+  LOOKUP_MANAGER->_register (ec.in(), this->name_.c_str ());
 }
 
 void
@@ -167,7 +163,7 @@ TAO_Notify_Tests_EventChannel_Command::handle_destroy (void)
   ACE_DEBUG ((LM_DEBUG, "Destroying event channel %s\n", this->name_.c_str ()));
   CosNotifyChannelAdmin::EventChannel_var ec;
 
-  LOOKUP_MANAGER->resolve (ec, this->name_.c_str () ACE_ENV_ARG_PARAMETER);
+  LOOKUP_MANAGER->resolve (ec, this->name_.c_str ());
 
   ec->destroy ();
 }
@@ -176,9 +172,9 @@ TAO_Notify_Tests_EventChannel_Command::handle_set_qos (void)
 {
   CosNotifyChannelAdmin::EventChannel_var ec;
 
-  LOOKUP_MANAGER->resolve (ec, this->name_.c_str () ACE_ENV_ARG_PARAMETER);
+  LOOKUP_MANAGER->resolve (ec, this->name_.c_str ());
 
-  ec->set_qos (this->qos_ ACE_ENV_ARG_PARAMETER);
+  ec->set_qos (this->qos_);
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp
index df44cc76328..2edb48c3742 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp
@@ -102,12 +102,12 @@ TAO_Notify_Tests_Filter_Command::handle_create_filter_factory (void)
 {
   CosNotifyChannelAdmin::EventChannel_var ec;
 
-  LOOKUP_MANAGER->resolve (ec, this->factory_.c_str () ACE_ENV_ARG_PARAMETER);
+  LOOKUP_MANAGER->resolve (ec, this->factory_.c_str ());
 
   CosNotifyFilter::FilterFactory_var ff =
     ec->default_filter_factory ();
 
-  LOOKUP_MANAGER->_register (ff.in(), this->name_.c_str () ACE_ENV_ARG_PARAMETER);
+  LOOKUP_MANAGER->_register (ff.in(), this->name_.c_str ());
 }
 
 void
@@ -115,12 +115,12 @@ TAO_Notify_Tests_Filter_Command::handle_create_filter (void)
 {
   CosNotifyFilter::FilterFactory_var ff;
 
-  LOOKUP_MANAGER->resolve (ff , this->factory_.c_str () ACE_ENV_ARG_PARAMETER);
+  LOOKUP_MANAGER->resolve (ff , this->factory_.c_str ());
 
   CosNotifyFilter::Filter_var filter =
-    ff->create_filter ("ETCL" ACE_ENV_ARG_PARAMETER);
+    ff->create_filter ("ETCL");
 
-  LOOKUP_MANAGER->_register (filter.in(), this->name_.c_str () ACE_ENV_ARG_PARAMETER);
+  LOOKUP_MANAGER->_register (filter.in(), this->name_.c_str ());
 }
 
 void
@@ -128,7 +128,7 @@ TAO_Notify_Tests_Filter_Command::handle_add_constraint (void)
 {
   CosNotifyFilter::Filter_var filter;
 
-  LOOKUP_MANAGER->resolve (filter , this->name_.c_str () ACE_ENV_ARG_PARAMETER);
+  LOOKUP_MANAGER->resolve (filter , this->name_.c_str ());
 
   CosNotifyFilter::ConstraintExpSeq constraint_list (1);
   constraint_list.length (1);
@@ -137,7 +137,7 @@ TAO_Notify_Tests_Filter_Command::handle_add_constraint (void)
   constraint_list[0].constraint_expr = CORBA::string_dup (this->constraint_.c_str ());
 
   ACE_DEBUG ((LM_DEBUG, "Adding constraint %s\n", this->constraint_.c_str ()));
-  filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
+  filter->add_constraints (constraint_list);
 }
 
 void
@@ -145,13 +145,13 @@ TAO_Notify_Tests_Filter_Command::handle_add_filter (void)
 {
   CosNotifyFilter::Filter_var filter;
 
-  LOOKUP_MANAGER->resolve (filter , this->name_.c_str () ACE_ENV_ARG_PARAMETER);
+  LOOKUP_MANAGER->resolve (filter , this->name_.c_str ());
 
   CosNotifyFilter::FilterAdmin_var filter_admin;
 
-  LOOKUP_MANAGER->resolve (filter_admin , this->factory_.c_str () ACE_ENV_ARG_PARAMETER);
+  LOOKUP_MANAGER->resolve (filter_admin , this->factory_.c_str ());
 
-  filter_admin->add_filter (filter.in () ACE_ENV_ARG_PARAMETER);
+  filter_admin->add_filter (filter.in ());
 }
 
 void
@@ -159,7 +159,7 @@ TAO_Notify_Tests_Filter_Command::handle_destroy_filter (void)
 {
   CosNotifyFilter::Filter_var filter;
 
-  LOOKUP_MANAGER->resolve (filter, this->name_.c_str () ACE_ENV_ARG_PARAMETER);
+  LOOKUP_MANAGER->resolve (filter, this->name_.c_str ());
 
   filter->destroy ();
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp
index 409c493eea1..2522e005b08 100644
--- a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp
@@ -19,25 +19,23 @@ TAO_Notify_Tests_LookupManager::~TAO_Notify_Tests_LookupManager ()
 }
 
 void
-TAO_Notify_Tests_LookupManager::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::init (CORBA::ORB_ptr orb)
 {
   orb_ = CORBA::ORB::_duplicate (orb);
 
-  this->resolve (this->root_poa_, TAO_Notify_Tests_Name::root_poa ACE_ENV_ARG_PARAMETER);
+  this->resolve (this->root_poa_, TAO_Notify_Tests_Name::root_poa);
 
-  this->resolve (this->naming_, TAO_Notify_Tests_Name::naming_service ACE_ENV_ARG_PARAMETER);
+  this->resolve (this->naming_, TAO_Notify_Tests_Name::naming_service);
 }
 
 void
-TAO_Notify_Tests_LookupManager::_register (CORBA::Object_ptr obj, const char* obj_name ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::_register (CORBA::Object_ptr obj, const char* obj_name)
 {
   CosNaming::Name_var name =
-    this->naming_->to_name (obj_name
-                            ACE_ENV_ARG_PARAMETER);
+    this->naming_->to_name (obj_name);
   //@@ Warning: this is rebind..
   this->naming_->rebind (name.in (),
-                         obj
-                         ACE_ENV_ARG_PARAMETER);
+                         obj);
 
   ACE_DEBUG ((LM_DEBUG, "Registered %s with Naming Service\n", obj_name));
 }
@@ -97,12 +95,12 @@ TAO_Notify_Tests_LookupManager::resolve (CosNaming::NamingContextExt_var& naming
 }
 
 void
-TAO_Notify_Tests_LookupManager::resolve (PortableServer::POA_var& poa, const char *poa_name ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::resolve (PortableServer::POA_var& poa, const char *poa_name)
 {
   if (ACE_OS::strcmp (poa_name, TAO_Notify_Tests_Name::root_poa) == 0)
     {
       CORBA::Object_ptr poa_object  =
-                this->orb_->resolve_initial_references(TAO_Notify_Tests_Name::root_poa ACE_ENV_ARG_PARAMETER);
+                this->orb_->resolve_initial_references(TAO_Notify_Tests_Name::root_poa);
 
       if (CORBA::is_nil (poa_object))
         {
@@ -111,28 +109,27 @@ TAO_Notify_Tests_LookupManager::resolve (PortableServer::POA_var& poa, const cha
           return;
         }
 
-      poa = PortableServer::POA::_narrow (poa_object ACE_ENV_ARG_PARAMETER);
+      poa = PortableServer::POA::_narrow (poa_object);
 
           this->root_poa_ = poa;
     }
   else
     {
-      poa = root_poa_->find_POA (poa_name, 0 ACE_ENV_ARG_PARAMETER);
+      poa = root_poa_->find_POA (poa_name, 0);
     }
 }
 
 void
-TAO_Notify_Tests_LookupManager::resolve (CosNaming::NamingContextExt_var& naming, const char *naming_name ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::resolve (CosNaming::NamingContextExt_var& naming, const char *naming_name)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references (naming_name ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references (naming_name);
 
   // Need to check return value for errors.
   if (CORBA::is_nil (naming_obj.in ()))
-    ACE_THROW (CORBA::UNKNOWN ());
+    throw CORBA::UNKNOWN ();
 
-  this->naming_ = CosNaming::NamingContextExt::_narrow (naming_obj.in ()
-                                                        ACE_ENV_ARG_PARAMETER);
+  this->naming_ = CosNaming::NamingContextExt::_narrow (naming_obj.in ());
 
   CosNaming::NamingContextExt::_duplicate (this->naming_.in ());
 
@@ -140,88 +137,88 @@ TAO_Notify_Tests_LookupManager::resolve (CosNaming::NamingContextExt_var& naming
 }
 
 CORBA::Object_ptr
-TAO_Notify_Tests_LookupManager::resolve_object (const char* obj_name ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::resolve_object (const char* obj_name)
 {
   CosNaming::Name name (1);
   name.length (1);
   name[0].id = CORBA::string_dup (obj_name);
 
   CORBA::Object_var obj =
-    this->naming_->resolve (name ACE_ENV_ARG_PARAMETER);
+    this->naming_->resolve (name);
 
   return obj._retn ();
 }
 
 void
-TAO_Notify_Tests_LookupManager::resolve (CosNotifyChannelAdmin::EventChannelFactory_var& ecf, const char * factory_name ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::resolve (CosNotifyChannelAdmin::EventChannelFactory_var& ecf, const char * factory_name)
 {
-  CORBA::Object_var object = this->resolve_object (factory_name ACE_ENV_ARG_PARAMETER);
+  CORBA::Object_var object = this->resolve_object (factory_name);
 
-  ecf = CosNotifyChannelAdmin::EventChannelFactory::_narrow (object.in() ACE_ENV_ARG_PARAMETER);
+  ecf = CosNotifyChannelAdmin::EventChannelFactory::_narrow (object.in());
 }
 
 void
-TAO_Notify_Tests_LookupManager::resolve (CosNotifyChannelAdmin::EventChannel_var& ec, const char * channel_name ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::resolve (CosNotifyChannelAdmin::EventChannel_var& ec, const char * channel_name)
 {
-  CORBA::Object_var object = this->resolve_object (channel_name ACE_ENV_ARG_PARAMETER);
+  CORBA::Object_var object = this->resolve_object (channel_name);
 
-  ec = CosNotifyChannelAdmin::EventChannel::_narrow (object.in() ACE_ENV_ARG_PARAMETER);
+  ec = CosNotifyChannelAdmin::EventChannel::_narrow (object.in());
 }
 
 void
-TAO_Notify_Tests_LookupManager::resolve (CosNotifyChannelAdmin::SupplierAdmin_var& sa, const char * admin_name ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::resolve (CosNotifyChannelAdmin::SupplierAdmin_var& sa, const char * admin_name)
 {
-  CORBA::Object_var object = this->resolve_object (admin_name ACE_ENV_ARG_PARAMETER);
+  CORBA::Object_var object = this->resolve_object (admin_name);
 
-  sa = CosNotifyChannelAdmin::SupplierAdmin::_narrow (object.in() ACE_ENV_ARG_PARAMETER);
+  sa = CosNotifyChannelAdmin::SupplierAdmin::_narrow (object.in());
 }
 
 void
-TAO_Notify_Tests_LookupManager::resolve (CosNotifyChannelAdmin::ConsumerAdmin_var& ca , const char * admin_name ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::resolve (CosNotifyChannelAdmin::ConsumerAdmin_var& ca , const char * admin_name)
 {
-  CORBA::Object_var object = this->resolve_object (admin_name ACE_ENV_ARG_PARAMETER);
+  CORBA::Object_var object = this->resolve_object (admin_name);
 
-  ca = CosNotifyChannelAdmin::ConsumerAdmin::_narrow (object.in() ACE_ENV_ARG_PARAMETER);
+  ca = CosNotifyChannelAdmin::ConsumerAdmin::_narrow (object.in());
 }
 
 void
-TAO_Notify_Tests_LookupManager::resolve (CosNotifyComm::StructuredPushSupplier_var& supplier, const char *supplier_name ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::resolve (CosNotifyComm::StructuredPushSupplier_var& supplier, const char *supplier_name)
 {
-  CORBA::Object_var object = this->resolve_object (supplier_name ACE_ENV_ARG_PARAMETER);
+  CORBA::Object_var object = this->resolve_object (supplier_name);
 
-  supplier = CosNotifyComm::StructuredPushSupplier::_narrow (object.in() ACE_ENV_ARG_PARAMETER);
+  supplier = CosNotifyComm::StructuredPushSupplier::_narrow (object.in());
 }
 
 void
-TAO_Notify_Tests_LookupManager::resolve (CosNotifyComm::StructuredPushConsumer_var& consumer, const char * consumer_name ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::resolve (CosNotifyComm::StructuredPushConsumer_var& consumer, const char * consumer_name)
 {
-  CORBA::Object_var object = this->resolve_object (consumer_name ACE_ENV_ARG_PARAMETER);
+  CORBA::Object_var object = this->resolve_object (consumer_name);
 
-  consumer = CosNotifyComm::StructuredPushConsumer::_narrow (object.in() ACE_ENV_ARG_PARAMETER);
+  consumer = CosNotifyComm::StructuredPushConsumer::_narrow (object.in());
 }
 
 void
-TAO_Notify_Tests_LookupManager::resolve (CosNotifyFilter::FilterFactory_var& ff, const char *filter_factory_name ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::resolve (CosNotifyFilter::FilterFactory_var& ff, const char *filter_factory_name)
 {
-  CORBA::Object_var object = this->resolve_object (filter_factory_name ACE_ENV_ARG_PARAMETER);
+  CORBA::Object_var object = this->resolve_object (filter_factory_name);
 
-  ff = CosNotifyFilter::FilterFactory::_narrow (object.in() ACE_ENV_ARG_PARAMETER);
+  ff = CosNotifyFilter::FilterFactory::_narrow (object.in());
 }
 
 void
-TAO_Notify_Tests_LookupManager::resolve (CosNotifyFilter::Filter_var& filter, const char *filter_name ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::resolve (CosNotifyFilter::Filter_var& filter, const char *filter_name)
 {
-  CORBA::Object_var object = this->resolve_object (filter_name ACE_ENV_ARG_PARAMETER);
+  CORBA::Object_var object = this->resolve_object (filter_name);
 
-  filter = CosNotifyFilter::Filter::_narrow (object.in() ACE_ENV_ARG_PARAMETER);
+  filter = CosNotifyFilter::Filter::_narrow (object.in());
 }
 
 void
-TAO_Notify_Tests_LookupManager::resolve (CosNotifyFilter::FilterAdmin_var& filter_admin, const char *filter_admin_name ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::resolve (CosNotifyFilter::FilterAdmin_var& filter_admin, const char *filter_admin_name)
 {
-  CORBA::Object_var object = this->resolve_object (filter_admin_name ACE_ENV_ARG_PARAMETER);
+  CORBA::Object_var object = this->resolve_object (filter_admin_name);
 
-  filter_admin = CosNotifyFilter::FilterAdmin::_narrow (object.in() ACE_ENV_ARG_PARAMETER);
+  filter_admin = CosNotifyFilter::FilterAdmin::_narrow (object.in());
 }
 
 #if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
diff --git a/TAO/orbsvcs/tests/Notify/lib/LookupManager.h b/TAO/orbsvcs/tests/Notify/lib/LookupManager.h
index b7ebe49ef06..110bc5871c0 100644
--- a/TAO/orbsvcs/tests/Notify/lib/LookupManager.h
+++ b/TAO/orbsvcs/tests/Notify/lib/LookupManager.h
@@ -47,7 +47,7 @@ public:
   ~TAO_Notify_Tests_LookupManager ();
 
   /// Init
-  void init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL);
+  void init (CORBA::ORB_ptr orb);
 
   ///= Register Objects
 
@@ -57,7 +57,7 @@ public:
   void _register (TAO_Notify_Tests_Priority_Mapping *priority_mapping);
 
   /// Register Objects with Naming Service
-  void _register(CORBA::Object_ptr obj, const char* obj_name ACE_ENV_ARG_DECL);
+  void _register(CORBA::Object_ptr obj, const char* obj_name);
 
   ///= Resolve methods
 
@@ -75,17 +75,17 @@ public:
   /// Return the default Naming context.
   void resolve (CosNaming::NamingContextExt_var& naming);
 
-  void resolve (PortableServer::POA_var& poa, const char *poa_name ACE_ENV_ARG_DECL);
-  void resolve (CosNaming::NamingContextExt_var& naming, const char *naming_name ACE_ENV_ARG_DECL);
-  void resolve (CosNotifyChannelAdmin::EventChannelFactory_var& ecf, const char *factory_name ACE_ENV_ARG_DECL);
-  void resolve (CosNotifyChannelAdmin::EventChannel_var& ec, const char *channel_name ACE_ENV_ARG_DECL);
-  void resolve (CosNotifyChannelAdmin::SupplierAdmin_var& sa, const char *admin_name ACE_ENV_ARG_DECL);
-  void resolve (CosNotifyChannelAdmin::ConsumerAdmin_var& ca , const char *admin_name ACE_ENV_ARG_DECL);
-  void resolve (CosNotifyComm::StructuredPushSupplier_var& supplier, const char *supplier_name ACE_ENV_ARG_DECL);
-  void resolve (CosNotifyComm::StructuredPushConsumer_var& consumer, const char *consumer_name ACE_ENV_ARG_DECL);
-  void resolve (CosNotifyFilter::FilterFactory_var& ff, const char *filter_factory_name ACE_ENV_ARG_DECL);
-  void resolve (CosNotifyFilter::Filter_var& filter, const char *filter_name ACE_ENV_ARG_DECL);
-  void resolve (CosNotifyFilter::FilterAdmin_var& filter_admin, const char *filter_admin_name ACE_ENV_ARG_DECL);
+  void resolve (PortableServer::POA_var& poa, const char *poa_name);
+  void resolve (CosNaming::NamingContextExt_var& naming, const char *naming_name);
+  void resolve (CosNotifyChannelAdmin::EventChannelFactory_var& ecf, const char *factory_name);
+  void resolve (CosNotifyChannelAdmin::EventChannel_var& ec, const char *channel_name);
+  void resolve (CosNotifyChannelAdmin::SupplierAdmin_var& sa, const char *admin_name);
+  void resolve (CosNotifyChannelAdmin::ConsumerAdmin_var& ca , const char *admin_name);
+  void resolve (CosNotifyComm::StructuredPushSupplier_var& supplier, const char *supplier_name);
+  void resolve (CosNotifyComm::StructuredPushConsumer_var& consumer, const char *consumer_name);
+  void resolve (CosNotifyFilter::FilterFactory_var& ff, const char *filter_factory_name);
+  void resolve (CosNotifyFilter::Filter_var& filter, const char *filter_name);
+  void resolve (CosNotifyFilter::FilterAdmin_var& filter_admin, const char *filter_admin_name);
 
 protected:
   /// Application Starter
@@ -95,7 +95,7 @@ protected:
   TAO_Notify_Tests_Activation_Manager* activation_manager_;
 
   /// Resolve to CORBA::Object
-  CORBA::Object_ptr resolve_object (const char* obj_name ACE_ENV_ARG_DECL);
+  CORBA::Object_ptr resolve_object (const char* obj_name);
 
   // The ORB that we use.
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp
index b0e96e70dbd..22a1adedfa8 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp
@@ -19,22 +19,21 @@ Notify_Test_Client::Notify_Test_Client (void)
 
 Notify_Test_Client::~Notify_Test_Client ()
 {
-  ACE_TRY_NEW_ENV
+  try
   {
-    root_poa_->destroy(1, 1 ACE_ENV_ARG_PARAMETER);
+    root_poa_->destroy(1, 1);
     orb_->destroy();
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "\nError: ");
+    e._tao_print_exception ("\nError: ");
   }
-  ACE_ENDTRY;
 }
 
 int
-Notify_Test_Client::init (int argc, char *argv [] ACE_ENV_ARG_DECL)
+Notify_Test_Client::init (int argc, char *argv [])
 {
-  int status = this->init_ORB (argc, argv ACE_ENV_ARG_PARAMETER);
+  int status = this->init_ORB (argc, argv);
   if (status == 0)
     {
       this->resolve_naming_service ();
@@ -52,13 +51,11 @@ Notify_Test_Client::parse_args (int /*argc*/, char** /*argv*/)
 
 int
 Notify_Test_Client::init_ORB (int argc,
-                              char *argv []
-                              ACE_ENV_ARG_DECL)
+                              char *argv [])
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                ""
-                                ACE_ENV_ARG_PARAMETER);
+                                "");
 
   if (this->parse_args (argc, argv) != 0)
     {
@@ -66,8 +63,7 @@ Notify_Test_Client::init_ORB (int argc,
     }
 
   CORBA::Object_ptr poa_object  =
-    this->orb_->resolve_initial_references("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references("RootPOA");
 
   if (CORBA::is_nil (poa_object))
     {
@@ -76,7 +72,7 @@ Notify_Test_Client::init_ORB (int argc,
       return -1;
     }
   this->root_poa_ =
-    PortableServer::POA::_narrow (poa_object ACE_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (poa_object);
 
   PortableServer::POAManager_var poa_manager =
     root_poa_->the_POAManager ();
@@ -90,16 +86,14 @@ void
 Notify_Test_Client::resolve_naming_service (void)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
-                                            ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references (NAMING_SERVICE_NAME);
 
   // Need to check return value for errors.
   if (CORBA::is_nil (naming_obj.in ()))
-    ACE_THROW (CORBA::UNKNOWN ());
+    throw CORBA::UNKNOWN ();
 
   this->naming_context_ =
-    CosNaming::NamingContext::_narrow (naming_obj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+    CosNaming::NamingContext::_narrow (naming_obj.in ());
 }
 
 void
@@ -110,13 +104,11 @@ Notify_Test_Client::resolve_Notify_factory (void)
   name[0].id = CORBA::string_dup (NOTIFY_FACTORY_NAME);
 
   CORBA::Object_var obj =
-    this->naming_context_->resolve (name
-                                   ACE_ENV_ARG_PARAMETER);
+    this->naming_context_->resolve (name);
 
   this->notify_factory_ =
     CosNotifyChannelAdmin::EventChannelFactory::_narrow (
                                                     obj.in ()
-                                                    ACE_ENV_ARG_PARAMETER
                                                   );
 }
 
@@ -126,13 +118,13 @@ Notify_Test_Client::ORB_run (void)
   while (! is_done())
   {
     ACE_Time_Value tv(0, 10 * 1000);
-    orb_->run(tv ACE_ENV_ARG_PARAMETER);
+    orb_->run(tv);
   }
 
   ACE_DEBUG((LM_DEBUG, "\nWaiting for stray events...\n"));
 
   ACE_Time_Value tv(2);
-  orb_->run(tv ACE_ENV_ARG_PARAMETER);
+  orb_->run(tv);
 
   return 0;
 }
@@ -188,8 +180,7 @@ Notify_Test_Client::notify_factory (void)
 
 CosNotifyChannelAdmin::EventChannel_ptr
 Notify_Test_Client::create_event_channel (const char* cname,
-                                          int resolve
-                                          ACE_ENV_ARG_DECL)
+                                          int resolve)
 {
   CosNotifyChannelAdmin::EventChannel_var ec;
   CosNaming::Name name (1);
@@ -214,8 +205,7 @@ Notify_Test_Client::create_event_channel (const char* cname,
 
       ec = notify_factory_->create_channel (initial_qos,
                                             initial_admin,
-                                            id
-                                            ACE_ENV_ARG_PARAMETER);
+                                            id);
 
 
       naming_context_->rebind(name, ec.in());
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
index 83ac9f07880..50dae888298 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
@@ -37,7 +37,7 @@ public:
   Notify_Test_Client (void);
   virtual ~Notify_Test_Client ();
 
-  virtual int init (int argc, char *argv [] ACE_ENV_ARG_DECL);
+  virtual int init (int argc, char *argv []);
   // starts the orb and resolves the notify factory via a naming service.
 
   virtual int parse_args (int argc, char* argv[]);
@@ -70,14 +70,12 @@ public:
   CosNotifyChannelAdmin::EventChannel_ptr create_event_channel (
                                               const char* name,
                                               int resolve
-                                              ACE_ENV_ARG_DECL
                                             );
   // Create an Event Channel.  Ownership is passed to the caller.
 
 protected:
   int init_ORB (int argc,
-                char *argv []
-                ACE_ENV_ARG_DECL);
+                char *argv []);
   // Initializes the ORB.
 
   void resolve_naming_service (void);
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer.cpp
index f2e6347a9ea..5826589c013 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer.cpp
@@ -26,7 +26,7 @@ TAO_Notify_Tests_Peer::~TAO_Notify_Tests_Peer ()
 }
 
 void
-TAO_Notify_Tests_Peer::init (PortableServer::POA_ptr poa  ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_Peer::init (PortableServer::POA_ptr poa)
 {
   this->default_POA_ = PortableServer::POA::_duplicate (poa);
 }
@@ -87,7 +87,7 @@ TAO_Notify_Tests_Peer::get_name (void)
 }
 
 void
-TAO_Notify_Tests_Peer::set_poa (PortableServer::POA_ptr poa  ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_Peer::set_poa (PortableServer::POA_ptr poa)
 {
   this->default_POA_ = PortableServer::POA::_duplicate (poa);
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer.h b/TAO/orbsvcs/tests/Notify/lib/Peer.h
index cff35edb8fa..e8b5424e205 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer.h
@@ -40,13 +40,13 @@ public:
   virtual ~TAO_Notify_Tests_Peer ();
 
   /// Init
-  void init (PortableServer::POA_ptr poa  ACE_ENV_ARG_DECL_NOT_USED);
+  void init (PortableServer::POA_ptr poa);
 
   /// Init this object.
   virtual int init_state (ACE_Arg_Shifter& arg_shifter);
 
   /// Set POA
-  void set_poa (PortableServer::POA_ptr poa  ACE_ENV_ARG_DECL);
+  void set_poa (PortableServer::POA_ptr poa);
 
   // Accessor to set/get our name.
   void set_name (ACE_CString& name);
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
index 6b6fbe1de6c..45309af74d1 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
@@ -43,8 +43,7 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::activate (void)
 template <class Peer_Traits>
 void
 TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (Proxy_Traits_PTR proxy,
-                                               Proxy_Traits_ID proxy_id
-                                               ACE_ENV_ARG_DECL)
+                                               Proxy_Traits_ID proxy_id)
 {
   // This will decr the ref count on exit.
   // Clients of this class should use raw pointers, not vars.
@@ -53,7 +52,7 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (Proxy_Traits_PTR proxy,
   ACE_TYPENAME Peer_Traits::VAR peer_var =
     this->activate ();
 
-  this->connect_to_peer (proxy, peer_var.in () ACE_ENV_ARG_PARAMETER);
+  this->connect_to_peer (proxy, peer_var.in ());
 
   // save the proxy
   this->proxy_ = Proxy_Traits_INTERFACE::_duplicate (proxy);
@@ -63,25 +62,21 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (Proxy_Traits_PTR proxy,
   if (this->proxy_name_.length () != 0)
     {
       LOOKUP_MANAGER->_register (this->proxy_.in (),
-                                 this->proxy_name_.c_str ()
-                                 ACE_ENV_ARG_PARAMETER);
+                                 this->proxy_name_.c_str ());
     }
 }
 
 template <class Peer_Traits>
 void
-TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (Admin_Traits_PTR admin_ptr
-                                               ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (Admin_Traits_PTR admin_ptr)
 {
   ACE_TYPENAME Proxy_Traits::VAR proxy_var =
-    this->obtain_proxy (admin_ptr
-                        ACE_ENV_ARG_PARAMETER);
+    this->obtain_proxy (admin_ptr);
 
   ACE_ASSERT (!CORBA::is_nil (proxy_var.in ()));
 
   this->connect (proxy_var.in (),
-                 this->proxy_id_
-                 ACE_ENV_ARG_PARAMETER);
+                 this->proxy_id_);
 }
 
 
@@ -92,46 +87,39 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (void)
   // Get the POA
   PortableServer::POA_var poa;
   LOOKUP_MANAGER->resolve (poa,
-                           this->poa_name_.c_str ()
-                           ACE_ENV_ARG_PARAMETER);
+                           this->poa_name_.c_str ());
 
   // set the POA
-  this->set_poa (poa.in ()
-                 ACE_ENV_ARG_PARAMETER);
+  this->set_poa (poa.in ());
 
   // Resolve the admin
   ACE_TYPENAME Admin_Traits::VAR admin_var;
 
   LOOKUP_MANAGER->resolve (admin_var,
-                           this->admin_name_.c_str ()
-                           ACE_ENV_ARG_PARAMETER);
+                           this->admin_name_.c_str ());
 
   ACE_TYPENAME Admin_Ext_Traits::VAR admin_ext_var =
-    Admin_Ext_Traits_INTERFACE::_narrow (admin_var.in ()
-                                         ACE_ENV_ARG_PARAMETER);
+    Admin_Ext_Traits_INTERFACE::_narrow (admin_var.in ());
 
   ACE_TYPENAME Proxy_Traits::VAR proxy_var =
     this->obtain_proxy (admin_ext_var.in (),
-                        this->qos_
-                        ACE_ENV_ARG_PARAMETER);
+                        this->qos_);
 
   ACE_ASSERT (!CORBA::is_nil (proxy_var.in ()));
 
   // connect supplier to proxy,
   // also activates the servant as CORBA object in the POA specified.
   this->connect (proxy_var.in (),
-                 this->proxy_id_
-                 ACE_ENV_ARG_PARAMETER);
+                 this->proxy_id_);
 }
 
 template <class Peer_Traits>
 void
 TAO_Notify_Tests_Peer_T<Peer_Traits>::set_qos (
     CosNotification::QoSProperties& qos
-    ACE_ENV_ARG_DECL
   )
 {
-  this->get_proxy ()->set_qos (qos ACE_ENV_ARG_PARAMETER);
+  this->get_proxy ()->set_qos (qos);
 }
 
 template <class Peer_Traits>
@@ -139,7 +127,7 @@ void
 TAO_Notify_Tests_Peer_T<Peer_Traits>::status (void)
 {
 #if (TAO_HAS_MINIMUM_CORBA == 0)
-  ACE_TRY
+  try
     {
       CORBA::Boolean not_exist =
         this->get_proxy ()->_non_existent ();
@@ -157,23 +145,22 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::status (void)
                       this->name_.c_str ()));
         }
     }
-  ACE_CATCH(CORBA::TRANSIENT, ex)
+  catch (const CORBA::TRANSIENT& ex)
     {
-      ACE_PRINT_EXCEPTION (ex, "Error: ");
+      ex._tao_print_exception ("Error: ");
       ACE_DEBUG ((LM_DEBUG,
                   "Peer %s is_equivalent transient exception.",
                   this->name_.c_str ()));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Error: ");
+      ex._tao_print_exception ("Error: ");
       ACE_DEBUG ((LM_DEBUG,
                   "Peer %s is_equivanent other exception.",
                   this->name_.c_str ()));
     }
-  ACE_ENDTRY;
 #else
-  ACE_ENV_ARG_NOT_USED;
+;
 #endif /* TAO_HAS_MINIMUM_CORBA */
 }
 
@@ -183,37 +170,32 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::disconnect (void)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_.in ()));
 
-  ACE_TRY_EX(TRY1)
+  try
     {
       this->disconnect_from_proxy ();
-      ACE_TRY_CHECK_EX(TRY1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Peer %s failed to disconnect from proxy.",
                   this->name_.c_str ()));
     }
-  ACE_ENDTRY;
 
-  ACE_TRY_EX(TRY2)
+  try
     {
       this->deactivate ();
-      ACE_TRY_CHECK_EX(TRY2);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Peer %s failed to deactivate.",
                   this->name_.c_str ()));
     }
-  ACE_ENDTRY;
 }
 
 template <class Peer_Traits>
 PortableServer::POA_ptr
 TAO_Notify_Tests_Peer_T<Peer_Traits>::_default_POA (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
@@ -226,11 +208,9 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::deactivate (void)
   PortableServer::POA_var poa = this->_default_POA ();
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this
-                        ACE_ENV_ARG_PARAMETER);
+    poa->servant_to_id (this);
 
-  poa->deactivate_object (id.in ()
-                          ACE_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in ());
 }
 
 #endif /* TAO_Notify_Tests_Peer_T_CPP */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.h b/TAO/orbsvcs/tests/Notify/lib/Peer_T.h
index 33bf03cabcf..fd7806f04d2 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.h
@@ -53,11 +53,11 @@ public:
 
   // Activates this servant with the POA supplied in init.
   // Connects to given proxy.
-  void connect (Proxy_Traits_PTR proxy, Proxy_Traits_ID proxy_id ACE_ENV_ARG_DECL);
+  void connect (Proxy_Traits_PTR proxy, Proxy_Traits_ID proxy_id);
 
   // Activates this servant with the POA supplied in init.
   // Creates a new proxy supplier and connects to it.
-  void connect (Admin_Traits_PTR admin_ptr ACE_ENV_ARG_DECL);
+  void connect (Admin_Traits_PTR admin_ptr);
 
   /// Connect using options parsed and set initial QoS.
   virtual void connect (void);
@@ -66,7 +66,7 @@ public:
   void disconnect (void);
 
   /// Set Qos
-  void set_qos (CosNotification::QoSProperties& qos ACE_ENV_ARG_DECL);
+  void set_qos (CosNotification::QoSProperties& qos);
 
   /// Dump status
   void status (void);
@@ -87,15 +87,14 @@ protected:
   ///= To be implemented by specializations.
 
   /// Connect to Peer.
-  virtual void connect_to_peer (Proxy_Traits_PTR proxy_ptr, Peer_Traits_PTR peer_ptr ACE_ENV_ARG_DECL) = 0;
+  virtual void connect_to_peer (Proxy_Traits_PTR proxy_ptr, Peer_Traits_PTR peer_ptr) = 0;
 
   /// Obtain Proxy.
-  virtual Proxy_Traits_PTR obtain_proxy (Admin_Traits_PTR admin_ptr ACE_ENV_ARG_DECL) = 0;
+  virtual Proxy_Traits_PTR obtain_proxy (Admin_Traits_PTR admin_ptr) = 0;
 
   /// Obtain Proxy with QoS.
   virtual Proxy_Traits_PTR obtain_proxy (Admin_Ext_Traits_PTR admin_ptr
-                                         , CosNotification::QoSProperties& qos
-                                         ACE_ENV_ARG_DECL) = 0;
+                                         , CosNotification::QoSProperties& qos) = 0;
 
   /// Disconnect from proxy.
   virtual void disconnect_from_proxy (void) = 0;
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
index 3f8b6083cf4..77c60f9f1cf 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
@@ -170,7 +170,7 @@ TAO_Notify_Tests_Periodic_Consumer::check_priority (const CosNotification::Prope
 }
 
 void
-TAO_Notify_Tests_Periodic_Consumer::push_structured_event (const CosNotification::StructuredEvent & notification ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_Periodic_Consumer::push_structured_event (const CosNotification::StructuredEvent & notification)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
index 943d189c411..a3e84ea25fd 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
@@ -57,7 +57,6 @@ protected:
 
   virtual void push_structured_event (
         const CosNotification::StructuredEvent & notification
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
index 32dc958d771..97f9474689c 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
@@ -86,8 +86,7 @@ TAO_Notify_Tests_Periodic_Consumer_Command::init (ACE_Arg_Shifter& arg_shifter)
          LOOKUP_MANAGER->resolve (act_mgr);
 
          {
-           ACE_DECLARE_NEW_CORBA_ENV;
-           act_mgr->_register (consumer, this->name_.c_str () ACE_ENV_ARG_PARAMETER);
+           act_mgr->_register (consumer, this->name_.c_str ());
          }
 
          consumer->init_state (arg_shifter);
@@ -159,8 +158,7 @@ TAO_Notify_Tests_Periodic_Consumer_Command::consumer (void)
   TAO_Notify_Tests_Periodic_Consumer* consumer = 0;
 
   {
-    ACE_DECLARE_NEW_CORBA_ENV;
-    act_mgr->resolve (consumer, this->name_.c_str () ACE_ENV_ARG_PARAMETER);
+    act_mgr->resolve (consumer, this->name_.c_str ());
   }
 
   if (consumer == 0)
@@ -172,7 +170,7 @@ TAO_Notify_Tests_Periodic_Consumer_Command::consumer (void)
 void
 TAO_Notify_Tests_Periodic_Consumer_Command::handle_set_qos (void)
 {
-  this->consumer ()->set_qos (this->qos_ ACE_ENV_ARG_PARAMETER);
+  this->consumer ()->set_qos (this->qos_);
 }
 
 void
@@ -195,7 +193,7 @@ TAO_Notify_Tests_Periodic_Consumer_Command::handle_subscriptions (void)
   if (consumer == 0)
     return;
 
-  consumer->subscription_change (this->added_, this->removed_ ACE_ENV_ARG_PARAMETER);
+  consumer->subscription_change (this->added_, this->removed_);
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
index 4dfd9eee2dc..59456515806 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
@@ -184,7 +184,7 @@ TAO_Notify_Tests_Periodic_Supplier::send_warmup_events (void)
 
   for (int i = 0; i < WARMUP_COUNT ; ++i)
     {
-      this->send_event (this->event_.event () ACE_ENV_ARG_PARAMETER);
+      this->send_event (this->event_.event ());
     }
 }
 
@@ -210,7 +210,7 @@ TAO_Notify_Tests_Periodic_Supplier::send_prologue (void)
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "(%P, %t) Supplier (%s) sending event 0th event\n"));
 
-  this->send_event (zeroth_event.event () ACE_ENV_ARG_PARAMETER);
+  this->send_event (zeroth_event.event ());
 }
 
 void
@@ -250,7 +250,7 @@ TAO_Notify_Tests_Periodic_Supplier::handle_svc (void)
         ACE_DEBUG ((LM_DEBUG, "(%P, %t) Supplier (%s) sending event #%d\n",
                     this->name_.c_str (), i));
 
-      this->send_event (this->event_.event () ACE_ENV_ARG_PARAMETER);
+      this->send_event (this->event_.event ());
 
       after = ACE_OS::gethrtime ();
 
@@ -302,7 +302,7 @@ TAO_Notify_Tests_Periodic_Supplier::svc (void)
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Thread_Task (%t) - wait\n"));
 
-  ACE_TRY_NEW_ENV
+  try
     {
       // First, send warmup events.
       this->send_warmup_events ();
@@ -318,17 +318,16 @@ TAO_Notify_Tests_Periodic_Supplier::svc (void)
 
       this->handle_svc ();
     }
-  ACE_CATCH (CORBA::UserException, ue)
+  catch (const CORBA::UserException& ue)
     {
-      ACE_PRINT_EXCEPTION (ue,
+      ue._tao_print_exception (
         "Error: Periodic supplier: error sending event. ");
     }
-  ACE_CATCH (CORBA::SystemException, se)
+  catch (const CORBA::SystemException& se)
     {
-      ACE_PRINT_EXCEPTION (se,
+      se._tao_print_exception (
         "Error: Periodic supplier: error sending event. ");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
index 09eda2b3150..58400838c17 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
@@ -76,8 +76,7 @@ TAO_Notify_Tests_Periodic_Supplier_Command::init (ACE_Arg_Shifter& arg_shifter)
          LOOKUP_MANAGER->resolve (act_mgr);
 
          {
-           ACE_DECLARE_NEW_CORBA_ENV;
-           act_mgr->_register (supplier, this->name_.c_str () ACE_ENV_ARG_PARAMETER);
+           act_mgr->_register (supplier, this->name_.c_str ());
          }
 
          supplier->init_state (arg_shifter);
@@ -146,8 +145,7 @@ TAO_Notify_Tests_Periodic_Supplier_Command::supplier (void)
   // Locate the supplier
   TAO_Notify_Tests_Periodic_Supplier* supplier = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  act_mgr->resolve (supplier, this->name_.c_str () ACE_ENV_ARG_PARAMETER);
+  act_mgr->resolve (supplier, this->name_.c_str ());
 
   if (supplier == 0)
     ACE_DEBUG ((LM_DEBUG, "Supplier %s not found by Lookup Manager\n", this->name_.c_str ()));
@@ -174,7 +172,7 @@ TAO_Notify_Tests_Periodic_Supplier_Command::handle_offers (void)
   if (supplier == 0)
     return;
 
-  supplier->offer_change (this->added_, this->removed_ ACE_ENV_ARG_PARAMETER);
+  supplier->offer_change (this->added_, this->removed_);
 }
 
 void
@@ -216,7 +214,7 @@ TAO_Notify_Tests_Periodic_Supplier_Command::handle_set_qos (void)
   if (supplier == 0)
     return;
 
-  supplier->set_qos (this->qos_ ACE_ENV_ARG_PARAMETER);
+  supplier->set_qos (this->qos_);
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp
index 8c9c1a6cf6c..d7a94d18abe 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp
@@ -24,9 +24,9 @@ TAO_Notify_Tests_PushConsumer::~TAO_Notify_Tests_PushConsumer ()
 }
 
 void
-TAO_Notify_Tests_PushConsumer::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_PushConsumer::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr)
 {
-  proxy_ptr->connect_any_push_consumer (peer_ptr ACE_ENV_ARG_PARAMETER);
+  proxy_ptr->connect_any_push_consumer (peer_ptr);
 }
 
 void
@@ -46,7 +46,7 @@ TAO_Notify_Tests_PushConsumer::disconnect_push_consumer (void)
 }
 
 void
-TAO_Notify_Tests_PushConsumer::push (const CORBA::Any & /*data*/ ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_PushConsumer::push (const CORBA::Any & /*data*/)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h
index 719a1ed3d4c..aab6ae3635b 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h
@@ -74,7 +74,7 @@ public:
 
 protected:
   /// Connect to Peer.
-  virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL);
+  virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr);
 
   /// Disconnect from proxy.
   virtual void disconnect_from_proxy (void);
@@ -88,7 +88,6 @@ protected:
  /// Default does nothing.
     void push (
         const CORBA::Any & data
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp
index d3b0465d9f6..2125a574fbf 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp
@@ -24,18 +24,17 @@ TAO_Notify_Tests_PushSupplier::~TAO_Notify_Tests_PushSupplier ()
 }
 
 void
-TAO_Notify_Tests_PushSupplier::send_event (const CORBA::Any& any ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_PushSupplier::send_event (const CORBA::Any& any)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_.in ()));
 
-  this->proxy_->push (any ACE_ENV_ARG_PARAMETER);
+  this->proxy_->push (any);
 }
 
 void
-TAO_Notify_Tests_PushSupplier::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_PushSupplier::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr)
 {
-  proxy_ptr->connect_any_push_supplier (peer_ptr
-                                        ACE_ENV_ARG_PARAMETER);
+  proxy_ptr->connect_any_push_supplier (peer_ptr);
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h
index 1f60e770930..82a27d6dcb3 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h
@@ -73,11 +73,11 @@ public:
   virtual ~TAO_Notify_Tests_PushSupplier ();
 
   /// Send one event.
-  virtual void send_event (const CORBA::Any & data ACE_ENV_ARG_DECL);
+  virtual void send_event (const CORBA::Any & data);
 
 protected:
   /// Connect to Peer.
-  virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL);
+  virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr);
 
   /// Disconnect from proxy.
   virtual void disconnect_from_proxy (void);
diff --git a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp
index f8ed0f5d93f..0f8c26001f1 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp
@@ -21,21 +21,20 @@ TAO_Notify_Tests_Relay_Consumer::connect (void)
   TAO_Notify_Tests_Direct_Consumer::connect ();
 
   // Resolve the destination object.
-  LOOKUP_MANAGER->resolve (this->destination_object_, this->destination_.c_str () ACE_ENV_ARG_PARAMETER);
+  LOOKUP_MANAGER->resolve (this->destination_object_, this->destination_.c_str ());
 }
 
 void
-TAO_Notify_Tests_Relay_Consumer::push_structured_event (const CosNotification::StructuredEvent &notification
-                                              ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_Relay_Consumer::push_structured_event (const CosNotification::StructuredEvent &notification)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosEventComm::Disconnected))
 {
   // The Periodic Consumer will record the run statistics.
-  //TAO_Notify_Tests_Periodic_Consumer::push_structured_event (notification ACE_ENV_ARG_PARAMETER);
+  //TAO_Notify_Tests_Periodic_Consumer::push_structured_event (notification);
 
   // Forward the event.
   if (CORBA::is_nil (this->destination_object_.in ()))
     ACE_DEBUG ((LM_DEBUG, "(%P,%t) Cannot Relay - Destination object %s is nil", this->destination_.c_str ()));
   else
-    this->destination_object_->push_structured_event (notification ACE_ENV_ARG_PARAMETER);
+    this->destination_object_->push_structured_event (notification);
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h
index 03892b7c54b..1dd0739b4e8 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h
@@ -40,7 +40,7 @@ public:
   virtual void connect (void);
 
   void push_structured_event (const CosNotification::StructuredEvent &/*notification*/
-                              ACE_ENV_ARG_DECL_NOT_USED)
+                              )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventComm::Disconnected));
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp
index 47b6de9c601..1cf382bd71c 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp
@@ -24,10 +24,9 @@ TAO_Notify_Tests_SequencePushConsumer::~TAO_Notify_Tests_SequencePushConsumer ()
 }
 
 void
-TAO_Notify_Tests_SequencePushConsumer::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_SequencePushConsumer::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr)
 {
-  proxy_ptr->connect_sequence_push_consumer (peer_ptr
-                                               ACE_ENV_ARG_PARAMETER);
+  proxy_ptr->connect_sequence_push_consumer (peer_ptr);
 }
 
 void
@@ -49,7 +48,7 @@ TAO_Notify_Tests_SequencePushConsumer::disconnect_sequence_push_consumer (void)
 void
 TAO_Notify_Tests_SequencePushConsumer::push_structured_events
    (const CosNotification::EventBatch &/*notifications*/
-    ACE_ENV_ARG_DECL_NOT_USED)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosEventComm::Disconnected))
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h
index 521a1020207..d17da42daa4 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h
@@ -74,7 +74,7 @@ public:
 
 protected:
   /// Connect to Peer.
-  virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL);
+  virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr);
 
   /// Disconnect from proxy.
   virtual void disconnect_from_proxy (void);
@@ -88,7 +88,6 @@ protected:
  /// Default does nothing.
   virtual void push_structured_events (
         const CosNotification::EventBatch & notifications
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp
index 512708e0c73..dce9988b74a 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp
@@ -25,19 +25,17 @@ TAO_Notify_Tests_SequencePushSupplier::~TAO_Notify_Tests_SequencePushSupplier ()
 
 void
 TAO_Notify_Tests_SequencePushSupplier::send_events (const CosNotification::EventBatch& events
-                                          ACE_ENV_ARG_DECL
                                           )
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_.in ()));
 
-  this->proxy_->push_structured_events (events ACE_ENV_ARG_PARAMETER);
+  this->proxy_->push_structured_events (events);
 }
 
 void
-TAO_Notify_Tests_SequencePushSupplier::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_SequencePushSupplier::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr)
 {
-  proxy_ptr->connect_sequence_push_supplier (peer_ptr
-                                               ACE_ENV_ARG_PARAMETER);
+  proxy_ptr->connect_sequence_push_supplier (peer_ptr);
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h
index 6cb47dc71be..35615eb5c1c 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h
@@ -73,12 +73,11 @@ public:
   virtual ~TAO_Notify_Tests_SequencePushSupplier ();
 
   /// Send one event.
-  virtual void send_events (const CosNotification::EventBatch& events
-                            ACE_ENV_ARG_DECL);
+  virtual void send_events (const CosNotification::EventBatch& events);
 
 protected:
   /// Connect to Peer.
-  virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL);
+  virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr);
 
   /// Disconnect from proxy.
   virtual void disconnect_from_proxy (void);
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp
index e68019136bd..cc58c87c8ea 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp
@@ -24,10 +24,9 @@ TAO_Notify_Tests_StructuredPushConsumer::~TAO_Notify_Tests_StructuredPushConsume
 }
 
 void
-TAO_Notify_Tests_StructuredPushConsumer::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_StructuredPushConsumer::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr)
 {
-  proxy_ptr->connect_structured_push_consumer (peer_ptr
-                                               ACE_ENV_ARG_PARAMETER);
+  proxy_ptr->connect_structured_push_consumer (peer_ptr);
 }
 
 void
@@ -49,7 +48,7 @@ TAO_Notify_Tests_StructuredPushConsumer::disconnect_structured_push_consumer (vo
 void
 TAO_Notify_Tests_StructuredPushConsumer::push_structured_event
    (const CosNotification::StructuredEvent &/*notification*/
-    ACE_ENV_ARG_DECL_NOT_USED)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosEventComm::Disconnected))
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h
index 426bb654439..68d24401d7c 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h
@@ -74,7 +74,7 @@ public:
 
 protected:
   /// Connect to Peer.
-  virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL);
+  virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr);
 
   /// Disconnect from proxy.
   virtual void disconnect_from_proxy (void);
@@ -88,7 +88,6 @@ protected:
  /// Default does nothing.
   virtual void push_structured_event (
         const CosNotification::StructuredEvent & notification
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp
index 787437534f4..fb9e76fc469 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp
@@ -26,19 +26,17 @@ TAO_Notify_Tests_StructuredPushSupplier::~TAO_Notify_Tests_StructuredPushSupplie
 void
 TAO_Notify_Tests_StructuredPushSupplier::send_event (
     const CosNotification::StructuredEvent& event
-    ACE_ENV_ARG_DECL
   )
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_.in ()));
 
-  this->proxy_->push_structured_event (event ACE_ENV_ARG_PARAMETER);
+  this->proxy_->push_structured_event (event);
 }
 
 void
-TAO_Notify_Tests_StructuredPushSupplier::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_StructuredPushSupplier::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr)
 {
-  proxy_ptr->connect_structured_push_supplier (peer_ptr
-                                               ACE_ENV_ARG_PARAMETER);
+  proxy_ptr->connect_structured_push_supplier (peer_ptr);
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h
index 29df4959471..5a70d452e8e 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h
@@ -73,12 +73,11 @@ public:
   virtual ~TAO_Notify_Tests_StructuredPushSupplier ();
 
   /// Send one event.
-  virtual void send_event (const CosNotification::StructuredEvent& event
-                           ACE_ENV_ARG_DECL);
+  virtual void send_event (const CosNotification::StructuredEvent& event);
 
 protected:
   /// Connect to Peer.
-  virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL);
+  virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr);
 
   /// Disconnect from proxy.
   virtual void disconnect_from_proxy (void);
diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
index f28b40c477f..83d4993a70b 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
@@ -94,15 +94,14 @@ TAO_Notify_Tests_SupplierAdmin_Command::handle_create (void)
 {
   CosNotifyChannelAdmin::EventChannel_var ec;
 
-  LOOKUP_MANAGER->resolve (ec, this->factory_.c_str () ACE_ENV_ARG_PARAMETER);
+  LOOKUP_MANAGER->resolve (ec, this->factory_.c_str ());
 
   // create supplier admin
   CosNotifyChannelAdmin::SupplierAdmin_var sa =
     ec->new_for_suppliers (this->ifgop_,
-                           this->id_
-                           ACE_ENV_ARG_PARAMETER);
+                           this->id_);
 
-  LOOKUP_MANAGER->_register (sa.in(), this->name_.c_str () ACE_ENV_ARG_PARAMETER);
+  LOOKUP_MANAGER->_register (sa.in(), this->name_.c_str ());
 }
 
 void
@@ -110,7 +109,7 @@ TAO_Notify_Tests_SupplierAdmin_Command::handle_offers (void)
 {
   CosNotifyChannelAdmin::SupplierAdmin_var admin;
 
-  LOOKUP_MANAGER->resolve (admin, this->name_.c_str () ACE_ENV_ARG_PARAMETER);
+  LOOKUP_MANAGER->resolve (admin, this->name_.c_str ());
 
       // Let the user see what we're subscribed for,
   ACE_DEBUG ((LM_DEBUG, "Calling SupplierAdmin offer_change : "));
@@ -128,7 +127,7 @@ TAO_Notify_Tests_SupplierAdmin_Command::handle_offers (void)
 
   ACE_DEBUG ((LM_DEBUG, "\n"));
 
-  admin->offer_change (this->added_, this->removed_ ACE_ENV_ARG_PARAMETER);
+  admin->offer_change (this->added_, this->removed_);
 }
 
 void
@@ -141,9 +140,9 @@ TAO_Notify_Tests_SupplierAdmin_Command::handle_set_qos (void)
 {
   CosNotifyChannelAdmin::SupplierAdmin_var admin;
 
-  LOOKUP_MANAGER->resolve (admin, this->name_.c_str () ACE_ENV_ARG_PARAMETER);
+  LOOKUP_MANAGER->resolve (admin, this->name_.c_str ());
 
-  admin->set_qos (this->qos_ ACE_ENV_ARG_PARAMETER);
+  admin->set_qos (this->qos_);
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
index 01f1ee5d10b..6cec63ea7d5 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
@@ -23,27 +23,24 @@ TAO_Notify_Tests_Supplier_T<Supplier_Traits>::get_proxy_consumer (void)
 }
 
 template <class Supplier_Traits> ACE_TYPENAME TAO_Notify_Tests_Supplier_T<Supplier_Traits>::Proxy_Traits_PTR
-TAO_Notify_Tests_Supplier_T<Supplier_Traits>::obtain_proxy (ACE_TYPENAME TAO_Notify_Tests_Supplier_T<Supplier_Traits>::Admin_Traits_PTR admin_ptr ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_Supplier_T<Supplier_Traits>::obtain_proxy (ACE_TYPENAME TAO_Notify_Tests_Supplier_T<Supplier_Traits>::Admin_Traits_PTR admin_ptr)
 {
   Supplier_Traits traits;
 
   CosNotifyChannelAdmin::ProxyConsumer_var proxy_consumer =
     admin_ptr->obtain_notification_push_consumer (traits.type_
                                                   , this->proxy_id_
-                                                  ACE_ENV_ARG_PARAMETER
                                                   );
 
 
   ACE_ASSERT (!CORBA::is_nil (proxy_consumer.in ()));
 
-  return Proxy_Traits_INTERFACE::_narrow (proxy_consumer.in ()
-  ACE_ENV_ARG_PARAMETER);
+  return Proxy_Traits_INTERFACE::_narrow (proxy_consumer.in ());
 }
 
 template <class Supplier_Traits> ACE_TYPENAME TAO_Notify_Tests_Supplier_T<Supplier_Traits>::Proxy_Traits_PTR
 TAO_Notify_Tests_Supplier_T<Supplier_Traits>::obtain_proxy (ACE_TYPENAME TAO_Notify_Tests_Supplier_T<Supplier_Traits>::Admin_Ext_Traits_PTR admin_ptr
-                                             , CosNotification::QoSProperties& qos
-                                             ACE_ENV_ARG_DECL)
+                                             , CosNotification::QoSProperties& qos)
 {
   Supplier_Traits traits;
 
@@ -51,17 +48,15 @@ TAO_Notify_Tests_Supplier_T<Supplier_Traits>::obtain_proxy (ACE_TYPENAME TAO_Not
   CosNotifyChannelAdmin::ProxyConsumer_var proxy_consumer =
     admin_ptr->obtain_notification_push_consumer_with_qos (traits.type_
                                                            , this->proxy_id_
-                                                           , qos
-                                                           ACE_ENV_ARG_PARAMETER);
+                                                           , qos);
 
   ACE_ASSERT (!CORBA::is_nil (proxy_consumer.in ()));
 
-  return Proxy_Traits_INTERFACE::_narrow (proxy_consumer.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+  return Proxy_Traits_INTERFACE::_narrow (proxy_consumer.in ());
 }
 
 template <class Supplier_Traits> void
-TAO_Notify_Tests_Supplier_T<Supplier_Traits>::offer_change (CosNotification::EventTypeSeq &added, CosNotification::EventTypeSeq& removed ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_Supplier_T<Supplier_Traits>::offer_change (CosNotification::EventTypeSeq &added, CosNotification::EventTypeSeq& removed)
 {
   // Let the user see what we're subscribed for,
   ACE_DEBUG ((LM_DEBUG, "(%P, %t) Calling Supplier offer change: \n"));
@@ -82,14 +77,13 @@ TAO_Notify_Tests_Supplier_T<Supplier_Traits>::offer_change (CosNotification::Eve
   /// subscribe
   ACE_TYPENAME Proxy_Traits::PTR proxy_consumer = this->get_proxy ();
 
-  proxy_consumer->offer_change (added, removed ACE_ENV_ARG_PARAMETER);
+  proxy_consumer->offer_change (added, removed);
 }
 
 template <class Supplier_Traits> void
 TAO_Notify_Tests_Supplier_T<Supplier_Traits>::subscription_change (
                                                          const CosNotification::EventTypeSeq & /*added*/,
                                                          const CosNotification::EventTypeSeq & /*removed*/
-        ACE_ENV_ARG_DECL_NOT_USED
         )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h
index 046359398f3..a00a7f33fdc 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h
@@ -64,22 +64,20 @@ public:
   Proxy_Traits_PTR get_proxy_consumer (void);
 
   /// Send offer change.
-  void offer_change (CosNotification::EventTypeSeq &added, CosNotification::EventTypeSeq& removed ACE_ENV_ARG_DECL);
+  void offer_change (CosNotification::EventTypeSeq &added, CosNotification::EventTypeSeq& removed);
 
 protected:
   /// Obtain Proxy.
-  virtual Proxy_Traits_PTR obtain_proxy (Admin_Traits_PTR admin_ptr ACE_ENV_ARG_DECL);
+  virtual Proxy_Traits_PTR obtain_proxy (Admin_Traits_PTR admin_ptr);
 
   /// Obtain Proxy with QoS.
   virtual Proxy_Traits_PTR obtain_proxy (Admin_Ext_Traits_PTR admin_ptr
-                                         , CosNotification::QoSProperties& qos
-                                          ACE_ENV_ARG_DECL);
+                                         , CosNotification::QoSProperties& qos);
 
     // = NotifySubscribe
     virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp
index 8ba1324e1fd..219e33382b6 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp
@@ -25,8 +25,7 @@ Notify_Sequence_Push_Consumer::~Notify_Sequence_Push_Consumer ()
 
 void
 Notify_Sequence_Push_Consumer::_connect (
-  CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-  ACE_ENV_ARG_DECL)
+  CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::SequencePushConsumer_var objref =
@@ -35,12 +34,11 @@ Notify_Sequence_Push_Consumer::_connect (
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     consumer_admin->obtain_notification_push_supplier (
     CosNotifyChannelAdmin::SEQUENCE_EVENT,
-    proxy_id_
-    ACE_ENV_ARG_PARAMETER);
+    proxy_id_);
 
   this->proxy_ =
     CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow (
-    proxysupplier.in () ACE_ENV_ARG_PARAMETER);
+    proxysupplier.in ());
 
   CosNotification::QoSProperties properties(1);
   properties.length(1);
@@ -48,8 +46,7 @@ Notify_Sequence_Push_Consumer::_connect (
   properties[0].value <<= (CORBA::Long)10;
 
   proxy_->set_qos(properties);
-  proxy_->connect_sequence_push_consumer (objref.in ()
-    ACE_ENV_ARG_PARAMETER);
+  proxy_->connect_sequence_push_consumer (objref.in ());
 
   // give ownership to POA
   this->_remove_ref ();
@@ -59,7 +56,7 @@ Notify_Sequence_Push_Consumer::_connect (
 void
 Notify_Sequence_Push_Consumer::push_structured_events(
   const CosNotification::EventBatch& events
-  ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+ /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if ( this->count_ == 0 )
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.h
index ccd5af92252..89094dcf08a 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.h
@@ -31,13 +31,11 @@ public:
 
   ~Notify_Sequence_Push_Consumer ();
 
-  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                ACE_ENV_ARG_DECL)
+  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
-  void push_structured_events(const CosNotification::EventBatch&
-                              ACE_ENV_ARG_DECL)
+  void push_structured_events(const CosNotification::EventBatch&)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   ACE_CString name_;
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp
index 980db3ea5f5..4f96edaaa6c 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp
@@ -26,8 +26,7 @@ Notify_Structured_Push_Consumer::~Notify_Structured_Push_Consumer ()
 
 void
 Notify_Structured_Push_Consumer::_connect (
-                CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                ACE_ENV_ARG_DECL)
+                CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::StructuredPushConsumer_var objref =
@@ -36,15 +35,13 @@ Notify_Structured_Push_Consumer::_connect (
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     consumer_admin->obtain_notification_push_supplier (
       CosNotifyChannelAdmin::STRUCTURED_EVENT,
-      proxy_id_
-      ACE_ENV_ARG_PARAMETER);
+      proxy_id_);
 
   this->proxy_ =
     CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (
-      proxysupplier.in () ACE_ENV_ARG_PARAMETER);
+      proxysupplier.in ());
 
-  proxy_->connect_structured_push_consumer (objref.in ()
-                                            ACE_ENV_ARG_PARAMETER);
+  proxy_->connect_structured_push_consumer (objref.in ());
 
   this->_remove_ref ();
 }
@@ -53,7 +50,7 @@ Notify_Structured_Push_Consumer::_connect (
 void
 Notify_Structured_Push_Consumer::push_structured_event(
                           const CosNotification::StructuredEvent& /*event*/
-                          ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+ /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if ( this->count_ == 0 )
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.h
index cd34305133d..a342bd45cb2 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.h
@@ -31,13 +31,11 @@ public:
                         Notify_Test_Client& client);
   ~Notify_Structured_Push_Consumer ();
 
-  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                ACE_ENV_ARG_DECL)
+  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
-  void push_structured_event(const CosNotification::StructuredEvent&
-                             ACE_ENV_ARG_DECL)
+  void push_structured_event(const CosNotification::StructuredEvent&)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   ACE_CString name_;
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp
index 6eb34323d53..6ed26aeaee9 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp
@@ -80,14 +80,12 @@ Consumer_Client::parse_args (int argc, char *argv[])
 
 
 static CosNotifyChannelAdmin::ConsumerAdmin_ptr
-create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::ConsumerAdmin_var admin =
     ec->new_for_consumers (CosNotifyChannelAdmin::AND_OP,
-                           adminid
-                           ACE_ENV_ARG_PARAMETER);
+                           adminid);
 
 
   if (filter)
@@ -98,7 +96,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
           ec->default_filter_factory ();
 
       CosNotifyFilter::Filter_var filter =
-          ffact->create_filter (GRAMMAR ACE_ENV_ARG_PARAMETER);
+          ffact->create_filter (GRAMMAR);
 
       CosNotifyFilter::ConstraintExpSeq constraint_list (1);
       constraint_list.length (1);
@@ -107,9 +105,9 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
       constraint_list[0].constraint_expr =
                                  CORBA::string_dup ("type == 'even'");
 
-      filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
+      filter->add_constraints (constraint_list);
 
-      admin->add_filter (filter.in () ACE_ENV_ARG_PARAMETER);
+      admin->add_filter (filter.in ());
     }
 
   return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ());
@@ -118,8 +116,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 
 static void
 create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
-                  Notify_Test_Client* client
-                  ACE_ENV_ARG_DECL)
+                  Notify_Test_Client* client)
 {
   for(unsigned int i = 0; i < consumers; i++)
     {
@@ -134,9 +131,9 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
                                          *client),
                         CORBA::NO_MEMORY ());
 
-      consumer->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
+      consumer->init (client->root_poa ());
 
-      consumer->_connect (admin ACE_ENV_ARG_PARAMETER);
+      consumer->_connect (admin);
     }
 }
 
@@ -147,11 +144,11 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
 int main (int argc, char* argv[])
 {
   int status = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
       Consumer_Client client;
 
-      status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      status = client.init (argc, argv);
 
       if (status == 0)
         {
@@ -163,14 +160,13 @@ int main (int argc, char* argv[])
             }
 
           CosNotifyChannelAdmin::EventChannel_var ec =
-            client.create_event_channel ("MyEventChannel", 1
-                                         ACE_ENV_ARG_PARAMETER);
+            client.create_event_channel ("MyEventChannel", 1);
 
           CORBA::ORB_ptr orb = client.orb ();
           CORBA::Object_var object =
-                              orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+                              orb->string_to_object (ior);
 
-          sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+          sig_var sig = sig::_narrow (object.in ());
 
           if (CORBA::is_nil (sig.in ()))
             {
@@ -181,11 +177,11 @@ int main (int argc, char* argv[])
             }
 
           CosNotifyChannelAdmin::ConsumerAdmin_var admin =
-            create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
+            create_consumeradmin (ec.in ());
 
           if (!CORBA::is_nil (admin.in ()))
             {
-              create_consumers(admin.in (), &client ACE_ENV_ARG_PARAMETER);
+              create_consumers(admin.in (), &client);
 
               // Tell the supplier to go
               sig->go ();
@@ -198,12 +194,11 @@ int main (int argc, char* argv[])
             }
         }
     }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
     {
-      ACE_PRINT_EXCEPTION (e, "Error: Consumer exception: ");
+      e._tao_print_exception ("Error: Consumer exception: ");
       status = 1;
     }
-  ACE_ENDTRY;
 
   return status;
 }
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
index f7131315692..a2c6cdd8b32 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
@@ -112,14 +112,12 @@ Supplier_Client::parse_args (int argc, char *argv[])
 
 
 static CosNotifyChannelAdmin::SupplierAdmin_ptr
-create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::SupplierAdmin_var admin =
     ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP,
-    adminid
-    ACE_ENV_ARG_PARAMETER);
+    adminid);
 
 
   return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ());
@@ -127,7 +125,7 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 
 
 static void
-SendEvents (int id ACE_ENV_ARG_DECL)
+SendEvents (int id)
 {
   ACE_UNUSED_ARG(id);
   CosNotification::EventBatch events (amount);
@@ -149,30 +147,28 @@ SendEvents (int id ACE_ENV_ARG_DECL)
     events[z].filterable_data[0].value <<= type;
   }
 
-  ACE_TRY_NEW_ENV
+  try
   {
-    supplier_1->send_events(events ACE_ENV_ARG_PARAMETER);
+    supplier_1->send_events(events);
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: Supplier exception: ");
+    e._tao_print_exception ("Error: Supplier exception: ");
   }
-  ACE_ENDTRY;
 }
 
 static void
 create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
-                  PortableServer::POA_ptr poa
-                  ACE_ENV_ARG_DECL)
+                  PortableServer::POA_ptr poa)
 {
   // startup the first supplier
   ACE_NEW_THROW_EX (supplier_1,
     TAO_Notify_Tests_SequencePushSupplier (),
     CORBA::NO_MEMORY ());
 
-  supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
+  supplier_1->init (poa);
 
-  supplier_1->connect (admin ACE_ENV_ARG_PARAMETER);
+  supplier_1->connect (admin);
 }
 
 
@@ -184,17 +180,16 @@ int main (int argc, char* argv[])
 {
   ACE_Auto_Ptr< sig_i > sig_impl;
   int status = 0;
-  ACE_TRY_NEW_ENV
+  try
   {
     Supplier_Client client;
 
-    status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+    status = client.init (argc, argv);
 
     if (status == 0)
     {
       CosNotifyChannelAdmin::EventChannel_var ec =
-        client.create_event_channel ("MyEventChannel", 0
-        ACE_ENV_ARG_PARAMETER);
+        client.create_event_channel ("MyEventChannel", 0);
 
       CORBA::ORB_ptr orb = client.orb ();
 
@@ -202,7 +197,7 @@ int main (int argc, char* argv[])
       sig_var sig = sig_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (sig.in ());
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
@@ -219,17 +214,17 @@ int main (int argc, char* argv[])
       }
 
       CosNotifyChannelAdmin::SupplierAdmin_var admin =
-        create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
+        create_supplieradmin (ec.in ());
       if (!CORBA::is_nil (admin.in ()))
       {
-        create_suppliers(admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER);
+        create_suppliers(admin.in (), client.root_poa ());
 
         sig_impl->wait_for_startup();
 
         ACE_DEBUG((LM_DEBUG, " 1 supplier sending %d events...\n", (max_events*amount)));
         for (int i = 0; i < max_events; ++i)
         {
-          SendEvents (i ACE_ENV_ARG_PARAMETER);
+          SendEvents (i);
         }
         ACE_DEBUG((LM_DEBUG, "\nSupplier sent %d events.\n", (max_events*amount)));
 
@@ -241,12 +236,11 @@ int main (int argc, char* argv[])
       }
     }
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: Supplier exception: ");
+    e._tao_print_exception ("Error: Supplier exception: ");
     status = 1;
   }
-  ACE_ENDTRY;
 
   return status;
 }
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
index 404a51ced9f..2e08e1570fa 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
@@ -78,14 +78,12 @@ Consumer_Client::parse_args (int argc, char *argv[])
 
 
 static CosNotifyChannelAdmin::ConsumerAdmin_ptr
-create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::ConsumerAdmin_var admin =
     ec->new_for_consumers (CosNotifyChannelAdmin::AND_OP,
-                           adminid
-                           ACE_ENV_ARG_PARAMETER);
+                           adminid);
 
 
   if (filter)
@@ -96,7 +94,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 
       // One Filter
       CosNotifyFilter::Filter_var filter =
-          ffact->create_filter (GRAMMAR ACE_ENV_ARG_PARAMETER);
+          ffact->create_filter (GRAMMAR);
 
       CosNotifyFilter::ConstraintExpSeq constraint_list (1);
       constraint_list.length (1);
@@ -105,9 +103,9 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
       constraint_list[0].constraint_expr =
                                  CORBA::string_dup ("type == 'even'");
 
-      filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
+      filter->add_constraints (constraint_list);
 
-      admin->add_filter (filter.in () ACE_ENV_ARG_PARAMETER);
+      admin->add_filter (filter.in ());
       // End One Filter
     }
 
@@ -117,8 +115,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 
 static void
 create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
-                  Notify_Test_Client* client
-                  ACE_ENV_ARG_DECL)
+                  Notify_Test_Client* client)
 {
   for(unsigned int i = 0; i < consumers; i++)
     {
@@ -133,9 +130,9 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
                                          *client),
                         CORBA::NO_MEMORY ());
 
-      consumer->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
+      consumer->init (client->root_poa ());
 
-      consumer->_connect (admin ACE_ENV_ARG_PARAMETER);
+      consumer->_connect (admin);
     }
 }
 
@@ -146,11 +143,11 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
 int main (int argc, char* argv[])
 {
   int status = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
       Consumer_Client client;
 
-      status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      status = client.init (argc, argv);
 
       if (status == 0)
         {
@@ -162,14 +159,13 @@ int main (int argc, char* argv[])
             }
 
           CosNotifyChannelAdmin::EventChannel_var ec =
-          client.create_event_channel ("MyEventChannel", 1
-                                       ACE_ENV_ARG_PARAMETER);
+          client.create_event_channel ("MyEventChannel", 1);
 
           CORBA::ORB_ptr orb = client.orb ();
           CORBA::Object_var object =
-                              orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+                              orb->string_to_object (ior);
 
-          sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+          sig_var sig = sig::_narrow (object.in ());
 
           if (CORBA::is_nil (sig.in ()))
             {
@@ -180,28 +176,27 @@ int main (int argc, char* argv[])
             }
 
           CosNotifyChannelAdmin::ConsumerAdmin_var admin =
-            create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
+            create_consumeradmin (ec.in ());
 
           if (!CORBA::is_nil (admin.in ()))
             {
-              create_consumers(admin.in (), &client ACE_ENV_ARG_PARAMETER);
+              create_consumers(admin.in (), &client);
 
               // Tell the supplier to go
               sig->go ();
 
-              client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
+              client.ORB_run( );
               ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
 
               sig->done ();
             }
         }
     }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
     {
-      ACE_PRINT_EXCEPTION (e, "Error: Consumer exception: ");
+      e._tao_print_exception ("Error: Consumer exception: ");
       status = 1;
     }
-  ACE_ENDTRY;
 
   return status;
 }
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
index 48dfb565431..9d7ec6fac29 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
@@ -112,14 +112,12 @@ Supplier_Client::parse_args (int argc, char *argv[])
 
 
 static CosNotifyChannelAdmin::SupplierAdmin_ptr
-create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::SupplierAdmin_var admin =
     ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP,
-    adminid
-    ACE_ENV_ARG_PARAMETER);
+    adminid);
 
 
   return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ());
@@ -127,7 +125,7 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 
 
 static void
-SendEvent (int id ACE_ENV_ARG_DECL_NOT_USED)
+SendEvent (int id)
 {
   const char* type = ( (id & 1) == 1 ? "odd" : "even" );
   CosNotification::StructuredEvent event;
@@ -144,30 +142,28 @@ SendEvent (int id ACE_ENV_ARG_DECL_NOT_USED)
   event.filterable_data[0].name = CORBA::string_dup("type");
   event.filterable_data[0].value <<= type;
 
-  ACE_TRY_NEW_ENV
+  try
   {
-    supplier_1->send_event(event ACE_ENV_ARG_PARAMETER);
+    supplier_1->send_event(event);
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: Supplier exception: ");
+    e._tao_print_exception ("Error: Supplier exception: ");
   }
-  ACE_ENDTRY;
 }
 
 static void
 create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
-                  PortableServer::POA_ptr poa
-                  ACE_ENV_ARG_DECL)
+                  PortableServer::POA_ptr poa)
 {
   // startup the first supplier
   ACE_NEW_THROW_EX (supplier_1,
     TAO_Notify_Tests_StructuredPushSupplier (),
     CORBA::NO_MEMORY ());
 
-  supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
+  supplier_1->init (poa);
 
-  supplier_1->connect (admin ACE_ENV_ARG_PARAMETER);
+  supplier_1->connect (admin);
 }
 
 
@@ -179,16 +175,15 @@ int main (int argc, char* argv[])
 {
   ACE_Auto_Ptr< sig_i > sig_impl;
   int status = 0;
-  ACE_TRY_NEW_ENV
+  try
   {
     Supplier_Client client;
-    status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+    status = client.init (argc, argv);
 
     if (status == 0)
     {
       CosNotifyChannelAdmin::EventChannel_var ec =
-        client.create_event_channel ("MyEventChannel", 0
-        ACE_ENV_ARG_PARAMETER);
+        client.create_event_channel ("MyEventChannel", 0);
 
       CORBA::ORB_ptr orb = client.orb ();
 
@@ -196,7 +191,7 @@ int main (int argc, char* argv[])
       sig_var sig = sig_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (sig.in ());
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
@@ -213,17 +208,17 @@ int main (int argc, char* argv[])
       }
 
       CosNotifyChannelAdmin::SupplierAdmin_var admin =
-        create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
+        create_supplieradmin (ec.in ());
       if (!CORBA::is_nil (admin.in ()))
       {
-        create_suppliers(admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER);
+        create_suppliers(admin.in (), client.root_poa ());
 
         sig_impl->wait_for_startup();
 
         ACE_DEBUG((LM_DEBUG, "1 supplier sending %d events...\n", max_events));
         for (int i = 0; i < max_events; ++i)
         {
-          SendEvent (i ACE_ENV_ARG_PARAMETER);
+          SendEvent (i);
         }
         ACE_DEBUG((LM_DEBUG, "\nSupplier sent %d events.\n", max_events));
 
@@ -235,12 +230,11 @@ int main (int argc, char* argv[])
       }
     }
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: Supplier exception: ");
+    e._tao_print_exception ("Error: Supplier exception: ");
     status = 1;
   }
-  ACE_ENDTRY;
 
   return status;
 }
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
index cf6a605897a..19753b337d0 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
@@ -80,11 +80,11 @@ RedGreen_Test::destroy_ec ()
     {
       // Even though we still have a reference, there's no guarantee
       // the EC is still around.  So, trap exceptions.
-      ACE_TRY_NEW_ENV
+      try
         {
           this->ec_->destroy ();
         }
-      ACE_CATCH (CORBA::COMM_FAILURE, ex)
+      catch (const CORBA::COMM_FAILURE& ex)
         {
           // Silently swallow this b/c this could mean the EC is gone
           // or that the network is hosed.  Either way, we're not waiting
@@ -95,12 +95,10 @@ RedGreen_Test::destroy_ec ()
                       "      invoke `destroy()' on the Event Channel in the \n"
                       "      RedGreen destroy_ec. This is likely not a problem.\n"));
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
-                              "in RedGreen destructor; swallowing.\n");
+          ex._tao_print_exception ("in RedGreen destructor; swallowing.\n");
         }
-      ACE_ENDTRY;
 
       this->ec_ = CosNotifyChannelAdmin::EventChannel::_nil ();
     }
@@ -109,12 +107,10 @@ RedGreen_Test::destroy_ec ()
 
 void
 RedGreen_Test::init (int argc,
-                     char *argv []
-                     ACE_ENV_ARG_DECL)
+                     char *argv [])
 {
   this->init_ORB (argc,
-                  argv
-                  ACE_ENV_ARG_PARAMETER);
+                  argv);
   this->resolve_naming_service ();
   this->resolve_Notify_factory ();
   this->create_EC ();
@@ -127,24 +123,23 @@ RedGreen_Test::init (int argc,
 void
 RedGreen_Test::run (void)
 {
-  ACE_TRY_NEW_ENV
+  try
   {
     this->send_events ();
 
     while (! consumer_is_done)
     {
       ACE_Time_Value tv(0, 10 * 1000);
-      this->orb_->run(tv ACE_ENV_ARG_PARAMETER);
+      this->orb_->run(tv);
     }
 
-    this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+    this->orb_->shutdown (0);
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION, "Supplier:");
-    ACE_RE_THROW;
+    ex._tao_print_exception ("Supplier:");
+    throw;
   }
-  ACE_ENDTRY;
 
   worker_.thr_mgr ()->wait ();
 }
@@ -158,17 +153,14 @@ RedGreen_Test::done (void)
 
 void
 RedGreen_Test::init_ORB (int argc,
-                         char *argv []
-                         ACE_ENV_ARG_DECL)
+                         char *argv [])
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                ""
-                                ACE_ENV_ARG_PARAMETER);
+                                "");
 
   CORBA::Object_ptr poa_object  =
-    this->orb_->resolve_initial_references("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references("RootPOA");
 
   if (CORBA::is_nil (poa_object))
     {
@@ -177,8 +169,7 @@ RedGreen_Test::init_ORB (int argc,
       return;
     }
   this->root_poa_ =
-    PortableServer::POA::_narrow (poa_object
-                                  ACE_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (poa_object);
 
   PortableServer::POAManager_var poa_manager =
     root_poa_->the_POAManager ();
@@ -199,18 +190,16 @@ void
 RedGreen_Test::resolve_naming_service (void)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
-                                            ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references (NAMING_SERVICE_NAME);
 
   // Need to check return value for errors.
   if (CORBA::is_nil (naming_obj.in ()))
     {
-      ACE_THROW (CORBA::UNKNOWN ());
+      throw CORBA::UNKNOWN ();
     }
 
   this->naming_context_ =
-    CosNaming::NamingContext::_narrow (naming_obj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+    CosNaming::NamingContext::_narrow (naming_obj.in ());
 }
 
 void
@@ -221,13 +210,11 @@ RedGreen_Test::resolve_Notify_factory (void)
   name[0].id = CORBA::string_dup (NOTIFY_FACTORY_NAME);
 
   CORBA::Object_var obj =
-    this->naming_context_->resolve (name
-                                    ACE_ENV_ARG_PARAMETER);
+    this->naming_context_->resolve (name);
 
   this->notify_factory_ =
     CosNotifyChannelAdmin::EventChannelFactory::_narrow (
         obj.in ()
-        ACE_ENV_ARG_PARAMETER
       );
 }
 
@@ -238,8 +225,7 @@ RedGreen_Test::create_EC (void)
 
   this->ec_ = notify_factory_->create_channel (this->initial_qos_,
                                                this->initial_admin_,
-                                               id
-                                               ACE_ENV_ARG_PARAMETER);
+                                               id);
 
   ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
 }
@@ -251,8 +237,7 @@ RedGreen_Test::create_supplieradmin (void)
 
   supplier_admin_ =
     ec_->new_for_suppliers (this->ifgop_,
-                            adminid
-                            ACE_ENV_ARG_PARAMETER);
+                            adminid);
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
 }
@@ -264,8 +249,7 @@ RedGreen_Test::create_consumeradmin (void)
 
   consumer_admin_ =
     ec_->new_for_consumers (this->ifgop_,
-                            adminid
-                            ACE_ENV_ARG_PARAMETER);
+                            adminid);
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
 }
@@ -275,13 +259,11 @@ RedGreen_Test::create_consumers (void)
 {
   ACE_NEW (this->normal_consumer_,
            RedGreen_Test_StructuredPushConsumer (this));
-  this->normal_consumer_->connect (this->consumer_admin_.in ()
-                                   ACE_ENV_ARG_PARAMETER);
+  this->normal_consumer_->connect (this->consumer_admin_.in ());
 
   ACE_NEW (this->slow_consumer_,
            SlowConsumer (this));
-  this->slow_consumer_->connect (this->consumer_admin_.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+  this->slow_consumer_->connect (this->consumer_admin_.in ());
 }
 
 void
@@ -289,8 +271,7 @@ RedGreen_Test::create_suppliers (void)
 {
   ACE_NEW (this->supplier_,
            RedGreen_Test_StructuredPushSupplier ());
-  this->supplier_->connect (this->supplier_admin_.in ()
-                            ACE_ENV_ARG_PARAMETER);
+  this->supplier_->connect (this->supplier_admin_.in ());
 }
 
 void
@@ -309,7 +290,6 @@ RedGreen_Test::send_events (void)
   this->normal_consumer_->get_proxy_supplier ()->subscription_change (
                                                      added_1,
                                                      removed_1
-                                                     ACE_ENV_ARG_PARAMETER
                                                    );
 
   // Setup the Consumer 2 to receive event_type : "DOMAIN_RED", "TYPE_RED"
@@ -324,7 +304,6 @@ RedGreen_Test::send_events (void)
   this->slow_consumer_->get_proxy_supplier ()->subscription_change (
                                                    added_2,
                                                    removed_2
-                                                   ACE_ENV_ARG_PARAMETER
                                                  );
 
   // Create the events - one of each type
@@ -356,11 +335,9 @@ RedGreen_Test::send_events (void)
   // let supplier 1 send all these events
   for (int i = 0; i < this->burst_size_; ++i)
     {
-      this->supplier_->send_event (red_event
-                                   ACE_ENV_ARG_PARAMETER);
+      this->supplier_->send_event (red_event);
 
-      this->supplier_->send_event (green_event
-                                   ACE_ENV_ARG_PARAMETER);
+      this->supplier_->send_event (green_event);
     }
 }
 
@@ -441,7 +418,6 @@ RedGreen_Test_StructuredPushConsumer::dump_stats (const char* msg,
 void
 RedGreen_Test_StructuredPushConsumer::connect (
     CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-    ACE_ENV_ARG_DECL
   )
 {
   // Activate the consumer with the default_POA_.
@@ -452,7 +428,6 @@ RedGreen_Test_StructuredPushConsumer::connect (
     consumer_admin->obtain_notification_push_supplier (
         CosNotifyChannelAdmin::STRUCTURED_EVENT,
         proxy_supplier_id_
-        ACE_ENV_ARG_PARAMETER
       );
 
   ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ()));
@@ -461,13 +436,11 @@ RedGreen_Test_StructuredPushConsumer::connect (
   this->proxy_supplier_ =
     CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (
         proxysupplier.in ()
-        ACE_ENV_ARG_PARAMETER
       );
 
   ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ()));
 
-  proxy_supplier_->connect_structured_push_consumer (objref.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+  proxy_supplier_->connect_structured_push_consumer (objref.in ());
 }
 
 void
@@ -481,7 +454,6 @@ void
 RedGreen_Test_StructuredPushConsumer::offer_change (
     const CosNotification::EventTypeSeq & /*added*/,
     const CosNotification::EventTypeSeq & /*removed*/
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNotifyComm::InvalidEventType))
@@ -492,7 +464,6 @@ RedGreen_Test_StructuredPushConsumer::offer_change (
 void
 RedGreen_Test_StructuredPushConsumer::push_structured_event (
     const CosNotification::StructuredEvent & notification
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosEventComm::Disconnected))
@@ -539,7 +510,6 @@ RedGreen_Test_StructuredPushConsumer::push_structured_event (
 
 void
 RedGreen_Test_StructuredPushConsumer::disconnect_structured_push_consumer (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -562,7 +532,6 @@ SlowConsumer::SlowConsumer (RedGreen_Test* RedGreen_Test)
 void
 SlowConsumer::push_structured_event (
     const CosNotification::StructuredEvent & notification
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosEventComm::Disconnected))
@@ -572,7 +541,6 @@ SlowConsumer::push_structured_event (
 
   RedGreen_Test_StructuredPushConsumer::push_structured_event (
       notification
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -609,7 +577,6 @@ RedGreen_Test_StructuredPushSupplier::dump_stats (const char* msg,
 void
 RedGreen_Test_StructuredPushSupplier::connect (
     CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin
-    ACE_ENV_ARG_DECL
   )
 {
   CosNotifyComm::StructuredPushSupplier_var objref =
@@ -619,7 +586,6 @@ RedGreen_Test_StructuredPushSupplier::connect (
     supplier_admin->obtain_notification_push_consumer (
         CosNotifyChannelAdmin::STRUCTURED_EVENT,
         proxy_consumer_id_
-        ACE_ENV_ARG_PARAMETER
       );
 
   ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ()));
@@ -628,13 +594,11 @@ RedGreen_Test_StructuredPushSupplier::connect (
   this->proxy_consumer_ =
     CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (
         proxyconsumer.in ()
-        ACE_ENV_ARG_PARAMETER
       );
 
   ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ()));
 
-  proxy_consumer_->connect_structured_push_supplier (objref.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+  proxy_consumer_->connect_structured_push_supplier (objref.in ());
 }
 
 void
@@ -643,7 +607,6 @@ RedGreen_Test_StructuredPushSupplier::disconnect (void)
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
   this->proxy_consumer_->disconnect_structured_push_consumer (
-                             ACE_ENV_SINGLE_ARG_PARAMETER
                            );
 }
 
@@ -651,7 +614,6 @@ void
 RedGreen_Test_StructuredPushSupplier::subscription_change (
     const CosNotification::EventTypeSeq & /*added*/,
     const CosNotification::EventTypeSeq & /*removed */
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNotifyComm::InvalidEventType))
@@ -662,7 +624,6 @@ RedGreen_Test_StructuredPushSupplier::subscription_change (
 void
 RedGreen_Test_StructuredPushSupplier::send_event (
     CosNotification::StructuredEvent& event
-    ACE_ENV_ARG_DECL
   )
 {
   event.filterable_data.length (1);
@@ -676,7 +637,7 @@ RedGreen_Test_StructuredPushSupplier::send_event (
                                  start);
   // any
   event.filterable_data[0].value <<= latency_base;
-  proxy_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER);
+  proxy_consumer_->push_structured_event (event);
 
   ACE_hrtime_t end = ACE_OS::gethrtime ();
 
@@ -686,7 +647,6 @@ RedGreen_Test_StructuredPushSupplier::send_event (
 
 void
 RedGreen_Test_StructuredPushSupplier::disconnect_structured_push_supplier (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -714,15 +674,14 @@ Worker::done (void)
 int
 Worker::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
   {
     this->orb_->run ();
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION, "Consumer:");
+    ex._tao_print_exception ("Consumer:");
   }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
index 3932834dedc..5cebcd037f7 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
@@ -75,8 +75,7 @@ class RedGreen_Test
   void dump_results (void);
 
   void init (int argc,
-             char *argv []
-             ACE_ENV_ARG_DECL);
+             char *argv []);
   // Initialize the Client.
 
   void run (void);
@@ -94,8 +93,7 @@ class RedGreen_Test
 
  protected:
   void init_ORB (int argc,
-                 char *argv []
-                 ACE_ENV_ARG_DECL);
+                 char *argv []);
   // Initializes the ORB.
 
   void resolve_naming_service (void);
@@ -175,8 +173,7 @@ class RedGreen_Test_StructuredPushConsumer
   RedGreen_Test_StructuredPushConsumer (RedGreen_Test* RedGreen_Test);
   // Constructor.
 
-  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                ACE_ENV_ARG_DECL);
+  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin);
   // Connect the Consumer to the EventChannel.
   // Creates a new proxy supplier and connects to it.
 
@@ -221,7 +218,6 @@ protected:
   virtual void offer_change (
       const CosNotification::EventTypeSeq & added,
       const CosNotification::EventTypeSeq & removed
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNotifyComm::InvalidEventType));
@@ -229,13 +225,11 @@ protected:
   // = StructuredPushSupplier methods
   virtual void push_structured_event (
       const CosNotification::StructuredEvent & notification
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventComm::Disconnected));
 
   virtual void disconnect_structured_push_consumer (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
@@ -249,7 +243,6 @@ public:
 
   virtual void push_structured_event (
       const CosNotification::StructuredEvent & notification
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventComm::Disconnected));
@@ -271,16 +264,14 @@ class RedGreen_Test_StructuredPushSupplier
   RedGreen_Test_StructuredPushSupplier (void);
   // Constructor.
 
-  void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin
-                ACE_ENV_ARG_DECL);
+  void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin);
   // Connect the Supplier to the EventChannel.
   // Creates a new proxy supplier and connects to it.
 
   void disconnect (void);
   // Disconnect from the supplier.
 
-  virtual void send_event (CosNotification::StructuredEvent& event
-                           ACE_ENV_ARG_DECL);
+  virtual void send_event (CosNotification::StructuredEvent& event);
   // Send one event.
 
   void accumulate_into (ACE_Throughput_Stats &throughput) const;
@@ -308,14 +299,12 @@ protected:
   virtual void subscription_change (
       const CosNotification::EventTypeSeq & added,
       const CosNotification::EventTypeSeq & removed
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNotifyComm::InvalidEventType));
 
   // = StructuredPushSupplier method
   virtual void disconnect_structured_push_supplier (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp
index e5c431eb157..26532667d31 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp
@@ -12,21 +12,19 @@ main (int argc, char *argv [])
 
   client.parse_args (argc, argv);
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      client.init (argc, argv
-                   ACE_ENV_ARG_PARAMETER); //Init the Client
+      client.init (argc, argv); //Init the Client
 
       client.run ();
 
       client.destroy_ec ();
     }
-  ACE_CATCH (CORBA::Exception, se)
+  catch (const CORBA::Exception& se)
     {
-      ACE_PRINT_EXCEPTION (se, "Error: ");
+      se._tao_print_exception ("Error: ");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
index 01b0fbcb6b0..b7002dd7bf2 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
@@ -44,7 +44,6 @@ Throughput_StructuredPushConsumer::dump_stats (const char* msg,
 void
 Throughput_StructuredPushConsumer::push_structured_event (
     const CosNotification::StructuredEvent & notification
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosEventComm::Disconnected))
@@ -158,7 +157,6 @@ Throughput_StructuredPushSupplier::svc (void)
 
   event.remainder_of_body <<= test_client_->payload_;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   this->throughput_start_ = ACE_OS::gethrtime ();
 
@@ -174,8 +172,7 @@ Throughput_StructuredPushSupplier::svc (void)
           // Any.
           event.filterable_data[0].value <<= Throughput_base;
 
-          this->proxy_->push_structured_event (event
-                                                        ACE_ENV_ARG_PARAMETER);
+          this->proxy_->push_structured_event (event);
 
           ACE_hrtime_t end = ACE_OS::gethrtime ();
           this->throughput_.sample (end - this->throughput_start_,
@@ -211,29 +208,24 @@ Notify_Throughput::Notify_Throughput (void)
 
 Notify_Throughput::~Notify_Throughput ()
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  this->orb_->shutdown (0
-                        ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 
   delete payload_;
 }
 
 int
-Notify_Throughput::init (int argc, char* argv [] ACE_ENV_ARG_DECL)
+Notify_Throughput::init (int argc, char* argv [])
 {
   // Initialize base class.
   Notify_Test_Client::init_ORB (argc,
-                                argv
-                                ACE_ENV_ARG_PARAMETER);
+                                argv);
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
   CORBA::Object_var manager_object =
-    orb_->resolve_initial_references ("ORBPolicyManager"
-                                     ACE_ENV_ARG_PARAMETER);
+    orb_->resolve_initial_references ("ORBPolicyManager");
 
   CORBA::PolicyManager_var policy_manager =
-    CORBA::PolicyManager::_narrow (manager_object.in ()
-                                   ACE_ENV_ARG_PARAMETER);
+    CORBA::PolicyManager::_narrow (manager_object.in ());
 
   CORBA::Any sync_scope;
   sync_scope <<= Messaging::SYNC_WITH_TARGET;
@@ -242,11 +234,9 @@ Notify_Throughput::init (int argc, char* argv [] ACE_ENV_ARG_DECL)
   policy_list.length (1);
   policy_list[0] =
     orb_->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                        sync_scope
-                        ACE_ENV_ARG_PARAMETER);
+                        sync_scope);
   policy_manager->set_policy_overrides (policy_list,
-                                        CORBA::SET_OVERRIDE
-                                        ACE_ENV_ARG_PARAMETER);
+                                        CORBA::SET_OVERRIDE);
 #else
   ACE_DEBUG ((LM_DEBUG,
               "CORBA Messaging disabled in this configuration,"
@@ -268,12 +258,12 @@ Notify_Throughput::init (int argc, char* argv [] ACE_ENV_ARG_DECL)
   CosNotifyChannelAdmin::AdminID adminid;
 
   supplier_admin_ =
-    ec_->new_for_suppliers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER);
+    ec_->new_for_suppliers (this->ifgop_, adminid);
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
 
   consumer_admin_ =
-    ec_->new_for_consumers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER);
+    ec_->new_for_consumers (this->ifgop_, adminid);
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
 
@@ -293,11 +283,9 @@ Notify_Throughput::init (int argc, char* argv [] ACE_ENV_ARG_DECL)
       ACE_NEW_RETURN (consumers_[i],
                       Throughput_StructuredPushConsumer (this),
                       -1);
-      consumers_[i]->init (root_poa_.in ()
-                           ACE_ENV_ARG_PARAMETER);
+      consumers_[i]->init (root_poa_.in ());
 
-      consumers_[i]->connect (this->consumer_admin_.in ()
-                              ACE_ENV_ARG_PARAMETER);
+      consumers_[i]->connect (this->consumer_admin_.in ());
     }
 
   for (i = 0; i < this->supplier_count_; ++i)
@@ -307,10 +295,8 @@ Notify_Throughput::init (int argc, char* argv [] ACE_ENV_ARG_DECL)
                       -1);
       suppliers_[i]->TAO_Notify_Tests_StructuredPushSupplier::init (
                          root_poa_.in ()
-                         ACE_ENV_ARG_PARAMETER
                        );
-      suppliers_[i]->connect (this->supplier_admin_.in ()
-                              ACE_ENV_ARG_PARAMETER);
+      suppliers_[i]->connect (this->supplier_admin_.in ());
     }
 
   return 0;
@@ -425,8 +411,7 @@ Notify_Throughput::create_EC (void)
 
       // Activate the factory
       this->notify_factory_ =
-        notify_service->create (this->root_poa_.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+        notify_service->create (this->root_poa_.in ());
 
       ACE_ASSERT (!CORBA::is_nil (this->notify_factory_.in ()));
     }
@@ -444,12 +429,10 @@ Notify_Throughput::create_EC (void)
       name[0].id = CORBA::string_dup (ec_name_.c_str ());
 
       CORBA::Object_var obj =
-        this->naming_context_->resolve (name
-                                        ACE_ENV_ARG_PARAMETER);
+        this->naming_context_->resolve (name);
 
       this->ec_ =
-        CosNotifyChannelAdmin::EventChannel::_narrow (obj.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
+        CosNotifyChannelAdmin::EventChannel::_narrow (obj.in ());
     }
 else
   {
@@ -457,8 +440,7 @@ else
 
     ec_ = notify_factory_->create_channel (initial_qos_,
                                            initial_admin_,
-                                           id
-                                           ACE_ENV_ARG_PARAMETER);
+                                           id);
   }
 
   ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
@@ -488,8 +470,7 @@ Notify_Throughput::run_test (void)
   for (int i = 0; i < this->supplier_count_; ++i)
     {
       suppliers_[i]->
-        TAO_Notify_Tests_StructuredPushSupplier::init (root_poa_.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
+        TAO_Notify_Tests_StructuredPushSupplier::init (root_poa_.in ());
 
       if (suppliers_[i]->ACE_Task_Base::activate (THR_NEW_LWP | THR_JOINABLE) != 0)
         {
@@ -579,10 +560,9 @@ main (int argc, char* argv[])
       return 1;
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      events.init (argc, argv
-                      ACE_ENV_ARG_PARAMETER); //Init the Client
+      events.init (argc, argv); //Init the Client
 
       events.run_test ();
 
@@ -593,12 +573,11 @@ main (int argc, char* argv[])
       ACE_DEBUG ((LM_DEBUG, "ending main...\n"));
 
     }
-  ACE_CATCH (CORBA::Exception, se)
+  catch (const CORBA::Exception& se)
     {
-      ACE_PRINT_EXCEPTION (se, "Error: ");
+      se._tao_print_exception ("Error: ");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
index fe31196fad3..a6e5fb04aec 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
@@ -66,7 +66,6 @@ public:
   // = StructuredPushSupplier methods
   virtual void push_structured_event (
         const CosNotification::StructuredEvent & notification
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -141,7 +140,7 @@ public:
 
   int parse_args(int argc, char *argv[]) ;
 
-  int init (int argc, char *argv [] ACE_ENV_ARG_DECL);
+  int init (int argc, char *argv []);
   // initialization.
 
   void run_test (void);
diff --git a/TAO/orbsvcs/tests/Property/client.cpp b/TAO/orbsvcs/tests/Property/client.cpp
index 10680104a94..bbeff9780f7 100644
--- a/TAO/orbsvcs/tests/Property/client.cpp
+++ b/TAO/orbsvcs/tests/Property/client.cpp
@@ -27,13 +27,11 @@ ACE_RCSID(CosPropertyService, client, "$Id$")
 
 int
 Client::init (int argc,
-              char *argv[]
-              ACE_ENV_ARG_DECL)
+              char *argv[])
 {
   // Init the ORB.
   manager_.init (argc,
-                 argv
-                 ACE_ENV_ARG_PARAMETER);
+                 argv);
 
   // Initialize the naming services
   if (my_name_client_.init (manager_.orb()) != 0)
@@ -47,11 +45,9 @@ Client::init (int argc,
   CosNaming::Name propsetdef_name (1);
   propsetdef_name.length (1);
   propsetdef_name [0].id = CORBA::string_dup ("PropertySetDef");
-  CORBA::Object_var propsetdef_obj = my_name_client_->resolve (propsetdef_name
-                                                               ACE_ENV_ARG_PARAMETER);
+  CORBA::Object_var propsetdef_obj = my_name_client_->resolve (propsetdef_name);
 
-  this->propsetdef_ = CosPropertyService::PropertySetDef::_narrow (propsetdef_obj.in ()
-                                                                   ACE_ENV_ARG_PARAMETER);
+  this->propsetdef_ = CosPropertyService::PropertySetDef::_narrow (propsetdef_obj.in ());
 
   if (CORBA::is_nil (this->propsetdef_.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -81,7 +77,7 @@ Client::property_tester (void)
   this->test_get_property_value ();
 
   // Testing delete property.
-  this->test_delete_property ("no_property" ACE_ENV_ARG_PARAMETER);
+  this->test_delete_property ("no_property");
 
   // Testing get_properties.
   this->test_get_properties ();
@@ -126,8 +122,7 @@ Client::test_define_property (void)
   anyval >>= CORBA::Any::to_char (ch);
 
   this->propsetdef_->define_property ("char_property",
-                                      anyval
-                                      ACE_ENV_ARG_PARAMETER);
+                                      anyval);
 
   // Prepare a Short and "define" that in the PropertySet.
   CORBA::Short s = 3;
@@ -136,8 +131,7 @@ Client::test_define_property (void)
   anyval >>= s;
 
   propsetdef_->define_property ("short_property",
-                                anyval
-                                ACE_ENV_ARG_PARAMETER);
+                                anyval);
 
   // Prepare a Long and "define" that in the PropertySet.
   CORBA::Long l = 931232;
@@ -146,8 +140,7 @@ Client::test_define_property (void)
   anyval >>= l;
   CORBA::Any newany(anyval);
   propsetdef_->define_property ("long_property",
-                                anyval
-                                ACE_ENV_ARG_PARAMETER);
+                                anyval);
 
   // Prepare a Float and "define" that in the PropertySet.
   CORBA::Float f = 3.14F;
@@ -156,8 +149,7 @@ Client::test_define_property (void)
   anyval >>= f;
 
   propsetdef_->define_property ("float_property",
-                                anyval
-                                ACE_ENV_ARG_PARAMETER);
+                                anyval);
 
 
   // Prepare a String and "define" that in the PropertySet.
@@ -166,8 +158,7 @@ Client::test_define_property (void)
   const char * newstr;
   anyval >>= newstr;
   propsetdef_->define_property ("string_property",
-                                anyval
-                                ACE_ENV_ARG_PARAMETER);
+                                anyval);
 
 
   return 0;
@@ -197,8 +188,7 @@ Client::test_get_all_property_names (void)
 
   propsetdef_->get_all_property_names (how_many,
                                        names_out,
-                                       iterator_out
-                                       ACE_ENV_ARG_PARAMETER);
+                                       iterator_out);
 
   // Get the values back to var.
   names_var = names_out.ptr ();
@@ -226,7 +216,7 @@ Client::test_get_all_property_names (void)
           CosPropertyService::PropertyName_out name_out (name_ptr);
 
           // Call the function.
-          CORBA::Boolean next_one_result = iterator_var->next_one (name_out ACE_ENV_ARG_PARAMETER);
+          CORBA::Boolean next_one_result = iterator_var->next_one (name_out);
 
           // Get the values back on a _var variable.
           CosPropertyService::PropertyName_var name_var = name_out.ptr ();
@@ -236,7 +226,7 @@ Client::test_get_all_property_names (void)
               ACE_DEBUG ((LM_DEBUG, "%s\n", name_var.in ()));
 
               // Call the function to iterate again.
-              next_one_result = iterator_var->next_one (name_out ACE_ENV_ARG_PARAMETER);
+              next_one_result = iterator_var->next_one (name_out);
 
               // Get the values back on a _var variable.
               name_var = name_out.ptr ();
@@ -277,8 +267,7 @@ Client::test_get_properties (void)
 
   // Get the properties.
   CORBA::Boolean return_val = propsetdef_->get_properties (names.in (),
-                                                           properties_out
-                                                           ACE_ENV_ARG_PARAMETER);
+                                                           properties_out);
   ACE_UNUSED_ARG (return_val);
 
 
@@ -358,27 +347,24 @@ Client::test_get_number_of_properties (void)
 // Test delete_property.
 
 int
-Client::test_delete_property (const char *property_name
-                              ACE_ENV_ARG_DECL)
+Client::test_delete_property (const char *property_name)
 {
-  ACE_TRY
+  try
     {
       CORBA::String_var property_name_var (property_name);
 
-      this->propsetdef_->delete_property (property_name_var.in ()
-                                          ACE_ENV_ARG_PARAMETER);
+      this->propsetdef_->delete_property (property_name_var.in ());
     }
-  ACE_CATCH (CORBA::UserException, ex)
+  catch (const CORBA::UserException& ex)
     {
       // For no property, it is ok to get the user exception.
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ex, "Not an user exception");
+      ex._tao_print_exception ("Not an user exception");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -397,8 +383,7 @@ Client::test_delete_properties (void)
   prop_names [1] = CORBA::string_dup ("short_property");
   prop_names [2] = CORBA::string_dup ("long_property");
   // prop_names [3] = CORBA::string_dup ("no_property");
-  this->propsetdef_->delete_properties (prop_names
-                                        ACE_ENV_ARG_PARAMETER);
+  this->propsetdef_->delete_properties (prop_names);
 
   return 0;
 }
@@ -445,7 +430,7 @@ Client::test_define_properties (void)
   nproperties[3].property_value <<= f;
 
   // Define this sequence of properties now.
-  this->propsetdef_->define_properties (nproperties ACE_ENV_ARG_PARAMETER);
+  this->propsetdef_->define_properties (nproperties);
 
   return 0;
 }
@@ -471,8 +456,7 @@ Client::test_get_all_properties (void)
 
   propsetdef_->get_all_properties (how_many,
                                    properties_out,
-                                   iterator_out
-                                   ACE_ENV_ARG_PARAMETER);
+                                   iterator_out);
 
   // Get these values to the _var's.
   CosPropertyService::Properties_var properties = properties_out.ptr ();
@@ -527,8 +511,7 @@ Client::test_get_all_properties (void)
           CosPropertyService::Property_out property_out (property_ptr);
 
           // Call the funtion.
-          CORBA::Boolean next_one_result = iterator->next_one (property_out
-                                                               ACE_ENV_ARG_PARAMETER);
+          CORBA::Boolean next_one_result = iterator->next_one (property_out);
 
           // Get the value to the _var variable.
           CosPropertyService::Property_var property = property_out.ptr ();
@@ -576,8 +559,7 @@ Client::test_get_all_properties (void)
                 }
 
               // Call the function for the next iteraton.
-              next_one_result = iterator->next_one (property_out
-                                                    ACE_ENV_ARG_PARAMETER);
+              next_one_result = iterator->next_one (property_out);
 
               // Get the value to the _var variable.
               property = property_out.ptr ();
@@ -602,8 +584,7 @@ Client::test_define_property_with_mode (void)
 
   this->propsetdef_->define_property_with_mode ("char_property",
                                                 anyval,
-                                                CosPropertyService::normal
-                                                ACE_ENV_ARG_PARAMETER);
+                                                CosPropertyService::normal);
 
   // Prepare a Short and "define" that in the PropertySet.
   CORBA::Short s = 3;
@@ -613,8 +594,7 @@ Client::test_define_property_with_mode (void)
 
   propsetdef_->define_property_with_mode ("short_property",
                                           anyval,
-                                          CosPropertyService::read_only
-                                          ACE_ENV_ARG_PARAMETER);
+                                          CosPropertyService::read_only);
 
   // Prepare a Long and "define" that in the PropertySet.
   CORBA::Long l = 931232;
@@ -624,8 +604,7 @@ Client::test_define_property_with_mode (void)
   CORBA::Any newany(anyval);
   propsetdef_->define_property_with_mode ("long_property",
                                           anyval,
-                                          CosPropertyService::fixed_normal
-                                          ACE_ENV_ARG_PARAMETER);
+                                          CosPropertyService::fixed_normal);
 
 
   // Prepare a Float and "define" that in the PropertySet.
@@ -635,8 +614,7 @@ Client::test_define_property_with_mode (void)
   anyval >>= f;
   propsetdef_->define_property_with_mode ("float_property",
                                           anyval,
-                                          CosPropertyService::fixed_readonly
-                                          ACE_ENV_ARG_PARAMETER);
+                                          CosPropertyService::fixed_readonly);
 
   // Prepare a String and "define" that in the PropertySet.
   CORBA::String_var strvar (CORBA::string_dup ("Test_String"));
@@ -645,8 +623,7 @@ Client::test_define_property_with_mode (void)
   anyval >>= newstr;
 
   propsetdef_->define_property  ("string_property",
-                                 anyval
-                                 ACE_ENV_ARG_PARAMETER);
+                                 anyval);
 
   return 0;
 }
@@ -654,47 +631,41 @@ Client::test_define_property_with_mode (void)
 int
 Client::test_get_property_value (void)
 {
-  ACE_TRY
+  try
     {
       // Get the ior property.
-      CORBA::Any_ptr any_ptr = this->propsetdef_->get_property_value ("PropertySetDef_IOR"
-                                                                      ACE_ENV_ARG_PARAMETER);
+      CORBA::Any_ptr any_ptr = this->propsetdef_->get_property_value ("PropertySetDef_IOR");
 
       // Check whether the IOR is fine.
       CORBA::Object_var propsetdef_object;
       (*any_ptr) >>= CORBA::Any::to_object (propsetdef_object.out ());
 
       CosPropertyService::PropertySetDef_var propsetdef =
-        CosPropertyService::PropertySetDef::_narrow (propsetdef_object.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+        CosPropertyService::PropertySetDef::_narrow (propsetdef_object.in ());
 
       if (CORBA::is_nil (propsetdef.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            "invalid object reference\n"),
                           -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "get_property_value");
+      ex._tao_print_exception ("get_property_value");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       Client client;
 
       if (client.init (argc,
-                       argv
-                       ACE_ENV_ARG_PARAMETER) == -1)
+                       argv) == -1)
         return 1;
 
       //  client.run ();
@@ -704,13 +675,11 @@ main (int argc, char **argv)
       else
         ACE_DEBUG ((LM_DEBUG, "Test succeeded\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "PropertyService Test : client");
+      ex._tao_print_exception ("PropertyService Test : client");
       return -1;
     }
- ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Property/client.h b/TAO/orbsvcs/tests/Property/client.h
index 56c94b9de27..d32b218b952 100644
--- a/TAO/orbsvcs/tests/Property/client.h
+++ b/TAO/orbsvcs/tests/Property/client.h
@@ -45,8 +45,7 @@ public:
   // Constructor.
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL);
+            char **argv);
   // Initialize the ORB etc, and bind the MMDevices.
 
   int run (void);
@@ -57,8 +56,7 @@ public:
 
 protected:
   int bind_to_remote_mmdevice (int argc,
-                               char *argv[]
-                               ACE_ENV_ARG_DECL);
+                               char *argv[]);
   // Bind to the remote MMDevice.
 
   // = Property Testing.
@@ -81,8 +79,7 @@ protected:
   int test_get_all_properties (void);
   // Testing get_all_properties.
 
-  int test_delete_property (const char *property_name
-                            ACE_ENV_ARG_DECL);
+  int test_delete_property (const char *property_name);
   // Testing delete_property.
 
   int test_delete_properties (void);
diff --git a/TAO/orbsvcs/tests/Property/main.cpp b/TAO/orbsvcs/tests/Property/main.cpp
index 668cb2909f1..11880dad81d 100644
--- a/TAO/orbsvcs/tests/Property/main.cpp
+++ b/TAO/orbsvcs/tests/Property/main.cpp
@@ -46,8 +46,7 @@ public:
   int test_get_number_of_properties (void);
   // Gets the number of properties currently defined in the PropertySet.
 
-  int test_delete_property (const char *property_name
-                            ACE_ENV_ARG_DECL);
+  int test_delete_property (const char *property_name);
   // Delete a given property.
 
   int test_is_property_defined (void);
@@ -96,7 +95,7 @@ public:
   int test_reset (void);
   // Test the reset method.
 
-  int test_next_n (size_t n ACE_ENV_ARG_DECL);
+  int test_next_n (size_t n);
   // Test the next_n method.
 private:
   TAO_PropertyNamesIterator iterator_;
@@ -132,8 +131,7 @@ TAO_PropertySet_Tester::test_define_property (void)
               "Main : Char ch = %c\n",
               ch));
   property_set_.define_property ("char_property",
-                                 anyval
-                                 ACE_ENV_ARG_PARAMETER);
+                                 anyval);
 
   // Prepare a Short and "define" that in the PropertySet.
   CORBA::Short s = 3;
@@ -144,8 +142,7 @@ TAO_PropertySet_Tester::test_define_property (void)
               "Main : Short s = %d\n",
               s));
   property_set_.define_property ("short_property",
-                                 anyval
-                                 ACE_ENV_ARG_PARAMETER);
+                                 anyval);
 
 
   // Prepare a Long and "define" that in the PropertySet.
@@ -159,8 +156,7 @@ TAO_PropertySet_Tester::test_define_property (void)
   CORBA::Any newany(anyval);
 
   property_set_.define_property ("long_property",
-                                 anyval
-                                 ACE_ENV_ARG_PARAMETER);
+                                 anyval);
 
   // Prepare a Float and "define" that in the PropertySet.
   CORBA::Float f = 3.14;
@@ -171,8 +167,7 @@ TAO_PropertySet_Tester::test_define_property (void)
               "Main : Float f = %f\n",
               f));
   property_set_.define_property ("float_property",
-                                 anyval
-                                 ACE_ENV_ARG_PARAMETER);
+                                 anyval);
 
   // Prepare a String and "define" that in the PropertySet.
   ACE_DEBUG ((LM_DEBUG,
@@ -186,8 +181,7 @@ TAO_PropertySet_Tester::test_define_property (void)
               strvar.in (),
               newstr));
   property_set_.define_property ("string_property",
-                                 anyval
-                                 ACE_ENV_ARG_PARAMETER);
+                                 anyval);
 
   return 0;
 }
@@ -206,12 +200,10 @@ TAO_PropertySet_Tester::test_get_number_of_properties (void)
 // Testing the delete_property. Delets property, with the given name,
 // if that exsists.
 int
-TAO_PropertySet_Tester::test_delete_property (const char *property_name
-                                              ACE_ENV_ARG_DECL)
+TAO_PropertySet_Tester::test_delete_property (const char *property_name)
 {
   ACE_DEBUG ((LM_DEBUG, "\nChecking delete_property\n"));
-  property_set_.delete_property (property_name
-                                 ACE_ENV_ARG_PARAMETER);
+  property_set_.delete_property (property_name);
 
   return 0;
 }
@@ -224,8 +216,7 @@ TAO_PropertySet_Tester::test_get_property_value (void)
   ACE_DEBUG ((LM_DEBUG,
               "\nChecking get_property_value\n"));
 
-  CORBA::Any_ptr anyptr = property_set_.get_property_value ("short_property"
-                                                            ACE_ENV_ARG_PARAMETER);
+  CORBA::Any_ptr anyptr = property_set_.get_property_value ("short_property");
 
   // Get the short value.
   if (anyptr != 0)
@@ -240,8 +231,7 @@ TAO_PropertySet_Tester::test_get_property_value (void)
     ACE_DEBUG ((LM_DEBUG,
                 "Short property not found\n"));
   // Get the string.
-  anyptr = property_set_.get_property_value ("string_property"
-                                             ACE_ENV_ARG_PARAMETER);
+  anyptr = property_set_.get_property_value ("string_property");
   if (anyptr != 0)
     {
       CORBA::String str;
@@ -263,22 +253,19 @@ TAO_PropertySet_Tester::test_is_property_defined (void)
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nChecking is_property_defined ()\n"));
-  if (property_set_.is_property_defined ("short_property"
-                                         ACE_ENV_ARG_PARAMETER) == 0)
+  if (property_set_.is_property_defined ("short_property") == 0)
     ACE_DEBUG ((LM_DEBUG,
                 "short_property not defined\n"));
   else
     ACE_DEBUG ((LM_DEBUG,
                 "short_property defined\n"));
-  if (property_set_.is_property_defined ("string_property"
-                                         ACE_ENV_ARG_PARAMETER) == 0)
+  if (property_set_.is_property_defined ("string_property") == 0)
     ACE_DEBUG ((LM_DEBUG,
                 "string_property not defined\n"));
   else
     ACE_DEBUG ((LM_DEBUG,
                 "string_property defined\n"));
-  if (property_set_.is_property_defined ("char_property"
-                                         ACE_ENV_ARG_PARAMETER) == 0)
+  if (property_set_.is_property_defined ("char_property") == 0)
     ACE_DEBUG ((LM_DEBUG,
                 "char_property not defined\n"));
   else
@@ -306,8 +293,7 @@ TAO_PropertySet_Tester::test_delete_properties (void)
               "Length of sequence %d, Maxlength : %d\n",
               prop_names.length (),
               prop_names.maximum ()));
-  property_set_.delete_properties (prop_names
-                                   ACE_ENV_ARG_PARAMETER);
+  property_set_.delete_properties (prop_names);
 
   return 0;
 }
@@ -363,7 +349,7 @@ TAO_PropertySet_Tester::test_define_properties (void)
   nproperties[4].property_value <<= strvar.in ();
 
   // Define this sequence of properties now.
-  property_set_.define_properties (nproperties ACE_ENV_ARG_PARAMETER);
+  property_set_.define_properties (nproperties);
 
   return 0;
 }
@@ -405,11 +391,11 @@ TAO_PropertyNamesIterator_Tester::test_next_one (void)
   ACE_DEBUG ((LM_DEBUG,
               "\nTesting next_one of NamesIterator, Iterating thru names.\n"));
   // Let us iterate, now.
-  int ret = iterator_.next_one (strvar.out () ACE_ENV_ARG_PARAMETER);
+  int ret = iterator_.next_one (strvar.out ());
   while (ret != 0)
     {
       ACE_DEBUG ((LM_DEBUG, "Str : %s\n", strvar.in ()));
-      ret = iterator_.next_one (strvar.out () ACE_ENV_ARG_PARAMETER);
+      ret = iterator_.next_one (strvar.out ());
     }
   return 0;
 }
@@ -426,14 +412,13 @@ TAO_PropertyNamesIterator_Tester::test_reset (void)
 
 // Test the next_n method. Get the next n names and print them all.
 int
-TAO_PropertyNamesIterator_Tester::test_next_n (size_t n
-                                               ACE_ENV_ARG_DECL)
+TAO_PropertyNamesIterator_Tester::test_next_n (size_t n)
 {
   CosPropertyService::PropertyNames_var pnames_var;
   ACE_DEBUG ((LM_DEBUG,
               "Checking next_n (), next %d\n",
               n));
-  int ret = iterator_.next_n (n, pnames_var.out () ACE_ENV_ARG_PARAMETER);
+  int ret = iterator_.next_n (n, pnames_var.out ());
   if (ret == 0)
     {
       // Return if no more items in the iterator.
@@ -451,12 +436,11 @@ TAO_PropertyNamesIterator_Tester::test_next_n (size_t n
 int
 main (int argc, char *argv [])
 {
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb_var = CORBA::ORB_init (argc,
                                                 argv,
-                                                "internet"
-                                                ACE_ENV_ARG_PARAMETER);
+                                                "internet");
 
       // = Checking PropertySet interface.
 
@@ -472,7 +456,7 @@ main (int argc, char *argv [])
       propertyset_tester.test_get_number_of_properties ();
 
       // Test delete property. Delete "string_property"
-      propertyset_tester.test_delete_property ("string_property" ACE_ENV_ARG_PARAMETER);
+      propertyset_tester.test_delete_property ("string_property");
 
       // Test the number of properties and print it out.
       propertyset_tester.test_get_number_of_properties ();
@@ -527,21 +511,20 @@ main (int argc, char *argv [])
       names_iterator_tester.test_reset ();
 
       // Checking next_n. Prints out all the names it has got.
-      names_iterator_tester.test_next_n (6 ACE_ENV_ARG_PARAMETER);
+      names_iterator_tester.test_next_n (6);
 
       // Try next_n without resetting.
-      names_iterator_tester.test_next_n (6 ACE_ENV_ARG_PARAMETER);
+      names_iterator_tester.test_next_n (6);
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_ENV_ARG_PARAMETER.print_exception ("System Exception");
+.print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_ENV_ARG_PARAMETER.print_exception ("User Exception");
+.print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Property/server.cpp b/TAO/orbsvcs/tests/Property/server.cpp
index 51cea140346..3dd1774a9b9 100644
--- a/TAO/orbsvcs/tests/Property/server.cpp
+++ b/TAO/orbsvcs/tests/Property/server.cpp
@@ -25,17 +25,15 @@ ACE_RCSID(CosPropertyService, server, "$Id$")
 int
 main (int argc, char ** argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       TAO_ORB_Manager m;
 
       // Initialize the ORB.
       m.init_child_poa (argc,
                         argv,
-                        "child_poa"
-                        ACE_ENV_ARG_PARAMETER);
+                        "child_poa");
 
       // Using naming server.
       TAO_Naming_Client my_name_client;
@@ -54,8 +52,7 @@ main (int argc, char ** argv)
       propsetdef_name.length (1);
       propsetdef_name[0].id = CORBA::string_dup ("PropertySetDef");
       my_name_client->bind (propsetdef_name,
-                            propsetdef.in ()
-                            ACE_ENV_ARG_PARAMETER);
+                            propsetdef.in ());
       CORBA::Any any_val;
 
       // Make this IOR as one of the properties in there.
@@ -67,12 +64,11 @@ main (int argc, char ** argv)
       // any_val.replace (CORBA::_tc_Object,
       //                  &ior_ptr,
       //                  1
-      //                  ACE_ENV_ARG_PARAMETER);
+      //);
 
       propsetdef_impl->define_property_with_mode ("PropertySetDef_IOR",
                                                   any_val,
-                                                  CosPropertyService::fixed_readonly
-                                                  ACE_ENV_ARG_PARAMETER);
+                                                  CosPropertyService::fixed_readonly);
 
       // Create PropertySet factory and then register.
       TAO_PropertySetFactory *propset_factory_impl;
@@ -86,25 +82,21 @@ main (int argc, char ** argv)
       propset_factory_name.length (1);
       propset_factory_name[0].id = CORBA::string_dup ("PropertySetFactory");
       my_name_client->bind (propset_factory_name,
-                            propset_factory.in ()
-                            ACE_ENV_ARG_PARAMETER);
+                            propset_factory.in ());
 
       // Run the ORB Event loop.
       m.run ();
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex,
-                           "System Exception");
+      sysex._tao_print_exception ("System Exception");
       return 1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex,
-                           "User Exception");
+      userex._tao_print_exception ("User Exception");
       return 1;
     }
-  ACE_ENDTRY;
   ACE_DEBUG ((LM_DEBUG,
               "\nServer is terminating"));
   return 0;
diff --git a/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.cpp b/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.cpp
index 92ea6cc74f6..f226d42dba3 100644
--- a/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.cpp
+++ b/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.cpp
@@ -40,8 +40,7 @@ Object1_impl::~Object1_impl()
 
 void Object1_impl::method1(const char* activity,
     CORBA::Long seconds,
-    char* &output
-    ACE_ENV_ARG_DECL_NOT_USED)
+    char* &output)
   ACE_THROW_SPEC ((CORBA::SystemException, testSched::testSchedException))
 {
   const int scale_factor = 2000;
diff --git a/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.h b/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.h
index ffddfb90fa9..ef99d1209a8 100644
--- a/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.h
+++ b/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.h
@@ -35,7 +35,6 @@ class Object1_impl : public POA_testSched::Object1
     virtual void method1(const char *activity,
                          CORBA::Long seconds,
                          char *&output
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS
                          )
       ACE_THROW_SPEC ((CORBA::SystemException, testSched::testSchedException));
 };
diff --git a/TAO/orbsvcs/tests/RTCosScheduling/client.cpp b/TAO/orbsvcs/tests/RTCosScheduling/client.cpp
index 00634d96afc..1e79d4e3d55 100644
--- a/TAO/orbsvcs/tests/RTCosScheduling/client.cpp
+++ b/TAO/orbsvcs/tests/RTCosScheduling/client.cpp
@@ -144,7 +144,7 @@ ORB_Thread(CORBA::ORB_var orb,
 }
 
 int svc(void) {
-  ACE_TRY_NEW_ENV
+  try
     {
       if (parse_args (argc_, argv_) != 0)
         {
@@ -159,7 +159,7 @@ int svc(void) {
 
       CORBA::Object_var obj =
         orb_->string_to_object ("file://server.ior"
-                                ACE_ENV_ARG_PARAMETER);
+                                );
 
 
       if (CORBA::is_nil (obj.in ()))
@@ -171,7 +171,7 @@ int svc(void) {
         }
 
       testSched::Object1_var object1 =
-        testSched::Object1::_narrow (obj.in ()ACE_ENV_ARG_PARAMETER);
+        testSched::Object1::_narrow (obj.in ());
 
 
       if (CORBA::is_nil (object1.in ()))
@@ -206,20 +206,17 @@ int svc(void) {
 
 
           /// Create a Current object so we can check on the priority locally
-          obj = orb_->resolve_initial_references ("RTCurrent"
-                                                  ACE_ENV_ARG_PARAMETER);
+          obj = orb_->resolve_initial_references ("RTCurrent");
           RTCORBA::Current_var current =
-            RTCORBA::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+            RTCORBA::Current::_narrow (obj.in ());
 
 
           /// Test to make sure the priority model is exposed
           CORBA::Policy_var policy =
-            object1->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE
-                                  ACE_ENV_ARG_PARAMETER);
+            object1->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE);
 
           RTCORBA::PriorityModelPolicy_var priority_policy =
-            RTCORBA::PriorityModelPolicy::_narrow (policy.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
+            RTCORBA::PriorityModelPolicy::_narrow (policy.in ());
 
           if (CORBA::is_nil (priority_policy.in ()))
             {
@@ -242,19 +239,15 @@ int svc(void) {
 
           do_work(before_);
 
-          ACE_TRY_EX(sched_act)
+          try
             {
-               client_sched->schedule_activity (::activity_
-                                                ACE_ENV_ARG_PARAMETER);
-               ACE_TRY_CHECK_EX(sched_act);
+               client_sched->schedule_activity (::activity_);
             }
-          ACE_CATCHANY
+          catch (const CORBA::Exception& ex)
             {
-               ACE_PRINT_EXCEPTION (ex,
-                                    "Invalid activity name\n");
+               ex._tao_print_exception ("Invalid activity name\n");
                return -1;
             }
-          ACE_ENDTRY;
 
           ACE_OS::sprintf(buf,
                           "%s\t%s\tBeginning activity at priority %d\n",
@@ -345,13 +338,11 @@ int svc(void) {
       // Finally destroy the ORB
       orb_->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in running the client\n");
+      ex._tao_print_exception ("Exception in running the client\n");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
  }
 
@@ -367,10 +358,10 @@ private:
 int
 ACE_TMAIN (int argc, char * argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
     CORBA::ORB_var orb =
-    CORBA::ORB_init (argc, argv, "client_orb" ACE_ENV_ARG_PARAMETER);
+    CORBA::ORB_init (argc, argv, "client_orb");
 
     ORB_Thread ot(orb, argc, argv);
 
@@ -393,12 +384,10 @@ ACE_TMAIN (int argc, char * argv[])
     ot.activate(flags);
     return ot.wait();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
-                          "ERROR in running the client\n");
+      ex._tao_print_exception ("ERROR in running the client\n");
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/tests/RTCosScheduling/server.cpp b/TAO/orbsvcs/tests/RTCosScheduling/server.cpp
index 2b29d6cb31b..236c0275b5e 100644
--- a/TAO/orbsvcs/tests/RTCosScheduling/server.cpp
+++ b/TAO/orbsvcs/tests/RTCosScheduling/server.cpp
@@ -43,18 +43,16 @@ ORB_Thread(CORBA::ORB_var orb) : orb_(orb)
 
 int
 svc(void) {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       orb_->run();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "svc");
+      ex._tao_print_exception ("svc");
       return 1;
     }
-  ACE_ENDTRY;
 
   exit(0);
   return 0;
@@ -115,8 +113,7 @@ parse_args (int argc, char *argv[])
 
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[]) {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       if (parse_args (argc, argv) != 0)
         {
@@ -126,17 +123,14 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) {
       CORBA::ORB_var orb=
         CORBA::ORB_init (argc,
                          argv,
-                         "testORB"
-                         ACE_ENV_ARG_PARAMETER);
+                         "testORB");
 
       /// get the root poa
       CORBA::Object_var object=
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var rootPOA=
-        PortableServer::POA::_narrow (object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
 
       /// Create a manager for the POA
       PortableServer::POAManager_var poa_manager =
@@ -163,8 +157,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) {
         server_sched->create_POA(rootPOA.in(),
                                  "my_RT_POA",
                                  poa_manager.in(),
-                                 poa_policy_list
-                                 ACE_ENV_ARG_PARAMETER);
+                                 poa_policy_list);
 
 
       Object1_impl * servant = 0;
@@ -173,17 +166,14 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) {
                        CORBA::NO_MEMORY());
 
       PortableServer::ObjectId_var id =
-        RTPOA->activate_object(servant
-                               ACE_ENV_ARG_PARAMETER);
+        RTPOA->activate_object(servant);
 
       CORBA::Object_var testObject =
-        RTPOA->id_to_reference(id.in()
-                           ACE_ENV_ARG_PARAMETER);
+        RTPOA->id_to_reference(id.in());
 
 
       CORBA::String_var testObject_IORString =
-        orb->object_to_string (testObject.in ()
-                               ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (testObject.in ());
 
 
       // If the ior_output_file exists, output the ior to it
@@ -199,18 +189,16 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) {
       if (use_realtime_)
         {
           /// Schedule the object
-          ACE_TRY_EX(INNER)
+          try
             {
               server_sched->schedule_object(testObject.inout(),
-                                            object_ ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK_EX(INNER);
+                                            object_);
             }
-          ACE_CATCH(RTCosScheduling::UnknownName, ex)
+          catch (const RTCosScheduling::UnknownName& ex)
             {
-              ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
-                                 "Unknown object passed to schedule_object\n");
+              ex._tao_print_exception (
+                "Unknown object passed to schedule_object\n");
             }
-          ACE_ENDTRY;
         }
 
       // Activate the manager and run the event loop
@@ -243,16 +231,14 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) {
       delete server_sched;
 
       /// clean up
-      rootPOA->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      rootPOA->destroy (1, 1);
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                            "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
index 070a8d06e7f..2f8a4561e24 100644
--- a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
@@ -44,7 +44,7 @@ public:
 
   // = Interface implementation accessor methods.
 
-  void id (CORBA::Short id ACE_ENV_ARG_DECL)
+  void id (CORBA::Short id)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Sets id.
 
@@ -73,7 +73,7 @@ My_Test_Object::id (void)
 }
 
 void
-My_Test_Object::id (CORBA::Short id ACE_ENV_ARG_DECL_NOT_USED)
+My_Test_Object::id (CORBA::Short id)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   id_ = id;
@@ -149,11 +149,10 @@ main (int argc, ACE_TCHAR **argv)
   CosNaming::NamingContext_var root_context_1;
   CosNaming::NamingContext_var root_context_2;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY_EX(bl_a)
+  try
   {
     // Initialize orb
-    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, 0 ACE_ENV_ARG_PARAMETER);
+    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, 0);
 
     // ior's are specified for the name servers through a commandline
     // option or a file.
@@ -161,85 +160,69 @@ main (int argc, ACE_TCHAR **argv)
     // Resolve the first name server
 
     CORBA::Object_var ns1obj = orb->string_to_object (
-                            ACE_TEXT_ALWAYS_CHAR (ns1ref) ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_a);
+                            ACE_TEXT_ALWAYS_CHAR (ns1ref));
 
     if (CORBA::is_nil (ns1obj.in ()))
             ACE_ERROR_RETURN ((LM_ERROR,
                                ACE_TEXT ("invalid ior <%s>\n"),
                                ns1ref),
                               -1);
-    root_context_1 = CosNaming::NamingContext::_narrow (ns1obj.in ()
-                                                        ACE_ENV_ARG_PARAMETER);
+    root_context_1 = CosNaming::NamingContext::_narrow (ns1obj.in ());
 
-    ACE_TRY_CHECK_EX(bl_a);
 
     // Resolve the second name server
 
     CORBA::Object_var ns2obj = orb->string_to_object (
-                            ACE_TEXT_ALWAYS_CHAR (ns2ref) ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_a);
+                            ACE_TEXT_ALWAYS_CHAR (ns2ref));
 
     if (CORBA::is_nil (ns2obj.in ()))
             ACE_ERROR_RETURN ((LM_ERROR,
                                ACE_TEXT ("invalid ior <%s>\n"),
                                ns2ref),
                               -1);
-    root_context_2 = CosNaming::NamingContext::_narrow (ns2obj.in ()
-                                                        ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_a);
+    root_context_2 = CosNaming::NamingContext::_narrow (ns2obj.in ());
 
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                         ACE_TEXT ("Unable to resolve name servers"));
+    ex._tao_print_exception (ACE_TEXT ("Unable to resolve name servers"));
     return -1;
   }
-  ACE_ENDTRY;
 
   // Create a bunch of objects in one context
   // Note: strings to the naming service must be char, not wchar
-  ACE_TRY_EX(bl_b)
+  try
   {
     // Bind one context level under root.
     CosNaming::Name level1;
     level1.length (1);
     level1[0].id = CORBA::string_dup ("level1_context");
     CosNaming::NamingContext_var level1_context;
-    level1_context = root_context_1->bind_new_context (level1
-                                                       ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_b);
+    level1_context = root_context_1->bind_new_context (level1);
     for (i=0; i<o_breath; i++)
     {
       // Instantiate a dummy object and bind it under the new context.
       My_Test_Object *impl1 = new My_Test_Object (i+1);
       Test_Object_var obj1 = impl1->_this ();
-      ACE_TRY_CHECK_EX(bl_b);
       impl1->_remove_ref ();
-      ACE_TRY_CHECK_EX(bl_b);
 
       CosNaming::Name obj_name;
       obj_name.length (1);
       char wide_name[16];
       ACE_OS::sprintf(wide_name, "obj_%d", i);
       obj_name[0].id = CORBA::string_dup (wide_name);
-      level1_context->bind (obj_name, obj1.in ()
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX(bl_b);
+      level1_context->bind (obj_name, obj1.in ());
     }
 
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                         ACE_TEXT ("Unable to create a lot of objects"));
+    ex._tao_print_exception (ACE_TEXT ("Unable to create a lot of objects"));
     return -1;
   }
-  ACE_ENDTRY;
 
   // Create a deep context tree
-  ACE_TRY_EX(bl_c)
+  try
   {
     CosNaming::NamingContext_var next_context = root_context_1;
     for (i=0; i<c_depth; i++)
@@ -251,22 +234,18 @@ main (int argc, ACE_TCHAR **argv)
       ACE_OS::sprintf(deep_name, "deep_%d", i);
       deep[0].id = CORBA::string_dup (deep_name);
       CosNaming::NamingContext_var deep_context;
-      deep_context = next_context->bind_new_context (deep
-                                                     ACE_ENV_ARG_PARAMETER);
+      deep_context = next_context->bind_new_context (deep);
       next_context = deep_context;
-    ACE_TRY_CHECK_EX(bl_c);
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                         ACE_TEXT ("Unable to create deep context"));
+    ex._tao_print_exception (ACE_TEXT ("Unable to create deep context"));
     return -1;
   }
-  ACE_ENDTRY;
 
   // Create a wide context tree
-  ACE_TRY_EX(bl_d)
+  try
   {
     for (i=0; i<c_breath; i++)
     {
@@ -277,21 +256,17 @@ main (int argc, ACE_TCHAR **argv)
       ACE_OS::sprintf(wide_name, "wide_%d", i);
       wide[0].id = CORBA::string_dup (wide_name);
       CosNaming::NamingContext_var wide_context;
-      wide_context = root_context_1->bind_new_context (wide
-                                                       ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_d);
+      wide_context = root_context_1->bind_new_context (wide);
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                         ACE_TEXT ("Unable to create wide context"));
+    ex._tao_print_exception (ACE_TEXT ("Unable to create wide context"));
     return -1;
   }
-  ACE_ENDTRY;
 
   // Delete three selected things, one from each tree
-  ACE_TRY_EX(bl_e)
+  try
   {
     // Remove the second to last object from the Naming Context
     CosNaming::Name wide1;
@@ -300,30 +275,23 @@ main (int argc, ACE_TCHAR **argv)
     char wide_name[16];
     ACE_OS::sprintf(wide_name, "obj_%d", o_breath-2);
     wide1[1].id = CORBA::string_dup (wide_name);
-    root_context_1->unbind (wide1 ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_e);
+    root_context_1->unbind (wide1);
 
     // Remove the second to last context from the wide root Naming Context
     CosNaming::Name wide2;
     wide2.length (1);
     ACE_OS::sprintf(wide_name, "wide_%d", c_breath-2);
     wide2[0].id = CORBA::string_dup (wide_name);
-    CORBA::Object_var result_obj_ref = root_context_1->resolve (wide2
-                                                          ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_e);
+    CORBA::Object_var result_obj_ref = root_context_1->resolve (wide2);
     CosNaming::NamingContext_var result_object =
-      CosNaming::NamingContext::_narrow (result_obj_ref.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_e);
+      CosNaming::NamingContext::_narrow (result_obj_ref.in ());
     if (CORBA::is_nil (result_object.in ()))
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("Problems with resolving wide context ")
                          ACE_TEXT ("- nil object ref.\n")),
                          -1);
     result_object->destroy();
-    ACE_TRY_CHECK_EX(bl_e);
-    root_context_1->unbind (wide2 ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_e);
+    root_context_1->unbind (wide2);
 
     // Remove the last context from the deep Naming Context
     CosNaming::Name deep;
@@ -334,34 +302,27 @@ main (int argc, ACE_TCHAR **argv)
       ACE_OS::sprintf(deep_name, "deep_%d", i);
       deep[i].id = CORBA::string_dup (deep_name);
     }
-    result_obj_ref = root_context_1->resolve (deep ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_e);
+    result_obj_ref = root_context_1->resolve (deep);
     result_object =
-      CosNaming::NamingContext::_narrow (result_obj_ref.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_e);
+      CosNaming::NamingContext::_narrow (result_obj_ref.in ());
     if (CORBA::is_nil (result_object.in ()))
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("Problems with resolving deep context ")
                          ACE_TEXT ("- nil object ref.\n")),
                          -1);
     result_object->destroy();
-    ACE_TRY_CHECK_EX(bl_e);
-    root_context_1->unbind (deep ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_e);
+    root_context_1->unbind (deep);
 
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                         ACE_TEXT ("Unable to delete objects"));
+    ex._tao_print_exception (ACE_TEXT ("Unable to delete objects"));
     return -1;
   }
-  ACE_ENDTRY;
 
   // Now use the other name server to access 3 objects next to the
   // deleted objects and the 3 deleted objects
-  ACE_TRY_EX(bl_f)
+  try
   {
     // Access the last object from the Naming Context
     CosNaming::Name wide;
@@ -370,28 +331,23 @@ main (int argc, ACE_TCHAR **argv)
     char wide_name[16];
     ACE_OS::sprintf(wide_name, "obj_%d", o_breath-1);
     wide[1].id = CORBA::string_dup (wide_name);
-    CORBA::Object_var result_obj_ref = root_context_2->resolve (wide
-                                                          ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_f);
-    Test_Object_var result_object = Test_Object::_narrow (result_obj_ref.in ()
-                                                          ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_f);
+    CORBA::Object_var result_obj_ref = root_context_2->resolve (wide);
+    Test_Object_var result_object = Test_Object::_narrow (result_obj_ref.in ());
     if (CORBA::is_nil (result_object.in ()))
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("Problems with resolving object from ")
                          ACE_TEXT ("redundant server - nil object ref.\n")),
                          -1);
-    ACE_TRY_CHECK_EX(bl_f);
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-      ACE_TEXT ("Unable to resolve object from redundant server"));
+    ex._tao_print_exception (
+      ACE_TEXT (
+        "Unable to resolve object from redundant server"));
     return -1;
   }
-  ACE_ENDTRY;
 
-  ACE_TRY_EX(bl_g)
+  try
   {
     // Access the deleted second to last object from the Naming Context
     CosNaming::Name wide;
@@ -400,21 +356,18 @@ main (int argc, ACE_TCHAR **argv)
     char wide_name[16];
     ACE_OS::sprintf(wide_name, "obj_%d", o_breath-2);
     wide[1].id = CORBA::string_dup (wide_name);
-    CORBA::Object_var result_obj_ref = root_context_2->resolve (wide
-                                                          ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_g);
+    CORBA::Object_var result_obj_ref = root_context_2->resolve (wide);
     ACE_ERROR_RETURN ((LM_ERROR,
                     ACE_TEXT ("Problems with resolving object from ")
                     ACE_TEXT ("redundant server - deleted object found.\n")),
                     -1);
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
     //expect exception since the context was deleted
   }
-  ACE_ENDTRY;
 
-  ACE_TRY_EX(bl_h)
+  try
   {
     // Access the last context from the wide Naming Context
     CosNaming::Name wide;
@@ -422,29 +375,24 @@ main (int argc, ACE_TCHAR **argv)
     char wide_name[16];
     ACE_OS::sprintf(wide_name, "wide_%d", c_breath-1);
     wide[0].id = CORBA::string_dup (wide_name);
-    CORBA::Object_var result_obj_ref = root_context_2->resolve (wide
-                                                          ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_h);
+    CORBA::Object_var result_obj_ref = root_context_2->resolve (wide);
     CosNaming::NamingContext_var result_object =
-      CosNaming::NamingContext::_narrow (result_obj_ref.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_h);
+      CosNaming::NamingContext::_narrow (result_obj_ref.in ());
     if (CORBA::is_nil (result_object.in ()))
       ACE_ERROR_RETURN ((LM_ERROR,
                       ACE_TEXT ("Problems with resolving wide context from ")
                       ACE_TEXT ("redundant server - nil object ref.\n")),
                       -1);
-    ACE_TRY_CHECK_EX(bl_h);
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-      ACE_TEXT ("Unable to resolve wide context from redundant server"));
+    ex._tao_print_exception (
+      ACE_TEXT (
+        "Unable to resolve wide context from redundant server"));
     return -1;
   }
-  ACE_ENDTRY;
 
-  ACE_TRY_EX(bl_i)
+  try
   {
     // Access the deleted second to last object from the Naming Context
     CosNaming::Name wide;
@@ -452,21 +400,18 @@ main (int argc, ACE_TCHAR **argv)
     char wide_name[16];
     ACE_OS::sprintf(wide_name, "wide_%d", c_breath-2);
     wide[0].id = CORBA::string_dup (wide_name);
-    CORBA::Object_var result_obj_ref = root_context_2->resolve (wide
-                                                          ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_i);
+    CORBA::Object_var result_obj_ref = root_context_2->resolve (wide);
     ACE_ERROR_RETURN ((LM_ERROR,
                     ACE_TEXT ("Problems with resolving wide context from ")
                     ACE_TEXT ("redundant server - deleted object found.\n")),
                     -1);
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
     //expect exception since the context was deleted
   }
-  ACE_ENDTRY;
 
-  ACE_TRY_EX(bl_j)
+  try
   {
     // Access the deleted last context from the deep Naming Context
     CosNaming::Name deep;
@@ -477,21 +422,18 @@ main (int argc, ACE_TCHAR **argv)
       ACE_OS::sprintf(deep_name, "deep_%d", i);
       deep[i].id = CORBA::string_dup (deep_name);
     }
-    CORBA::Object_var result_obj_ref = root_context_1->resolve (deep
-                                                          ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_j);
+    CORBA::Object_var result_obj_ref = root_context_1->resolve (deep);
     ACE_ERROR_RETURN ((LM_ERROR,
                     ACE_TEXT ("Problems with resolving deep context from ")
                     ACE_TEXT ("redundant server - deleted object found.\n")),
                     -1);
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
     //expect exception since the context was deleted
   }
-  ACE_ENDTRY;
 
-  ACE_TRY_EX(bl_k)
+  try
   {
     // Access the second to last object from the Naming Context
     CosNaming::Name deep;
@@ -502,29 +444,24 @@ main (int argc, ACE_TCHAR **argv)
       ACE_OS::sprintf(deep_name, "deep_%d", i);
       deep[i].id = CORBA::string_dup (deep_name);
     }
-    CORBA::Object_var result_obj_ref = root_context_1->resolve (deep
-                                                          ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_k);
+    CORBA::Object_var result_obj_ref = root_context_1->resolve (deep);
     CosNaming::NamingContext_var result_object =
-      CosNaming::NamingContext::_narrow (result_obj_ref.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_k);
+      CosNaming::NamingContext::_narrow (result_obj_ref.in ());
     if (CORBA::is_nil (result_object.in ()))
       ACE_ERROR_RETURN ((LM_ERROR,
                       ACE_TEXT ("Problems with resolving deep context from ")
                       ACE_TEXT ("redundant server - nil object ref.\n")),
                       -1);
 
-    ACE_TRY_CHECK_EX(bl_k);
 
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-      ACE_TEXT ("Unable to resolve deep context from redundant server"));
+    ex._tao_print_exception (
+      ACE_TEXT (
+        "Unable to resolve deep context from redundant server"));
     return -1;
   }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Redundancy test OK\n")));
   return 0;
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
index 6dd7b143e86..4d51cdb0b34 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
@@ -336,14 +336,14 @@ main (int argc, char *argv[])
   };
 
 
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "internet" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "internet");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil(poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -351,7 +351,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in() ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -381,8 +381,7 @@ main (int argc, char *argv[])
         {
           // create the RT_Info
           config_infos[i].handle =
-            ACE_Scheduler_Factory::server ()->create (config_infos[i].entry_point
-                                                      ACE_ENV_ARG_PARAMETER);
+            ACE_Scheduler_Factory::server ()->create (config_infos[i].entry_point);
 
           // initialize the RT_Info
           ACE_Scheduler_Factory::server ()->
@@ -395,8 +394,7 @@ main (int argc, char *argv[])
                  static_cast<RtecScheduler::Importance_t> (config_infos[i].importance),
                  config_infos[i].quantum,
                  config_infos[i].threads,
-                 static_cast<RtecScheduler::Info_Type_t> (config_infos[i].info_type)
-                 ACE_ENV_ARG_PARAMETER);
+                 static_cast<RtecScheduler::Info_Type_t> (config_infos[i].info_type));
 
           // make operations in second half dependant on
           // operations in the first half of the array,
@@ -408,7 +406,7 @@ main (int argc, char *argv[])
                                 config_infos[i - (operation_count / 2)].handle,
                                 2,                             // number of calls
                                 RtecBase::ONE_WAY_CALL    // type of dependency
-                                ACE_ENV_ARG_PARAMETER);
+                                );
             }
         }
 
@@ -422,8 +420,7 @@ main (int argc, char *argv[])
                                          ACE_SCOPE_THREAD),
          ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                          ACE_SCOPE_THREAD),
-         infos.out (), deps.out (), configs.out (), anomalies.out ()
-         ACE_ENV_ARG_PARAMETER);
+         infos.out (), deps.out (), configs.out (), anomalies.out ());
 
 
       ACE_Scheduler_Factory::dump_schedule (infos.in (),
@@ -433,11 +430,10 @@ main (int argc, char *argv[])
                                             "Sched_Conf_Runtime.h",
                                             format_string);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "SYS_EX");
+      ex._tao_print_exception ("SYS_EX");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
index f23c3b659f6..811efaad8a7 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
@@ -190,14 +190,14 @@ main (int argc, char *argv[])
                   }
   };
 
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "internet" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "internet");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil(poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -205,7 +205,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in() ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -233,8 +233,7 @@ main (int argc, char *argv[])
         {
           // create the RT_Info
           config_infos[i].handle =
-            ACE_Scheduler_Factory::server ()->create (config_infos[i].entry_point
-                                                      ACE_ENV_ARG_PARAMETER);
+            ACE_Scheduler_Factory::server ()->create (config_infos[i].entry_point);
 
           // initialize the RT_Info
           ACE_Scheduler_Factory::server ()->
@@ -247,8 +246,7 @@ main (int argc, char *argv[])
                  static_cast<RtecScheduler::Importance_t> (config_infos[i].importance),
                  config_infos[i].quantum,
                  config_infos[i].threads,
-                 static_cast<RtecScheduler::Info_Type_t> (config_infos[i].info_type)
-                 ACE_ENV_ARG_PARAMETER);
+                 static_cast<RtecScheduler::Info_Type_t> (config_infos[i].info_type));
         }
 
 
@@ -258,7 +256,7 @@ main (int argc, char *argv[])
                         config_infos[0].handle,
                         1,                            // number of calls
                         RtecBase::ONE_WAY_CALL  // type of dependency
-                        ACE_ENV_ARG_PARAMETER);
+                        );
 
       // register dependency of consumer that will have unresolved remote
       // dependencies on supplier with unresolved remote dependencies
@@ -267,7 +265,7 @@ main (int argc, char *argv[])
                         config_infos[2].handle,
                         1,                            // number of calls
                         RtecBase::ONE_WAY_CALL  // type of dependency
-                        ACE_ENV_ARG_PARAMETER);
+                        );
 
 
       // register dependency of consumer that will have unresolved local
@@ -277,7 +275,7 @@ main (int argc, char *argv[])
                         config_infos[4].handle,
                         1,                            // number of calls
                         RtecBase::ONE_WAY_CALL  // type of dependency
-                        ACE_ENV_ARG_PARAMETER);
+                        );
 
 
       // register dependencies on each supplier of first consumer that will
@@ -287,21 +285,21 @@ main (int argc, char *argv[])
                         config_infos[0].handle,
                         1,                            // number of calls
                         RtecBase::ONE_WAY_CALL  // type of dependency
-                        ACE_ENV_ARG_PARAMETER);
+                        );
 
       ACE_Scheduler_Factory::server ()->
         add_dependency (config_infos[6].handle,
                         config_infos[2].handle,
                         1,                            // number of calls
                         RtecBase::ONE_WAY_CALL  // type of dependency
-                        ACE_ENV_ARG_PARAMETER);
+                        );
 
       ACE_Scheduler_Factory::server ()->
         add_dependency (config_infos[6].handle,
                         config_infos[4].handle,
                         1,                            // number of calls
                         RtecBase::ONE_WAY_CALL  // type of dependency
-                        ACE_ENV_ARG_PARAMETER);
+                        );
 
       // Register dependencies on each of the other consumers by second
       // consumer that will have both unresolved local and unresolved remote
@@ -311,28 +309,28 @@ main (int argc, char *argv[])
                         config_infos[1].handle,
                         1,                            // number of calls
                         RtecBase::ONE_WAY_CALL  // type of dependency
-                        ACE_ENV_ARG_PARAMETER);
+                        );
 
       ACE_Scheduler_Factory::server ()->
         add_dependency (config_infos[7].handle,
                         config_infos[3].handle,
                         1,                            // number of calls
                         RtecBase::ONE_WAY_CALL  // type of dependency
-                        ACE_ENV_ARG_PARAMETER);
+                        );
 
       ACE_Scheduler_Factory::server ()->
         add_dependency (config_infos[7].handle,
                         config_infos[5].handle,
                         1,                            // number of calls
                         RtecBase::ONE_WAY_CALL  // type of dependency
-                        ACE_ENV_ARG_PARAMETER);
+                        );
 
       ACE_Scheduler_Factory::server ()->
         add_dependency (config_infos[7].handle,
                         config_infos[6].handle,
                         1,                            // number of calls
                         RtecBase::ONE_WAY_CALL  // type of dependency
-                        ACE_ENV_ARG_PARAMETER);
+                        );
 
       RtecScheduler::RT_Info_Set_var infos;
       RtecScheduler::Dependency_Set_var deps;
@@ -345,7 +343,7 @@ main (int argc, char *argv[])
          ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                          ACE_SCOPE_THREAD),
          infos.out (), deps.out (),
-         configs.out (), anomalies.out () ACE_ENV_ARG_PARAMETER);
+         configs.out (), anomalies.out ());
 
       ACE_Scheduler_Factory::dump_schedule (infos.in (),
                                             deps.in (),
@@ -354,11 +352,10 @@ main (int argc, char *argv[])
                                             "Sched_Conf_Anomalies_Runtime.h",
                                             format_string);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "SYS_EX");
+      ex._tao_print_exception ("SYS_EX");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
index 90b95b32eda..0a0fb3ba803 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
@@ -21,14 +21,14 @@ ACE_RCSID(Sched_Conf, Sched_Conf_Runtime, "$Id$")
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "internet" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "internet");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil(poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -36,7 +36,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in() ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -59,17 +59,14 @@ main (int argc, char *argv[])
           // Make sure the correct handle is returned by the
           // run-time scheduler's create and lookup methods.
           ACE_ASSERT (infos [i].handle ==
-                      runtime_scheduler->create (infos [i].entry_point
-                                                 ACE_ENV_ARG_PARAMETER));
+                      runtime_scheduler->create (infos [i].entry_point));
 
           ACE_ASSERT (infos [i].handle ==
-                      runtime_scheduler->lookup (infos [i].entry_point
-                                                 ACE_ENV_ARG_PARAMETER));
+                      runtime_scheduler->lookup (infos [i].entry_point));
 
           // Make sure the values in the RT_Info returned by get are OK.
           delete rt_info;
-          rt_info = runtime_scheduler->get (infos [i].handle
-                                            ACE_ENV_ARG_PARAMETER);
+          rt_info = runtime_scheduler->get (infos [i].handle);
 
           ACE_ASSERT (rt_info != 0);
           ACE_ASSERT (ACE_OS::strcmp (rt_info->entry_point,
@@ -112,15 +109,13 @@ main (int argc, char *argv[])
                                   static_cast<RtecScheduler::Importance_t> (infos [i].importance),
                                   infos [i].quantum,
                                   infos [i].threads,
-                                  static_cast<RtecScheduler::Info_Type_t> (infos [i].info_type)
-                                  ACE_ENV_ARG_PARAMETER);
+                                  static_cast<RtecScheduler::Info_Type_t> (infos [i].info_type));
 
           // Make sure the correct priority values are returned.
           runtime_scheduler->priority (infos [i].handle,
                                        priority,
                                        subpriority,
-                                       p_priority
-                                       ACE_ENV_ARG_PARAMETER);
+                                       p_priority);
 
           ACE_ASSERT (priority == infos [i].priority);
           ACE_ASSERT (subpriority == infos [i].static_subpriority);
@@ -128,8 +123,7 @@ main (int argc, char *argv[])
           runtime_scheduler->entry_point_priority (infos [i].entry_point,
                                                    priority,
                                                    subpriority,
-                                                   p_priority
-                                                   ACE_ENV_ARG_PARAMETER);
+                                                   p_priority);
 
           ACE_ASSERT (priority == infos [i].priority);
           ACE_ASSERT (subpriority == infos [i].static_subpriority);
@@ -145,19 +139,17 @@ main (int argc, char *argv[])
           runtime_scheduler->
             dispatch_configuration (configs [j].preemption_priority,
                                     priority,
-                                    dispatching_type
-                                    ACE_ENV_ARG_PARAMETER);
+                                    dispatching_type);
 
           ACE_ASSERT (priority == configs [j].thread_priority);
           ACE_ASSERT (dispatching_type == configs [j].dispatching_type);
 
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "SYS_EX");
+      ex._tao_print_exception ("SYS_EX");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
index 196d9a21348..41c5ec1bd6d 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
@@ -46,13 +46,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -60,7 +60,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -73,8 +73,7 @@ main (int argc, char *argv[])
       pol <<= BiDirPolicy::BOTH;
       policies[0] =
         orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
-                            pol
-                            ACE_ENV_ARG_PARAMETER);
+                            pol);
 
       // Create POA as child of RootPOA with the above policies.  This POA
       // will receive request in the same connection in which it sent
@@ -82,8 +81,7 @@ main (int argc, char *argv[])
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("childPOA",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
+                              policies);
 
       // Creation of childPOA is over. Destroy the Policy objects.
       for (CORBA::ULong i = 0;
@@ -99,10 +97,10 @@ main (int argc, char *argv[])
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior);
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        Simple_Server::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -119,25 +117,22 @@ main (int argc, char *argv[])
         PortableServer::string_to_ObjectId ("client_callback");
 
       child_poa->activate_object_with_id (id.in (),
-                                          &callback_impl
-                                          ACE_ENV_ARG_PARAMETER);
+                                          &callback_impl);
 
       CORBA::Object_var callback_object =
-        child_poa->id_to_reference (id.in ()
-                                    ACE_ENV_ARG_PARAMETER);
+        child_poa->id_to_reference (id.in ());
 
       Callback_var callback =
-        Callback::_narrow (callback_object.in () ACE_ENV_ARG_PARAMETER);
+        Callback::_narrow (callback_object.in ());
 
 
       CORBA::String_var ior =
-        orb->object_to_string (callback.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (callback.in ());
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client callback activated as <%s>\n", ior.in ()));
 
       // Send the calback object to the server
-      server->callback_object (callback.in ()
-                               ACE_ENV_ARG_PARAMETER);
+      server->callback_object (callback.in ());
 
       // This is a non-portable, but the only currently available way of
       // determining the number of currently open connections.
@@ -146,7 +141,7 @@ main (int argc, char *argv[])
 
       // A  method to kickstart callbacks from the server
       CORBA::Long r =
-        server->test_method (1 ACE_ENV_ARG_PARAMETER);
+        server->test_method (1);
 
       if (r != 0)
         {
@@ -174,16 +169,14 @@ main (int argc, char *argv[])
           ACE_OS::abort ();
         }
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp
index aaa2535f686..2014504133c 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp
@@ -43,13 +43,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -57,7 +57,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -70,8 +70,7 @@ main (int argc, char *argv[])
       pol <<= BiDirPolicy::BOTH;
       policies[0] =
         orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
-                            pol
-                            ACE_ENV_ARG_PARAMETER);
+                            pol);
 
       // Create POA as child of RootPOA with the above policies.  This POA
       // will receive request in the same connection in which it sent
@@ -79,8 +78,7 @@ main (int argc, char *argv[])
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("childPOA",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
+                              policies);
 
       // Creation of childPOA is over. Destroy the Policy objects.
       for (CORBA::ULong i = 0;
@@ -102,15 +100,13 @@ main (int argc, char *argv[])
         PortableServer::string_to_ObjectId ("simple_server");
 
       child_poa->activate_object_with_id (id.in (),
-                                          &server_impl
-                                          ACE_ENV_ARG_PARAMETER);
+                                          &server_impl);
 
       CORBA::Object_var obj =
-        child_poa->id_to_reference (id.in ()
-                                    ACE_ENV_ARG_PARAMETER);
+        child_poa->id_to_reference (id.in ());
 
       CORBA::String_var ior =
-        orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (obj.in ());
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server activated as <%s>\n", ior.in ()));
 
@@ -146,15 +142,13 @@ main (int argc, char *argv[])
         }
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
index 806c839695c..e1f06c3ef6a 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
@@ -18,11 +18,11 @@ Callback_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n"));
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 void
-Callback_i::callback_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+Callback_i::callback_method ( /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -34,7 +34,7 @@ Callback_i::callback_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_A
 
 CORBA::Long
 Simple_Server_i::test_method (CORBA::Boolean do_callback
-                              ACE_ENV_ARG_DECL_NOT_USED )
+ )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (do_callback)
@@ -47,7 +47,7 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback
 
 void
 Simple_Server_i::callback_object (Callback_ptr callback
-                                  ACE_ENV_ARG_DECL_NOT_USED )
+ )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Store the callback object
@@ -96,5 +96,5 @@ void
 Simple_Server_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h
index 7958d4fb10f..33333f74968 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h
@@ -58,12 +58,10 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Long test_method (CORBA::Boolean do_callback
-                           ACE_ENV_ARG_DECL_NOT_USED)
+  CORBA::Long test_method (CORBA::Boolean do_callback)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void callback_object (Callback_ptr callback
-                        ACE_ENV_ARG_DECL_NOT_USED)
+  void callback_object (Callback_ptr callback)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void shutdown (void)
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp
index bfd8c262d0d..4e93ab3c7d3 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp
@@ -19,8 +19,7 @@ TX_Object_i::~TX_Object_i (void)
 }
 
 void
-TX_Object_i::send (const DataSeq & data
-                   ACE_ENV_ARG_DECL_NOT_USED)
+TX_Object_i::send (const DataSeq & data)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->data_ = data;
@@ -31,8 +30,7 @@ TX_Object_i::send (const DataSeq & data
 }
 
 void
-TX_Object_i::recv (DataSeq_out data
-                   ACE_ENV_ARG_DECL)
+TX_Object_i::recv (DataSeq_out data)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_NEW_THROW_EX (data,
@@ -50,5 +48,5 @@ void
 TX_Object_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h
index 6a998c432c1..0a5a0608374 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h
+++ b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h
@@ -33,12 +33,10 @@ public:
   // Destructor
   virtual ~TX_Object_i (void);
 
-  virtual void send (const DataSeq & data
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send (const DataSeq & data)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void recv (DataSeq_out data
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void recv (DataSeq_out data)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void shutdown (void)
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/client.cpp b/TAO/orbsvcs/tests/Security/Big_Request/client.cpp
index cd70b917849..2e7121199a2 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Big_Request/client.cpp
@@ -40,8 +40,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       ACE_TString env ("SSL_CERT_FILE=");
       env += cert_file;
@@ -50,14 +49,13 @@ main (int argc, char *argv[])
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
+                         "");
 
       if (::parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var obj =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior);
 
       if (CORBA::is_nil (obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -65,7 +63,7 @@ main (int argc, char *argv[])
                           -1);
 
       TX_Object_var txObject =
-        TX_Object::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+        TX_Object::_narrow (obj.in ());
 
       DataSeq data_input;
 
@@ -81,11 +79,11 @@ main (int argc, char *argv[])
                   "Sending  octet sequence of length:\t%u\n",
                   data_input.length ()));
 
-      txObject->send (data_input ACE_ENV_ARG_PARAMETER);
+      txObject->send (data_input);
 
       DataSeq_var data_output;
 
-      txObject->recv (data_output.out () ACE_ENV_ARG_PARAMETER);
+      txObject->recv (data_output.out ());
 
       ACE_DEBUG ((LM_DEBUG,
                   "Received octet sequence of length:\t%u\n",
@@ -103,14 +101,12 @@ main (int argc, char *argv[])
                            "the one that was sent.\n"),
                           -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "ERROR");
+      ex._tao_print_exception ("ERROR");
 
       return -1;
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
               "\n"
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp b/TAO/orbsvcs/tests/Security/Big_Request/server.cpp
index ae3e8436cc3..5e3953c6868 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Big_Request/server.cpp
@@ -42,20 +42,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char * argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       ACE_TString env ("SSL_CERT_FILE=");
       env += cert_file;
       ACE_OS::putenv (env.c_str ());
 
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poaObj =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var rootPoa =
-        PortableServer::POA::_narrow (poaObj.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poaObj.in ());
 
       PortableServer::POAManager_var poa_manager =
         rootPoa->the_POAManager ();
@@ -70,7 +69,7 @@ main (int argc, char * argv[])
       TX_Object_var txObject = implObject._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (txObject.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (txObject.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -93,18 +92,16 @@ main (int argc, char * argv[])
                   "\n"
                   "Event loop finished.\n"));
 
-      rootPoa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      rootPoa->destroy (1, 1);
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "ERROR");
+      ex._tao_print_exception ("ERROR");
 
       return -1;
     }
-  ACE_ENDTRY;
 
 
   return 0;
diff --git a/TAO/orbsvcs/tests/Security/Callback/client.cpp b/TAO/orbsvcs/tests/Security/Callback/client.cpp
index 7d8d96bc98f..3e5862fe0ed 100644
--- a/TAO/orbsvcs/tests/Security/Callback/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/client.cpp
@@ -12,8 +12,7 @@ const char *cert_file = "cacert.pem";
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       ACE_TString env ("SSL_CERT_FILE=");
       env += cert_file;
@@ -23,25 +22,22 @@ main (int argc, char *argv[])
       // Initialize the ORB
       //
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
-                         ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       //
       // Get the Root POA.
       //
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in ());
 
       //
       // Get a reference to the server.
       //
       obj = orb->string_to_object ("file://server.ior"
-                                   ACE_ENV_ARG_PARAMETER);
+                                   );
 
       if (CORBA::is_nil (obj.in ()))
         {
@@ -55,8 +51,7 @@ main (int argc, char *argv[])
       // Downcast the IOR to the appropriate object type.
       //
       server_var server_obj =
-        server::_narrow (obj.in ()
-                         ACE_ENV_ARG_PARAMETER);
+        server::_narrow (obj.in ());
 
       if (CORBA::is_nil (server_obj.in ()))
         {
@@ -87,34 +82,28 @@ main (int argc, char *argv[])
       //
       // Set the server's callback and invoke the test request.
       //
-      server_obj->set_client (client_ref.in ()
-                              ACE_ENV_ARG_PARAMETER);
+      server_obj->set_client (client_ref.in ());
 
-      server_obj->test_request ("first secure callback to client"
-                                ACE_ENV_ARG_PARAMETER);
+      server_obj->test_request ("first secure callback to client");
 
       //
       // Repeat the callback test.
       //
-      server_obj->set_client (client_ref.in () ACE_ENV_ARG_PARAMETER);
-      server_obj->test_request ("second secure callback to client"
-                                ACE_ENV_ARG_PARAMETER);
+      server_obj->set_client (client_ref.in ());
+      server_obj->test_request ("second secure callback to client");
 
       server_obj->shutdown ();
 
-      poa->destroy (1, 1
-                    ACE_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1);
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("Caught exception\n"));
+      ex._tao_print_exception (ACE_TEXT ("Caught exception\n"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Security/Callback/client_i.cpp b/TAO/orbsvcs/tests/Security/Callback/client_i.cpp
index ff5ecb97cb4..30af277ad32 100644
--- a/TAO/orbsvcs/tests/Security/Callback/client_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/client_i.cpp
@@ -15,8 +15,7 @@ client_i::~client_i (void)
 }
 
 void
-client_i::test_reply (const char *msg
-                      ACE_ENV_ARG_DECL_NOT_USED)
+client_i::test_reply (const char *msg)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG((LM_INFO,
diff --git a/TAO/orbsvcs/tests/Security/Callback/client_i.h b/TAO/orbsvcs/tests/Security/Callback/client_i.h
index e5d6603aca9..593fac1e9a2 100644
--- a/TAO/orbsvcs/tests/Security/Callback/client_i.h
+++ b/TAO/orbsvcs/tests/Security/Callback/client_i.h
@@ -30,8 +30,7 @@ public:
   client_i (server_ptr s);
   virtual ~client_i (void);
 
-  virtual void test_reply (const char *msg
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void test_reply (const char *msg)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/Security/Callback/server.cpp b/TAO/orbsvcs/tests/Security/Callback/server.cpp
index ce444768711..f3b2e230f87 100644
--- a/TAO/orbsvcs/tests/Security/Callback/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/server.cpp
@@ -12,8 +12,7 @@ const char *cert_file = "cacert.pem";
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       ACE_TString env ("SSL_CERT_FILE=");
       env += cert_file;
@@ -23,19 +22,16 @@ main (int argc, char *argv[])
       // Initialize the ORB
       //
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
-                         ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       //
       // Get the Root POA.
       //
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in ());
 
       //
       // Create the server, get object reference,
@@ -48,14 +44,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var theServer = tmp;
 
       PortableServer::ObjectId_var oid =
-        poa->activate_object (theServer.in ()
-                              ACE_ENV_ARG_PARAMETER);
+        poa->activate_object (theServer.in ());
       CORBA::Object_var server_obj =
-        poa->id_to_reference (oid.in ()
-                              ACE_ENV_ARG_PARAMETER);
+        poa->id_to_reference (oid.in ());
       CORBA::String_var server_IORString =
-        orb->object_to_string (server_obj.in ()
-                               ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (server_obj.in ());
 
       //
       // Write the IOR to a file.
@@ -81,19 +74,16 @@ main (int argc, char *argv[])
 
       orb->run ();
 
-      poa->destroy (1, 1
-                    ACE_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1);
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("Caught exception\n"));
+      ex._tao_print_exception (ACE_TEXT ("Caught exception\n"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Security/Callback/server_i.cpp b/TAO/orbsvcs/tests/Security/Callback/server_i.cpp
index 8b465287492..b16ab2f3f1f 100644
--- a/TAO/orbsvcs/tests/Security/Callback/server_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/server_i.cpp
@@ -15,24 +15,22 @@ server_i::~server_i (void)
 }
 
 void
-server_i::set_client (client_ptr c
-                      ACE_ENV_ARG_DECL_NOT_USED)
+server_i::set_client (client_ptr c)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->client_ = client::_duplicate (c);
 }
 
 void
-server_i::test_request (const char *msg
-                        ACE_ENV_ARG_DECL)
+server_i::test_request (const char *msg)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->client_->test_reply (msg ACE_ENV_ARG_PARAMETER);
+  this->client_->test_reply (msg);
 }
 
 void
 server_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/tests/Security/Callback/server_i.h b/TAO/orbsvcs/tests/Security/Callback/server_i.h
index 262925a1de1..fe6d4278022 100644
--- a/TAO/orbsvcs/tests/Security/Callback/server_i.h
+++ b/TAO/orbsvcs/tests/Security/Callback/server_i.h
@@ -30,12 +30,10 @@ public:
   server_i (CORBA::ORB_ptr orb);
   virtual ~server_i (void);
 
-  virtual void set_client (client_ptr c
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void set_client (client_ptr c)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void test_request (const char *msg
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void test_request (const char *msg)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void shutdown (void)
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp
index e0f4d7f5d42..1a71e6962d8 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp
@@ -50,25 +50,24 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       ACE_TString env ("SSL_CERT_FILE=");
       env += cert_file;
       ACE_OS::putenv (env.c_str ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior);
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        Simple_Server::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -80,7 +79,7 @@ main (int argc, char *argv[])
 
       for (CORBA::ULong i = 0; i < 2; i++)
         {
-          ACE_TRY_EX(nested_try)
+          try
             {
               ACE_DEBUG ((LM_DEBUG,
                           "CLIENT (%P): Connecting to the server...\n"));
@@ -88,16 +87,15 @@ main (int argc, char *argv[])
               // If we are retrying then make just one request.
               do
                 {
-                  server->send_line ("some data" ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK_EX (nested_try);
+                  server->send_line ("some data");
 
                 }
               while (i == 0);
             }
-          ACE_CATCH (CORBA::COMM_FAILURE, ex)
+          catch (const CORBA::COMM_FAILURE& ex)
             {
               // If this happens second time then we are done.
-              if (i != 0) ACE_RE_THROW;
+              if (i != 0) throw;
 
               // Waiting for server to come back
               ACE_DEBUG ((LM_DEBUG,
@@ -107,7 +105,6 @@ main (int argc, char *argv[])
                           wait_time));
               ACE_OS::sleep (wait_time);
             }
-          ACE_ENDTRY;
         }
 
       if (call_shutdown)
@@ -128,13 +125,11 @@ main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG,
                   "CLIENT (%P): Done.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CLIENT (%P): Caught exception:");
+      ex._tao_print_exception ("CLIENT (%P): Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp
index 1b7a35667d1..dea2f849101 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp
@@ -41,19 +41,18 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       ACE_TString env ("SSL_CERT_FILE=");
       env += cert_file;
       ACE_OS::putenv (env.c_str ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -61,7 +60,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -75,34 +74,29 @@ main (int argc, char *argv[])
       policies.length (2);
 
       policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                               ACE_ENV_ARG_PARAMETER);
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID);
 
       policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                          ACE_ENV_ARG_PARAMETER);
+        root_poa->create_lifespan_policy (PortableServer::PERSISTENT);
 
       PortableServer::POA_var persistent_poa =
         root_poa->create_POA ("PersistentPOA",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
+                              policies);
 
       PortableServer::ObjectId_var oid =
         PortableServer::string_to_ObjectId ("object1");
 
       persistent_poa->activate_object_with_id (oid.in (),
-                                               &server_impl
-                                               ACE_ENV_ARG_PARAMETER);
+                                               &server_impl);
 
 
       CORBA::Object_var server =
         persistent_poa->create_reference_with_id (oid.in (),
-                                                  "IDL:Simple_Server:1.0"
-                                                  ACE_ENV_ARG_PARAMETER);
+                                                  "IDL:Simple_Server:1.0");
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (server.in ());
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
@@ -135,19 +129,17 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "SERVER (%P): Event loop finished.\n"));
 
-      persistent_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      persistent_poa->destroy (1, 1);
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1);
 
       ACE_OS::sleep (1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "SERVER (%P): Caught exception:");
+      ex._tao_print_exception ("SERVER (%P): Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp
index 560668426b3..f278cf08e3a 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp
@@ -11,8 +11,7 @@ ACE_RCSID (Send_File,
            "$Id$")
 
 void
-Simple_Server_i::send_line (const char *
-                            ACE_ENV_ARG_DECL_NOT_USED)
+Simple_Server_i::send_line (const char *)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.h b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.h
index 76894de600f..dce0675446b 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.h
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.h
@@ -31,8 +31,7 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  void send_line (const char *line
-                  ACE_ENV_ARG_DECL_NOT_USED)
+  void send_line (const char *line)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void shutdown (void)
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp
index 601cc34cbfa..4387fae58b2 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp
@@ -19,7 +19,7 @@ Client_Worker::validate_connection (void)
 
   for (int j = 0; j != 100; ++j)
    {
-      ACE_TRY
+      try
         {
           this->server_->ping ();
 
@@ -27,19 +27,17 @@ Client_Worker::validate_connection (void)
             ACE_DEBUG (( LM_DEBUG,
                          "******** VALIDATED ******* \n"));
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
         }
-      ACE_ENDTRY;
    }
 }
 
 int
 Client_Worker::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Validate connections befire doing any actual work..
       this->validate_connection ();
@@ -48,7 +46,7 @@ Client_Worker::svc (void)
 
        for (int i = 0; i < this->niterations_; ++i)
          {
-           this->server_->test_method (i ACE_ENV_ARG_PARAMETER);
+           this->server_->test_method (i);
 
            if (TAO_debug_level > 0)
              ACE_DEBUG ((LM_DEBUG,
@@ -56,15 +54,13 @@ Client_Worker::svc (void)
                          i));
          }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_ERROR ((LM_ERROR,
                   "(%P|%t) Got an exception \n"));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Client_Worker : Exception Raised");
+      ex._tao_print_exception ("Client_Worker : Exception Raised");
 
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp
index 1bf51007b38..066154a3f59 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp
@@ -9,14 +9,12 @@ Server_Worker::Server_Worker (CORBA::ORB_ptr orb)
 int
 Server_Worker::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       this->orb_->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
index 7266e19efd8..901cc538d48 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
@@ -53,23 +53,22 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       // Get Object Reference using IOR file
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior);
 
       // Cast to Appropriate Type
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        Simple_Server::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -101,14 +100,12 @@ main (int argc, char *argv[])
       orb->destroy ();
     }
 
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
 
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp
index b53457045e5..5614a78a8e7 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp
@@ -41,15 +41,14 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -58,7 +57,7 @@ main (int argc, char *argv[])
 
       // Get a Root POA reference
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -72,7 +71,7 @@ main (int argc, char *argv[])
         server_impl._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -102,13 +101,11 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
index 9df35c7e625..b688de2b03a 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
@@ -69,11 +69,11 @@ Simple_Server_i::validate_protocol (void)
     }
 
   if (this->validated_ == VALIDATED_NOSUCCESS)
-    ACE_THROW (Simple_Server::WrongProtocolType ());
+    throw Simple_Server::WrongProtocolType ();
 }
 
 CORBA::Long
-Simple_Server_i::test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED)
+Simple_Server_i::test_method (CORBA::Long x)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -87,5 +87,5 @@ void
 Simple_Server_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h
index 61e2dab7631..0894e704594 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h
@@ -38,7 +38,7 @@ public:
     ACE_THROW_SPEC ((Simple_Server::WrongProtocolType,
                      CORBA::SystemException));
 
-  CORBA::Long test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED)
+  CORBA::Long test_method (CORBA::Long x)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void shutdown (void)
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
index 3c3da5a345f..95ff3134ba4 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
@@ -21,35 +21,33 @@ Client_Worker::validate_connection (void)
 
   for (int j = 0; j != 100; ++j)
    {
-      ACE_TRY
+      try
         {
-          this->server_->test_method (j ACE_ENV_ARG_PARAMETER);
-          this->another_->test_method (j ACE_ENV_ARG_PARAMETER);
+          this->server_->test_method (j);
+          this->another_->test_method (j);
           if(TAO_debug_level > 0)
             ACE_DEBUG (( LM_DEBUG,
                          "******** VALIDATED ******* \n"));
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
         }
-      ACE_ENDTRY;
    }
 }
 
 int
 Client_Worker::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Validate connections befire doing any actual work..
       this->validate_connection ();
 
        for (int i = 0; i < this->niterations_; ++i)
          {
-           this->server_->test_method (i ACE_ENV_ARG_PARAMETER);
-           this->another_->test_method (i ACE_ENV_ARG_PARAMETER);
+           this->server_->test_method (i);
+           this->another_->test_method (i);
 
            if (TAO_debug_level > 0)
              ACE_DEBUG ((LM_DEBUG,
@@ -57,11 +55,9 @@ Client_Worker::svc (void)
                          i));
          }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Client_Worker : Exception Raised");
+      ex._tao_print_exception ("Client_Worker : Exception Raised");
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp
index 1bf51007b38..066154a3f59 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp
@@ -9,14 +9,12 @@ Server_Worker::Server_Worker (CORBA::ORB_ptr orb)
 int
 Server_Worker::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       this->orb_->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
index e00d7011f09..0197fd6615e 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
@@ -55,12 +55,11 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -73,11 +72,11 @@ main (int argc, char *argv[])
 
       // Get Object Reference using IOR file
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior);
 
       // Cast to Appropriate Type
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        Simple_Server::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -88,11 +87,11 @@ main (int argc, char *argv[])
 
 
       object =
-        orb->string_to_object (another_ior ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object (another_ior);
 
       // Cast to Appropriate Type
       Another_One_var another =
-        Another_One::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        Another_One::_narrow (object.in ());
 
 
       Client_Worker client (server.in (),
@@ -119,14 +118,12 @@ main (int argc, char *argv[])
       orb->destroy ();
     }
 
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
 
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
index 32d72ed2c6f..f6b1490fcda 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
@@ -62,15 +62,14 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -79,7 +78,7 @@ main (int argc, char *argv[])
 
       // Get a Root POA reference
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -97,10 +96,10 @@ main (int argc, char *argv[])
         another_one_impl._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (server.in ());
 
       CORBA::String_var another_ior =
-        orb->object_to_string (another_one.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (another_one.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -109,10 +108,10 @@ main (int argc, char *argv[])
       if (ior_table_name != 0)
         {
           CORBA::Object_var table_object =
-             orb->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
+             orb->resolve_initial_references ("IORTable");
 
           IORTable::Table_var adapter =
-             IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
+             IORTable::Table::_narrow (table_object.in ());
 
           if (CORBA::is_nil (adapter.in ()))
             {
@@ -120,8 +119,8 @@ main (int argc, char *argv[])
               return -1;
             }
 
-          adapter->bind ( ior_table_name, ior.in () ACE_ENV_ARG_PARAMETER);
-          adapter->bind ( another_table_name, another_ior.in() ACE_ENV_ARG_PARAMETER);
+          adapter->bind ( ior_table_name, ior.in ());
+          adapter->bind ( another_table_name, another_ior.in());
         }
 
 
@@ -163,13 +162,11 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
index 8d988a4ea52..dbe79cedd55 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
@@ -12,7 +12,7 @@ ACE_RCSID (MT_Server,
            "$Id$")
 
 CORBA::Long
-Simple_Server_i::test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED)
+Simple_Server_i::test_method (CORBA::Long x)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -26,13 +26,13 @@ void
 Simple_Server_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 //---------------------------------------------------------------------------
 
 CORBA::Long
-Another_One_i::test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED)
+Another_One_i::test_method (CORBA::Long x)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h
index 58f4a15a2fb..b9277d89035 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h
@@ -31,7 +31,7 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Long test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED)
+  CORBA::Long test_method (CORBA::Long x)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void shutdown (void)
@@ -56,7 +56,7 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Long test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED)
+  CORBA::Long test_method (CORBA::Long x)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp
index 97c36d401e3..3c682f2d2df 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp
@@ -40,5 +40,5 @@ void
 Foo_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
index 175ab0e5f35..38d85f88e7c 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
@@ -15,8 +15,7 @@ const char *cert_file = "cacert.pem";
 
 void
 insecure_invocation_test (CORBA::ORB_ptr orb,
-                          CORBA::Object_ptr obj
-                          ACE_ENV_ARG_DECL)
+                          CORBA::Object_ptr obj)
 {
   // Disable protection for this insecure invocation test.
 
@@ -28,8 +27,7 @@ insecure_invocation_test (CORBA::ORB_ptr orb,
   // Create the Security::QOPPolicy.
   CORBA::Policy_var policy =
     orb->create_policy (Security::SecQOPPolicy,
-                        no_protection
-                        ACE_ENV_ARG_PARAMETER);
+                        no_protection);
 
   CORBA::PolicyList policy_list (1);
   policy_list.length (1);
@@ -39,11 +37,10 @@ insecure_invocation_test (CORBA::ORB_ptr orb,
   // protection).
   CORBA::Object_var object =
     obj->_set_policy_overrides (policy_list,
-                                CORBA::SET_OVERRIDE
-                                ACE_ENV_ARG_PARAMETER);
+                                CORBA::SET_OVERRIDE);
 
   Foo::Bar_var server =
-    Foo::Bar::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+    Foo::Bar::_narrow (object.in ());
 
   if (CORBA::is_nil (server.in ()))
     {
@@ -52,16 +49,16 @@ insecure_invocation_test (CORBA::ORB_ptr orb,
                   "nil.\n",
                   ior));
 
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
-  ACE_TRY
+  try
     {
       // This invocation should result in a CORBA::NO_PERMISSION
       // exception.
       server->baz ();
     }
-  ACE_CATCH (CORBA::NO_PERMISSION, exc)
+  catch (const CORBA::NO_PERMISSION& exc)
     {
       ACE_DEBUG ((LM_INFO,
                   "(%P|%t) Received CORBA::NO_PERMISSION from "
@@ -69,21 +66,19 @@ insecure_invocation_test (CORBA::ORB_ptr orb,
 
       return;
     }
-  ACE_ENDTRY;
 
   ACE_ERROR ((LM_ERROR,
               "(%P|%t) ERROR: CORBA::NO_PERMISSION was not thrown.\n"
               "(%P|%t) ERROR: It should have been thrown.\n"));
 
-  ACE_THROW (CORBA::INTERNAL ());
+  throw CORBA::INTERNAL ();
 }
 
 void
-secure_invocation_test (CORBA::Object_ptr object
-                        ACE_ENV_ARG_DECL)
+secure_invocation_test (CORBA::Object_ptr object)
 {
   Foo::Bar_var server =
-    Foo::Bar::_narrow (object ACE_ENV_ARG_PARAMETER);
+    Foo::Bar::_narrow (object);
 
   if (CORBA::is_nil (server.in ()))
     {
@@ -92,7 +87,7 @@ secure_invocation_test (CORBA::Object_ptr object
                   "nil.\n",
                   ior));
 
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   // This invocation should return successfully.
@@ -129,20 +124,20 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       ACE_TString env ("SSL_CERT_FILE=");
       env += cert_file;
       ACE_OS::putenv (env.c_str ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior);
 
       // This test sets creates a Security::QOPPolicy with the
       // Quality-of-Protection set to "no protection."  It then
@@ -150,23 +145,21 @@ main (int argc, char *argv[])
       // then result in a CORBA::NO_PERMISSION exception.
       //
       // The server is not shutdown by this test.
-      insecure_invocation_test (orb.in (), object.in () ACE_ENV_ARG_PARAMETER);
+      insecure_invocation_test (orb.in (), object.in ());
 
       // This test uses the default secure SSLIOP settings to securely
       // invoke a method on the server.  No exception should occur.
       //
       // The server *is* shutdown by this test.
-      secure_invocation_test (object.in () ACE_ENV_ARG_PARAMETER);
+      secure_invocation_test (object.in ());
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
               "\n"
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
index 26c16044238..4856df76c19 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
@@ -40,17 +40,17 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       ACE_TString env ("SSL_CERT_FILE=");
       env += cert_file;
       ACE_OS::putenv (env.c_str ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -59,7 +59,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -68,12 +68,10 @@ main (int argc, char *argv[])
         return 1;
 
       obj =
-        orb->resolve_initial_references ("SecurityLevel3:SecurityCurrent"
-                                         ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("SecurityLevel3:SecurityCurrent");
 
       SecurityLevel3::SecurityCurrent_var security_current =
-        SecurityLevel3::SecurityCurrent::_narrow (obj.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
+        SecurityLevel3::SecurityCurrent::_narrow (obj.in ());
 
       if (CORBA::is_nil (security_current.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -101,8 +99,7 @@ main (int argc, char *argv[])
         server_impl2._this ();
 
       const CORBA::Boolean equivalent =
-        server->_is_equivalent (server2.in ()
-                               ACE_ENV_ARG_PARAMETER);
+        server->_is_equivalent (server2.in ());
 
       if (equivalent)
         {
@@ -112,7 +109,7 @@ main (int argc, char *argv[])
         }
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -137,17 +134,15 @@ main (int argc, char *argv[])
                   "\n"
                   "Event loop finished.\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1);
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
index c6c1677e504..e7e9693e1e3 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
@@ -41,7 +41,7 @@ public:
 
   // = Interface implementation accessor methods.
 
-  void id (CORBA::Short id ACE_ENV_ARG_DECL)
+  void id (CORBA::Short id)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Sets id.
 
@@ -70,7 +70,7 @@ My_Test_Object::id (void)
 }
 
 void
-My_Test_Object::id (CORBA::Short id ACE_ENV_ARG_DECL_NOT_USED)
+My_Test_Object::id (CORBA::Short id)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   id_ = id;
@@ -205,13 +205,11 @@ CosNaming_Client::init (int argc, char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize ORB.
       this->orbmgr_.init (this->argc_,
-                          this->argv_
-                          ACE_ENV_ARG_PARAMETER);
+                          this->argv_);
 
       this->orbmgr_.activate_poa_manager ();
 
@@ -222,12 +220,11 @@ CosNaming_Client::init (int argc, char **argv)
       CORBA::ORB_var orb = this->orbmgr_.orb ();
       return this->naming_client_.init (orb.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "init");
+      ex._tao_print_exception ("init");
       // and return -1 below . . .
     }
-  ACE_ENDTRY;
 
   return -1;
 }
@@ -247,46 +244,41 @@ MT_Test::svc (void)
 
   CosNaming::NamingContext_var name_service;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY_EX (SETUP)
+  try
     {
       CORBA::Object_var name_service_obj =
-        orb_->string_to_object (name_service_ior_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (SETUP);
+        orb_->string_to_object (name_service_ior_);
 
       name_service =
-        CosNaming::NamingContext::_narrow (name_service_obj.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (SETUP);
+        CosNaming::NamingContext::_narrow (name_service_obj.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in MT test setup");
+      ex._tao_print_exception (
+        "Unexpected exception in MT test setup");
       return -1;
     }
-  ACE_ENDTRY;
 
   if (name_service.in () == 0)
     return -1;
 
   // Bind the object.
-  ACE_TRY_EX (BIND)
+  try
     {
       name_service->bind (test_name_,
-                          test_ref_.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (BIND);
+                          test_ref_.in ());
       ACE_DEBUG ((LM_DEBUG,
                   "Bound name OK in thread %t\n"));
     }
-  ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
+  catch (const CosNaming::NamingContext::AlreadyBound& ex)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Unable to bind in thread %t\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in MT test bind");
+      ex._tao_print_exception (
+        "Unexpected exception in MT test bind");
       // This debug statement works around a IRIX/MIPSPro 7.3 bug (it
       // fails with optimize=1 debug=0; but works with any other
       // settings for those flags).
@@ -294,63 +286,55 @@ MT_Test::svc (void)
                   test_name_.length ()));
       return -1;
     }
-  ACE_ENDTRY;
 
   // Resolve the object from the Naming Context.
-  ACE_TRY_EX (RESOLVE)
+  try
     {
       CORBA::Object_var result_obj_ref =
-        name_service->resolve (test_name_
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (RESOLVE);
+        name_service->resolve (test_name_);
 
       Test_Object_var result_object =
-        Test_Object::_narrow (result_obj_ref.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (RESOLVE);
+        Test_Object::_narrow (result_obj_ref.in ());
 
       if (!CORBA::is_nil (result_object.in ()))
         {
           CORBA::Short id = result_object->id ();
-          ACE_TRY_CHECK_EX (RESOLVE);
 
           if (id == CosNaming_Client::OBJ1_ID)
             ACE_DEBUG ((LM_DEBUG,
                         "Resolved name OK in thread %t\n"));
         }
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+  catch (const CosNaming::NamingContext::NotFound& ex)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Unable to resolve in thread %t\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in MT test resolve");
+      ex._tao_print_exception (
+        "Unexpected exception in MT test resolve");
       return -1;
     }
-  ACE_ENDTRY;
 
   // Unbind the object from the Naming Context.
-  ACE_TRY_EX (UNBIND)
+  try
     {
-      name_service->unbind (test_name_
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (UNBIND);
+      name_service->unbind (test_name_);
       ACE_DEBUG ((LM_DEBUG,
                   "Unbound name OK in thread %t\n"));
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+  catch (const CosNaming::NamingContext::NotFound& ex)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Unable to unbind in thread %t\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in MT test unbind");
+      ex._tao_print_exception (
+        "Unexpected exception in MT test unbind");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -367,8 +351,7 @@ MT_Test::execute (TAO_Naming_Client &root_context)
   My_Test_Object *test_obj_impl =
     new My_Test_Object (CosNaming_Client::OBJ1_ID);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       test_ref_ =
         test_obj_impl->_this ();
@@ -385,16 +368,15 @@ MT_Test::execute (TAO_Naming_Client &root_context)
         root_context.get_context ();
 
       name_service_ior_ =
-        orb_->object_to_string (context.in ()
-                                ACE_ENV_ARG_PARAMETER);
+        orb_->object_to_string (context.in ());
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception while instantiating dummy");
+      ex._tao_print_exception (
+        "Unexpected exception while instantiating dummy");
       return -1;
     }
-  ACE_ENDTRY;
 
   // Create a name for dummy.
   test_name_.length (1);
@@ -414,8 +396,7 @@ MT_Test::execute (TAO_Naming_Client &root_context)
 int
 Simple_Test::execute (TAO_Naming_Client &root_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Dummy object instantiation.
       My_Test_Object *test_obj_impl = new My_Test_Object (CosNaming_Client::OBJ1_ID);
@@ -430,18 +411,15 @@ Simple_Test::execute (TAO_Naming_Client &root_context)
       test_name.length (1);
       test_name[0].id = CORBA::string_dup ("Foo");
       root_context->bind (test_name,
-                          test_obj_ref.in ()
-                          ACE_ENV_ARG_PARAMETER);
+                          test_obj_ref.in ());
       ACE_DEBUG ((LM_DEBUG,
                   "Bound name OK\n"));
 
       // Resolve the object from the Naming Context.
       CORBA::Object_var result_obj_ref =
-        root_context->resolve (test_name
-                               ACE_ENV_ARG_PARAMETER);
+        root_context->resolve (test_name);
       Test_Object_var result_object =
-        Test_Object::_narrow (result_obj_ref.in ()
-                              ACE_ENV_ARG_PARAMETER);
+        Test_Object::_narrow (result_obj_ref.in ());
       if (!CORBA::is_nil (result_object.in ()))
         {
           CORBA::Short id = result_object->id ();
@@ -450,17 +428,16 @@ Simple_Test::execute (TAO_Naming_Client &root_context)
         }
 
       // Unbind the object from the Naming Context.
-      root_context->unbind (test_name
-                            ACE_ENV_ARG_PARAMETER);
+      root_context->unbind (test_name);
       ACE_DEBUG ((LM_DEBUG,
                   "Unbound name OK\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in Simple test");
+      ex._tao_print_exception (
+        "Unexpected exception in Simple test");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -468,8 +445,7 @@ Simple_Test::execute (TAO_Naming_Client &root_context)
 int
 Tree_Test::execute (TAO_Naming_Client &root_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Create a tree of contexts: root->level1->level2.  Bind object
       // foo under context level2.
@@ -479,8 +455,7 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
       level1.length (1);
       level1[0].id = CORBA::string_dup ("level1_context");
       CosNaming::NamingContext_var level1_context;
-      level1_context = root_context->bind_new_context (level1
-                                                       ACE_ENV_ARG_PARAMETER);
+      level1_context = root_context->bind_new_context (level1);
 
       // Create a new context.
       CosNaming::NamingContext_var level2_context;
@@ -495,27 +470,23 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
       CosNaming::Name obj_name;
       obj_name.length (1);
       obj_name[0].id = CORBA::string_dup ("foo");
-      level2_context->bind (obj_name, obj1.in ()
-                            ACE_ENV_ARG_PARAMETER);
+      level2_context->bind (obj_name, obj1.in ());
 
       // Bind the context we just created under level1.
       CosNaming::Name level2 (level1);
       level2.length (2);
       level2[1].id = CORBA::string_dup ("level2_context");
       root_context->bind_context (level2,
-                                  level2_context.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+                                  level2_context.in ());
 
       // Resolve and unbind level1/level2/foo, and bind it back.
       CosNaming::Name test_name (level2);
       test_name.length (3);
       test_name[2].id = obj_name[0].id;
       CORBA::Object_var result_obj_ref =
-        root_context->resolve (test_name
-                               ACE_ENV_ARG_PARAMETER);
+        root_context->resolve (test_name);
       Test_Object_var result_object =
-        Test_Object::_narrow (result_obj_ref.in ()
-                              ACE_ENV_ARG_PARAMETER);
+        Test_Object::_narrow (result_obj_ref.in ());
 
       if (CORBA::is_nil (result_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -531,28 +502,22 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
 
       // Unbind the object from the Naming Context and bind it back
       // in.
-      root_context->unbind (test_name
-                            ACE_ENV_ARG_PARAMETER);
+      root_context->unbind (test_name);
       root_context->bind (test_name,
-                          obj1.in ()
-                          ACE_ENV_ARG_PARAMETER);
+                          obj1.in ());
 
       // Create new context and rebind under the name level1/level2.
       CosNaming::NamingContext_var new_level2_context;
       new_level2_context =
         root_context->new_context ();
       root_context->rebind_context (level2,
-                                  new_level2_context.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+                                  new_level2_context.in ());
 
       // Bind, resolve, rebind, and resolve foo under level1/level2.
       root_context->bind (test_name,
-                          obj1.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      result_obj_ref = root_context->resolve (test_name
-                                              ACE_ENV_ARG_PARAMETER);
-      result_object = Test_Object::_narrow (result_obj_ref.in ()
-                                            ACE_ENV_ARG_PARAMETER);
+                          obj1.in ());
+      result_obj_ref = root_context->resolve (test_name);
+      result_object = Test_Object::_narrow (result_obj_ref.in ());
 
       CORBA::Short obj_id = result_object->id ();
 
@@ -569,12 +534,9 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
       impl2->_remove_ref ();
 
       root_context->rebind (test_name,
-                            obj2.in ()
-                            ACE_ENV_ARG_PARAMETER);
-      result_obj_ref = root_context->resolve (test_name
-                                              ACE_ENV_ARG_PARAMETER);
-      result_object = Test_Object::_narrow (result_obj_ref.in ()
-                                            ACE_ENV_ARG_PARAMETER);
+                            obj2.in ());
+      result_obj_ref = root_context->resolve (test_name);
+      result_object = Test_Object::_narrow (result_obj_ref.in ());
 
       obj_id = result_object->id ();
 
@@ -585,13 +547,13 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
                           -1);
     }
 
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in Tree test");
+      ex._tao_print_exception (
+        "Unexpected exception in Tree test");
       return -1;
     }
 
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
               "All functions work properly \n"));
@@ -601,8 +563,7 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
 int
 Exceptions_Test::execute (TAO_Naming_Client &root_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Set things up.
 
@@ -611,12 +572,10 @@ Exceptions_Test::execute (TAO_Naming_Client &root_context)
       context_name.length (1);
       context_name[0].id = CORBA::string_dup ("level1_context");
       CosNaming::NamingContext_var level1_context;
-      level1_context = root_context->bind_new_context (context_name
-                                                       ACE_ENV_ARG_PARAMETER);
+      level1_context = root_context->bind_new_context (context_name);
       context_name[0].id = CORBA::string_dup ("level2_context");
       CosNaming::NamingContext_var level2_context;
-      level2_context = level1_context->bind_new_context (context_name
-                                                         ACE_ENV_ARG_PARAMETER);
+      level2_context = level1_context->bind_new_context (context_name);
 
       // Bind a dummy object foo under each context.
       My_Test_Object *impl = new My_Test_Object;
@@ -627,70 +586,57 @@ Exceptions_Test::execute (TAO_Naming_Client &root_context)
       object_name.length (1);
       object_name[0].id = CORBA::string_dup ("foo");
       root_context->bind (object_name,
-                          obj.in ()
-                          ACE_ENV_ARG_PARAMETER);
+                          obj.in ());
       level1_context->bind (object_name,
-                            obj.in ()
-                            ACE_ENV_ARG_PARAMETER);
+                            obj.in ());
       level2_context->bind (object_name,
-                            obj.in ()
-                            ACE_ENV_ARG_PARAMETER);
+                            obj.in ());
 
       // Run exceptions tests.
-      invalid_name_test (root_context
-                         ACE_ENV_ARG_PARAMETER);
-      already_bound_test (root_context
-                          ACE_ENV_ARG_PARAMETER);
-      already_bound_test2 (root_context
-                           ACE_ENV_ARG_PARAMETER);
-      not_found_test (root_context
-                      ACE_ENV_ARG_PARAMETER);
-      not_found_test2 (root_context
-                       ACE_ENV_ARG_PARAMETER);
-      not_found_test3 (root_context
-                       ACE_ENV_ARG_PARAMETER);
+      invalid_name_test (root_context);
+      already_bound_test (root_context);
+      already_bound_test2 (root_context);
+      not_found_test (root_context);
+      not_found_test2 (root_context);
+      not_found_test3 (root_context);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in Exceptions test");
+      ex._tao_print_exception (
+        "Unexpected exception in Exceptions test");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
 
 void
-Exceptions_Test::invalid_name_test (TAO_Naming_Client &root_context
-                                    ACE_ENV_ARG_DECL)
+Exceptions_Test::invalid_name_test (TAO_Naming_Client &root_context)
 {
-  ACE_TRY
+  try
     {
       CosNaming::Name test_name;
       test_name.length (0);
 
-      root_context->resolve (test_name
-                             ACE_ENV_ARG_PARAMETER);
+      root_context->resolve (test_name);
       ACE_DEBUG ((LM_DEBUG, "Invalid name test failed\n"));
     }
-  ACE_CATCH (CosNaming::NamingContext::InvalidName, ex)
+  catch (const CosNaming::NamingContext::InvalidName& ex)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "InvalidName exception works properly\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG ((LM_DEBUG, "Invalid name test failed\n"));
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 void
-Exceptions_Test::already_bound_test (TAO_Naming_Client &root_context
-                                     ACE_ENV_ARG_DECL)
+Exceptions_Test::already_bound_test (TAO_Naming_Client &root_context)
 {
-  ACE_TRY
+  try
     {
       CosNaming::Name test_name;
       test_name.length (1);
@@ -700,29 +646,26 @@ Exceptions_Test::already_bound_test (TAO_Naming_Client &root_context
       impl->_remove_ref ();
 
       root_context->bind (test_name,
-                          obj.in ()
-                          ACE_ENV_ARG_PARAMETER);
+                          obj.in ());
       ACE_DEBUG ((LM_DEBUG, "Already bound (case 1) test failed\n"));
     }
-  ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
+  catch (const CosNaming::NamingContext::AlreadyBound& ex)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "AlreadyBound exception (case 1) works properly\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG ((LM_DEBUG, "Already bound (case 1) test failed\n"));
-      ACE_RE_THROW;
+      throw;
     }
 
-  ACE_ENDTRY;
 }
 
 void
-Exceptions_Test::already_bound_test2 (TAO_Naming_Client &root_context
-                                      ACE_ENV_ARG_DECL)
+Exceptions_Test::already_bound_test2 (TAO_Naming_Client &root_context)
 {
-  ACE_TRY
+  try
     {
       CosNaming::Name test_name;
       test_name.length (2);
@@ -733,28 +676,25 @@ Exceptions_Test::already_bound_test2 (TAO_Naming_Client &root_context
       impl->_remove_ref ();
 
       root_context->bind (test_name,
-                          obj.in ()
-                          ACE_ENV_ARG_PARAMETER);
+                          obj.in ());
       ACE_DEBUG ((LM_DEBUG, "Already bound (case 2) test failed\n"));
     }
-  ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
+  catch (const CosNaming::NamingContext::AlreadyBound& ex)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "AlreadyBound  exception (case 2) works properly\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG ((LM_DEBUG, "Already bound (case 2) test failed\n"));
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 void
-Exceptions_Test::not_found_test (TAO_Naming_Client &root_context
-                                 ACE_ENV_ARG_DECL)
+Exceptions_Test::not_found_test (TAO_Naming_Client &root_context)
 {
-  ACE_TRY
+  try
     {
       CosNaming::Name test_name;
       test_name.length (3);
@@ -762,11 +702,10 @@ Exceptions_Test::not_found_test (TAO_Naming_Client &root_context
       test_name[1].id = CORBA::string_dup ("level2_context");
       test_name[2].id = CORBA::string_dup ("bar");
 
-      root_context->unbind (test_name
-                            ACE_ENV_ARG_PARAMETER);
+      root_context->unbind (test_name);
       ACE_DEBUG ((LM_DEBUG, "Not found test failed\n"));
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+  catch (const CosNaming::NamingContext::NotFound& ex)
     {
       if (ex.why == CosNaming::NamingContext::missing_node &&
           ex.rest_of_name.length () == 1
@@ -779,19 +718,17 @@ Exceptions_Test::not_found_test (TAO_Naming_Client &root_context
                     "NotFound  exception (case 1)"
                     " - parameters aren't set correctly\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG ((LM_DEBUG, "Not found test failed\n"));
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 void
-Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context
-                                  ACE_ENV_ARG_DECL)
+Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context)
 {
-  ACE_TRY
+  try
     {
       CosNaming::Name test_name;
       test_name.length (3);
@@ -799,11 +736,10 @@ Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context
       test_name[1].id = CORBA::string_dup ("level3_context");
       test_name[2].id = CORBA::string_dup ("foo");
 
-      root_context->unbind (test_name
-                            ACE_ENV_ARG_PARAMETER);
+      root_context->unbind (test_name);
       ACE_DEBUG ((LM_DEBUG, "Unbind test failed\n"));
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+  catch (const CosNaming::NamingContext::NotFound& ex)
     {
       if (ex.why == CosNaming::NamingContext::missing_node
           && ex.rest_of_name.length () == 2
@@ -818,20 +754,18 @@ Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context
                     "NotFound  exception (case 2)"
                     " - parameters aren't set correctly\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG ((LM_DEBUG, "Unbind test failed\n"));
-      ACE_RE_THROW;
+      throw;
     }
 
-  ACE_ENDTRY;
 }
 
 void
-Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context
-                                  ACE_ENV_ARG_DECL)
+Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context)
 {
-  ACE_TRY
+  try
     {
       CosNaming::Name test_name;
       test_name.length (3);
@@ -839,10 +773,10 @@ Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context
       test_name[1].id = CORBA::string_dup ("foo");
       test_name[2].id = CORBA::string_dup ("foo");
 
-      root_context->unbind (test_name ACE_ENV_ARG_PARAMETER);
+      root_context->unbind (test_name);
       ACE_DEBUG ((LM_DEBUG, "Not found (case 3) test failed - no exception was thrown\n"));
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+  catch (const CosNaming::NamingContext::NotFound& ex)
     {
       if (ex.why == CosNaming::NamingContext::not_context
           && ex.rest_of_name.length () == 2
@@ -857,19 +791,17 @@ Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context
                     "NotFound  exception (case 3)"
                     " - parameters aren't set correctly\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG ((LM_DEBUG, "Not found (case 3) test failed\n"));
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 int
 Iterator_Test::execute (TAO_Naming_Client &root_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Instantiate four dummy objects.
       My_Test_Object *impl = new My_Test_Object;
@@ -890,25 +822,20 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
       name4.length (1);
       name4[0].id = CORBA::string_dup ("foo4");
       root_context->bind (name1,
-                          obj.in ()
-                          ACE_ENV_ARG_PARAMETER);
+                          obj.in ());
       root_context->bind (name2,
-                          obj.in ()
-                          ACE_ENV_ARG_PARAMETER);
+                          obj.in ());
       root_context->bind (name3,
-                          obj.in ()
-                          ACE_ENV_ARG_PARAMETER);
+                          obj.in ());
       root_context->bind (name4,
-                          obj.in ()
-                          ACE_ENV_ARG_PARAMETER);
+                          obj.in ());
 
       // List the content of the Naming Context.
       CosNaming::BindingIterator_var iter;
       CosNaming::BindingList_var bindings_list;
       root_context->list (1,
                           bindings_list.out (),
-                          iter.out ()
-                          ACE_ENV_ARG_PARAMETER);
+                          iter.out ());
       if (CORBA::is_nil (iter.in ())
           || bindings_list->length () != 1
           || bindings_list[0u].binding_type != CosNaming::nobject)
@@ -921,8 +848,7 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
 
       // Invoke operations on the iterator.
       CosNaming::Binding_var binding;
-      iter->next_one (binding.out ()
-                      ACE_ENV_ARG_PARAMETER);
+      iter->next_one (binding.out ());
       if (binding->binding_type != CosNaming::nobject)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "CosNaming::next_one does not function properly\n"),
@@ -931,7 +857,7 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
                   "Second binding: %s\n",
                   binding->binding_name[0].id.in ()));
 
-      iter->next_n (2, bindings_list.out () ACE_ENV_ARG_PARAMETER);
+      iter->next_n (2, bindings_list.out ());
       if (bindings_list->length () != 2
           || bindings_list[0u].binding_type != CosNaming::nobject
           || bindings_list[1u].binding_type != CosNaming::nobject)
@@ -946,20 +872,19 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
 
       // We already iterated over all the bindings, so the following
       // should return false.
-      CORBA::Boolean result = iter->next_one (binding.out ()
-                                              ACE_ENV_ARG_PARAMETER);
+      CORBA::Boolean result = iter->next_one (binding.out ());
       if (result)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "CosNaming::BindingIterator does not function properly\n"),
                           -1);
       iter->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in Iterator test");
+      ex._tao_print_exception (
+        "Unexpected exception in Iterator test");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -967,8 +892,7 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
 int
 Destroy_Test::execute (TAO_Naming_Client &root_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Create a context and bind an object under it.
 
@@ -984,62 +908,55 @@ Destroy_Test::execute (TAO_Naming_Client &root_context)
       object_name.length (1);
       object_name[0].id = CORBA::string_dup ("foo");
       my_context->bind (object_name,
-                            obj.in ()
-                            ACE_ENV_ARG_PARAMETER);
+                            obj.in ());
 
       // Do the testing.
-      not_empty_test (my_context
-                                      ACE_ENV_ARG_PARAMETER);
+      not_empty_test (my_context);
 
-      my_context->unbind (object_name ACE_ENV_ARG_PARAMETER);
+      my_context->unbind (object_name);
       my_context->destroy ();
 
-      not_exist_test (my_context
-                         ACE_ENV_ARG_PARAMETER);
+      not_exist_test (my_context);
     }
 
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in Destroy test");
+      ex._tao_print_exception (
+        "Unexpected exception in Destroy test");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
 
 void
-Destroy_Test::not_empty_test (CosNaming::NamingContext_var &ref
-                                    ACE_ENV_ARG_DECL)
+Destroy_Test::not_empty_test (CosNaming::NamingContext_var &ref)
 {
-  ACE_TRY
+  try
     {
       ref->destroy ();
     }
 
-  ACE_CATCH (CosNaming::NamingContext::NotEmpty, ex)
+  catch (const CosNaming::NamingContext::NotEmpty& ex)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "NotEmpty exception works properly\n"));
     }
-  ACE_ENDTRY;
 }
 
 void
-Destroy_Test::not_exist_test (CosNaming::NamingContext_var &ref
-                                    ACE_ENV_ARG_DECL)
+Destroy_Test::not_exist_test (CosNaming::NamingContext_var &ref)
 {
-  ACE_TRY
+  try
     {
       ref->destroy ();
     }
 
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+  catch (const CORBA::OBJECT_NOT_EXIST& ex)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Destroy works properly\n"));
     }
-  ACE_ENDTRY;
 }
 
 Persistent_Test_Begin::Persistent_Test_Begin (CORBA::ORB_ptr orb,
@@ -1056,8 +973,7 @@ Persistent_Test_Begin::~Persistent_Test_Begin (void)
 int
 Persistent_Test_Begin::execute (TAO_Naming_Client &root_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Create a name structure we will reuse.
       CosNaming::Name test_name;
@@ -1066,18 +982,16 @@ Persistent_Test_Begin::execute (TAO_Naming_Client &root_context)
 
       // Create and bind a naming context under the <root> context.
       CosNaming::NamingContext_var level1_context =
-        root_context->bind_new_context (test_name
-                                        ACE_ENV_ARG_PARAMETER);
+        root_context->bind_new_context (test_name);
 
       // Create and bind a naming context under <level1> context.
       test_name[0].id = CORBA::string_dup ("level2");
       CosNaming::NamingContext_var level2_context =
-        level1_context->bind_new_context (test_name
-                                        ACE_ENV_ARG_PARAMETER);
+        level1_context->bind_new_context (test_name);
 
       // Log the ior of <level1_context> for use by <Persistent_Test_End>.
       CORBA::String_var ior =
-        orb_->object_to_string (level1_context.in () ACE_ENV_ARG_PARAMETER);
+        orb_->object_to_string (level1_context.in ());
 
       ACE_OS::fprintf (this->file_,
                        "%s",
@@ -1086,13 +1000,12 @@ Persistent_Test_Begin::execute (TAO_Naming_Client &root_context)
 
       ACE_DEBUG ((LM_DEBUG, "Persistent Naming test (part 1) OK.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception in Persistent Test (part 1)");
+      ex._tao_print_exception (
+        "Unexpected exception in Persistent Test (part 1)");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -1111,8 +1024,7 @@ Persistent_Test_End::~Persistent_Test_End (void)
 int
 Persistent_Test_End::execute (TAO_Naming_Client &root_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Create a name structure we will reuse.
       CosNaming::Name test_name;
@@ -1122,10 +1034,10 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context)
       // Convert stringified ior we got from <Persistent_Test_Begin>
       // for <level1> Naming Context to Naming Context reference.
       CORBA::Object_var obj =
-        orb_->string_to_object (ior_ ACE_ENV_ARG_PARAMETER);
+        orb_->string_to_object (ior_);
 
       CosNaming::NamingContext_var level1_context =
-        CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (obj.in ());
 
       if (CORBA::is_nil (level1_context.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -1134,7 +1046,7 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context)
 
       //  Resolve for <level2> context through the persistent ior we
       // got from part 1 of this test.
-      obj = level1_context->resolve (test_name ACE_ENV_ARG_PARAMETER);
+      obj = level1_context->resolve (test_name);
 
       // Now, resolve for <level2> context using the <root> context
       // reference which we obtained through <resolve_initial_references>.
@@ -1142,19 +1054,18 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context)
       test_name[0].id = CORBA::string_dup ("level1");
       test_name[1].id = CORBA::string_dup ("level2");
       CORBA::Object_var obj2 =
-        root_context->resolve (test_name ACE_ENV_ARG_PARAMETER);
+        root_context->resolve (test_name);
 
       // Make sure we got the same answer through both methods.
       if (obj2->_is_equivalent (obj.in ()))
         ACE_DEBUG ((LM_DEBUG, "Persistent Naming test (part 2) OK.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception in Persistent Test (part 2)");
+      ex._tao_print_exception (
+        "Unexpected exception in Persistent Test (part 2)");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h
index e8fe27385c1..2850fe0e090 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h
@@ -171,18 +171,12 @@ private:
   // the following functions isolate specific tests due to the
   // limitation of only 1 TAO_TRY being allowed per function.
 
-  void invalid_name_test (TAO_Naming_Client &root_context
-                          ACE_ENV_ARG_DECL);
-  void already_bound_test (TAO_Naming_Client &root_context
-                           ACE_ENV_ARG_DECL);
-  void already_bound_test2 (TAO_Naming_Client &root_context
-                            ACE_ENV_ARG_DECL);
-  void not_found_test (TAO_Naming_Client &root_context
-                       ACE_ENV_ARG_DECL);
-  void not_found_test2 (TAO_Naming_Client &root_context
-                        ACE_ENV_ARG_DECL);
-  void not_found_test3 (TAO_Naming_Client &root_context
-                        ACE_ENV_ARG_DECL);
+  void invalid_name_test (TAO_Naming_Client &root_context);
+  void already_bound_test (TAO_Naming_Client &root_context);
+  void already_bound_test2 (TAO_Naming_Client &root_context);
+  void not_found_test (TAO_Naming_Client &root_context);
+  void not_found_test2 (TAO_Naming_Client &root_context);
+  void not_found_test3 (TAO_Naming_Client &root_context);
 };
 
 class Destroy_Test : public Naming_Test
@@ -205,10 +199,8 @@ public:
 
 private:
   // = The following functions isolate specific tests.
-  void not_empty_test (CosNaming::NamingContext_var &ref
-                       ACE_ENV_ARG_DECL);
-  void not_exist_test (CosNaming::NamingContext_var &ref
-                       ACE_ENV_ARG_DECL);
+  void not_empty_test (CosNaming::NamingContext_var &ref);
+  void not_exist_test (CosNaming::NamingContext_var &ref);
 };
 
 class Persistent_Test_Begin : public Naming_Test
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.cpp b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
index c6c1677e504..e7e9693e1e3 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
@@ -41,7 +41,7 @@ public:
 
   // = Interface implementation accessor methods.
 
-  void id (CORBA::Short id ACE_ENV_ARG_DECL)
+  void id (CORBA::Short id)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Sets id.
 
@@ -70,7 +70,7 @@ My_Test_Object::id (void)
 }
 
 void
-My_Test_Object::id (CORBA::Short id ACE_ENV_ARG_DECL_NOT_USED)
+My_Test_Object::id (CORBA::Short id)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   id_ = id;
@@ -205,13 +205,11 @@ CosNaming_Client::init (int argc, char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize ORB.
       this->orbmgr_.init (this->argc_,
-                          this->argv_
-                          ACE_ENV_ARG_PARAMETER);
+                          this->argv_);
 
       this->orbmgr_.activate_poa_manager ();
 
@@ -222,12 +220,11 @@ CosNaming_Client::init (int argc, char **argv)
       CORBA::ORB_var orb = this->orbmgr_.orb ();
       return this->naming_client_.init (orb.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "init");
+      ex._tao_print_exception ("init");
       // and return -1 below . . .
     }
-  ACE_ENDTRY;
 
   return -1;
 }
@@ -247,46 +244,41 @@ MT_Test::svc (void)
 
   CosNaming::NamingContext_var name_service;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY_EX (SETUP)
+  try
     {
       CORBA::Object_var name_service_obj =
-        orb_->string_to_object (name_service_ior_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (SETUP);
+        orb_->string_to_object (name_service_ior_);
 
       name_service =
-        CosNaming::NamingContext::_narrow (name_service_obj.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (SETUP);
+        CosNaming::NamingContext::_narrow (name_service_obj.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in MT test setup");
+      ex._tao_print_exception (
+        "Unexpected exception in MT test setup");
       return -1;
     }
-  ACE_ENDTRY;
 
   if (name_service.in () == 0)
     return -1;
 
   // Bind the object.
-  ACE_TRY_EX (BIND)
+  try
     {
       name_service->bind (test_name_,
-                          test_ref_.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (BIND);
+                          test_ref_.in ());
       ACE_DEBUG ((LM_DEBUG,
                   "Bound name OK in thread %t\n"));
     }
-  ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
+  catch (const CosNaming::NamingContext::AlreadyBound& ex)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Unable to bind in thread %t\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in MT test bind");
+      ex._tao_print_exception (
+        "Unexpected exception in MT test bind");
       // This debug statement works around a IRIX/MIPSPro 7.3 bug (it
       // fails with optimize=1 debug=0; but works with any other
       // settings for those flags).
@@ -294,63 +286,55 @@ MT_Test::svc (void)
                   test_name_.length ()));
       return -1;
     }
-  ACE_ENDTRY;
 
   // Resolve the object from the Naming Context.
-  ACE_TRY_EX (RESOLVE)
+  try
     {
       CORBA::Object_var result_obj_ref =
-        name_service->resolve (test_name_
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (RESOLVE);
+        name_service->resolve (test_name_);
 
       Test_Object_var result_object =
-        Test_Object::_narrow (result_obj_ref.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (RESOLVE);
+        Test_Object::_narrow (result_obj_ref.in ());
 
       if (!CORBA::is_nil (result_object.in ()))
         {
           CORBA::Short id = result_object->id ();
-          ACE_TRY_CHECK_EX (RESOLVE);
 
           if (id == CosNaming_Client::OBJ1_ID)
             ACE_DEBUG ((LM_DEBUG,
                         "Resolved name OK in thread %t\n"));
         }
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+  catch (const CosNaming::NamingContext::NotFound& ex)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Unable to resolve in thread %t\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in MT test resolve");
+      ex._tao_print_exception (
+        "Unexpected exception in MT test resolve");
       return -1;
     }
-  ACE_ENDTRY;
 
   // Unbind the object from the Naming Context.
-  ACE_TRY_EX (UNBIND)
+  try
     {
-      name_service->unbind (test_name_
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (UNBIND);
+      name_service->unbind (test_name_);
       ACE_DEBUG ((LM_DEBUG,
                   "Unbound name OK in thread %t\n"));
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+  catch (const CosNaming::NamingContext::NotFound& ex)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Unable to unbind in thread %t\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in MT test unbind");
+      ex._tao_print_exception (
+        "Unexpected exception in MT test unbind");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -367,8 +351,7 @@ MT_Test::execute (TAO_Naming_Client &root_context)
   My_Test_Object *test_obj_impl =
     new My_Test_Object (CosNaming_Client::OBJ1_ID);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       test_ref_ =
         test_obj_impl->_this ();
@@ -385,16 +368,15 @@ MT_Test::execute (TAO_Naming_Client &root_context)
         root_context.get_context ();
 
       name_service_ior_ =
-        orb_->object_to_string (context.in ()
-                                ACE_ENV_ARG_PARAMETER);
+        orb_->object_to_string (context.in ());
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception while instantiating dummy");
+      ex._tao_print_exception (
+        "Unexpected exception while instantiating dummy");
       return -1;
     }
-  ACE_ENDTRY;
 
   // Create a name for dummy.
   test_name_.length (1);
@@ -414,8 +396,7 @@ MT_Test::execute (TAO_Naming_Client &root_context)
 int
 Simple_Test::execute (TAO_Naming_Client &root_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Dummy object instantiation.
       My_Test_Object *test_obj_impl = new My_Test_Object (CosNaming_Client::OBJ1_ID);
@@ -430,18 +411,15 @@ Simple_Test::execute (TAO_Naming_Client &root_context)
       test_name.length (1);
       test_name[0].id = CORBA::string_dup ("Foo");
       root_context->bind (test_name,
-                          test_obj_ref.in ()
-                          ACE_ENV_ARG_PARAMETER);
+                          test_obj_ref.in ());
       ACE_DEBUG ((LM_DEBUG,
                   "Bound name OK\n"));
 
       // Resolve the object from the Naming Context.
       CORBA::Object_var result_obj_ref =
-        root_context->resolve (test_name
-                               ACE_ENV_ARG_PARAMETER);
+        root_context->resolve (test_name);
       Test_Object_var result_object =
-        Test_Object::_narrow (result_obj_ref.in ()
-                              ACE_ENV_ARG_PARAMETER);
+        Test_Object::_narrow (result_obj_ref.in ());
       if (!CORBA::is_nil (result_object.in ()))
         {
           CORBA::Short id = result_object->id ();
@@ -450,17 +428,16 @@ Simple_Test::execute (TAO_Naming_Client &root_context)
         }
 
       // Unbind the object from the Naming Context.
-      root_context->unbind (test_name
-                            ACE_ENV_ARG_PARAMETER);
+      root_context->unbind (test_name);
       ACE_DEBUG ((LM_DEBUG,
                   "Unbound name OK\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in Simple test");
+      ex._tao_print_exception (
+        "Unexpected exception in Simple test");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -468,8 +445,7 @@ Simple_Test::execute (TAO_Naming_Client &root_context)
 int
 Tree_Test::execute (TAO_Naming_Client &root_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Create a tree of contexts: root->level1->level2.  Bind object
       // foo under context level2.
@@ -479,8 +455,7 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
       level1.length (1);
       level1[0].id = CORBA::string_dup ("level1_context");
       CosNaming::NamingContext_var level1_context;
-      level1_context = root_context->bind_new_context (level1
-                                                       ACE_ENV_ARG_PARAMETER);
+      level1_context = root_context->bind_new_context (level1);
 
       // Create a new context.
       CosNaming::NamingContext_var level2_context;
@@ -495,27 +470,23 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
       CosNaming::Name obj_name;
       obj_name.length (1);
       obj_name[0].id = CORBA::string_dup ("foo");
-      level2_context->bind (obj_name, obj1.in ()
-                            ACE_ENV_ARG_PARAMETER);
+      level2_context->bind (obj_name, obj1.in ());
 
       // Bind the context we just created under level1.
       CosNaming::Name level2 (level1);
       level2.length (2);
       level2[1].id = CORBA::string_dup ("level2_context");
       root_context->bind_context (level2,
-                                  level2_context.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+                                  level2_context.in ());
 
       // Resolve and unbind level1/level2/foo, and bind it back.
       CosNaming::Name test_name (level2);
       test_name.length (3);
       test_name[2].id = obj_name[0].id;
       CORBA::Object_var result_obj_ref =
-        root_context->resolve (test_name
-                               ACE_ENV_ARG_PARAMETER);
+        root_context->resolve (test_name);
       Test_Object_var result_object =
-        Test_Object::_narrow (result_obj_ref.in ()
-                              ACE_ENV_ARG_PARAMETER);
+        Test_Object::_narrow (result_obj_ref.in ());
 
       if (CORBA::is_nil (result_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -531,28 +502,22 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
 
       // Unbind the object from the Naming Context and bind it back
       // in.
-      root_context->unbind (test_name
-                            ACE_ENV_ARG_PARAMETER);
+      root_context->unbind (test_name);
       root_context->bind (test_name,
-                          obj1.in ()
-                          ACE_ENV_ARG_PARAMETER);
+                          obj1.in ());
 
       // Create new context and rebind under the name level1/level2.
       CosNaming::NamingContext_var new_level2_context;
       new_level2_context =
         root_context->new_context ();
       root_context->rebind_context (level2,
-                                  new_level2_context.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+                                  new_level2_context.in ());
 
       // Bind, resolve, rebind, and resolve foo under level1/level2.
       root_context->bind (test_name,
-                          obj1.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      result_obj_ref = root_context->resolve (test_name
-                                              ACE_ENV_ARG_PARAMETER);
-      result_object = Test_Object::_narrow (result_obj_ref.in ()
-                                            ACE_ENV_ARG_PARAMETER);
+                          obj1.in ());
+      result_obj_ref = root_context->resolve (test_name);
+      result_object = Test_Object::_narrow (result_obj_ref.in ());
 
       CORBA::Short obj_id = result_object->id ();
 
@@ -569,12 +534,9 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
       impl2->_remove_ref ();
 
       root_context->rebind (test_name,
-                            obj2.in ()
-                            ACE_ENV_ARG_PARAMETER);
-      result_obj_ref = root_context->resolve (test_name
-                                              ACE_ENV_ARG_PARAMETER);
-      result_object = Test_Object::_narrow (result_obj_ref.in ()
-                                            ACE_ENV_ARG_PARAMETER);
+                            obj2.in ());
+      result_obj_ref = root_context->resolve (test_name);
+      result_object = Test_Object::_narrow (result_obj_ref.in ());
 
       obj_id = result_object->id ();
 
@@ -585,13 +547,13 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
                           -1);
     }
 
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in Tree test");
+      ex._tao_print_exception (
+        "Unexpected exception in Tree test");
       return -1;
     }
 
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
               "All functions work properly \n"));
@@ -601,8 +563,7 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
 int
 Exceptions_Test::execute (TAO_Naming_Client &root_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Set things up.
 
@@ -611,12 +572,10 @@ Exceptions_Test::execute (TAO_Naming_Client &root_context)
       context_name.length (1);
       context_name[0].id = CORBA::string_dup ("level1_context");
       CosNaming::NamingContext_var level1_context;
-      level1_context = root_context->bind_new_context (context_name
-                                                       ACE_ENV_ARG_PARAMETER);
+      level1_context = root_context->bind_new_context (context_name);
       context_name[0].id = CORBA::string_dup ("level2_context");
       CosNaming::NamingContext_var level2_context;
-      level2_context = level1_context->bind_new_context (context_name
-                                                         ACE_ENV_ARG_PARAMETER);
+      level2_context = level1_context->bind_new_context (context_name);
 
       // Bind a dummy object foo under each context.
       My_Test_Object *impl = new My_Test_Object;
@@ -627,70 +586,57 @@ Exceptions_Test::execute (TAO_Naming_Client &root_context)
       object_name.length (1);
       object_name[0].id = CORBA::string_dup ("foo");
       root_context->bind (object_name,
-                          obj.in ()
-                          ACE_ENV_ARG_PARAMETER);
+                          obj.in ());
       level1_context->bind (object_name,
-                            obj.in ()
-                            ACE_ENV_ARG_PARAMETER);
+                            obj.in ());
       level2_context->bind (object_name,
-                            obj.in ()
-                            ACE_ENV_ARG_PARAMETER);
+                            obj.in ());
 
       // Run exceptions tests.
-      invalid_name_test (root_context
-                         ACE_ENV_ARG_PARAMETER);
-      already_bound_test (root_context
-                          ACE_ENV_ARG_PARAMETER);
-      already_bound_test2 (root_context
-                           ACE_ENV_ARG_PARAMETER);
-      not_found_test (root_context
-                      ACE_ENV_ARG_PARAMETER);
-      not_found_test2 (root_context
-                       ACE_ENV_ARG_PARAMETER);
-      not_found_test3 (root_context
-                       ACE_ENV_ARG_PARAMETER);
+      invalid_name_test (root_context);
+      already_bound_test (root_context);
+      already_bound_test2 (root_context);
+      not_found_test (root_context);
+      not_found_test2 (root_context);
+      not_found_test3 (root_context);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in Exceptions test");
+      ex._tao_print_exception (
+        "Unexpected exception in Exceptions test");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
 
 void
-Exceptions_Test::invalid_name_test (TAO_Naming_Client &root_context
-                                    ACE_ENV_ARG_DECL)
+Exceptions_Test::invalid_name_test (TAO_Naming_Client &root_context)
 {
-  ACE_TRY
+  try
     {
       CosNaming::Name test_name;
       test_name.length (0);
 
-      root_context->resolve (test_name
-                             ACE_ENV_ARG_PARAMETER);
+      root_context->resolve (test_name);
       ACE_DEBUG ((LM_DEBUG, "Invalid name test failed\n"));
     }
-  ACE_CATCH (CosNaming::NamingContext::InvalidName, ex)
+  catch (const CosNaming::NamingContext::InvalidName& ex)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "InvalidName exception works properly\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG ((LM_DEBUG, "Invalid name test failed\n"));
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 void
-Exceptions_Test::already_bound_test (TAO_Naming_Client &root_context
-                                     ACE_ENV_ARG_DECL)
+Exceptions_Test::already_bound_test (TAO_Naming_Client &root_context)
 {
-  ACE_TRY
+  try
     {
       CosNaming::Name test_name;
       test_name.length (1);
@@ -700,29 +646,26 @@ Exceptions_Test::already_bound_test (TAO_Naming_Client &root_context
       impl->_remove_ref ();
 
       root_context->bind (test_name,
-                          obj.in ()
-                          ACE_ENV_ARG_PARAMETER);
+                          obj.in ());
       ACE_DEBUG ((LM_DEBUG, "Already bound (case 1) test failed\n"));
     }
-  ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
+  catch (const CosNaming::NamingContext::AlreadyBound& ex)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "AlreadyBound exception (case 1) works properly\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG ((LM_DEBUG, "Already bound (case 1) test failed\n"));
-      ACE_RE_THROW;
+      throw;
     }
 
-  ACE_ENDTRY;
 }
 
 void
-Exceptions_Test::already_bound_test2 (TAO_Naming_Client &root_context
-                                      ACE_ENV_ARG_DECL)
+Exceptions_Test::already_bound_test2 (TAO_Naming_Client &root_context)
 {
-  ACE_TRY
+  try
     {
       CosNaming::Name test_name;
       test_name.length (2);
@@ -733,28 +676,25 @@ Exceptions_Test::already_bound_test2 (TAO_Naming_Client &root_context
       impl->_remove_ref ();
 
       root_context->bind (test_name,
-                          obj.in ()
-                          ACE_ENV_ARG_PARAMETER);
+                          obj.in ());
       ACE_DEBUG ((LM_DEBUG, "Already bound (case 2) test failed\n"));
     }
-  ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
+  catch (const CosNaming::NamingContext::AlreadyBound& ex)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "AlreadyBound  exception (case 2) works properly\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG ((LM_DEBUG, "Already bound (case 2) test failed\n"));
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 void
-Exceptions_Test::not_found_test (TAO_Naming_Client &root_context
-                                 ACE_ENV_ARG_DECL)
+Exceptions_Test::not_found_test (TAO_Naming_Client &root_context)
 {
-  ACE_TRY
+  try
     {
       CosNaming::Name test_name;
       test_name.length (3);
@@ -762,11 +702,10 @@ Exceptions_Test::not_found_test (TAO_Naming_Client &root_context
       test_name[1].id = CORBA::string_dup ("level2_context");
       test_name[2].id = CORBA::string_dup ("bar");
 
-      root_context->unbind (test_name
-                            ACE_ENV_ARG_PARAMETER);
+      root_context->unbind (test_name);
       ACE_DEBUG ((LM_DEBUG, "Not found test failed\n"));
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+  catch (const CosNaming::NamingContext::NotFound& ex)
     {
       if (ex.why == CosNaming::NamingContext::missing_node &&
           ex.rest_of_name.length () == 1
@@ -779,19 +718,17 @@ Exceptions_Test::not_found_test (TAO_Naming_Client &root_context
                     "NotFound  exception (case 1)"
                     " - parameters aren't set correctly\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG ((LM_DEBUG, "Not found test failed\n"));
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 void
-Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context
-                                  ACE_ENV_ARG_DECL)
+Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context)
 {
-  ACE_TRY
+  try
     {
       CosNaming::Name test_name;
       test_name.length (3);
@@ -799,11 +736,10 @@ Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context
       test_name[1].id = CORBA::string_dup ("level3_context");
       test_name[2].id = CORBA::string_dup ("foo");
 
-      root_context->unbind (test_name
-                            ACE_ENV_ARG_PARAMETER);
+      root_context->unbind (test_name);
       ACE_DEBUG ((LM_DEBUG, "Unbind test failed\n"));
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+  catch (const CosNaming::NamingContext::NotFound& ex)
     {
       if (ex.why == CosNaming::NamingContext::missing_node
           && ex.rest_of_name.length () == 2
@@ -818,20 +754,18 @@ Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context
                     "NotFound  exception (case 2)"
                     " - parameters aren't set correctly\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG ((LM_DEBUG, "Unbind test failed\n"));
-      ACE_RE_THROW;
+      throw;
     }
 
-  ACE_ENDTRY;
 }
 
 void
-Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context
-                                  ACE_ENV_ARG_DECL)
+Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context)
 {
-  ACE_TRY
+  try
     {
       CosNaming::Name test_name;
       test_name.length (3);
@@ -839,10 +773,10 @@ Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context
       test_name[1].id = CORBA::string_dup ("foo");
       test_name[2].id = CORBA::string_dup ("foo");
 
-      root_context->unbind (test_name ACE_ENV_ARG_PARAMETER);
+      root_context->unbind (test_name);
       ACE_DEBUG ((LM_DEBUG, "Not found (case 3) test failed - no exception was thrown\n"));
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+  catch (const CosNaming::NamingContext::NotFound& ex)
     {
       if (ex.why == CosNaming::NamingContext::not_context
           && ex.rest_of_name.length () == 2
@@ -857,19 +791,17 @@ Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context
                     "NotFound  exception (case 3)"
                     " - parameters aren't set correctly\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG ((LM_DEBUG, "Not found (case 3) test failed\n"));
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 int
 Iterator_Test::execute (TAO_Naming_Client &root_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Instantiate four dummy objects.
       My_Test_Object *impl = new My_Test_Object;
@@ -890,25 +822,20 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
       name4.length (1);
       name4[0].id = CORBA::string_dup ("foo4");
       root_context->bind (name1,
-                          obj.in ()
-                          ACE_ENV_ARG_PARAMETER);
+                          obj.in ());
       root_context->bind (name2,
-                          obj.in ()
-                          ACE_ENV_ARG_PARAMETER);
+                          obj.in ());
       root_context->bind (name3,
-                          obj.in ()
-                          ACE_ENV_ARG_PARAMETER);
+                          obj.in ());
       root_context->bind (name4,
-                          obj.in ()
-                          ACE_ENV_ARG_PARAMETER);
+                          obj.in ());
 
       // List the content of the Naming Context.
       CosNaming::BindingIterator_var iter;
       CosNaming::BindingList_var bindings_list;
       root_context->list (1,
                           bindings_list.out (),
-                          iter.out ()
-                          ACE_ENV_ARG_PARAMETER);
+                          iter.out ());
       if (CORBA::is_nil (iter.in ())
           || bindings_list->length () != 1
           || bindings_list[0u].binding_type != CosNaming::nobject)
@@ -921,8 +848,7 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
 
       // Invoke operations on the iterator.
       CosNaming::Binding_var binding;
-      iter->next_one (binding.out ()
-                      ACE_ENV_ARG_PARAMETER);
+      iter->next_one (binding.out ());
       if (binding->binding_type != CosNaming::nobject)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "CosNaming::next_one does not function properly\n"),
@@ -931,7 +857,7 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
                   "Second binding: %s\n",
                   binding->binding_name[0].id.in ()));
 
-      iter->next_n (2, bindings_list.out () ACE_ENV_ARG_PARAMETER);
+      iter->next_n (2, bindings_list.out ());
       if (bindings_list->length () != 2
           || bindings_list[0u].binding_type != CosNaming::nobject
           || bindings_list[1u].binding_type != CosNaming::nobject)
@@ -946,20 +872,19 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
 
       // We already iterated over all the bindings, so the following
       // should return false.
-      CORBA::Boolean result = iter->next_one (binding.out ()
-                                              ACE_ENV_ARG_PARAMETER);
+      CORBA::Boolean result = iter->next_one (binding.out ());
       if (result)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "CosNaming::BindingIterator does not function properly\n"),
                           -1);
       iter->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in Iterator test");
+      ex._tao_print_exception (
+        "Unexpected exception in Iterator test");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -967,8 +892,7 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
 int
 Destroy_Test::execute (TAO_Naming_Client &root_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Create a context and bind an object under it.
 
@@ -984,62 +908,55 @@ Destroy_Test::execute (TAO_Naming_Client &root_context)
       object_name.length (1);
       object_name[0].id = CORBA::string_dup ("foo");
       my_context->bind (object_name,
-                            obj.in ()
-                            ACE_ENV_ARG_PARAMETER);
+                            obj.in ());
 
       // Do the testing.
-      not_empty_test (my_context
-                                      ACE_ENV_ARG_PARAMETER);
+      not_empty_test (my_context);
 
-      my_context->unbind (object_name ACE_ENV_ARG_PARAMETER);
+      my_context->unbind (object_name);
       my_context->destroy ();
 
-      not_exist_test (my_context
-                         ACE_ENV_ARG_PARAMETER);
+      not_exist_test (my_context);
     }
 
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in Destroy test");
+      ex._tao_print_exception (
+        "Unexpected exception in Destroy test");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
 
 void
-Destroy_Test::not_empty_test (CosNaming::NamingContext_var &ref
-                                    ACE_ENV_ARG_DECL)
+Destroy_Test::not_empty_test (CosNaming::NamingContext_var &ref)
 {
-  ACE_TRY
+  try
     {
       ref->destroy ();
     }
 
-  ACE_CATCH (CosNaming::NamingContext::NotEmpty, ex)
+  catch (const CosNaming::NamingContext::NotEmpty& ex)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "NotEmpty exception works properly\n"));
     }
-  ACE_ENDTRY;
 }
 
 void
-Destroy_Test::not_exist_test (CosNaming::NamingContext_var &ref
-                                    ACE_ENV_ARG_DECL)
+Destroy_Test::not_exist_test (CosNaming::NamingContext_var &ref)
 {
-  ACE_TRY
+  try
     {
       ref->destroy ();
     }
 
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+  catch (const CORBA::OBJECT_NOT_EXIST& ex)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Destroy works properly\n"));
     }
-  ACE_ENDTRY;
 }
 
 Persistent_Test_Begin::Persistent_Test_Begin (CORBA::ORB_ptr orb,
@@ -1056,8 +973,7 @@ Persistent_Test_Begin::~Persistent_Test_Begin (void)
 int
 Persistent_Test_Begin::execute (TAO_Naming_Client &root_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Create a name structure we will reuse.
       CosNaming::Name test_name;
@@ -1066,18 +982,16 @@ Persistent_Test_Begin::execute (TAO_Naming_Client &root_context)
 
       // Create and bind a naming context under the <root> context.
       CosNaming::NamingContext_var level1_context =
-        root_context->bind_new_context (test_name
-                                        ACE_ENV_ARG_PARAMETER);
+        root_context->bind_new_context (test_name);
 
       // Create and bind a naming context under <level1> context.
       test_name[0].id = CORBA::string_dup ("level2");
       CosNaming::NamingContext_var level2_context =
-        level1_context->bind_new_context (test_name
-                                        ACE_ENV_ARG_PARAMETER);
+        level1_context->bind_new_context (test_name);
 
       // Log the ior of <level1_context> for use by <Persistent_Test_End>.
       CORBA::String_var ior =
-        orb_->object_to_string (level1_context.in () ACE_ENV_ARG_PARAMETER);
+        orb_->object_to_string (level1_context.in ());
 
       ACE_OS::fprintf (this->file_,
                        "%s",
@@ -1086,13 +1000,12 @@ Persistent_Test_Begin::execute (TAO_Naming_Client &root_context)
 
       ACE_DEBUG ((LM_DEBUG, "Persistent Naming test (part 1) OK.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception in Persistent Test (part 1)");
+      ex._tao_print_exception (
+        "Unexpected exception in Persistent Test (part 1)");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -1111,8 +1024,7 @@ Persistent_Test_End::~Persistent_Test_End (void)
 int
 Persistent_Test_End::execute (TAO_Naming_Client &root_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Create a name structure we will reuse.
       CosNaming::Name test_name;
@@ -1122,10 +1034,10 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context)
       // Convert stringified ior we got from <Persistent_Test_Begin>
       // for <level1> Naming Context to Naming Context reference.
       CORBA::Object_var obj =
-        orb_->string_to_object (ior_ ACE_ENV_ARG_PARAMETER);
+        orb_->string_to_object (ior_);
 
       CosNaming::NamingContext_var level1_context =
-        CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (obj.in ());
 
       if (CORBA::is_nil (level1_context.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -1134,7 +1046,7 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context)
 
       //  Resolve for <level2> context through the persistent ior we
       // got from part 1 of this test.
-      obj = level1_context->resolve (test_name ACE_ENV_ARG_PARAMETER);
+      obj = level1_context->resolve (test_name);
 
       // Now, resolve for <level2> context using the <root> context
       // reference which we obtained through <resolve_initial_references>.
@@ -1142,19 +1054,18 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context)
       test_name[0].id = CORBA::string_dup ("level1");
       test_name[1].id = CORBA::string_dup ("level2");
       CORBA::Object_var obj2 =
-        root_context->resolve (test_name ACE_ENV_ARG_PARAMETER);
+        root_context->resolve (test_name);
 
       // Make sure we got the same answer through both methods.
       if (obj2->_is_equivalent (obj.in ()))
         ACE_DEBUG ((LM_DEBUG, "Persistent Naming test (part 2) OK.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception in Persistent Test (part 2)");
+      ex._tao_print_exception (
+        "Unexpected exception in Persistent Test (part 2)");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.h b/TAO/orbsvcs/tests/Simple_Naming/client.h
index e8fe27385c1..2850fe0e090 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/client.h
+++ b/TAO/orbsvcs/tests/Simple_Naming/client.h
@@ -171,18 +171,12 @@ private:
   // the following functions isolate specific tests due to the
   // limitation of only 1 TAO_TRY being allowed per function.
 
-  void invalid_name_test (TAO_Naming_Client &root_context
-                          ACE_ENV_ARG_DECL);
-  void already_bound_test (TAO_Naming_Client &root_context
-                           ACE_ENV_ARG_DECL);
-  void already_bound_test2 (TAO_Naming_Client &root_context
-                            ACE_ENV_ARG_DECL);
-  void not_found_test (TAO_Naming_Client &root_context
-                       ACE_ENV_ARG_DECL);
-  void not_found_test2 (TAO_Naming_Client &root_context
-                        ACE_ENV_ARG_DECL);
-  void not_found_test3 (TAO_Naming_Client &root_context
-                        ACE_ENV_ARG_DECL);
+  void invalid_name_test (TAO_Naming_Client &root_context);
+  void already_bound_test (TAO_Naming_Client &root_context);
+  void already_bound_test2 (TAO_Naming_Client &root_context);
+  void not_found_test (TAO_Naming_Client &root_context);
+  void not_found_test2 (TAO_Naming_Client &root_context);
+  void not_found_test3 (TAO_Naming_Client &root_context);
 };
 
 class Destroy_Test : public Naming_Test
@@ -205,10 +199,8 @@ public:
 
 private:
   // = The following functions isolate specific tests.
-  void not_empty_test (CosNaming::NamingContext_var &ref
-                       ACE_ENV_ARG_DECL);
-  void not_exist_test (CosNaming::NamingContext_var &ref
-                       ACE_ENV_ARG_DECL);
+  void not_empty_test (CosNaming::NamingContext_var &ref);
+  void not_exist_test (CosNaming::NamingContext_var &ref);
 };
 
 class Persistent_Test_Begin : public Naming_Test
diff --git a/TAO/orbsvcs/tests/Time/Client_i.cpp b/TAO/orbsvcs/tests/Time/Client_i.cpp
index a0cab560b86..da3b881bd0f 100644
--- a/TAO/orbsvcs/tests/Time/Client_i.cpp
+++ b/TAO/orbsvcs/tests/Time/Client_i.cpp
@@ -33,20 +33,18 @@ Client_i::test_for_secure_universal_time (void)
   ACE_DEBUG ((LM_DEBUG,
               "[CLIENT] Process/Thread Id : (%P/%t) Testing secure_time()\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CosTime::UTO_var UTO_server =
            this->clerk_->secure_universal_time ();
 
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
       ACE_DEBUG ((LM_DEBUG,
                   "[CLIENT] Process/Thread Id : (%P/%t) test_for_secure_universal_time() successful !!\n"));
         }
-  ACE_ENDTRY;
 }
 
 // The following test retrieves the current universal time as a UTO
@@ -57,8 +55,7 @@ Client_i::test_for_universal_time (void)
 {
   ACE_DEBUG ((LM_DEBUG,
               "[CLIENT] Process/Thread Id : (%P/%t) Testing universal_time()\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CosTime::UTO_var UTO_server =
         this->clerk_->universal_time ();
@@ -89,13 +86,12 @@ Client_i::test_for_universal_time (void)
 #endif
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Error:");
+      ex._tao_print_exception ("Error:");
       ACE_DEBUG ((LM_DEBUG,
                   "[CLIENT] Process/Thread Id : (%P/%t) test_for_universal_time()\n"));
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -108,13 +104,11 @@ Client_i::test_for_new_universal_time (void)
   ACE_DEBUG ((LM_DEBUG,
               "[CLIENT] Process/Thread Id : (%P/%t) Testing new_universal_time()\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CosTime::UTO_var UTO_server = this->clerk_->new_universal_time (time,
                                                                       inaccuracy,
-                                                                      tdf
-                                                                      ACE_ENV_ARG_PARAMETER);
+                                                                      tdf);
 
       ACE_ASSERT (UTO_server->time () == 999999999);
       ACE_ASSERT (UTO_server->inaccuracy () == 9999);
@@ -125,13 +119,12 @@ Client_i::test_for_new_universal_time (void)
       ACE_ASSERT ((UTO_server->utc_time ()).tdf == 99);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "[CLIENT] Process/Thread Id : (%P/%t) Test new_universal_time () fails.\n"));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception :\n");
+      ex._tao_print_exception ("Exception :\n");
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -147,11 +140,9 @@ Client_i::test_for_uto_from_utc (void)
   ACE_DEBUG ((LM_DEBUG,
               "[CLIENT] Process/Thread Id : (%P/%t) Testing uto_from_utc ()\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      CosTime::UTO_var UTO_server = this->clerk_->uto_from_utc (utc_struct
-                                                                ACE_ENV_ARG_PARAMETER);
+      CosTime::UTO_var UTO_server = this->clerk_->uto_from_utc (utc_struct);
 
       TimeBase::InaccuracyT inaccuracy = utc_struct.inacchi;
       inaccuracy <<= 32;
@@ -166,13 +157,12 @@ Client_i::test_for_uto_from_utc (void)
       ACE_ASSERT ((UTO_server->utc_time ()).tdf == 99);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "[CLIENT] Process/Thread Id : (%P/%t) Test uto_from_utc () fails.\n"));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception :\n");
+      ex._tao_print_exception ("Exception :\n");
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -184,24 +174,21 @@ Client_i::test_for_new_interval (void)
   ACE_DEBUG ((LM_DEBUG,
               "[CLIENT] Process/Thread Id : (%P/%t) Testing new_interval ()\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CosTime::TIO_var TIO_server = this->clerk_->new_interval (lower,
-                                                                upper
-                                                                ACE_ENV_ARG_PARAMETER);
+                                                                upper);
 
       ACE_ASSERT ((TIO_server->time_interval ()).lower_bound == 666666666);
       ACE_ASSERT ((TIO_server->time_interval ()).upper_bound == 999999999);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "[CLIENT] Process/Thread Id : (%P/%t) Test new_interval () fails.\n"));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception :\n");
+      ex._tao_print_exception ("Exception :\n");
     }
-  ACE_ENDTRY;
 
   return;
 }
@@ -321,9 +308,8 @@ Client_i::~Client_i (void)
 int
 Client_i::obtain_initial_references (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Initialize the naming services.
       if (my_name_client_.init (orb_.in ()) != 0)
@@ -352,11 +338,9 @@ Client_i::obtain_initial_references (void)
                   name));
 
       CORBA::Object_var temp_object =
-        my_name_client_->resolve (clerk_name
-                                  ACE_ENV_ARG_PARAMETER);
+        my_name_client_->resolve (clerk_name);
 
-      clerk_ = CosTime::TimeService::_narrow (temp_object.in ()
-                                              ACE_ENV_ARG_PARAMETER);
+      clerk_ = CosTime::TimeService::_narrow (temp_object.in ());
 
       if (CORBA::is_nil (clerk_.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -364,12 +348,12 @@ Client_i::obtain_initial_references (void)
                            "Clerk Reference\n"),
                            -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Client :: obtain_initial_references\n");
+      ex._tao_print_exception (
+        "Client :: obtain_initial_references\n");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -383,15 +367,13 @@ Client_i::init (int argc, char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
-                                    0
-                                    ACE_ENV_ARG_PARAMETER);
+                                    0);
 
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
@@ -403,8 +385,7 @@ Client_i::init (int argc, char **argv)
           // option or a file.
 
           CORBA::Object_var server_object =
-          this->orb_->string_to_object (this->ior_
-                                        ACE_ENV_ARG_PARAMETER);
+          this->orb_->string_to_object (this->ior_);
 
           if (CORBA::is_nil (server_object.in ()))
             ACE_ERROR_RETURN ((LM_ERROR,
@@ -412,8 +393,7 @@ Client_i::init (int argc, char **argv)
                                this->ior_),
                               -1);
           this->clerk_ =
-            CosTime::TimeService::_narrow (server_object.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+            CosTime::TimeService::_narrow (server_object.in ());
 
           ACE_DEBUG ((LM_DEBUG,
                       "[CLIENT] Process/Thread Id : (%P/%t) Using the IOR provided\n"));
@@ -428,12 +408,11 @@ Client_i::init (int argc, char **argv)
 
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Client_i::init\n");
+      ex._tao_print_exception ("Client_i::init\n");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
index 3d2963be284..68641508765 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
@@ -8,8 +8,7 @@ ACE_RCSID(Trading, Offer_Exporter, "$Id$")
 
 TAO_Offer_Exporter::
 TAO_Offer_Exporter (CosTrading::Lookup_ptr lookup_if,
-                    CORBA::Boolean verbose
-                    ACE_ENV_ARG_DECL)
+                    CORBA::Boolean verbose)
   ACE_THROW_SPEC ((CORBA::SystemException))
     : verbose_ (verbose)
 {
@@ -53,12 +52,11 @@ TAO_Offer_Exporter::export_offers (void)
       this->props_fs_[i][4].value <<= "Default";
     }
 
-  this->export_to (this->register_.in () ACE_ENV_ARG_PARAMETER);
+  this->export_to (this->register_.in ());
 }
 
 void
-TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg
-                               ACE_ENV_ARG_DECL)
+TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::Register::InvalidObjectRef,
                    CosTrading::IllegalServiceType,
@@ -70,7 +68,7 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg
                    CosTrading::MissingMandatoryProperty,
                    CosTrading::DuplicatePropertyName))
 {
-  ACE_TRY
+  try
     {
       for (int i = 0; i < NUM_OFFERS; i++)
         {
@@ -79,8 +77,7 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg
           CosTrading::OfferId_var offer_id =
             reg->_cxx_export (offer_obj,
                               TT_Info::INTERFACE_NAMES[1],
-                              this->props_plotters_[i]
-                              ACE_ENV_ARG_PARAMETER);
+                              this->props_plotters_[i]);
 
           if (this->verbose_)
             {
@@ -91,8 +88,7 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg
 
           offer_id = reg->_cxx_export (offer_obj,
                                        TT_Info::INTERFACE_NAMES[2],
-                                       this->props_printers_[i]
-                                       ACE_ENV_ARG_PARAMETER);
+                                       this->props_printers_[i]);
 
           if (this->verbose_)
             {
@@ -103,9 +99,7 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg
 
           offer_id = reg->_cxx_export (offer_obj,
                                        TT_Info::INTERFACE_NAMES[3],
-                                       this->props_fs_[i]
-                                       ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK
+                                       this->props_fs_[i]);
 
           if (this->verbose_)
             {
@@ -113,12 +107,12 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Offer_Exporter::export_offers");
-      ACE_RE_THROW;
+      ex._tao_print_exception (
+        "TAO_Offer_Exporter::export_offers");
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -159,7 +153,7 @@ TAO_Offer_Exporter::export_offers_to_all (void)
 
   for (CORBA::ULong i = link_name_seq->length () - 1; i > 0; i--)
     {
-      ACE_TRY
+      try
         {
           if (this->verbose_)
             {
@@ -168,7 +162,7 @@ TAO_Offer_Exporter::export_offers_to_all (void)
             }
 
           CosTrading::Link::LinkInfo_var link_info =
-            link_if->describe_link (link_name_seq[i] ACE_ENV_ARG_PARAMETER);
+            link_if->describe_link (link_name_seq[i]);
 
           for (int j = 0; j < NUM_OFFERS; j++)
             {
@@ -183,13 +177,12 @@ TAO_Offer_Exporter::export_offers_to_all (void)
                           static_cast<const char*> (link_name_seq[i])));
             }
 
-          this->export_to (link_info->target_reg.in () ACE_ENV_ARG_PARAMETER);
+          this->export_to (link_info->target_reg.in ());
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           // @@ IGNORE??
         }
-      ACE_ENDTRY;
     }
 }
 
@@ -203,7 +196,7 @@ TAO_Offer_Exporter::withdraw_offers (void)
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Withdrawing all offers.\n"));
 
-  ACE_TRY
+  try
     {
       CORBA::ULong length;
 
@@ -214,16 +207,16 @@ TAO_Offer_Exporter::withdraw_offers (void)
           length = offer_id_seq->length ();
           for (CORBA::ULong i = 0; i < length; i++)
             {
-              this->register_->withdraw (offer_id_seq[i] ACE_ENV_ARG_PARAMETER);
+              this->register_->withdraw (offer_id_seq[i]);
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Offer_Exporter::withdraw_offers");
-      ACE_RE_THROW;
+      ex._tao_print_exception (
+        "TAO_Offer_Exporter::withdraw_offers");
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -235,7 +228,7 @@ TAO_Offer_Exporter::describe_offers (void)
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Describing all offers.\n"));
 
-  ACE_TRY
+  try
     {
       CORBA::ULong length;
       CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids ();
@@ -250,24 +243,24 @@ TAO_Offer_Exporter::describe_offers (void)
           for (CORBA::ULong i = 0; i < length; i++)
             {
               CosTrading::Register::OfferInfo_var offer_info =
-                this->register_->describe (offer_id_seq[i] ACE_ENV_ARG_PARAMETER);
+                this->register_->describe (offer_id_seq[i]);
 
               if (this->verbose_)
                 {
                   ACE_DEBUG ((LM_DEBUG, "Offer Id: %s\n", (const char *) offer_id_seq[i]));
                   ACE_DEBUG ((LM_DEBUG, "Service Type: %s\n", offer_info->type.in ()));
-                  TT_Info::dump_properties (offer_info->properties, 0 ACE_ENV_ARG_PARAMETER);
+                  TT_Info::dump_properties (offer_info->properties, 0);
                   ACE_DEBUG ((LM_DEBUG, "------------------------------\n"));
                 }
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Offer_Exporter::describe_offers");
-      ACE_RE_THROW;
+      ex._tao_print_exception (
+        "TAO_Offer_Exporter::describe_offers");
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -287,7 +280,7 @@ TAO_Offer_Exporter::modify_offers (void)
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Modifying all offers.\n"));
 
-  ACE_TRY
+  try
     {
       CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids ();
 
@@ -309,17 +302,16 @@ TAO_Offer_Exporter::modify_offers (void)
             {
               this->register_->modify (offer_id_seq[i],
                                        del_list,
-                                       modify_list
-                                       ACE_ENV_ARG_PARAMETER);
+                                       modify_list);
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Offer_Exporter::modify_offers");
-      ACE_RE_THROW;
+      ex._tao_print_exception (
+        "TAO_Offer_Exporter::modify_offers");
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -339,30 +331,26 @@ withdraw_offers_using_constraints (void)
   if (this->verbose_)
     ACE_DEBUG ((LM_DEBUG, "Constraint: %s\n", constraint));
 
-  ACE_TRY
+  try
     {
       this->register_->
         withdraw_using_constraint (TT_Info::INTERFACE_NAMES[TT_Info::PLOTTER],
-                                   constraint
-                                   ACE_ENV_ARG_PARAMETER);
+                                   constraint);
 
       this->register_->
         withdraw_using_constraint (TT_Info::INTERFACE_NAMES[TT_Info::PRINTER],
-                                   constraint
-                                   ACE_ENV_ARG_PARAMETER);
+                                   constraint);
 
       this->register_->
         withdraw_using_constraint (TT_Info::INTERFACE_NAMES[TT_Info::FILESYSTEM],
-                                   constraint
-                                   ACE_ENV_ARG_PARAMETER);
+                                   constraint);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "TAO_Offer_Exporter::withdraw_using_constraint");
-      ACE_RE_THROW;
+      ex._tao_print_exception (
+        "TAO_Offer_Exporter::withdraw_using_constraint");
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 CosTrading::OfferIdSeq*
@@ -374,15 +362,14 @@ TAO_Offer_Exporter::grab_offerids (void)
     ACE_DEBUG ((LM_DEBUG, "TAO_Offer_Exporter::Grabbing all offer ids.\n"));
 
   CosTrading::OfferIdSeq *offer_id_seq;
-  ACE_TRY
+  try
     {
       CORBA::ULong length = NUM_OFFERS;
       CosTrading::OfferIdIterator_ptr offer_id_iter;
 
       this->admin_->list_offers (NUM_OFFERS,
                                  CosTrading::OfferIdSeq_out (offer_id_seq),
-                                 CosTrading::OfferIdIterator_out (offer_id_iter)
-                                 ACE_ENV_ARG_PARAMETER);
+                                 CosTrading::OfferIdIterator_out (offer_id_iter));
 
       if ((! CORBA::is_nil (offer_id_iter)) && offer_id_seq != 0)
         {
@@ -394,8 +381,7 @@ TAO_Offer_Exporter::grab_offerids (void)
             {
               any_left =
                 offer_id_iter->next_n (length,
-                                       CosTrading::OfferIdSeq_out (id_seq)
-                                       ACE_ENV_ARG_PARAMETER);
+                                       CosTrading::OfferIdSeq_out (id_seq));
 
               int offers = id_seq->length ();
               int old_length = offer_id_seq->length ();
@@ -418,13 +404,11 @@ TAO_Offer_Exporter::grab_offerids (void)
             ACE_DEBUG ((LM_DEBUG, "Offer Id: %s\n", (const char *)(*offer_id_seq)[j]));
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "TAO_Offer_Exporter::grab_offerids");
-      ACE_RE_THROW;
+      ex._tao_print_exception ("TAO_Offer_Exporter::grab_offerids");
+      throw;
     }
-  ACE_ENDTRY;
   // @@ redundant.
 
   return offer_id_seq;
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.h b/TAO/orbsvcs/tests/Trading/Offer_Exporter.h
index e3cb09ccded..f31142f193b 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.h
+++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.h
@@ -25,8 +25,7 @@ class TAO_TTest_Export TAO_Offer_Exporter
 public:
 
   TAO_Offer_Exporter (CosTrading::Lookup_ptr lookup_if,
-                      CORBA::Boolean verbose
-                      ACE_ENV_ARG_DECL)
+                      CORBA::Boolean verbose)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   ~TAO_Offer_Exporter (void);
@@ -104,8 +103,7 @@ private:
   void create_offers (void);
   // Fill in each of the offer structures.
 
-  void export_to (CosTrading::Register_ptr reg
-                  ACE_ENV_ARG_DECL)
+  void export_to (CosTrading::Register_ptr reg)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::Register::InvalidObjectRef,
                      CosTrading::IllegalServiceType,
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
index a3fe6454fe1..c2f2049c714 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
@@ -34,7 +34,7 @@ TAO_Offer_Importer::perform_queries (void)
   policies.return_card (16*NUM_OFFERS);
   policies.link_follow_rule (CosTrading::always);
 
-  this->perform_queries_with_policies (policies ACE_ENV_ARG_PARAMETER);
+  this->perform_queries_with_policies (policies);
 }
 
 void
@@ -80,7 +80,7 @@ TAO_Offer_Importer::perform_directed_queries (void)
         }
 
       CosTrading::Link::LinkInfo_var link_info =
-        link_if->describe_link (link_name_seq[0u] ACE_ENV_ARG_PARAMETER);
+        link_if->describe_link (link_name_seq[0u]);
 
       CosTrading::Lookup_ptr lookup_if = link_info->target.in ();
       CosTrading::Link_var link_if2 = lookup_if->link_if ();
@@ -111,7 +111,7 @@ TAO_Offer_Importer::perform_directed_queries (void)
               policies.starting_trader (new CosTrading::TraderName
                                         (2, 2, trader_name, 1));
 
-              this->perform_queries_with_policies (policies ACE_ENV_ARG_PARAMETER);
+              this->perform_queries_with_policies (policies);
             }
         }
       else
@@ -131,7 +131,6 @@ TAO_Offer_Importer::perform_directed_queries (void)
 void
 TAO_Offer_Importer::perform_queries_with_policies (
     const TAO_Policy_Creator& policies
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
@@ -145,7 +144,7 @@ TAO_Offer_Importer::perform_queries_with_policies (
                    CosTrading::DuplicatePropertyName,
                    CosTrading::DuplicatePolicyName))
 {
-  ACE_TRY
+  try
     {
       CosTrading::Lookup::SpecifiedProps desired_props;
 
@@ -182,8 +181,7 @@ TAO_Offer_Importer::perform_queries_with_policies (
                                 8,
                                 offer_seq_out,
                                 offer_iterator_out,
-                                limits_applied_out
-                                ACE_ENV_ARG_PARAMETER);
+                                limits_applied_out);
 
           CosTrading::OfferSeq_var offer_seq (offer_seq_ptr);
           CosTrading::OfferIterator_var offer_iterator (offer_iterator_ptr);
@@ -193,8 +191,7 @@ TAO_Offer_Importer::perform_queries_with_policies (
             {
               ACE_DEBUG ((LM_DEBUG, "*** Results:\n\n"));
               this->display_results (*offer_seq_ptr,
-                                     offer_iterator_ptr
-                                     ACE_ENV_ARG_PARAMETER);
+                                     offer_iterator_ptr);
 
               if (limits_applied_out->length () > 0)
                 ACE_DEBUG ((LM_DEBUG, "*** Limits Applied:\n\n"));
@@ -208,21 +205,20 @@ TAO_Offer_Importer::perform_queries_with_policies (
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Offer_Importer::perform_queries");
-      ACE_RE_THROW;
+      ex._tao_print_exception (
+        "TAO_Offer_Importer::perform_queries");
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 void
 TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq,
-                                     CosTrading::OfferIterator_ptr offer_iterator
-                                     ACE_ENV_ARG_DECL) const
+                                     CosTrading::OfferIterator_ptr offer_iterator) const
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       CORBA::ULong length = 0, i = 0;
       ACE_DEBUG ((LM_DEBUG, "------------------------------\n"));
@@ -232,12 +228,11 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq,
         {
           // Call back to the exported object.
           TAO_Trader_Test::Remote_Output_var remote_output =
-            TAO_Trader_Test::Remote_Output::_narrow (offer_seq[i].reference.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+            TAO_Trader_Test::Remote_Output::_narrow (offer_seq[i].reference.in ());
 
           remote_output->confirm ();
 
-          TT_Info::dump_properties (offer_seq[i].properties, 1 ACE_ENV_ARG_PARAMETER);
+          TT_Info::dump_properties (offer_seq[i].properties, 1);
           ACE_DEBUG ((LM_DEBUG, "------------------------------\n"));
         }
 
@@ -254,21 +249,19 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq,
               CosTrading::OfferSeq_out iter_offers_out (iter_offers_ptr);
 
               any_left = offer_iterator->next_n (length,
-                                                 iter_offers_out
-                                                 ACE_ENV_ARG_PARAMETER);
+                                                 iter_offers_out);
 
               CosTrading::OfferSeq_var iter_offers (iter_offers_ptr);
               for (length = iter_offers->length (), i = 0; i < length; i++)
                 {
                   // Call back to the exported object.
                   TAO_Trader_Test::Remote_Output_var remote_output =
-                    TAO_Trader_Test::Remote_Output::_narrow (offer_seq[i].reference.in ()
-                                                             ACE_ENV_ARG_PARAMETER);
+                    TAO_Trader_Test::Remote_Output::_narrow (offer_seq[i].reference.in ());
 
                   remote_output->confirm ();
 
                   CosTrading::PropertySeq& props = iter_offers[i].properties;
-                  TT_Info::dump_properties (props, 1 ACE_ENV_ARG_PARAMETER);
+                  TT_Info::dump_properties (props, 1);
 
                   ACE_DEBUG ((LM_DEBUG, "------------------------------\n"));
                 }
@@ -278,10 +271,10 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq,
           offer_iterator->destroy ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Offer_Importer::display_results");
-      ACE_RE_THROW;
+      ex._tao_print_exception (
+        "TAO_Offer_Importer::display_results");
+      throw;
     }
-  ACE_ENDTRY;
 }
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.h b/TAO/orbsvcs/tests/Trading/Offer_Importer.h
index 5ef28dd3419..74b47228d6a 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Importer.h
+++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.h
@@ -64,8 +64,7 @@ public:
 
 private:
 
-  void perform_queries_with_policies (const TAO_Policy_Creator& policy_manager
-                                      ACE_ENV_ARG_DECL)
+  void perform_queries_with_policies (const TAO_Policy_Creator& policy_manager)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -81,8 +80,7 @@ private:
   // pass in <policy_manager>.
 
   void display_results (const CosTrading::OfferSeq& offer_seq,
-                        CosTrading::OfferIterator_ptr offer_iterator
-                        ACE_ENV_ARG_DECL) const
+                        CosTrading::OfferIterator_ptr offer_iterator) const
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Display the results of the query to the screen.
 
diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
index e62a03e8657..a09226a8b65 100644
--- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
@@ -6,8 +6,7 @@ ACE_RCSID(Trading, Service_Type_Exporter, "$Id$")
 
 TAO_Service_Type_Exporter::
 TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if,
-                           CORBA::Boolean verbose
-                           ACE_ENV_ARG_DECL)
+                           CORBA::Boolean verbose)
     ACE_THROW_SPEC ((CORBA::SystemException))
   : verbose_ (verbose),
     lookup_ (lookup_if)
@@ -16,8 +15,7 @@ TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if,
   CosTrading::TypeRepository_var obj = lookup_if->type_repos ();
 
   // Narrow the Service Type Repository.
-  this->repos_ = CosTradingRepos::ServiceTypeRepository::_narrow (obj.in ()
-                                                                  ACE_ENV_ARG_PARAMETER);
+  this->repos_ = CosTradingRepos::ServiceTypeRepository::_narrow (obj.in ());
 
   // Build the service type descriptions.
   this->create_types ();
@@ -35,11 +33,11 @@ TAO_Service_Type_Exporter::remove_all_types (void)
 
   for (int i = NUM_TYPES - 1; i >= 0; i--)
     {
-      ACE_TRY
+      try
         {
-          this->repos_->remove_type (TT_Info::INTERFACE_NAMES[i] ACE_ENV_ARG_PARAMETER);
+          this->repos_->remove_type (TT_Info::INTERFACE_NAMES[i]);
         }
-      ACE_CATCH (CosTrading::UnknownServiceType, excp)
+      catch (const CosTrading::UnknownServiceType& excp)
         {
           if (this->verbose_)
             {
@@ -48,12 +46,11 @@ TAO_Service_Type_Exporter::remove_all_types (void)
             }
 
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "TAO_Service_Type_Exporter::remove_all_types");
+          ex._tao_print_exception (
+            "TAO_Service_Type_Exporter::remove_all_types");
         }
-      ACE_ENDTRY;
     }
 }
 
@@ -72,7 +69,7 @@ TAO_Service_Type_Exporter::add_all_types (void)
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Service_Type_Exporter::"
               "adding all types to the Repository.\n"));
-  this->add_all_types_to (this->repos_.in () ACE_ENV_ARG_PARAMETER);
+  this->add_all_types_to (this->repos_.in ());
 }
 
 void
@@ -102,12 +99,12 @@ TAO_Service_Type_Exporter::add_all_types_to_all (void)
   for (CORBA::ULong i = link_name_seq->length () - 1; i > 0; i--)
     {
       CosTradingRepos::ServiceTypeRepository_ptr str = 0;
-      ACE_TRY
+      try
         {
           ACE_DEBUG ((LM_DEBUG, "Getting link information for %s\n",
                       static_cast<const char*> (link_name_seq[i])));
           CosTrading::Link::LinkInfo_var link_info =
-            link_if->describe_link (link_name_seq[i] ACE_ENV_ARG_PARAMETER);
+            link_if->describe_link (link_name_seq[i]);
 
           ACE_DEBUG ((LM_DEBUG, "Adding service types to %s\n",
                       static_cast<const char*> (link_name_seq[i])));
@@ -116,25 +113,22 @@ TAO_Service_Type_Exporter::add_all_types_to_all (void)
             link_info->target->type_repos ();
 
           str =
-            CosTradingRepos::ServiceTypeRepository::_narrow (remote_repos.in ()
-                                                             ACE_ENV_ARG_PARAMETER);
+            CosTradingRepos::ServiceTypeRepository::_narrow (remote_repos.in ());
 
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           // @@ Seth, Ignore all these exceptions?
         }
-      ACE_ENDTRY;
 
       // @@ Seth, But this one?
-      this->add_all_types_to (str ACE_ENV_ARG_PARAMETER);
+      this->add_all_types_to (str);
     }
 }
 
 void
 TAO_Service_Type_Exporter::
-add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos
-                  ACE_ENV_ARG_DECL)
+add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
@@ -147,44 +141,47 @@ add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos
 {
   for (int i = 0; i < NUM_TYPES; i++)
     {
-      ACE_TRY
+      try
         {
           repos->add_type (TT_Info::INTERFACE_NAMES[i],
                            this->type_structs_[i].if_name,
                            this->type_structs_[i].props,
-                           this->type_structs_[i].super_types
-                           ACE_ENV_ARG_PARAMETER);
+                           this->type_structs_[i].super_types);
         }
-      ACE_CATCH (CosTradingRepos::ServiceTypeRepository::ServiceTypeExists, ste)
+      catch (
+        const CosTradingRepos::ServiceTypeRepository::ServiceTypeExists& ste)
         {
-          ACE_PRINT_EXCEPTION (ste, "TAO_Service_Type_Exporter::add_all_types");
+          ste._tao_print_exception (
+            "TAO_Service_Type_Exporter::add_all_types");
 
           if (ste.name.in () != 0)
             ACE_DEBUG ((LM_DEBUG, "Invalid name: %s\n", ste.name.in ()));
         }
-      ACE_CATCH (CosTrading::IllegalPropertyName, excp)
+      catch (const CosTrading::IllegalPropertyName& excp)
         {
-          ACE_PRINT_EXCEPTION (excp, "TAO_Service_Type_Exporter::add_all_types");
+          excp._tao_print_exception (
+            "TAO_Service_Type_Exporter::add_all_types");
 
           if (excp.name.in () != 0)
             ACE_DEBUG ((LM_DEBUG, "Invalid name: %s\n", excp.name.in ()));
         }
-      ACE_CATCH (CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition, vtr)
+      catch (
+        const CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition& vtr)
         {
-          ACE_PRINT_EXCEPTION (vtr, "TAO_Service_Type_Exporter::add_all_types");
+          vtr._tao_print_exception (
+            "TAO_Service_Type_Exporter::add_all_types");
 
           if (vtr.type_1.in () != 0)
             ACE_DEBUG ((LM_DEBUG, "Type One: %s\n", vtr.type_2.in ()));
           if (vtr.type_2.in () != 0)
             ACE_DEBUG ((LM_DEBUG, "Type Two: %s\n", vtr.type_2.in ()));
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "TAO_Service_Type_Exporter::add_all_types");
-          ACE_RE_THROW;
+          ex._tao_print_exception (
+            "TAO_Service_Type_Exporter::add_all_types");
+          throw;
         }
-      ACE_ENDTRY;
     }
 }
 
@@ -192,7 +189,7 @@ void
 TAO_Service_Type_Exporter::list_all_types (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes sst;
       ACE_DEBUG ((LM_DEBUG, "*** TAO_Service_Type_Exporter::"
@@ -200,7 +197,7 @@ TAO_Service_Type_Exporter::list_all_types (void)
 
       sst.all_ (1);
       CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq_var type_names =
-        this->repos_->list_types (sst ACE_ENV_ARG_PARAMETER);
+        this->repos_->list_types (sst);
 
       CORBA::ULong l = type_names->length ();
       for (CORBA::ULong i = 0; i != l; ++i)
@@ -213,13 +210,11 @@ TAO_Service_Type_Exporter::list_all_types (void)
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "TAO_Service_Type_Exporter::list_all_types");
-      ACE_RE_THROW;
+      ex._tao_print_exception ("TAO_Service_Type_Exporter::list_all_types");
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -228,7 +223,7 @@ TAO_Service_Type_Exporter::describe_all_types (void)
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType))
 {
-  ACE_TRY
+  try
     {
       ACE_DEBUG ((LM_DEBUG, "*** TAO_Service_Type_Exporter::"
                   "describing all types in the Repository.\n"));
@@ -236,8 +231,7 @@ TAO_Service_Type_Exporter::describe_all_types (void)
       for (int i = 0; i < NUM_TYPES; i++)
         {
           CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct =
-            this->repos_->describe_type (TT_Info::INTERFACE_NAMES[i]
-                                         ACE_ENV_ARG_PARAMETER);
+            this->repos_->describe_type (TT_Info::INTERFACE_NAMES[i]);
 
           if (this->verbose_)
             {
@@ -246,13 +240,12 @@ TAO_Service_Type_Exporter::describe_all_types (void)
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "TAO_Service_Type_Exporter::describe_all_types");
-      ACE_RE_THROW;
+      ex._tao_print_exception (
+        "TAO_Service_Type_Exporter::describe_all_types");
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -261,7 +254,7 @@ TAO_Service_Type_Exporter::fully_describe_all_types (void)
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType))
 {
-  ACE_TRY
+  try
     {
       ACE_DEBUG ((LM_DEBUG, "*** TAO_Service_Type_Exporter::"
                   "fully describing all types in the Repository.\n"));
@@ -269,8 +262,7 @@ TAO_Service_Type_Exporter::fully_describe_all_types (void)
       for (int i = 0; i < NUM_TYPES; i++)
         {
           CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct =
-            this->repos_->fully_describe_type (TT_Info::INTERFACE_NAMES[i]
-                                               ACE_ENV_ARG_PARAMETER);
+            this->repos_->fully_describe_type (TT_Info::INTERFACE_NAMES[i]);
 
           if (this->verbose_)
             {
@@ -279,13 +271,12 @@ TAO_Service_Type_Exporter::fully_describe_all_types (void)
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "TAO_Service_Type_Exporter::fully_describe_all_types");
-      ACE_RE_THROW;
+      ex._tao_print_exception (
+        "TAO_Service_Type_Exporter::fully_describe_all_types");
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h
index ce9134fd85c..c11ae36f505 100644
--- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h
+++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h
@@ -24,8 +24,7 @@ class TAO_TTest_Export TAO_Service_Type_Exporter
 public:
 
   TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if,
-                             CORBA::Boolean verbose
-                             ACE_ENV_ARG_DECL)
+                             CORBA::Boolean verbose)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void remove_all_types (void)
@@ -85,8 +84,7 @@ private:
   void create_types (void);
   // Generate the service type description structures.
 
-  void add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos
-                         ACE_ENV_ARG_DECL)
+  void add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp
index c28feb6e4f3..b907db37a75 100644
--- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp
+++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp
@@ -16,8 +16,7 @@ TAO_Simple_Dynamic_Property<T>::TAO_Simple_Dynamic_Property (const T& dp)
 template <class T> CORBA::Any*
 TAO_Simple_Dynamic_Property<T>::evalDP (const char*,
                                         CORBA::TypeCode_ptr,
-                                        const CORBA::Any&
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+                                        const CORBA::Any&)
   ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure))
 {
   CORBA::Any* return_value = 0;
diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
index 0f7e395b8f5..d9b455df004 100644
--- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
+++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
@@ -33,7 +33,7 @@ public:
   virtual CORBA::Any* evalDP (const char* /* name */,
                               CORBA::TypeCode_ptr /* returned_type */,
                               const CORBA::Any& /* extra_info */
-                              ACE_ENV_ARG_DECL_NOT_USED)
+                              )
     ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure));
 
 private:
diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.cpp b/TAO/orbsvcs/tests/Trading/TT_Info.cpp
index 5864a3aae44..ac783c39186 100644
--- a/TAO/orbsvcs/tests/Trading/TT_Info.cpp
+++ b/TAO/orbsvcs/tests/Trading/TT_Info.cpp
@@ -143,8 +143,7 @@ const char* TT_Info::QUERIES[][3] =
 
 void
 TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq,
-                          CORBA::Boolean print_dynamic
-                          ACE_ENV_ARG_DECL)
+                          CORBA::Boolean print_dynamic)
 {
   TAO_Property_Evaluator prop_eval (prop_seq);
 
@@ -154,13 +153,13 @@ TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq,
       CORBA::Any* value = 0;
       CORBA::TypeCode_ptr tc = 0;
       ACE_DEBUG ((LM_DEBUG, "%-15s: ", prop_seq[k].name.in ()));
-      ACE_TRY
+      try
         {
           CORBA::Boolean is_dynamic = prop_eval.is_dynamic_property (k);
 
           if (print_dynamic || ! is_dynamic)
             {
-              value = prop_eval.property_value(k ACE_ENV_ARG_PARAMETER);
+              value = prop_eval.property_value(k);
 
               tc = value->type ();
             }
@@ -169,16 +168,15 @@ TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq,
               ACE_DEBUG ((LM_DEBUG, "Dynamic Property\n"));
             }
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           // @@ Seth, don't pass the exceptions back?
           ACE_DEBUG ((LM_DEBUG, "Error retrieving property value.\n"));
         }
-      ACE_ENDTRY;
 
       if (tc == 0)
         continue;
-      int check = tc->equal (TAO_Trader_Test::_tc_StringSeq ACE_ENV_ARG_PARAMETER);
+      int check = tc->equal (TAO_Trader_Test::_tc_StringSeq);
 
       if (check)
         {
@@ -192,7 +190,7 @@ TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq,
         }
       else
         {
-          check = tc->equal (TAO_Trader_Test::_tc_ULongSeq ACE_ENV_ARG_PARAMETER);
+          check = tc->equal (TAO_Trader_Test::_tc_ULongSeq);
 
           if (check)
             {
diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.h b/TAO/orbsvcs/tests/Trading/TT_Info.h
index 7146a4a1e86..76fdc207e07 100644
--- a/TAO/orbsvcs/tests/Trading/TT_Info.h
+++ b/TAO/orbsvcs/tests/Trading/TT_Info.h
@@ -16,8 +16,7 @@ class TAO_TTest_Export TT_Info
 public:
 
   static void dump_properties (const CosTrading::PropertySeq& prop_seq,
-                               CORBA::Boolean print_dynamic = 1
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                               CORBA::Boolean print_dynamic = 1);
   // Dump the contents of this property sequence.
 
   enum INTERFACES
diff --git a/TAO/orbsvcs/tests/Trading/colocated_test.cpp b/TAO/orbsvcs/tests/Trading/colocated_test.cpp
index aaacba20d2c..4b7a7dfb84f 100644
--- a/TAO/orbsvcs/tests/Trading/colocated_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/colocated_test.cpp
@@ -31,10 +31,10 @@ parse_args (int argc, char *argv[],
 int
 main (int argc, char** argv)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       TAO_ORB_Manager orb_manager;
-      orb_manager.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      orb_manager.init (argc, argv);
 
       // Command line argument interpretation.
       CORBA::Boolean verbose = 0;
@@ -56,8 +56,7 @@ main (int argc, char** argv)
       ACE_DEBUG ((LM_DEBUG, "*** Running the Service Type Exporter tests.\n"));
       TAO_Service_Type_Exporter type_exporter
         (CosTrading::Lookup::_duplicate (trd_comp.lookup_if ()),
-         verbose
-         ACE_ENV_ARG_PARAMETER);
+         verbose);
 
       type_exporter.remove_all_types ();
 
@@ -73,8 +72,7 @@ main (int argc, char** argv)
       ACE_DEBUG ((LM_DEBUG, "*** Running the Offer Exporter tests.\n"));
       TAO_Offer_Exporter offer_exporter
         (CosTrading::Lookup::_duplicate (trd_comp.lookup_if ()),
-         verbose
-         ACE_ENV_ARG_PARAMETER);
+         verbose);
 
       offer_exporter.withdraw_offers ();
 
@@ -103,11 +101,10 @@ main (int argc, char** argv)
 
       offer_importer.perform_queries ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "Trader Export Tests Failed"), -1);
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Trading/export_test.cpp b/TAO/orbsvcs/tests/Trading/export_test.cpp
index 0b57ae4128f..5dafa58c709 100644
--- a/TAO/orbsvcs/tests/Trading/export_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/export_test.cpp
@@ -15,10 +15,10 @@ ACE_RCSID (Trading,
 int
 main (int argc, char** argv)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       TAO_ORB_Manager orb_manager;
-      orb_manager.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      orb_manager.init (argc, argv);
 
       // Command line argument interpretation.
       TT_Parse_Args parse_args (argc, argv);
@@ -30,7 +30,7 @@ main (int argc, char** argv)
       char* ior = parse_args.ior ();
       CORBA::Object_var trading_obj = (ior == 0) ?
         orb->resolve_initial_references ("TradingService") :
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior);
 
       if (CORBA::is_nil (trading_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -40,13 +40,12 @@ main (int argc, char** argv)
       // Narrow the lookup interface.
       ACE_DEBUG ((LM_DEBUG, "*** Narrowing the lookup interface.\n"));
       CosTrading::Lookup_var lookup_if =
-        CosTrading::Lookup::_narrow (trading_obj.in () ACE_ENV_ARG_PARAMETER);
+        CosTrading::Lookup::_narrow (trading_obj.in ());
 
       // Run the Service Type Exporter tests
       ACE_DEBUG ((LM_DEBUG, "*** Running the Service Type Exporter tests.\n"));
       TAO_Service_Type_Exporter type_exporter (lookup_if.in (),
-                                               ! parse_args.quiet ()
-                                               ACE_ENV_ARG_PARAMETER);
+                                               ! parse_args.quiet ());
 
       type_exporter.remove_all_types ();
 
@@ -71,7 +70,7 @@ main (int argc, char** argv)
 
       // Run the Offer Exporter tests
       ACE_DEBUG ((LM_DEBUG, "*** Running the Offer Exporter tests.\n"));
-      TAO_Offer_Exporter offer_exporter (lookup_if.in (), ! parse_args.quiet () ACE_ENV_ARG_PARAMETER);
+      TAO_Offer_Exporter offer_exporter (lookup_if.in (), ! parse_args.quiet ());
 
       // = Test series.
 
@@ -123,11 +122,10 @@ main (int argc, char** argv)
 
       orb_manager.run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_ERROR_RETURN ((LM_ERROR, "Trader Export Tests Failed"), -1);
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Trading/import_test.cpp b/TAO/orbsvcs/tests/Trading/import_test.cpp
index b0bd73e7fb1..b2b99b605df 100644
--- a/TAO/orbsvcs/tests/Trading/import_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/import_test.cpp
@@ -8,10 +8,10 @@ ACE_RCSID(Trading, import_test, "$Id$")
 int
 main (int argc, char** argv)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       TAO_ORB_Manager orb_manager;
-      orb_manager.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      orb_manager.init (argc, argv);
 
       // Command line argument interpretation.
       TT_Parse_Args parse_args (argc, argv);
@@ -22,7 +22,7 @@ main (int argc, char** argv)
       char* ior = parse_args.ior ();
       CORBA::Object_var trading_obj = (ior == 0) ?
         orb->resolve_initial_references ("TradingService") :
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior);
 
       if (CORBA::is_nil (trading_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -32,7 +32,7 @@ main (int argc, char** argv)
       // Narrow the lookup interface.
       ACE_DEBUG ((LM_DEBUG, "*** Narrowing the lookup interface.\n"));
       CosTrading::Lookup_var lookup_if =
-        CosTrading::Lookup::_narrow (trading_obj.in () ACE_ENV_ARG_PARAMETER);
+        CosTrading::Lookup::_narrow (trading_obj.in ());
 
       // Run the Offer Importer tests
       ACE_DEBUG ((LM_DEBUG, "*** Running the Offer Importer tests.\n"));
@@ -45,11 +45,10 @@ main (int argc, char** argv)
           offer_importer.perform_directed_queries ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_ERROR_RETURN ((LM_ERROR, "Trader Import Tests Failed."), -1);
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/ior_corbaname/client.cpp b/TAO/orbsvcs/tests/ior_corbaname/client.cpp
index b33efd88c51..40a0e221060 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/client.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/client.cpp
@@ -24,8 +24,7 @@
 int main (int argc, char *argv [])
 {
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       IOR_corbaname_Client_i client;
 
@@ -36,10 +35,9 @@ int main (int argc, char *argv [])
           return client.run ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "client");
+      ex._tao_print_exception ("client");
     }
-  ACE_ENDTRY;
   return 1;
 }
diff --git a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp
index bc6109a41b7..421c80f8d30 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp
@@ -38,7 +38,7 @@ int
 IOR_corbaname_Client_i::run (void)
 {
 
-  ACE_TRY
+  try
     {
       CosNaming::Name name (1);
 
@@ -63,12 +63,11 @@ IOR_corbaname_Client_i::run (void)
 
       // Resolve the stringified name.
       CORBA::Object_var factory_object =
-        this->orb_->string_to_object (corbaname_url.c_str ()
-                                      ACE_ENV_ARG_PARAMETER);
+        this->orb_->string_to_object (corbaname_url.c_str ());
 
       // Narrow
       corbaname::Status_var factory =
-        corbaname::Status::_narrow (factory_object.in () ACE_ENV_ARG_PARAMETER);
+        corbaname::Status::_narrow (factory_object.in ());
 
       if (CORBA::is_nil (factory.in ()))
         {
@@ -89,21 +88,20 @@ IOR_corbaname_Client_i::run (void)
                       0));
         }
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+  catch (const CosNaming::NamingContext::NotFound& ex)
     {
-      ACE_PRINT_EXCEPTION (ex, "CosNaming::NamingContext::NotFound");
+      ex._tao_print_exception ("CosNaming::NamingContext::NotFound");
     }
-  ACE_CATCH (CORBA::SystemException, ex)
+  catch (const CORBA::SystemException& ex)
     {
-      ACE_PRINT_EXCEPTION (ex, "A system exception on client side");
+      ex._tao_print_exception ("A system exception on client side");
       return -1;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "client");
+      ex._tao_print_exception ("client");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -114,8 +112,7 @@ IOR_corbaname_Client_i::init (int argc, char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
 
       // First initialize the ORB, that will remove some arguments...
@@ -123,7 +120,7 @@ IOR_corbaname_Client_i::init (int argc, char **argv)
         CORBA::ORB_init (this->argc_,
                          this->argv_,
                          "" /* the ORB name, it can be anything! */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 
       // There must be at least one argument, the file that has to be
       // retrieved
@@ -134,12 +131,11 @@ IOR_corbaname_Client_i::init (int argc, char **argv)
                            -1);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "client");
+      ex._tao_print_exception ("client");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/ior_corbaname/server.cpp b/TAO/orbsvcs/tests/ior_corbaname/server.cpp
index b4668dbcc34..8106ca49e23 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/server.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/server.cpp
@@ -5,23 +5,22 @@
 
 int main (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
 
       // First initialize the ORB, that will remove some arguments...
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv,
                          "" /* the ORB name, it can be anything! */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 
       // Get a reference to the RootPOA
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
 
       // Narrow down to the correct reference
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       // Set a POA Manager
       PortableServer::POAManager_var poa_manager =
@@ -39,12 +38,11 @@ int main (int argc, char* argv[])
 
       // Get a reference to Naming Context
       CORBA::Object_var naming_context_object =
-        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("NameService");
 
       // Narrow down the reference
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_context_object.in()
-                                           ACE_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (naming_context_object.in());
 
       // Bind Status to the Naming Context
       CosNaming::Name name (1);
@@ -52,8 +50,7 @@ int main (int argc, char* argv[])
       name[0].id = CORBA::string_dup ("STATUS");
 
       naming_context->bind (name,
-                            status.in ()
-                            ACE_ENV_ARG_PARAMETER);
+                            status.in ());
 
       // Run the orb
       orb->run ();
@@ -63,11 +60,10 @@ int main (int argc, char* argv[])
       orb->destroy ();
 
     }
-  ACE_CATCH (CORBA::SystemException, ex)
+  catch (const CORBA::SystemException& ex)
     {
-      ACE_PRINT_EXCEPTION (ex, "CORBA exception raised in server!");
+      ex._tao_print_exception ("CORBA exception raised in server!");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp
index 4dddd2dff48..31338b4d59d 100644
--- a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp
+++ b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp
@@ -39,12 +39,11 @@ ACE_RCSID (tests_svc_loader,
 int main (int argc, char *argv [])
 {
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // First initialize the ORB, that will remove some arguments...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, 0);
 
       // There must be at least one argument, the file that has to be
       // retrieved
@@ -59,7 +58,7 @@ int main (int argc, char *argv [])
 
       // Use the first argument to create the object reference.
       CORBA::Object_var object =
-        orb->string_to_object (argv[1] ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object (argv[1]);
 
       // Check if this object reference is a valid one..
       CORBA::Boolean not_exists =
@@ -79,12 +78,11 @@ int main (int argc, char *argv [])
         }
 
     }
-  ACE_CATCH (CORBA::SystemException ,e)
+  catch (const CORBA::SystemException& e)
     {
       ACE_DEBUG ((LM_ERROR,
                   "CORBA System Exception Raised!\n"));
     }
-  ACE_ENDTRY;
 
   return 0;
 }