Wed Jan 24 14:00:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

48 files changed, 316 insertions, 1159 deletions

diff --git a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp
index 8dd1103b673..89a29ffbc1f 100644
--- a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp
+++ b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp
@@ -29,39 +29,29 @@ int main(int, char**)
       int argc = 0;
       CORBA::ORB_var orb1 =
                     CORBA::ORB_init(argc, 0, "orb1" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       CORBA::ORB_var orb2 =
                     CORBA::ORB_init(argc, 0, "orb2" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       CORBA::Object_var poaObj_var =
                     orb1->resolve_initial_references ("RootPOA"
                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       PortableServer::POA_var rootPoa =
                     PortableServer::POA::_narrow (poaObj_var.in ()
                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       PortableServer::POAManager_var poaManager =
-                    rootPoa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                    rootPoa->the_POAManager ();
 
       CORBA::Object_var poaObj_var2 =
                     orb2->resolve_initial_references ("RootPOA"
                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       PortableServer::POA_var rootPoa2 =
                     PortableServer::POA::_narrow (poaObj_var2.in ()
                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       PortableServer::POAManager_var poaManager2 =
-                    rootPoa2->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                    rootPoa2->the_POAManager ();
 
-      poaManager2->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poaManager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poaManager2->activate ();
+      poaManager->activate ();
 
       TestMonitorable_i* monitorable_i = 0;
       ACE_NEW_RETURN (monitorable_i, TestMonitorable_i, 1);
@@ -74,28 +64,22 @@ int main(int, char**)
       PortableServer::ObjectId_var monitorableId1_var =
                     rootPoa->activate_object (monitorable_var.in ()
                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       CORBA::Object_var obj1 =
                     rootPoa->id_to_reference (monitorableId1_var.in ()
                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       Arch_Idl::Monitorable_var monitorable1 =
                     Arch_Idl::Monitorable::_narrow (obj1.in ()
                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       PortableServer::ObjectId_var monitorableId2_var =
                     rootPoa2->activate_object (m2_var.in ()
                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       CORBA::Object_var obj2 =
                     rootPoa2->id_to_reference (monitorableId2_var.in ()
                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       Arch_Idl::Monitorable_var monitorable2 =
                     Arch_Idl::Monitorable::_narrow (obj2.in ()
                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
diff --git a/TAO/tests/RTCORBA/Banded_Connections/client.cpp b/TAO/tests/RTCORBA/Banded_Connections/client.cpp
index 248fb4b0f2e..7e724bdff8f 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/client.cpp
+++ b/TAO/tests/RTCORBA/Banded_Connections/client.cpp
@@ -49,17 +49,14 @@ get_server_priority (Test_ptr server
   CORBA::Policy_var policy =
     server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE
                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   // Narrow down to correct type.
   RTCORBA::PriorityModelPolicy_var priority_policy =
     RTCORBA::PriorityModelPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   // Make sure that we have the SERVER_DECLARED priority model.
   RTCORBA::PriorityModel priority_model =
-    priority_policy->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    priority_policy->priority_model ();
   if (priority_model != RTCORBA::SERVER_DECLARED)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "ERROR: priority_model != "
@@ -67,7 +64,7 @@ get_server_priority (Test_ptr server
                       -1);
 
   // Return the server priority.
-  return priority_policy->server_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return priority_policy->server_priority ();
 }
 
 void
@@ -81,7 +78,6 @@ invocation_exception_test (Test_ptr obj,
       obj->test_method (1,
                         priority
                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // This next line of code should not run because an exception
       // should have been raised.
@@ -100,7 +96,6 @@ invocation_exception_test (Test_ptr obj,
       ACE_RE_THROW;
     }
   ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 class Task : public ACE_Task_Base
@@ -132,42 +127,34 @@ Task::svc (void)
       CORBA::Object_var object =
         this->orb_->resolve_initial_references ("RTORB"
                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       RTCORBA::RTORB_var rt_orb =
         RTCORBA::RTORB::_narrow (object.in ()
                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Get the RTCurrent.
       object =
         this->orb_->resolve_initial_references ("RTCurrent"
                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       RTCORBA::Current_var current =
         RTCORBA::Current::_narrow (object.in ()
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Test object 1 (with CLIENT_PROPAGATED priority model).
       object =
         this->orb_->string_to_object (ior1
                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       Test_var client_propagated_obj =
         Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Test object 2 (with SERVER_DECLARED priority model).
       object = this->orb_->string_to_object (ior2
                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       Test_var server_declared_obj =
         Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Test: Attempt to set priority bands that do not match server
       // resource configuration on the <client_propagated_obj>.
@@ -187,7 +174,6 @@ Task::svc (void)
       policies[0] =
         rt_orb->create_priority_banded_connection_policy (false_bands
                                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Set false bands at the object level.  Note that a new object
       // is returned.
@@ -195,24 +181,20 @@ Task::svc (void)
         client_propagated_obj->_set_policy_overrides (policies,
                                                       CORBA::SET_OVERRIDE
                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       client_propagated_obj =
         Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Invoking on this object with false bands should produce an
       // exception.
       invocation_exception_test (client_propagated_obj.in (),
                                  0
                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Get the correct bands from the <server_declared_obj>.
       policies[0] =
         server_declared_obj->_get_policy (RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE
                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       RTCORBA::PriorityBandedConnectionPolicy_var bands_policy =
         RTCORBA::PriorityBandedConnectionPolicy::_narrow (policies[0]);
@@ -226,12 +208,10 @@ Task::svc (void)
         client_propagated_obj->_set_policy_overrides (policies,
                                                       CORBA::SET_OVERRIDE
                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Overwrite existing <client_propagated_obj>.
       client_propagated_obj =
         Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Test: Attempt invocation on <client_propagated_obj> with
       // client thread priority not matching any of the bands.  Should
@@ -247,14 +227,12 @@ Task::svc (void)
       // Reset the current thread's priority.
       current->the_priority (client_priority
                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Invoking on this object with an invalid client thread
       // priority should produce an exception.
       invocation_exception_test (client_propagated_obj.in (),
                                  client_priority
                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Test: Make invocations on the <client_propagated_obj>.
       ACE_DEBUG ((LM_DEBUG,
@@ -272,13 +250,11 @@ Task::svc (void)
           // Reset the current thread's priority.
           current->the_priority (client_priority
                                  ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           // Invoke test method on server.
           client_propagated_obj->test_method (1, // CLIENT_PROPAGATED
                                               client_priority
                                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
         }
 
       // Test: Attempt invocation with the same thread priority, but
@@ -290,17 +266,14 @@ Task::svc (void)
       CORBA::Short server_priority =
         get_server_priority (server_declared_obj.in ()
                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Invoke test method on server.
       server_declared_obj->test_method (0, // SERVER_DECLARED
                                         server_priority
                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Testing over. Shut down Server ORB.
-      server_declared_obj->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server_declared_obj->shutdown ();
     }
   ACE_CATCHANY
     {
@@ -324,7 +297,6 @@ main (int argc, char *argv[])
                          argv,
                          ""
                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Parse arguments.
       int result =
diff --git a/TAO/tests/RTCORBA/Banded_Connections/server.cpp b/TAO/tests/RTCORBA/Banded_Connections/server.cpp
index b45fef9cba9..ece7dea038e 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/server.cpp
+++ b/TAO/tests/RTCORBA/Banded_Connections/server.cpp
@@ -19,7 +19,7 @@ public:
                     ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -39,12 +39,10 @@ Test_i::Test_i (CORBA::ORB_ptr orb,
   CORBA::Object_var obj =
     this->orb_->resolve_initial_references ("RTCurrent"
                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   this->rt_current_ =
     RTCORBA::Current::_narrow (obj.in ()
                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 void
@@ -55,8 +53,7 @@ Test_i::test_method (CORBA::Boolean client_propagated,
 {
   // Get the upcall thread's priority.
   CORBA::Short server_priority =
-    this->rt_current_->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->rt_current_->the_priority ();
 
   // Check which policy we are dealing with.
   if (!client_propagated)
@@ -116,12 +113,11 @@ Test_i::test_method (CORBA::Boolean client_propagated,
 }
 
 void
-Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Test_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0
                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 //*************************************************************************
@@ -239,19 +235,16 @@ create_object (PortableServer::POA_ptr poa,
   PortableServer::ObjectId_var id;
   id = poa->activate_object (server_impl
                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   // Create object reference.
   CORBA::Object_var server =
     poa->id_to_reference (id.in ()
                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   // Print out the IOR.
   CORBA::String_var ior =
     orb->object_to_string (server.in ()
                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   // Print ior to the file.
   if (filename != 0)
@@ -285,7 +278,6 @@ object_activation_exception_test (RTPortableServer::POA_ptr poa,
         poa->activate_object_with_priority (server_impl,
                                             priority
                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // This next line of code should not run because an exception
       // should have been raised.
@@ -304,7 +296,6 @@ object_activation_exception_test (RTPortableServer::POA_ptr poa,
       ACE_RE_THROW;
     }
   ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
@@ -321,7 +312,6 @@ poa_creation_exception_test (PortableServer::POA_ptr root_poa,
                               manager,
                               policies
                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // This next line of code should not run because an exception
       // should have been raised.
@@ -340,7 +330,6 @@ poa_creation_exception_test (PortableServer::POA_ptr root_poa,
       ACE_RE_THROW;
     }
   ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 int
@@ -356,7 +345,6 @@ main (int argc, char *argv[])
                          argv,
                          ""
                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Parse arguments.
       int result =
@@ -374,27 +362,22 @@ main (int argc, char *argv[])
       CORBA::Object_var object =
         orb->resolve_initial_references ("RTORB"
                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       RTCORBA::RTORB_var rt_orb =
         RTCORBA::RTORB::_narrow (object.in ()
                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Get the RootPOA.
       object =
         orb->resolve_initial_references ("RootPOA"
                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Get the POA Manager.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       // Obtain priority bands to be used in this test from the file
       // specified by the user.
@@ -440,7 +423,6 @@ main (int argc, char *argv[])
                                               max_buffered_requests,
                                               max_request_buffer_size
                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Test: Attempt to create a POA with priority bands that do not
       // match the lanes.  Should get POA::InvalidPolicy exception.
@@ -459,13 +441,11 @@ main (int argc, char *argv[])
       poa_policy_list[0] =
         rt_orb->create_priority_banded_connection_policy (false_bands
                                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Create a thread-pool policy.
       poa_policy_list[1] =
         rt_orb->create_threadpool_policy (threadpool_id
                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Try to create a POA with invalid policies.  Should throw an
       // exception.
@@ -473,7 +453,6 @@ main (int argc, char *argv[])
                                    poa_manager.in (),
                                    poa_policy_list
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Two policies for the next POA.
       poa_policy_list.length (2);
@@ -483,13 +462,11 @@ main (int argc, char *argv[])
         rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
                                               0
                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Create a thread-pool policy.
       poa_policy_list[1] =
         rt_orb->create_threadpool_policy (threadpool_id
                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Create POA with CLIENT_PROPAGATED priority model, with lanes
       // but no bands.
@@ -498,7 +475,6 @@ main (int argc, char *argv[])
                               poa_manager.in (),
                               poa_policy_list
                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Three policies for the next POA.
       poa_policy_list.length (3);
@@ -512,19 +488,16 @@ main (int argc, char *argv[])
         rt_orb->create_priority_model_policy (RTCORBA::SERVER_DECLARED,
                                               poa_priority
                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Create a bands policy.
       poa_policy_list[1] =
         rt_orb->create_priority_banded_connection_policy (bands
                                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Create a thread-pool policy.
       poa_policy_list[2] =
         rt_orb->create_threadpool_policy (threadpool_id
                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Create POA with SERVER_DECLARED priority model, with bands
       // and lanes.
@@ -533,7 +506,6 @@ main (int argc, char *argv[])
                               poa_manager.in (),
                               poa_policy_list
                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Test: Attempt to register an object with priority that
       // doesn't match lanes.  Should get BAD_PARAM exception.
@@ -542,7 +514,6 @@ main (int argc, char *argv[])
 
       RTPortableServer::POA_var rt_server_declared_poa =
         RTPortableServer::POA::_narrow (server_declared_poa.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Activation with incorrect priority should fail.
       CORBA::Short wrong_priority = 10000;
@@ -550,19 +521,16 @@ main (int argc, char *argv[])
                                         0,
                                         wrong_priority
                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Create first servant and register with <client_propagated_poa>.
       Test_i server_impl (orb.in (),
                           bands
                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       result = create_object (client_propagated_poa.in (),
                               orb.in (),
                               &server_impl,
                               ior_output_file1
                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (result != 0)
         return result;
 
@@ -570,27 +538,22 @@ main (int argc, char *argv[])
       Test_i server_impl2 (orb.in (),
                            bands
                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       result = create_object (server_declared_poa.in (),
                               orb.in (),
                               &server_impl2,
                               ior_output_file2
                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (result != 0)
         return result;
 
       // Activate POA manager.
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // Run ORB.
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       // Destroy ORB.
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
   ACE_CATCH (CORBA::INTERNAL, exception)
     {
diff --git a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp
index d57bc36ba7f..d2efbb0bec5 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp
@@ -28,8 +28,7 @@ Client_ORBInitializer::post_init (
 {
 
   CORBA::String_var orb_id =
-    info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    info->orb_id ();
 
   PortableInterceptor::ClientRequestInterceptor_ptr interceptor =
     PortableInterceptor::ClientRequestInterceptor::_nil ();
@@ -38,13 +37,11 @@ Client_ORBInitializer::post_init (
   ACE_NEW_THROW_EX (interceptor,
                     Client_Request_Interceptor (orb_id.in ()),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   PortableInterceptor::ClientRequestInterceptor_var
     client_interceptor = interceptor;
 
   info->add_client_request_interceptor (client_interceptor.in ()
                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
diff --git a/TAO/tests/RTCORBA/Client_Propagated/client.cpp b/TAO/tests/RTCORBA/Client_Propagated/client.cpp
index dc1fe8657cd..8716992f0a0 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/client.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/client.cpp
@@ -64,11 +64,9 @@ Task::svc (void)
     {
       CORBA::Object_var object =
         this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       Test_var server =
         Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -83,11 +81,9 @@ Task::svc (void)
       CORBA::Policy_var policy =
         server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE
                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       RTCORBA::PriorityModelPolicy_var priority_policy =
         RTCORBA::PriorityModelPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (priority_policy.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -95,8 +91,7 @@ Task::svc (void)
                           -1);
 
       RTCORBA::PriorityModel priority_model =
-        priority_policy->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        priority_policy->priority_model ();
 
       if (priority_model != RTCORBA::CLIENT_PROPAGATED)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -108,18 +103,14 @@ Task::svc (void)
       // for each.
       object =
         this->orb_->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       RTCORBA::Current_var current =
         RTCORBA::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       object = this->orb_->resolve_initial_references ("PriorityMappingManager"
                                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       RTCORBA::PriorityMappingManager_var mapping_manager =
         RTCORBA::PriorityMappingManager::_narrow (object.in ()
                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       RTCORBA::PriorityMapping *pm =
         mapping_manager->mapping ();
@@ -146,11 +137,9 @@ Task::svc (void)
       for (int i = 0; i < 3; ++i)
         {
           current->the_priority (desired_priority ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           CORBA::Short priority =
-            current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            current->the_priority ();
 
           if (desired_priority != priority)
             ACE_ERROR_RETURN ((LM_ERROR,
@@ -160,14 +149,12 @@ Task::svc (void)
 
 
           server->test_method (priority ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           desired_priority++;
         }
 
       // Shut down Server ORB.
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
     }
   ACE_CATCH (CORBA::DATA_CONVERSION, ex)
     {
@@ -204,12 +191,10 @@ main (int argc, char *argv[])
 
       PortableInterceptor::register_orb_initializer (initializer.in ()
                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Initialize and obtain reference to the Test object.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return -1;
diff --git a/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp b/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp
index bd250e433e7..a53b6cd45ef 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp
@@ -20,14 +20,14 @@ Client_Request_Interceptor::~Client_Request_Interceptor (void)
 }
 
 char *
-Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Client_Request_Interceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Client_Request_Interceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -64,7 +64,6 @@ Client_Request_Interceptor::receive_reply (
       // report the fact via an exception.
       IOP::ServiceContext_var sc =
         ri->get_reply_service_context (IOP::RTCorbaPriority ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -102,18 +101,14 @@ Client_Request_Interceptor::receive_exception (
       this->orb_ = CORBA::ORB_init (argc, 0,
                                     this->orb_id_.in ()
                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
     }
 
-  CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var operation = ri->operation ();
 
-  CORBA::Object_var target = ri->target (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Object_var target = ri->target ();
 
   CORBA::String_var ior =
     this->orb_->object_to_string (target.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
               "%s.received_exception "
@@ -121,11 +116,9 @@ Client_Request_Interceptor::receive_exception (
               this->myname_,
               operation.in (),
               ior.in ()));
-  ACE_CHECK;
 
   // Try to get the RTCorbaPriority context.  If its not there,
   // report the fact via an exception.
   IOP::ServiceContext_var sc =
     ri->get_reply_service_context (IOP::RTCorbaPriority ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
diff --git a/TAO/tests/RTCORBA/Client_Propagated/interceptors.h b/TAO/tests/RTCORBA/Client_Propagated/interceptors.h
index 414fa636345..9f4118b2dd7 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/interceptors.h
+++ b/TAO/tests/RTCORBA/Client_Propagated/interceptors.h
@@ -32,11 +32,11 @@ public:
   virtual ~Client_Request_Interceptor ();
   // dtor.
 
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Canonical name of the interceptor.
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr
diff --git a/TAO/tests/RTCORBA/Client_Propagated/server.cpp b/TAO/tests/RTCORBA/Client_Propagated/server.cpp
index 463429c1312..4faab819821 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/server.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/server.cpp
@@ -22,7 +22,7 @@ public:
                     ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -45,18 +45,15 @@ Test_i::test_method (CORBA::Short priority
 
   CORBA::Object_var obj =
     this->orb_->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   RTCORBA::Current_var current =
     RTCORBA::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   if (CORBA::is_nil (obj.in ()))
     ACE_THROW (CORBA::INTERNAL ());
 
   CORBA::Short servant_thread_priority =
-    current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    current->the_priority ();
 
   // Print out the info.
   if (servant_thread_priority != priority)
@@ -71,7 +68,7 @@ Test_i::test_method (CORBA::Short priority
 }
 
 void
-Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Test_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
@@ -135,11 +132,9 @@ Task::svc (void)
     {
       CORBA::Object_var object =
         this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -147,21 +142,16 @@ Task::svc (void)
                           -1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       object = this->orb_->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ()
                                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       object =
         this->orb_->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       RTCORBA::Current_var current =
         RTCORBA::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Create POA with CLIENT_PROPAGATED PriorityModelPolicy,
       // and register Test object with it.
@@ -171,30 +161,25 @@ Task::svc (void)
         rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
                                               0
                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("Child_POA",
                               poa_manager.in (),
                               poa_policy_list
                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       Test_i server_impl (this->orb_.in ());
 
       PortableServer::ObjectId_var id =
         child_poa->activate_object (&server_impl ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       CORBA::Object_var server =
         child_poa->id_to_reference (id.in ()
                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Print Object IOR.
       CORBA::String_var ior =
         this->orb_->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n\n", ior.in ()));
 
@@ -212,22 +197,18 @@ Task::svc (void)
 
       // Get the initial priority of the current thread.
       CORBA::Short initial_thread_priority =
-        current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        current->the_priority ();
 
       // Run ORB Event loop.
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
 
       ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n"));
 
       // Get the final priority of the current thread.
       CORBA::Short final_thread_priority =
-        current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        current->the_priority ();
 
       if (final_thread_priority != initial_thread_priority)
         ACE_DEBUG ((LM_DEBUG,
@@ -262,7 +243,6 @@ main (int argc, char *argv[])
       // RootPOA, RTORB, RTCurrent, POAManager).
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return -1;
diff --git a/TAO/tests/RTCORBA/Client_Protocol/client.cpp b/TAO/tests/RTCORBA/Client_Protocol/client.cpp
index 2ef31055c8f..3fd1935a8d9 100644
--- a/TAO/tests/RTCORBA/Client_Protocol/client.cpp
+++ b/TAO/tests/RTCORBA/Client_Protocol/client.cpp
@@ -69,8 +69,7 @@ exception_test (Test_ptr server,
 {
   ACE_TRY
     {
-      server->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->test_method ();
     }
   ACE_CATCH (CORBA::INV_POLICY, ex)
     {
@@ -83,7 +82,6 @@ exception_test (Test_ptr server,
       ACE_RE_THROW;
     }
   ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 int
@@ -96,7 +94,6 @@ main (int argc, char *argv[])
       // ORB.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Parse arguments.
       if (parse_args (argc, argv) != 0)
@@ -105,20 +102,16 @@ main (int argc, char *argv[])
       // RTORB.
       CORBA::Object_var object =
         orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ()
                                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (check_for_nil (rt_orb.in (), "RTORB") == -1)
         return -1;
 
       // PolicyManager.
       object = orb->resolve_initial_references ("ORBPolicyManager"
                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       CORBA::PolicyManager_var policy_manager =
         CORBA::PolicyManager::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (check_for_nil (policy_manager.in (), "PolicyManager")
           == -1)
         return -1;
@@ -126,27 +119,21 @@ main (int argc, char *argv[])
       // PolicyCurrent.
       object = orb->resolve_initial_references ("PolicyCurrent"
                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       CORBA::PolicyCurrent_var policy_current =
         CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (check_for_nil (policy_current.in (), "PolicyCurrent")
           == -1)
         return -1;
 
       // Test object 1 (ClientProtocolPolicy set on server).
       object = orb->string_to_object (ior1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       Test_var server1 = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (check_for_nil (server1.in (), "server1") == -1)
         return -1;
 
       // Test object 2 (no client-exposed ClientProtocolPolicy).
       object = orb->string_to_object (ior2 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       Test_var server2 = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (check_for_nil (server2.in (), "server2") == -1)
         return -1;
 
@@ -156,8 +143,7 @@ main (int argc, char *argv[])
       // ClientProtocolPolicy set on the server side.
       ACE_DEBUG ((LM_DEBUG,
                   "\n     Test 1\n"));
-      server1->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server1->test_method ();
 
       // Test 2: Set the ORB-level ClientProtocolPolicy override, and
       // attempt the same invocation again.  Should get
@@ -178,16 +164,13 @@ main (int argc, char *argv[])
       policy_list[0] =
         rt_orb->create_client_protocol_policy (protocols
                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       policy_manager->set_policy_overrides (policy_list,
                                             CORBA::SET_OVERRIDE
                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       exception_test (server1.in (),
                       "ERROR: Test 2 failed\n" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Test 3: Attempt the invocation on the second object reference
       // (the one that didn't have ClientProtocolPolicy set on the
@@ -195,8 +178,7 @@ main (int argc, char *argv[])
       // conflicts.
       ACE_DEBUG ((LM_DEBUG,
                   "\n     Test 3\n"));
-      server2->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server2->test_method ();
 
       // Test 4: Override ClientProtocolPolicy on the Current level.
       // For the override value, use the sequence of protocols, none
@@ -214,16 +196,13 @@ main (int argc, char *argv[])
       policy_list[0] =
         rt_orb->create_client_protocol_policy (protocols
                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       policy_current->set_policy_overrides (policy_list,
                                             CORBA::SET_OVERRIDE
                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       exception_test (server2.in (),
                       "ERROR: Test 4 failed\n" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Test 5: Override ClientProtocolPolicy on the Current level
       // again.  This time use the sequence in which the first
@@ -237,21 +216,17 @@ main (int argc, char *argv[])
       policy_list[0] =
         rt_orb->create_client_protocol_policy (protocols
                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       policy_current->set_policy_overrides (policy_list,
                                             CORBA::SET_OVERRIDE
                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
-      server2->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server2->test_method ();
 
       // Testing over.  Shut down server ORB.
       ACE_DEBUG ((LM_DEBUG,
                   "\n     Testing over\n"));
-      server2->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server2->shutdown ();
 
       // Needed for SHMIOP to work fine. Please dont remove. Please
       // see Bug 1197  for details.
diff --git a/TAO/tests/RTCORBA/Client_Protocol/server.cpp b/TAO/tests/RTCORBA/Client_Protocol/server.cpp
index 6b4cc59125f..66a6c7f0538 100644
--- a/TAO/tests/RTCORBA/Client_Protocol/server.cpp
+++ b/TAO/tests/RTCORBA/Client_Protocol/server.cpp
@@ -16,10 +16,10 @@ public:
   Test_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void test_method (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -41,7 +41,7 @@ Test_i::test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAM
 }
 
 void
-Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Test_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -120,17 +120,14 @@ create_object (PortableServer::POA_ptr poa,
   // Register with poa.
   PortableServer::ObjectId_var id =
     poa->activate_object (server_impl ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   CORBA::Object_var server =
     poa->id_to_reference (id.in ()
                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   // Print out the IOR.
   CORBA::String_var ior =
     orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG, "<%s>\n\n", ior.in ()));
 
@@ -158,7 +155,6 @@ main (int argc, char *argv[])
       // ORB.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Parse arguments.
       if (parse_args (argc, argv) != 0)
@@ -167,27 +163,22 @@ main (int argc, char *argv[])
       // RTORB.
       CORBA::Object_var object =
         orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ()
                                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (check_for_nil (rt_orb.in (), "RTORB") == -1)
         return -1;
 
       // RootPOA.
       object =
         orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (check_for_nil (root_poa.in (), "RootPOA") == -1)
         return -1;
 
       // POAManager.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       // Create child POA with RTCORBA::ClientProtocolPolicy set.
       RTCORBA::ProtocolList protocols;
@@ -205,14 +196,12 @@ main (int argc, char *argv[])
       poa_policy_list[0] =
         rt_orb->create_client_protocol_policy (protocols
                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       PortableServer::POA_var poa =
         root_poa->create_POA ("Child_POA",
                               poa_manager.in (),
                               poa_policy_list
                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Servant.
       Test_i server_impl (orb.in ());
@@ -222,7 +211,6 @@ main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG, "\nActivated object one as "));
       result = create_object (poa.in (), orb.in (), &server_impl,
                               ior_output_file1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (result == -1)
         return -1;
 
@@ -230,16 +218,13 @@ main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG, "\nActivated object two as "));
       result = create_object (root_poa.in (), orb.in (), &server_impl,
                               ior_output_file2 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (result == -1)
         return -1;
 
       // Run ORB Event loop.
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n\n"));
     }
diff --git a/TAO/tests/RTCORBA/Collocation/Collocation.cpp b/TAO/tests/RTCORBA/Collocation/Collocation.cpp
index fa40bd0ca34..73d2e5eb3c6 100644
--- a/TAO/tests/RTCORBA/Collocation/Collocation.cpp
+++ b/TAO/tests/RTCORBA/Collocation/Collocation.cpp
@@ -37,13 +37,13 @@ public:
           Tests &tests
           ACE_ENV_ARG_DECL);
 
-  void start (ACE_ENV_SINGLE_ARG_DECL)
+  void start (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void method (ACE_ENV_SINGLE_ARG_DECL)
+  void method (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+  PortableServer::POA_ptr _default_POA (void);
 
   int client_propagated (void);
 
@@ -113,12 +113,10 @@ test_i::test_i (CORBA::ORB_ptr orb,
   CORBA::Object_var object =
     this->orb_->resolve_initial_references ("RTCurrent"
                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   this->current_ =
     RTCORBA::Current::_narrow (object.in ()
                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 int
@@ -214,7 +212,7 @@ test_i::invocation_priority (RTCORBA::Priority invocation_priority)
 }
 
 void
-test_i::start (ACE_ENV_SINGLE_ARG_DECL)
+test_i::start (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -235,28 +233,22 @@ test_i::start (ACE_ENV_SINGLE_ARG_DECL)
                              this->current_.in (),
                              this->orb_.in ()
                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
 
-      test->object_->method (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      test->object_->method ();
 
       CORBA::String_var ior =
         this->orb_->object_to_string (test->object_.in ()
                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
 
       CORBA::Object_var object =
         this->orb_->string_to_object (ior.in ()
                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
 
       test_var test_from_string =
         test::_narrow (object.in ()
                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
 
-      test_from_string->method (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      test_from_string->method ();
 
       iterator.advance ();
     }
@@ -304,14 +296,14 @@ test_i::thread_info (const char *method_name)
 }
 
 void
-test_i::method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::method (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->thread_info ("test_i::method");
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -323,8 +315,7 @@ setup_test_parameters (Test_Object_And_Servant *test,
                        ACE_ENV_ARG_DECL)
 {
   CORBA::Short current_thread_priority =
-    current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    current->the_priority ();
 
   if (!test->servant_->serviced_by_rt_tp () ||
       test->servant_->client_propagated ())
@@ -377,7 +368,7 @@ public:
   Server (CORBA::ORB_ptr orb
           ACE_ENV_ARG_DECL);
 
-  void create_servant_in_root_poa (ACE_ENV_SINGLE_ARG_DECL);
+  void create_servant_in_root_poa (void);
   void create_poa_and_servant_with_tp_policy (const char *poa_name,
                                               int set_priority_model,
                                               RTCORBA::PriorityModel priority_model
@@ -385,9 +376,9 @@ public:
   void create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name,
                                                          RTCORBA::PriorityModel priority_model
                                                          ACE_ENV_ARG_DECL);
-  void test (ACE_ENV_SINGLE_ARG_DECL);
-  void start_testing (ACE_ENV_SINGLE_ARG_DECL);
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  void test (void);
+  void start_testing (void);
+  void shutdown (void);
 
   CORBA::ORB_var orb_;
   RTCORBA::RTORB_var rt_orb_;
@@ -420,47 +411,38 @@ Server::Server (CORBA::ORB_ptr orb
   CORBA::Object_var object =
     this->orb_->resolve_initial_references ("RTORB"
                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   this->rt_orb_ =
     RTCORBA::RTORB::_narrow (object.in ()
                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   object =
     this->orb_->resolve_initial_references ("RTCurrent"
                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   this->current_ =
     RTCORBA::Current::_narrow (object.in ()
                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   default_thread_priority =
-    this->current_->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->current_->the_priority ();
 
   object =
     this->orb_->resolve_initial_references ("RootPOA"
                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   this->root_poa_ =
     PortableServer::POA::_narrow (object.in ()
                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   this->poa_manager_ =
-    this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->root_poa_->the_POAManager ();
 
-  this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->poa_manager_->activate ();
 }
 
 void
-Server::create_servant_in_root_poa (ACE_ENV_SINGLE_ARG_DECL)
+Server::create_servant_in_root_poa (void)
 {
   test_i *servant = 0;
   ACE_NEW_THROW_EX (servant,
@@ -469,7 +451,6 @@ Server::create_servant_in_root_poa (ACE_ENV_SINGLE_ARG_DECL)
                             this->tests_
                             ACE_ENV_ARG_PARAMETER),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   servant->invocation_pool_and_lane (0, 0);
   servant->in_lane (0);
@@ -481,8 +462,7 @@ Server::create_servant_in_root_poa (ACE_ENV_SINGLE_ARG_DECL)
   this->tests_[this->tests_.size () - 1].servant_ =
     servant;
   this->tests_[this->tests_.size () - 1].object_ =
-    servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    servant->_this ();
 }
 
 void
@@ -500,18 +480,15 @@ Server::create_poa_and_servant_with_tp_policy (const char *poa_name,
                                       this->max_buffered_requests_,
                                       this->max_request_buffer_size_
                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   CORBA::Policy_var threadpool_policy =
     this->rt_orb_->create_threadpool_policy (threadpool_id
                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   CORBA::Policy_var priority_model_policy =
     this->rt_orb_->create_priority_model_policy (priority_model,
                                                  default_thread_priority
                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   CORBA::PolicyList policies;
 
@@ -531,12 +508,10 @@ Server::create_poa_and_servant_with_tp_policy (const char *poa_name,
                                  this->poa_manager_.in (),
                                  policies
                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   RTPortableServer::POA_var rt_poa =
     RTPortableServer::POA::_narrow (poa.in ()
                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   test_i *servant1 = 0;
   ACE_NEW_THROW_EX (servant1,
@@ -545,7 +520,6 @@ Server::create_poa_and_servant_with_tp_policy (const char *poa_name,
                             this->tests_
                             ACE_ENV_ARG_PARAMETER),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   servant1->in_lane (0);
 
@@ -561,7 +535,6 @@ Server::create_poa_and_servant_with_tp_policy (const char *poa_name,
           id1 =
             rt_poa->activate_object (servant1
                                      ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
         }
       else
         {
@@ -573,7 +546,6 @@ Server::create_poa_and_servant_with_tp_policy (const char *poa_name,
                                     this->tests_
                                     ACE_ENV_ARG_PARAMETER),
                             CORBA::NO_MEMORY ());
-          ACE_CHECK;
 
           servant2->in_lane (0);
 
@@ -592,18 +564,15 @@ Server::create_poa_and_servant_with_tp_policy (const char *poa_name,
             rt_poa->activate_object_with_priority (servant1,
                                                    default_thread_priority + 1
                                                    ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
 
           id2 =
             rt_poa->activate_object_with_priority (servant2,
                                                    default_thread_priority
                                                    ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
 
           CORBA::Object_var object2 =
             poa->id_to_reference (id2.in ()
                                   ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
 
           this->tests_.size (this->tests_.size () + 1);
           this->tests_[this->tests_.size () - 1].object_ =
@@ -611,7 +580,6 @@ Server::create_poa_and_servant_with_tp_policy (const char *poa_name,
                            ACE_ENV_ARG_PARAMETER);
           this->tests_[this->tests_.size () - 1].servant_ =
             servant2;
-          ACE_CHECK;
         }
     }
   else
@@ -621,7 +589,6 @@ Server::create_poa_and_servant_with_tp_policy (const char *poa_name,
       id1 =
         rt_poa->activate_object (servant1
                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
     }
 
   PortableServer::ServantBase_var safe_servant (servant1);
@@ -629,7 +596,6 @@ Server::create_poa_and_servant_with_tp_policy (const char *poa_name,
   CORBA::Object_var object1 =
     poa->id_to_reference (id1.in ()
                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   this->tests_.size (this->tests_.size () + 1);
   this->tests_[this->tests_.size () - 1].object_ =
@@ -637,7 +603,6 @@ Server::create_poa_and_servant_with_tp_policy (const char *poa_name,
                    ACE_ENV_ARG_PARAMETER);
   this->tests_[this->tests_.size () - 1].servant_ =
     servant1;
-  ACE_CHECK;
 }
 
 void
@@ -664,18 +629,15 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name,
                                                  this->max_buffered_requests_,
                                                  this->max_request_buffer_size_
                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   CORBA::Policy_var threadpool_policy =
     this->rt_orb_->create_threadpool_policy (threadpool_id
                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   CORBA::Policy_var priority_model_policy =
     this->rt_orb_->create_priority_model_policy (priority_model,
                                                  default_thread_priority
                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   CORBA::PolicyList policies;
 
@@ -692,12 +654,10 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name,
                                  this->poa_manager_.in (),
                                  policies
                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   RTPortableServer::POA_var rt_poa =
     RTPortableServer::POA::_narrow (poa.in ()
                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   test_i *servant1 = 0;
   ACE_NEW_THROW_EX (servant1,
@@ -706,7 +666,6 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name,
                             this->tests_
                             ACE_ENV_ARG_PARAMETER),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   servant1->in_lane (1);
 
@@ -722,7 +681,6 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name,
       id1 =
         rt_poa->activate_object (servant1
                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
     }
   else
     {
@@ -734,7 +692,6 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name,
                                 this->tests_
                                 ACE_ENV_ARG_PARAMETER),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK;
 
       servant2->in_lane (1);
 
@@ -753,18 +710,15 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name,
         rt_poa->activate_object_with_priority (servant1,
                                                default_thread_priority + 1
                                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
 
       id2 =
         rt_poa->activate_object_with_priority (servant2,
                                                default_thread_priority
                                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
 
       CORBA::Object_var object2 =
         poa->id_to_reference (id2.in ()
                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
 
       this->tests_.size (this->tests_.size () + 1);
       this->tests_[this->tests_.size () - 1].object_ =
@@ -772,13 +726,11 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name,
                        ACE_ENV_ARG_PARAMETER);
       this->tests_[this->tests_.size () - 1].servant_ =
         servant2;
-      ACE_CHECK;
     }
 
   CORBA::Object_var object1 =
     poa->id_to_reference (id1.in ()
                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   this->tests_.size (this->tests_.size () + 1);
   this->tests_[this->tests_.size () - 1].object_ =
@@ -786,11 +738,10 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name,
                    ACE_ENV_ARG_PARAMETER);
   this->tests_[this->tests_.size () - 1].servant_ =
     servant1;
-  ACE_CHECK;
 }
 
 void
-Server::start_testing (ACE_ENV_SINGLE_ARG_DECL)
+Server::start_testing (void)
 {
   Tests::ITERATOR iterator (this->tests_);
   while (!iterator.done ())
@@ -802,40 +753,33 @@ Server::start_testing (ACE_ENV_SINGLE_ARG_DECL)
                              this->current_.in (),
                              this->orb_.in ()
                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
 
-      test->object_->start (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      test->object_->start ();
 
       iterator.advance ();
     }
 }
 
 void
-Server::test (ACE_ENV_SINGLE_ARG_DECL)
+Server::test (void)
 {
-  this->start_testing (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->start_testing ();
 
   ACE_DEBUG ((LM_DEBUG,
               "\n\n*** Changing priority to be higher ***\n\n"));
 
   this->current_->the_priority (default_thread_priority + 1
                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
-  this->start_testing (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->start_testing ();
 }
 
 void
-Server::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Server::shutdown (void)
 {
   this->orb_->shutdown (1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
-  this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->orb_->destroy ();
 }
 
 class Task : public ACE_Task_Base
@@ -865,44 +809,35 @@ Task::svc (void)
     {
       Server server (this->orb_.in ()
                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
-      server.create_servant_in_root_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server.create_servant_in_root_poa ();
 
       server.create_poa_and_servant_with_tp_policy ("tp_client_propagated_poa",
                                                     1,
                                                     RTCORBA::CLIENT_PROPAGATED
                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       server.create_poa_and_servant_with_tp_policy ("tp_server_declared_poa",
                                                     1,
                                                     RTCORBA::SERVER_DECLARED
                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       server.create_poa_and_servant_with_tp_policy ("tp_no_priority_model_poa",
                                                     0,
                                                     RTCORBA::CLIENT_PROPAGATED
                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       server.create_poa_and_servant_with_tp_with_lanes_policy ("tp_with_lanes_client_propagated_poa",
                                                                RTCORBA::CLIENT_PROPAGATED
                                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       server.create_poa_and_servant_with_tp_with_lanes_policy ("tp_with_lanes_server_declared_poa",
                                                                RTCORBA::SERVER_DECLARED
                                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
-      server.test (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server.test ();
 
-      server.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server.shutdown ();
     }
   ACE_CATCHANY
     {
@@ -925,7 +860,6 @@ main (int argc, char *argv[])
                          argv,
                          ""
                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Make sure we can support multiple priorities that are
       // required for this test.
diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp b/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp
index ed68835f061..88f7b6bb573 100644
--- a/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp
+++ b/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp
@@ -55,7 +55,6 @@ create_threadpool (RTCORBA::RTORB_ptr rt_orb
                                max_buffered_requests,
                                max_request_buffer_size
                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
 
   return id;
 }
@@ -83,7 +82,6 @@ create_threadpool_with_lanes (RTCORBA::RTORB_ptr rt_orb
                                           max_buffered_requests,
                                           max_request_buffer_size
                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
 
   return id;
 }
@@ -98,31 +96,25 @@ main (int argc, char *argv[])
                          argv,
                          ""
                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       CORBA::Object_var object =
         orb->resolve_initial_references ("RTORB"
                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       RTCORBA::RTORB_var rt_orb =
         RTCORBA::RTORB::_narrow (object.in ()
                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       object =
         orb->resolve_initial_references ("RTCurrent"
                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       RTCORBA::Current_var current =
         RTCORBA::Current::_narrow (object.in ()
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       default_thread_priority =
-        current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        current->the_priority ();
 
       int result =
         parse_args (argc, argv);
@@ -137,24 +129,19 @@ main (int argc, char *argv[])
           RTCORBA::ThreadpoolId id =
             create_threadpool (rt_orb.in ()
                                ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           rt_orb->destroy_threadpool (id
                                       ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           id =
             create_threadpool_with_lanes (rt_orb.in ()
                                           ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           rt_orb->destroy_threadpool (id
                                       ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
         }
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
   ACE_CATCHANY
     {
diff --git a/TAO/tests/RTCORBA/Diffserv/client.cpp b/TAO/tests/RTCORBA/Diffserv/client.cpp
index 1956eb1e5ac..9c6d8d9cc3f 100644
--- a/TAO/tests/RTCORBA/Diffserv/client.cpp
+++ b/TAO/tests/RTCORBA/Diffserv/client.cpp
@@ -30,12 +30,10 @@ change_network_priority (int enable_network_priority,
     {
       CORBA::Object_var object =
         orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       RTCORBA::RTORB_var rt_orb =
         RTCORBA::RTORB::_narrow (object.in ()
                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Set the tcp protocol protperties
       RTCORBA::TCPProtocolProperties_var tcp_properties =
@@ -46,7 +44,6 @@ change_network_priority (int enable_network_priority,
                                                 1,
                                                 enable_network_priority
                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       RTCORBA::ProtocolList protocols;
       protocols.length (1);
@@ -61,7 +58,6 @@ change_network_priority (int enable_network_priority,
       policy_list[0] =
         rt_orb->create_client_protocol_policy (protocols
                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       switch (level)
         {
@@ -70,16 +66,13 @@ change_network_priority (int enable_network_priority,
           {
             object = orb->resolve_initial_references ("ORBPolicyManager"
                                                       ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
 
             CORBA::PolicyManager_var policy_manager =
               CORBA::PolicyManager::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
 
             policy_manager->set_policy_overrides (policy_list,
                                                   CORBA::SET_OVERRIDE
                                                   ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
 
             break;
           }
@@ -90,16 +83,13 @@ change_network_priority (int enable_network_priority,
             object =
               orb->resolve_initial_references ("PolicyCurrent"
                                                ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
 
             CORBA::PolicyCurrent_var policy_current =
               CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
 
             policy_current->set_policy_overrides (policy_list,
                                                   CORBA::SET_OVERRIDE
                                                   ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
 
             break;
           }
@@ -110,10 +100,8 @@ change_network_priority (int enable_network_priority,
             CORBA::Object_var object = server->_set_policy_overrides (policy_list,
                                                                       CORBA::SET_OVERRIDE
                                                                       ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
 
             server = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
 
             break;
           }
@@ -189,7 +177,6 @@ main (int argc, char *argv[])
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return -1;
@@ -197,22 +184,18 @@ main (int argc, char *argv[])
       // Initialize and obtain reference to the Test object.
       CORBA::Object_var client_object =
         orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       Test_var server =
         Test::_narrow (client_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Resolve the Network priority Mapping Manager
       CORBA::Object_var object =
         orb->resolve_initial_references ("NetworkPriorityMappingManager"
                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       RTCORBA::NetworkPriorityMappingManager_var mapping_manager =
         RTCORBA::NetworkPriorityMappingManager::_narrow (object.in ()
                                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Initialize the custom priority mapping
       Custom_Network_Priority_Mapping *cnpm = 0;
@@ -250,15 +233,13 @@ main (int argc, char *argv[])
               break;
             }
 
-          server->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server->test_method ();
         }
 
       // Shut down Server ORB.
       if (shutdown_server)
         {
-          server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server->shutdown ();
         }
     }
   ACE_CATCHANY
diff --git a/TAO/tests/RTCORBA/Diffserv/server.cpp b/TAO/tests/RTCORBA/Diffserv/server.cpp
index cee01e1b4f7..98035dc47ef 100644
--- a/TAO/tests/RTCORBA/Diffserv/server.cpp
+++ b/TAO/tests/RTCORBA/Diffserv/server.cpp
@@ -15,10 +15,10 @@ class Test_i : public POA_Test
 public:
   Test_i (CORBA::ORB_ptr orb);
 
-  void test_method (ACE_ENV_SINGLE_ARG_DECL)
+  void test_method (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -31,7 +31,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 void
-Test_i::test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_i::test_method (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -39,7 +39,7 @@ Test_i::test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Test_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
@@ -86,16 +86,13 @@ create_object (PortableServer::POA_ptr poa,
   PortableServer::ObjectId_var id =
     poa->activate_object (servant
                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   CORBA::Object_var object =
     poa->id_to_reference (id.in ()
                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   CORBA::String_var ior =
     orb->object_to_string (object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   FILE *output_file= ACE_OS::fopen (filename, "w");
   ACE_OS::fprintf (output_file, "%s", ior.in ());
@@ -113,7 +110,6 @@ main (int argc, char *argv[])
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, ""
                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Parse arguments.
       if (parse_args (argc, argv) != 0)
@@ -123,16 +119,13 @@ main (int argc, char *argv[])
       object =
         orb->resolve_initial_references ("RootPOA"
                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // POAManager.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       // Servant.
       Test_i servant (orb.in ());
@@ -143,17 +136,14 @@ main (int argc, char *argv[])
                      &servant,
                      simple_servant_ior_file
                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       object =
         orb->resolve_initial_references ("NetworkPriorityMappingManager"
                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       RTCORBA::NetworkPriorityMappingManager_var mapping_manager =
         RTCORBA::NetworkPriorityMappingManager::_narrow (object.in ()
                                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       Custom_Network_Priority_Mapping *cnpm = 0;
       ACE_NEW_RETURN  (cnpm,
@@ -168,12 +158,10 @@ main (int argc, char *argv[])
       object =
         orb->resolve_initial_references ("RTORB"
                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       RTCORBA::RTORB_var rt_orb =
         RTCORBA::RTORB::_narrow (object.in ()
                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Set transport protocol properties
       RTCORBA::TCPProtocolProperties_var tcp_properties =
@@ -184,7 +172,6 @@ main (int argc, char *argv[])
                                                 1,
                                                 1
                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       RTCORBA::ProtocolList protocols;
       protocols.length (1);
@@ -200,7 +187,6 @@ main (int argc, char *argv[])
       policy_list[0] =
         rt_orb->create_server_protocol_policy (protocols
                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Create POA with Diffserv enabled
       PortableServer::POA_var poa_with_diffserv =
@@ -208,7 +194,6 @@ main (int argc, char *argv[])
                               poa_manager.in (),
                               policy_list
                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Create object 2.
       create_object (poa_with_diffserv.in (),
@@ -216,15 +201,12 @@ main (int argc, char *argv[])
                      &servant,
                      diffserv_servant_ior_file
                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Activate POA manager.
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // Start ORB event loop.
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n\n"));
     }
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp
index abe1dd456ec..0f26de829f3 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp
@@ -79,11 +79,9 @@ Task::svc (void)
     {
       CORBA::Object_var object =
         this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       test_var test =
         test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       pid_t pid =
         ACE_OS::getpid ();
@@ -98,7 +96,6 @@ Task::svc (void)
                           i,
                           mtc
                           ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           // Each 2 iterations sleep 5 seconds
           if (i % 2 == 0)
@@ -143,8 +140,7 @@ Task::svc (void)
 
       if (shutdown_server)
         {
-          test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test->shutdown ();
         }
     }
   ACE_CATCHANY
@@ -165,7 +161,6 @@ main (int argc, char *argv[])
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       int result =
         parse_args (argc, argv);
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp
index ea5dc6db558..f1e665bb85d 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp
@@ -65,7 +65,6 @@ write_ior_to_file (CORBA::ORB_ptr orb,
   CORBA::String_var ior =
     orb->object_to_string (test
                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   char filename[BUFSIZ];
   ACE_OS::sprintf (filename,
@@ -109,7 +108,6 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
     root_poa->create_implicit_activation_policy
     (PortableServer::IMPLICIT_ACTIVATION
      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   // Thread pool policy.
   policies[1] =
@@ -120,7 +118,6 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
     rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
                                           0
                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   // Create the POA under the RootPOA.
   PortableServer::POA_var poa =
@@ -128,15 +125,13 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
                           poa_manager,
                           policies
                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   // Creation of POAs is over. Destroy the Policy objects.
   for (CORBA::ULong i = 0;
        i < policies.length ();
        ++i)
     {
-      policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      policies[i]->destroy ();
     }
 
   test_i *servant =
@@ -148,14 +143,12 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
   ACE_UNUSED_ARG (safe_servant);
 
   test_var test =
-    servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    servant->_this ();
 
   int result =
     write_ior_to_file (orb,
                        test.in ()
                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   return result;
 }
@@ -188,59 +181,48 @@ Task::svc (void)
       CORBA::Object_var object =
         this->orb_->resolve_initial_references ("RootPOA"
                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (object.in ()
                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       object =
         this->orb_->resolve_initial_references ("RTORB"
                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       RTCORBA::RTORB_var rt_orb =
         RTCORBA::RTORB::_narrow (object.in ()
                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       object =
         this->orb_->resolve_initial_references ("RTCurrent"
                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       RTCORBA::Current_var current =
         RTCORBA::Current::_narrow (object.in ()
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       RTCORBA::Priority default_thread_priority =
-        current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        current->the_priority ();
 
       test_i servant (this->orb_.in (),
                       root_poa.in (),
                       nap_time);
       test_var test =
-        servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        servant._this ();
 
       int result =
         write_ior_to_file (this->orb_.in (),
                            test.in ()
                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (result != 0)
         return result;
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       CORBA::ULong stacksize = 0;
       CORBA::Boolean allow_request_buffering = 0;
@@ -256,12 +238,10 @@ Task::svc (void)
                                    max_buffered_requests,
                                    max_request_buffer_size
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       CORBA::Policy_var threadpool_policy_1 =
         rt_orb->create_threadpool_policy (threadpool_id_1
                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       CORBA::Boolean allow_borrowing = 0;
       RTCORBA::ThreadpoolLanes lanes (1);
@@ -279,12 +259,10 @@ Task::svc (void)
                                               max_buffered_requests,
                                               max_request_buffer_size
                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       CORBA::Policy_var threadpool_policy_2 =
         rt_orb->create_threadpool_policy (threadpool_id_2
                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       result =
         create_POA_and_register_servant (threadpool_policy_1.in (),
@@ -294,7 +272,6 @@ Task::svc (void)
                                          this->orb_.in (),
                                          rt_orb.in ()
                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (result != 0)
         return result;
 
@@ -306,15 +283,12 @@ Task::svc (void)
                                          this->orb_.in (),
                                          rt_orb.in ()
                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (result != 0)
         return result;
 
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
 
-      this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->destroy ();
     }
   ACE_CATCHANY
     {
@@ -337,7 +311,6 @@ main (int argc, char *argv[])
                          argv,
                          ""
                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       int result =
         parse_args (argc, argv);
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp
index 6fbd244dd26..70925240498 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp
@@ -56,16 +56,15 @@ test_i::method (CORBA::Long client_id,
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 void
-test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+test_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0
                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h
index 7951ca0854c..c97381b3e02 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h
@@ -27,11 +27,11 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Shutdown the server.
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Our POA.
-  PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+  PortableServer::POA_ptr _default_POA (void);
 
 private:
   /// ORB.
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/client.cpp b/TAO/tests/RTCORBA/Explicit_Binding/client.cpp
index 25e0135f39b..7ad8531b54b 100644
--- a/TAO/tests/RTCORBA/Explicit_Binding/client.cpp
+++ b/TAO/tests/RTCORBA/Explicit_Binding/client.cpp
@@ -55,7 +55,6 @@ main (int argc, char *argv[])
       // ORB.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Parse arguments.
       if (parse_args (argc, argv) != 0)
@@ -64,29 +63,23 @@ main (int argc, char *argv[])
       // RTORB.
       CORBA::Object_var object =
         orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ()
                                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (check_for_nil (rt_orb.in (), "RTORB") == -1)
         return -1;
 
       // PolicyCurrent.
       object = orb->resolve_initial_references ("PolicyCurrent"
                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       CORBA::PolicyCurrent_var policy_current =
         CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (check_for_nil (policy_current.in (), "PolicyCurrent")
           == -1)
         return -1;
 
       // Test object.
       object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       Test_var server = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (check_for_nil (server.in (), "server") == -1)
         return -1;
 
@@ -109,12 +102,10 @@ main (int argc, char *argv[])
       policy_list[0] =
         rt_orb->create_client_protocol_policy (protocols
                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       policy_current->set_policy_overrides (policy_list,
                                             CORBA::SET_OVERRIDE
                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "\n     Test 1\n"));
@@ -122,7 +113,6 @@ main (int argc, char *argv[])
       CORBA::PolicyList_var pols;
       int status = server->_validate_connection (pols.out ()
                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (!status)
         ACE_DEBUG ((LM_DEBUG,
@@ -134,8 +124,7 @@ main (int argc, char *argv[])
       // NO new connections should get established.
       ACE_DEBUG ((LM_DEBUG,
                   "\n     Test 2\n"));
-      server->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->test_method ();
 
       // Test 3: Check that <validate_connection> detects policy
       // misconfigurations and reports them through
@@ -151,16 +140,13 @@ main (int argc, char *argv[])
       policy_list[0] =
         rt_orb->create_client_protocol_policy (protocols
                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       policy_current->set_policy_overrides (policy_list,
                                             CORBA::SET_OVERRIDE
                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       status = server->_validate_connection (pols.out ()
                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (status)
         ACE_DEBUG ((LM_DEBUG,
@@ -187,18 +173,15 @@ main (int argc, char *argv[])
       policy_list[0] =
         rt_orb->create_client_protocol_policy (protocols
                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       policy_current->set_policy_overrides (policy_list,
                                             CORBA::SET_OVERRIDE
                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "\n  Testing over - shutting down\n"));
       ACE_OS::sleep (2);
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
 
       ACE_OS::sleep (2);
     }
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp
index 7c434d0c2e5..385adec4426 100644
--- a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp
+++ b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp
@@ -17,10 +17,10 @@ public:
   // ctor
 
   // = The Test methods.
-  void test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void test_method (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -42,7 +42,7 @@ Test_i::test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/* ACE_ENV_SINGLE_ARG_PARAM
 }
 
 void
-Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Test_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
@@ -102,17 +102,14 @@ create_object (PortableServer::POA_ptr poa,
   PortableServer::ObjectId_var id =
     poa->activate_object (server_impl ACE_ENV_ARG_PARAMETER);
 
-  ACE_CHECK_RETURN (-1);
 
   CORBA::Object_var server =
     poa->id_to_reference (id.in ()
                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   // Print out the IOR.
   CORBA::String_var ior =
     orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG, "<%s>\n\n", ior.in ()));
 
@@ -140,7 +137,6 @@ main (int argc, char *argv[])
       // ORB.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Parse arguments.
       if (parse_args (argc, argv) != 0)
@@ -149,17 +145,14 @@ main (int argc, char *argv[])
       // RootPOA.
       CORBA::Object_var object =
         orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (check_for_nil (root_poa.in (), "RootPOA") == -1)
         return -1;
 
       // POAManager.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       // Servant.
       Test_i server_impl (orb.in ());
@@ -171,16 +164,13 @@ main (int argc, char *argv[])
                               &server_impl,
                               ior_output_file
                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (result == -1)
         return -1;
 
       // Run ORB Event loop.
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n"));
     }
diff --git a/TAO/tests/RTCORBA/Linear_Priority/client.cpp b/TAO/tests/RTCORBA/Linear_Priority/client.cpp
index 6588b34f7a4..b065dd6271c 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/client.cpp
+++ b/TAO/tests/RTCORBA/Linear_Priority/client.cpp
@@ -78,7 +78,7 @@ public:
 
   int svc (void);
 
-  void validate_connection (ACE_ENV_SINGLE_ARG_DECL);
+  void validate_connection (void);
 
 private:
   test_var test_;
@@ -98,7 +98,7 @@ Worker_Thread::Worker_Thread (ACE_Thread_Manager &thread_manager,
 }
 
 void
-Worker_Thread::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
+Worker_Thread::validate_connection (void)
 {
   // Try to validate the connection several times, ignoring transient
   // exceptions.  If the connection can still not be setup, return
@@ -113,7 +113,6 @@ Worker_Thread::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
           ++current_attempt;
           this->test_->_validate_connection (inconsistent_policies.out ()
                                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           // If successful, we are done.
           return;
@@ -131,7 +130,6 @@ Worker_Thread::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
           ACE_RE_THROW;
         }
       ACE_ENDTRY;
-      ACE_CHECK;
     }
 }
 
@@ -142,15 +140,12 @@ Worker_Thread::svc (void)
     {
       this->current_->the_priority (this->priority_
                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
-      this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->validate_connection ();
 
       for (int i = 0; i < iterations; i++)
         {
-          this->test_->method (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->test_->method ();
         }
     }
   ACE_CATCHANY
@@ -190,46 +185,37 @@ Task::svc (void)
       CORBA::Object_var object =
         this->orb_->resolve_initial_references ("RTORB"
                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       RTCORBA::RTORB_var rt_orb =
         RTCORBA::RTORB::_narrow (object.in ()
                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       object =
         this->orb_->resolve_initial_references ("RTCurrent"
                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       RTCORBA::Current_var current =
         RTCORBA::Current::_narrow (object.in ()
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       current->the_priority (0
                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       object =
         this->orb_->resolve_initial_references ("ORBPolicyManager"
                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       CORBA::PolicyManager_var policy_manager =
         CORBA::PolicyManager::_narrow (object.in ()
                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       object =
         this->orb_->string_to_object (ior
                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       test_var test =
         test::_narrow (object.in ()
                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       ULong_Array priorities;
       int result =
@@ -250,14 +236,12 @@ Task::svc (void)
                             policies,
                             debug
                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (result != 0)
         return result;
 
       policy_manager->set_policy_overrides (policies,
                                             CORBA::SET_OVERRIDE
                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       u_long i = 0;
 
@@ -305,8 +289,7 @@ Task::svc (void)
 
       if (shutdown_server)
         {
-          test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test->shutdown ();
         }
     }
   ACE_CATCHANY
@@ -329,7 +312,6 @@ main (int argc, char **argv)
                          argv,
                          0
                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       int result =
         parse_args (argc, argv);
diff --git a/TAO/tests/RTCORBA/Linear_Priority/server.cpp b/TAO/tests/RTCORBA/Linear_Priority/server.cpp
index 9129c0f3ee9..98b4974ab6d 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/server.cpp
+++ b/TAO/tests/RTCORBA/Linear_Priority/server.cpp
@@ -15,13 +15,13 @@ public:
   test_i (CORBA::ORB_ptr orb,
           PortableServer::POA_ptr poa);
 
-  void method (ACE_ENV_SINGLE_ARG_DECL)
+  void method (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+  PortableServer::POA_ptr _default_POA (void);
 
 private:
 
@@ -37,7 +37,7 @@ test_i::test_i (CORBA::ORB_ptr orb,
 }
 
 void
-test_i::method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::method (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -45,7 +45,7 @@ test_i::method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+test_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -53,11 +53,10 @@ test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 
   this->orb_->shutdown (0
                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -125,7 +124,6 @@ write_iors_to_file (CORBA::Object_ptr object,
   CORBA::String_var ior =
     orb->object_to_string (object
                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   u_int result = 0;
   result =
@@ -167,26 +165,21 @@ Task::svc (void)
       CORBA::Object_var object =
         this->orb_->resolve_initial_references ("RTORB"
                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       RTCORBA::RTORB_var rt_orb =
         RTCORBA::RTORB::_narrow (object.in ()
                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       object =
         this->orb_->resolve_initial_references ("RootPOA"
                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (object.in ()
                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       CORBA::PolicyList policies;
 
@@ -197,7 +190,6 @@ Task::svc (void)
                             policies,
                             debug
                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (result != 0)
         return result;
 
@@ -215,7 +207,6 @@ Task::svc (void)
                             policies,
                             debug
                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (result != 0)
         return result;
 
@@ -223,13 +214,11 @@ Task::svc (void)
         rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
                                               0
                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Implicit_activation policy.
       CORBA::Policy_var implicit_activation_policy =
         root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       policies.length (policies.length () + 1);
       policies[policies.length () - 1] =
@@ -244,35 +233,28 @@ Task::svc (void)
                               poa_manager.in (),
                               policies
                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       test_i *servant = 0;
       ACE_NEW_THROW_EX (servant,
                         test_i (this->orb_.in (),
                                 poa.in ()),
                         CORBA::NO_MEMORY ());
-      ACE_TRY_CHECK;
 
       PortableServer::ServantBase_var safe_servant (servant);
 
       test_var test =
-        servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        servant->_this ();
 
       write_iors_to_file (test.in (),
                           this->orb_.in (),
                           ior
                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
 
-      this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->destroy ();
     }
   ACE_CATCHANY
     {
@@ -294,7 +276,6 @@ main (int argc, char **argv)
                          argv,
                          0
                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       int result =
         parse_args (argc, argv);
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp
index de8d374edf7..27def4d9f77 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp
@@ -169,11 +169,9 @@ Task::svc (void)
       CORBA::Object_var object =
         this->orb_->resolve_initial_references ("PriorityMappingManager"
                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       RTCORBA::PriorityMappingManager_var mapping_manager =
         RTCORBA::PriorityMappingManager::_narrow (object.in ()
                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (check_for_nil (mapping_manager.in (), "Mapping Manager") == -1)
         return -1;
 
@@ -183,19 +181,15 @@ Task::svc (void)
       // RTCurrent.
       object =
         this->orb_->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       RTCORBA::Current_var current =
         RTCORBA::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (check_for_nil (current.in (), "RTCurrent") == -1)
         return -1;
 
       // Obtain Test object reference.
       object =
         this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       Test_var server = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (check_for_nil (server.in (), "Test object") == -1)
         return -1;
 
@@ -204,18 +198,15 @@ Task::svc (void)
       CORBA::Policy_var policy =
         server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE
                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       RTCORBA::PriorityModelPolicy_var priority_policy =
         RTCORBA::PriorityModelPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (check_for_nil (priority_policy.in (), "PriorityModelPolicy") == -1)
         return -1;
 
       RTCORBA::PriorityModel priority_model =
-        priority_policy->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        priority_policy->priority_model ();
       if (priority_model != RTCORBA::CLIENT_PROPAGATED)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "ERROR: priority_model != "
@@ -275,9 +266,7 @@ Task::svc (void)
       // Testing over.  Shut down the server.
       ACE_DEBUG ((LM_DEBUG, "Client threads finished\n"));
       current->the_priority (priority1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
     }
   ACE_CATCHANY
     {
@@ -300,7 +289,6 @@ main (int argc, char *argv[])
       // ORB.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Parse arguments.
       if (parse_args (argc, argv) != 0)
@@ -380,10 +368,8 @@ Worker_Thread::svc (void)
       // RTORB.
       CORBA::Object_var object =
         this->orb_->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ()
                                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (check_for_nil (rt_orb.in (), "RTORB") == -1)
         return 0;
 
@@ -391,10 +377,8 @@ Worker_Thread::svc (void)
       object =
         this->orb_->resolve_initial_references ("PolicyCurrent"
                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       CORBA::PolicyCurrent_var policy_current =
         CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (check_for_nil (policy_current.in (), "PolicyCurrent")
           == -1)
         return 0;
@@ -413,12 +397,10 @@ Worker_Thread::svc (void)
       policy_list[0] =
         rt_orb->create_client_protocol_policy (protocols
                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       policy_current->set_policy_overrides (policy_list,
                                             CORBA::SET_OVERRIDE
                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Wait for other threads.
       this->synchronizer_->wait ();
@@ -426,8 +408,7 @@ Worker_Thread::svc (void)
       for (int i = 0; i < iterations; ++i)
         {
           // Invoke method.
-          this->server_->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->server_->test_method ();
         }
     }
   ACE_CATCHANY
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
index 893dbddf688..fde1982564a 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
@@ -18,10 +18,10 @@ public:
   Test_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void test_method (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -42,7 +42,7 @@ Test_i::test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARA
 }
 
 void
-Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Test_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
@@ -119,27 +119,22 @@ Task::svc (void)
       // RTORB.
       CORBA::Object_var object =
         this->orb_->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ()
                                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (check_for_nil (rt_orb.in (), "RTORB") == -1)
         return -1;
 
       // RootPOA.
       object =
         this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (check_for_nil (root_poa.in (), "RootPOA") == -1)
         return -1;
 
       // POAManager.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       // Create POA with CLIENT_PROPAGATED PriorityModelPolicy.
       CORBA::PolicyList poa_policy_list;
@@ -148,31 +143,26 @@ Task::svc (void)
         rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
                                               0
                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("Child_POA",
                               poa_manager.in (),
                               poa_policy_list
                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Create object.
       Test_i server_impl (this->orb_.in ());
 
       PortableServer::ObjectId_var id =
         child_poa->activate_object (&server_impl ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       CORBA::Object_var server =
         child_poa->id_to_reference (id.in ()
                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Print Object IOR.
       CORBA::String_var ior =
         this->orb_->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n\n", ior.in ()));
 
@@ -189,12 +179,10 @@ Task::svc (void)
         }
 
       // Activate POA manager.
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // Start ORB event loop.
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
 
       ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n\n"));
     }
@@ -217,7 +205,6 @@ main (int argc, char *argv[])
       // ORB.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Parse arguments.
       if (parse_args (argc, argv) != 0)
diff --git a/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp b/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp
index 9277febd56e..a078e2cd10e 100644
--- a/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp
+++ b/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp
@@ -33,19 +33,16 @@ test_multiple_orbs (const char *test_name,
                              argv,
                              name
                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           if (rt_orb)
             {
               CORBA::Object_var object =
                 orbs[i]->resolve_initial_references ("RTORB"
                                                      ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
 
               rt_orbs[i] =
                 RTCORBA::RTORB::_narrow (object.in ()
                                          ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
 
               ACE_ASSERT (rt_orbs[i].in () != RTCORBA::RTORB::_nil ());
             }
@@ -57,8 +54,7 @@ test_multiple_orbs (const char *test_name,
                i < iterations;
                ++i)
             {
-              orbs[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              orbs[i]->destroy ();
             }
         }
     }
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/client.cpp b/TAO/tests/RTCORBA/Persistent_IOR/client.cpp
index 6e9b26cbec7..8a28b1ac007 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/client.cpp
+++ b/TAO/tests/RTCORBA/Persistent_IOR/client.cpp
@@ -59,7 +59,6 @@ main (int argc, char **argv)
                          argv,
                          0
                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       int result =
         parse_args (argc, argv);
@@ -69,12 +68,10 @@ main (int argc, char **argv)
       CORBA::Object_var object =
         orb->string_to_object (ior
                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       test_var test =
         test::_narrow (object.in ()
                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (test.in ()))
         {
@@ -86,14 +83,12 @@ main (int argc, char **argv)
 
       for (int i = 0; i < iterations; i++)
         {
-          test->method (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test->method ();
         }
 
       if (shutdown_server)
         {
-          test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test->shutdown ();
         }
     }
   ACE_CATCHANY
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
index d75fb4a6afd..a3837fc739e 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
+++ b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
@@ -13,13 +13,13 @@ public:
   test_i (CORBA::ORB_ptr orb,
           PortableServer::POA_ptr poa);
 
-  void method (ACE_ENV_SINGLE_ARG_DECL)
+  void method (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+  PortableServer::POA_ptr _default_POA (void);
 
 private:
 
@@ -35,7 +35,7 @@ test_i::test_i (CORBA::ORB_ptr orb,
 }
 
 void
-test_i::method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::method (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -43,7 +43,7 @@ test_i::method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+test_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -51,11 +51,10 @@ test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 
   this->orb_->shutdown (0
                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -128,7 +127,6 @@ write_iors_to_file (CORBA::Object_ptr object,
   CORBA::String_var ior =
     orb->object_to_string (object
                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   if (debug)
     ACE_DEBUG ((LM_DEBUG,
@@ -159,12 +157,10 @@ create_poa_and_servant_with_persistent_policy (CORBA::ORB_ptr orb,
   CORBA::Policy_var implicit_activation_policy =
     root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   CORBA::Policy_var lifespan_policy =
     root_poa->create_lifespan_policy (PortableServer::PERSISTENT
                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   policies.length (policies.length () + 1);
   policies[policies.length () - 1] =
@@ -179,26 +175,22 @@ create_poa_and_servant_with_persistent_policy (CORBA::ORB_ptr orb,
                           poa_manager,
                           policies
                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   test_i *servant = 0;
   ACE_NEW_THROW_EX (servant,
                     test_i (orb,
                             poa.in ()),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   PortableServer::ServantBase_var safe_servant (servant);
 
   test_var test =
-    servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    servant->_this ();
 
   write_iors_to_file (test.in (),
                       orb,
                       persistent_ior
                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 void
@@ -217,17 +209,14 @@ create_poa_and_servant_with_tp_policy (CORBA::ORB_ptr orb,
                                max_buffered_requests,
                                max_request_buffer_size
                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   CORBA::Policy_var threadpool_policy =
     rt_orb->create_threadpool_policy (threadpool_id
                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   CORBA::Policy_var implicit_activation_policy =
     root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   CORBA::PolicyList policies;
 
@@ -244,26 +233,22 @@ create_poa_and_servant_with_tp_policy (CORBA::ORB_ptr orb,
                           poa_manager,
                           policies
                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   test_i *servant = 0;
   ACE_NEW_THROW_EX (servant,
                     test_i (orb,
                             poa.in ()),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   PortableServer::ServantBase_var safe_servant (servant);
 
   test_var test =
-    servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    servant->_this ();
 
   write_iors_to_file (test.in (),
                       orb,
                       transient_ior
                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 void
@@ -282,22 +267,18 @@ create_poa_with_tp_and_persistent_policy (CORBA::ORB_ptr orb,
                                max_buffered_requests,
                                max_request_buffer_size
                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   CORBA::Policy_var threadpool_policy =
     rt_orb->create_threadpool_policy (threadpool_id
                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   CORBA::Policy_var implicit_activation_policy =
     root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   CORBA::Policy_var lifespan_policy =
     root_poa->create_lifespan_policy (PortableServer::PERSISTENT
                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   CORBA::PolicyList policies;
 
@@ -318,26 +299,22 @@ create_poa_with_tp_and_persistent_policy (CORBA::ORB_ptr orb,
                           poa_manager,
                           policies
                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   test_i *servant = 0;
   ACE_NEW_THROW_EX (servant,
                     test_i (orb,
                             poa.in ()),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   PortableServer::ServantBase_var safe_servant (servant);
 
   test_var test =
-    servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    servant->_this ();
 
   write_iors_to_file (test.in (),
                       orb,
                       tp_persistent_ior
                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 int
@@ -350,7 +327,6 @@ main (int argc, char **argv)
                          argv,
                          0
                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       int result =
         parse_args (argc, argv);
@@ -360,69 +336,55 @@ main (int argc, char **argv)
       CORBA::Object_var object =
         orb->resolve_initial_references ("RTORB"
                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       RTCORBA::RTORB_var rt_orb =
         RTCORBA::RTORB::_narrow (object.in ()
                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       object =
         orb->resolve_initial_references ("RTCurrent"
                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       RTCORBA::Current_var current =
         RTCORBA::Current::_narrow (object.in ()
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       default_thread_priority =
-        current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        current->the_priority ();
 
       object =
         orb->resolve_initial_references ("RootPOA"
                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (object.in ()
                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       create_poa_and_servant_with_tp_policy (orb.in (),
                                              rt_orb.in (),
                                              root_poa.in  (),
                                              poa_manager.in ()
                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       create_poa_and_servant_with_persistent_policy (orb.in (),
                                                      root_poa.in  (),
                                                      poa_manager.in ()
                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       create_poa_with_tp_and_persistent_policy (orb.in (),
                                                 rt_orb.in (),
                                                 root_poa.in  (),
                                                 poa_manager.in ()
                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
   ACE_CATCH (CORBA::INTERNAL, ex)
     {
diff --git a/TAO/tests/RTCORBA/Policies/Policies.cpp b/TAO/tests/RTCORBA/Policies/Policies.cpp
index 63d97ab4717..0c38f923ca9 100644
--- a/TAO/tests/RTCORBA/Policies/Policies.cpp
+++ b/TAO/tests/RTCORBA/Policies/Policies.cpp
@@ -37,17 +37,14 @@ main (int argc, char **argv)
                          argv,
                          0
                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       CORBA::Object_var object =
         orb->resolve_initial_references ("RTORB"
                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       RTCORBA::RTORB_var rtorb =
         RTCORBA::RTORB::_narrow (object.in ()
                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       /*
        * The following code should be reenabled once the OMG spec has
@@ -59,7 +56,6 @@ main (int argc, char **argv)
           rtorb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
                                                RTCORBA::minPriority
                                                ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
 
         CORBA::Any policy_value;
         policy_value <<= RTCORBA::CLIENT_PROPAGATED;
@@ -69,12 +65,10 @@ main (int argc, char **argv)
           orb->create_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE,
                               policy_value
                               ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
 
         RTCORBA::PriorityModelPolicy_var policy2 =
           RTCORBA::PriorityModelPolicy::_narrow (policy.in ()
                                                  ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
 
         ACE_ASSERT (policy1->priority_model () == policy2->priority_model ());
         ACE_ASSERT (policy1->server_priority () == policy2->server_priority ());
@@ -88,7 +82,6 @@ main (int argc, char **argv)
         RTCORBA::ThreadpoolPolicy_var policy1 =
           rtorb->create_threadpool_policy (poolid
                                            ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
 
         CORBA::Any policy_value;
         policy_value <<= poolid;
@@ -97,12 +90,10 @@ main (int argc, char **argv)
           orb->create_policy (RTCORBA::THREADPOOL_POLICY_TYPE,
                               policy_value
                               ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
 
         RTCORBA::ThreadpoolPolicy_var policy2 =
           RTCORBA::ThreadpoolPolicy::_narrow (policy.in ()
                                               ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
 
         ACE_ASSERT (policy1->threadpool () == policy2->threadpool ());
       }
@@ -113,7 +104,6 @@ main (int argc, char **argv)
         RTCORBA::ServerProtocolPolicy_var policy1 =
           rtorb->create_server_protocol_policy (empty_protocols
                                                 ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
 
         CORBA::Any policy_value;
         policy_value <<= empty_protocols;
@@ -122,12 +112,10 @@ main (int argc, char **argv)
           orb->create_policy (RTCORBA::SERVER_PROTOCOL_POLICY_TYPE,
                               policy_value
                               ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
 
         RTCORBA::ServerProtocolPolicy_var policy2 =
           RTCORBA::ServerProtocolPolicy::_narrow (policy.in ()
                                                   ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
 
         RTCORBA::ProtocolList_var protocols1 =
           policy1->protocols ();
@@ -143,7 +131,6 @@ main (int argc, char **argv)
         RTCORBA::ClientProtocolPolicy_var policy1 =
           rtorb->create_client_protocol_policy (empty_protocols
                                                 ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
 
         CORBA::Any policy_value;
         policy_value <<= empty_protocols;
@@ -152,12 +139,10 @@ main (int argc, char **argv)
           orb->create_policy (RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE,
                               policy_value
                               ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
 
         RTCORBA::ClientProtocolPolicy_var policy2 =
           RTCORBA::ClientProtocolPolicy::_narrow (policy.in ()
                                                   ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
 
         RTCORBA::ProtocolList_var protocols1 =
           policy1->protocols ();
@@ -169,8 +154,7 @@ main (int argc, char **argv)
 
       {
         RTCORBA::PrivateConnectionPolicy_var policy1 =
-          rtorb->create_private_connection_policy (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          rtorb->create_private_connection_policy ();
 
         CORBA::Any policy_value;
 
@@ -178,12 +162,10 @@ main (int argc, char **argv)
           orb->create_policy (RTCORBA::PRIVATE_CONNECTION_POLICY_TYPE,
                               policy_value
                               ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
 
         RTCORBA::PrivateConnectionPolicy_var policy2 =
           RTCORBA::PrivateConnectionPolicy::_narrow (policy.in ()
                                                      ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
       }
 
       {
@@ -192,7 +174,6 @@ main (int argc, char **argv)
         RTCORBA::PriorityBandedConnectionPolicy_var policy1 =
           rtorb->create_priority_banded_connection_policy (empty_priority_bands
                                                            ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
 
         CORBA::Any policy_value;
         policy_value <<= empty_priority_bands;
@@ -201,12 +182,10 @@ main (int argc, char **argv)
           orb->create_policy (RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE,
                               policy_value
                               ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
 
         RTCORBA::PriorityBandedConnectionPolicy_var policy2 =
           RTCORBA::PriorityBandedConnectionPolicy::_narrow (policy.in ()
                                                             ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
 
         RTCORBA::PriorityBands_var priority_bands1 =
           policy1->priority_bands ();
@@ -227,7 +206,6 @@ main (int argc, char **argv)
       return -1;
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
index 56f29a399f9..ca8a9719d14 100644
--- a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
+++ b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
@@ -81,52 +81,42 @@ Task::svc (void)
       CORBA::Object_var object =
         this->orb_->resolve_initial_references ("RTCurrent"
                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       RTCORBA::Current_var current =
         RTCORBA::Current::_narrow (object.in ()
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       default_thread_priority =
-        current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        current->the_priority ();
 
       object =
         this->orb_->string_to_object (ior
                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       test_var test =
         test::_narrow (object.in ()
                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       for (int i = 0; i < iterations; i++)
         {
           current->the_priority (default_thread_priority
                                  ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           CORBA::Short priority =
-            test->method (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            test->method ();
 
           if (priority != TAO_INVALID_PRIORITY)
             {
               current->the_priority (priority
                                      ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
 
-              test->prioritized_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              test->prioritized_method ();
             }
         }
 
       if (shutdown_server)
         {
-          test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test->shutdown ();
         }
     }
   ACE_CATCHANY
@@ -149,7 +139,6 @@ main (int argc, char **argv)
                          argv,
                          0
                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       int result =
         parse_args (argc, argv);
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
index db378d994bd..89166031267 100644
--- a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
+++ b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
@@ -16,16 +16,16 @@ public:
           CORBA::Short server_priority,
           CORBA::Short client_priority);
 
-  CORBA::Short method (ACE_ENV_SINGLE_ARG_DECL)
+  CORBA::Short method (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void prioritized_method (ACE_ENV_SINGLE_ARG_DECL)
+  void prioritized_method (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+  PortableServer::POA_ptr _default_POA (void);
 
 private:
 
@@ -47,7 +47,7 @@ test_i::test_i (CORBA::ORB_ptr orb,
 }
 
 CORBA::Short
-test_i::method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::method (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -57,22 +57,19 @@ test_i::method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-test_i::prioritized_method (ACE_ENV_SINGLE_ARG_DECL)
+test_i::prioritized_method (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_var object =
     this->orb_->resolve_initial_references ("RTCurrent"
                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   RTCORBA::Current_var current =
     RTCORBA::Current::_narrow (object.in ()
                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   CORBA::Short priority =
-    current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    current->the_priority ();
 
   ACE_DEBUG ((LM_DEBUG,
               "test_i::prioritized_method: client = %d server = %d (should be %d)\n",
@@ -84,7 +81,7 @@ test_i::prioritized_method (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+test_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -92,11 +89,10 @@ test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 
   this->orb_->shutdown (0
                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -156,7 +152,6 @@ write_iors_to_file (CORBA::Object_ptr object,
   CORBA::String_var ior =
     orb->object_to_string (object
                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   u_int result = 0;
   result =
@@ -178,8 +173,8 @@ public:
           PortableServer::POA_ptr root_poa,
           PortableServer::POAManager_ptr poa_manager);
 
-  void test_root_poa (ACE_ENV_SINGLE_ARG_DECL);
-  void test_child_poa (ACE_ENV_SINGLE_ARG_DECL);
+  void test_root_poa (void);
+  void test_child_poa (void);
 
   typedef void (server::*test_function) (CORBA::PolicyList &policies,
                                          CORBA::Short server_priority,
@@ -236,29 +231,29 @@ public:
                                        const char *test_name
                                        ACE_ENV_ARG_DECL);
 
-  void test_default_pool_no_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL);
+  void test_default_pool_no_bands_client_propagated_poa (void);
 
-  void test_no_lanes_no_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL);
+  void test_no_lanes_no_bands_client_propagated_poa (void);
 
-  void test_lanes_no_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL);
+  void test_lanes_no_bands_client_propagated_poa (void);
 
-  void test_default_pool_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL);
+  void test_default_pool_bands_client_propagated_poa (void);
 
-  void test_no_lanes_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL);
+  void test_no_lanes_bands_client_propagated_poa (void);
 
-  void test_lanes_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL);
+  void test_lanes_bands_client_propagated_poa (void);
 
-  void test_default_pool_no_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL);
+  void test_default_pool_no_bands_server_declared_poa (void);
 
-  void test_no_lanes_no_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL);
+  void test_no_lanes_no_bands_server_declared_poa (void);
 
-  void test_lanes_no_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL);
+  void test_lanes_no_bands_server_declared_poa (void);
 
-  void test_default_pool_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL);
+  void test_default_pool_bands_server_declared_poa (void);
 
-  void test_no_lanes_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL);
+  void test_no_lanes_bands_server_declared_poa (void);
 
-  void test_lanes_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL);
+  void test_lanes_bands_server_declared_poa (void);
 
 private:
 
@@ -280,7 +275,7 @@ server::server (CORBA::ORB_ptr orb,
 }
 
 void
-server::test_root_poa (ACE_ENV_SINGLE_ARG_DECL)
+server::test_root_poa (void)
 {
   test_i *servant = 0;
   ACE_NEW_THROW_EX (servant,
@@ -289,37 +284,32 @@ server::test_root_poa (ACE_ENV_SINGLE_ARG_DECL)
                             TAO_INVALID_PRIORITY,
                             TAO_INVALID_PRIORITY),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   PortableServer::ServantBase_var safe_servant (servant);
 
   test_var test =
-    servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    servant->_this ();
 
   write_iors_to_file (test.in (),
                       this->orb_.in (),
                       "root"
                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 void
-server::test_child_poa (ACE_ENV_SINGLE_ARG_DECL)
+server::test_child_poa (void)
 {
   CORBA::PolicyList policies;
   policies.length (1);
   policies[policies.length () - 1] =
     this->root_poa_->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
                                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   PortableServer::POA_var poa =
     this->root_poa_->create_POA ("child",
                                  this->poa_manager_.in (),
                                  policies
                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   test_i *servant = 0;
   ACE_NEW_THROW_EX (servant,
@@ -328,19 +318,16 @@ server::test_child_poa (ACE_ENV_SINGLE_ARG_DECL)
                             TAO_INVALID_PRIORITY,
                             TAO_INVALID_PRIORITY),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   PortableServer::ServantBase_var safe_servant (servant);
 
   test_var test =
-    servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    servant->_this ();
 
   write_iors_to_file (test.in (),
                       this->orb_.in (),
                       "child"
                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 void
@@ -356,7 +343,6 @@ server::test_default_pool_poa (CORBA::Short server_priority,
                      client_priority,
                      test_name
                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 void
@@ -381,14 +367,12 @@ server::test_bands_poa (CORBA::PolicyList &policies,
   policies[policies.length () - 1] =
     this->rt_orb_->create_priority_banded_connection_policy (bands
                                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   (this->*function) (policies,
                      server_priority,
                      client_priority,
                      test_name
                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 void
@@ -407,12 +391,10 @@ server::test_no_lanes_poa (CORBA::Short server_priority,
                                       max_buffered_requests,
                                       max_request_buffer_size
                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   CORBA::Policy_var threadpool_policy =
     this->rt_orb_->create_threadpool_policy (threadpool_id
                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   CORBA::PolicyList policies;
   policies.length (1);
@@ -424,7 +406,6 @@ server::test_no_lanes_poa (CORBA::Short server_priority,
                      client_priority,
                      test_name
                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 void
@@ -457,12 +438,10 @@ server::test_lanes_poa (CORBA::Short server_priority,
                                                  max_buffered_requests,
                                                  max_request_buffer_size
                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   CORBA::Policy_var threadpool_policy =
     this->rt_orb_->create_threadpool_policy (threadpool_id
                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   CORBA::PolicyList policies;
   policies.length (1);
@@ -474,7 +453,6 @@ server::test_lanes_poa (CORBA::Short server_priority,
                      client_priority,
                      test_name
                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 void
@@ -489,19 +467,16 @@ server::test_no_bands_client_propagated_poa (CORBA::PolicyList &policies,
     this->rt_orb_->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
                                                  default_thread_priority
                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   PortableServer::POA_var poa =
     this->root_poa_->create_POA (test_name,
                                  this->poa_manager_.in (),
                                  policies
                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   RTPortableServer::POA_var rt_poa =
     RTPortableServer::POA::_narrow (poa.in ()
                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   test_i *servant = 0;
   ACE_NEW_THROW_EX (servant,
@@ -510,25 +485,21 @@ server::test_no_bands_client_propagated_poa (CORBA::PolicyList &policies,
                             server_priority,
                             client_priority),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   PortableServer::ServantBase_var safe_servant (servant);
 
   PortableServer::ObjectId_var id =
     rt_poa->activate_object (servant
                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   CORBA::Object_var object =
     poa->id_to_reference (id.in ()
                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   write_iors_to_file (object.in (),
                       this->orb_.in (),
                       test_name
                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 void
@@ -544,73 +515,66 @@ server::test_bands_client_propagated_poa (CORBA::PolicyList &policies,
                         &server::test_no_bands_client_propagated_poa,
                         test_name
                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 void
-server::test_default_pool_no_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL)
+server::test_default_pool_no_bands_client_propagated_poa (void)
 {
   this->test_default_pool_poa (::client_priority + 1,
                                ::client_priority + 1,
                                &server::test_no_bands_client_propagated_poa,
                                "default_pool_no_bands_client_propagated"
                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 void
-server::test_no_lanes_no_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL)
+server::test_no_lanes_no_bands_client_propagated_poa (void)
 {
   this->test_no_lanes_poa (::client_priority - 1,
                            ::client_priority - 1,
                            &server::test_no_bands_client_propagated_poa,
                            "no_lanes_no_bands_client_propagated"
                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 void
-server::test_lanes_no_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL)
+server::test_lanes_no_bands_client_propagated_poa (void)
 {
   this->test_lanes_poa (::client_priority,
                         ::client_priority,
                         &server::test_no_bands_client_propagated_poa,
                         "lanes_no_bands_client_propagated"
                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 void
-server::test_default_pool_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL)
+server::test_default_pool_bands_client_propagated_poa (void)
 {
   this->test_default_pool_poa (::client_priority + 1,
                                ::client_priority + 1,
                                &server::test_bands_client_propagated_poa,
                                "default_pool_bands_client_propagated"
                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 void
-server::test_no_lanes_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL)
+server::test_no_lanes_bands_client_propagated_poa (void)
 {
   this->test_no_lanes_poa (::client_priority - 1,
                            ::client_priority - 1,
                            &server::test_bands_client_propagated_poa,
                            "no_lanes_bands_client_propagated"
                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 void
-server::test_lanes_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL)
+server::test_lanes_bands_client_propagated_poa (void)
 {
   this->test_lanes_poa (::client_priority,
                         ::client_priority + 1,
                         &server::test_bands_client_propagated_poa,
                         "lanes_bands_client_propagated"
                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
 }
 
@@ -626,19 +590,16 @@ server::test_no_bands_server_declared_poa (CORBA::PolicyList &policies,
     this->rt_orb_->create_priority_model_policy (RTCORBA::SERVER_DECLARED,
                                                  default_thread_priority
                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   PortableServer::POA_var poa =
     this->root_poa_->create_POA (test_name,
                                  this->poa_manager_.in (),
                                  policies
                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   RTPortableServer::POA_var rt_poa =
     RTPortableServer::POA::_narrow (poa.in ()
                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   test_i *servant = 0;
   ACE_NEW_THROW_EX (servant,
@@ -647,7 +608,6 @@ server::test_no_bands_server_declared_poa (CORBA::PolicyList &policies,
                             server_priority,
                             client_priority),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   PortableServer::ServantBase_var safe_servant (servant);
 
@@ -655,18 +615,15 @@ server::test_no_bands_server_declared_poa (CORBA::PolicyList &policies,
     rt_poa->activate_object_with_priority (servant,
                                            ::server_priority
                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   CORBA::Object_var object =
     poa->id_to_reference (id.in ()
                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   write_iors_to_file (object.in (),
                       this->orb_.in (),
                       test_name
                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 void
@@ -682,73 +639,66 @@ server::test_bands_server_declared_poa (CORBA::PolicyList &policies,
                         &server::test_no_bands_server_declared_poa,
                         test_name
                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 void
-server::test_default_pool_no_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL)
+server::test_default_pool_no_bands_server_declared_poa (void)
 {
   this->test_default_pool_poa (::server_priority,
                                ::client_priority + 1,
                                &server::test_no_bands_server_declared_poa,
                                "default_pool_no_bands_server_declared"
                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 void
-server::test_no_lanes_no_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL)
+server::test_no_lanes_no_bands_server_declared_poa (void)
 {
   this->test_no_lanes_poa (::server_priority,
                            ::client_priority - 1,
                            &server::test_no_bands_server_declared_poa,
                            "no_lanes_no_bands_server_declared"
                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 void
-server::test_lanes_no_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL)
+server::test_lanes_no_bands_server_declared_poa (void)
 {
   this->test_lanes_poa (::server_priority,
                         ::client_priority + 1,
                         &server::test_no_bands_server_declared_poa,
                         "lanes_no_bands_server_declared"
                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 void
-server::test_default_pool_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL)
+server::test_default_pool_bands_server_declared_poa (void)
 {
   this->test_default_pool_poa (::server_priority,
                                ::client_priority - 1,
                                &server::test_bands_server_declared_poa,
                                "default_pool_bands_server_declared"
                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 void
-server::test_no_lanes_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL)
+server::test_no_lanes_bands_server_declared_poa (void)
 {
   this->test_no_lanes_poa (::server_priority,
                            ::client_priority + 1,
                            &server::test_bands_server_declared_poa,
                            "no_lanes_bands_server_declared"
                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 void
-server::test_lanes_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL)
+server::test_lanes_bands_server_declared_poa (void)
 {
   this->test_lanes_poa (::server_priority,
                         ::client_priority - 1,
                         &server::test_bands_server_declared_poa,
                         "lanes_bands_server_declared"
                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 class Task : public ACE_Task_Base
@@ -779,12 +729,10 @@ Task::svc (void)
       CORBA::Object_var object =
         this->orb_->resolve_initial_references ("RTORB"
                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       RTCORBA::RTORB_var rt_orb =
         RTCORBA::RTORB::_narrow (object.in ()
                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // The following sets the current thread to the lowest priority
       // for this scheduling policy.  This will give us the biggest
@@ -808,16 +756,13 @@ Task::svc (void)
       object =
         this->orb_->resolve_initial_references ("RTCurrent"
                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       RTCORBA::Current_var current =
         RTCORBA::Current::_narrow (object.in ()
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       default_thread_priority =
-        current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        current->the_priority ();
 
       client_priority =
         default_thread_priority + 2;
@@ -828,72 +773,52 @@ Task::svc (void)
       object =
         this->orb_->resolve_initial_references ("RootPOA"
                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (object.in ()
                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       server server (this->orb_.in (),
                      rt_orb.in (),
                      root_poa.in (),
                      poa_manager.in ());
 
-      server.test_root_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server.test_root_poa ();
 
-      server.test_child_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server.test_child_poa ();
 
-      server.test_default_pool_no_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server.test_default_pool_no_bands_client_propagated_poa ();
 
-      server.test_default_pool_no_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server.test_default_pool_no_bands_server_declared_poa ();
 
-      server.test_no_lanes_no_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server.test_no_lanes_no_bands_client_propagated_poa ();
 
-      server.test_no_lanes_no_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server.test_no_lanes_no_bands_server_declared_poa ();
 
-      server.test_lanes_no_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server.test_lanes_no_bands_client_propagated_poa ();
 
-      server.test_lanes_no_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server.test_lanes_no_bands_server_declared_poa ();
 
-      server.test_default_pool_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server.test_default_pool_bands_client_propagated_poa ();
 
-      server.test_default_pool_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server.test_default_pool_bands_server_declared_poa ();
 
-      server.test_no_lanes_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server.test_no_lanes_bands_client_propagated_poa ();
 
-      server.test_no_lanes_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server.test_no_lanes_bands_server_declared_poa ();
 
-      server.test_lanes_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server.test_lanes_bands_client_propagated_poa ();
 
-      server.test_lanes_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server.test_lanes_bands_server_declared_poa ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
 
-      this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->destroy ();
     }
   ACE_CATCHANY
     {
@@ -915,7 +840,6 @@ main (int argc, char **argv)
                          argv,
                          0
                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       int result =
         parse_args (argc, argv);
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp
index d33a71f3f25..850a1857e9b 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp
@@ -86,35 +86,28 @@ Task::svc (void)
     {
       CORBA::Object_var object =
         this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       test_var test =
         test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       object =
         this->orb_->resolve_initial_references ("RTORB"
                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       RTCORBA::RTORB_var rt_orb =
         RTCORBA::RTORB::_narrow (object.in ()
                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       object =
         this->orb_->resolve_initial_references ("RTCurrent"
                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       RTCORBA::Current_var rt_current =
         RTCORBA::Current::_narrow (object.in ()
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       RTCORBA::Priority default_thread_priority =
-        rt_current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        rt_current->the_priority ();
 
       RTCORBA::Priority low_priority =
         default_thread_priority;
@@ -136,26 +129,21 @@ Task::svc (void)
           policies[0] =
             rt_orb->create_priority_banded_connection_policy (bands
                                                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           object =
             test->_set_policy_overrides (policies,
                                          CORBA::SET_OVERRIDE
                                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           test =
             test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
         }
 
       rt_current->the_priority (low_priority
                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       test->initialize (iterations * 2
                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       int i = 0;
       char iteration_description[BUFSIZ];
@@ -165,12 +153,10 @@ Task::svc (void)
           test->method (work,
                         iteration_description
                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
         }
 
       rt_current->the_priority (high_priority
                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       for (i = 0; i != iterations; ++i)
         {
@@ -178,7 +164,6 @@ Task::svc (void)
           test->method (work,
                         iteration_description
                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
         }
     }
   ACE_CATCHANY
@@ -199,7 +184,6 @@ main (int argc, char *argv[])
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       int result =
         parse_args (argc, argv);
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp
index b14c292ffe6..dcd2b4a17d5 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp
@@ -64,7 +64,6 @@ write_ior_to_file (CORBA::ORB_ptr orb,
   CORBA::String_var ior =
     orb->object_to_string (test
                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   char filename[BUFSIZ];
   ACE_OS::sprintf (filename,
@@ -109,7 +108,6 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
     root_poa->create_implicit_activation_policy
     (PortableServer::IMPLICIT_ACTIVATION
      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   // Thread pool policy.
   policies[1] =
@@ -120,7 +118,6 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
     rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
                                           0
                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   // Create the POA under the RootPOA.
   PortableServer::POA_var poa =
@@ -128,15 +125,13 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
                           poa_manager,
                           policies
                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   // Creation of POAs is over. Destroy the Policy objects.
   for (CORBA::ULong i = 0;
        i < policies.length ();
        ++i)
     {
-      policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      policies[i]->destroy ();
     }
 
   test_i *servant =
@@ -149,14 +144,12 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
   ACE_UNUSED_ARG (safe_servant);
 
   test_var test =
-    servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    servant->_this ();
 
   int const result =
     write_ior_to_file (orb,
                        test.in ()
                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   return result;
 }
@@ -189,46 +182,37 @@ Task::svc (void)
       CORBA::Object_var object =
         this->orb_->resolve_initial_references ("RootPOA"
                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (object.in ()
                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       object =
         this->orb_->resolve_initial_references ("RTORB"
                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       RTCORBA::RTORB_var rt_orb =
         RTCORBA::RTORB::_narrow (object.in ()
                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       object =
         this->orb_->resolve_initial_references ("RTCurrent"
                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       RTCORBA::Current_var current =
         RTCORBA::Current::_narrow (object.in ()
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       RTCORBA::Priority default_thread_priority =
-        current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        current->the_priority ();
 
       low_priority = default_thread_priority;
       high_priority = default_thread_priority + 1;
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       CORBA::ULong stacksize = 0;
       CORBA::Boolean allow_request_buffering = 0;
@@ -244,12 +228,10 @@ Task::svc (void)
                                    max_buffered_requests,
                                    max_request_buffer_size
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       CORBA::Policy_var threadpool_policy_1 =
         rt_orb->create_threadpool_policy (threadpool_id_1
                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       CORBA::Boolean allow_borrowing = 0;
       RTCORBA::ThreadpoolLanes lanes (2);
@@ -271,12 +253,10 @@ Task::svc (void)
                                               max_buffered_requests,
                                               max_request_buffer_size
                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       CORBA::Policy_var threadpool_policy_2 =
         rt_orb->create_threadpool_policy (threadpool_id_2
                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       int result =
         create_POA_and_register_servant (threadpool_policy_1.in (),
@@ -286,7 +266,6 @@ Task::svc (void)
                                          this->orb_.in (),
                                          rt_orb.in ()
                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (result != 0)
         return result;
 
@@ -298,15 +277,12 @@ Task::svc (void)
                                          this->orb_.in (),
                                          rt_orb.in ()
                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (result != 0)
         return result;
 
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
 
-      this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->destroy ();
     }
   ACE_CATCHANY
     {
@@ -329,7 +305,6 @@ main (int argc, char *argv[])
                          argv,
                          ""
                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       int result =
         parse_args (argc, argv);
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp
index e4ae87b051b..a83c6442b0e 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp
@@ -29,7 +29,6 @@ test_i::test_i (CORBA::ORB_ptr orb,
       CORBA::Object_var object =
         this->orb_->resolve_initial_references ("RTCurrent"
                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       this->rt_current_ =
         RTCORBA::Current::_narrow (object.in ()
@@ -60,8 +59,7 @@ test_i::method (CORBA::ULong work,
     (TAO_Thread_Lane *) tss->lane_;
 
   RTCORBA::Priority current_priority =
-    this->rt_current_->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->rt_current_->the_priority ();
 
   const char *priority_string = 0;
   if (current_priority == this->low_priority_)
@@ -99,12 +97,11 @@ test_i::method (CORBA::ULong work,
     {
       this->orb_->shutdown (0
                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
     }
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.h b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.h
index 634167f5f35..3d7bb55eb47 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.h
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.h
@@ -33,7 +33,7 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Our POA.
-  PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+  PortableServer::POA_ptr _default_POA (void);
 
   /// Work (burn CPU).
   void work (CORBA::ULong work);
diff --git a/TAO/tests/RTCORBA/Private_Connection/client.cpp b/TAO/tests/RTCORBA/Private_Connection/client.cpp
index a1b7369b55d..42e98aa72ad 100644
--- a/TAO/tests/RTCORBA/Private_Connection/client.cpp
+++ b/TAO/tests/RTCORBA/Private_Connection/client.cpp
@@ -58,7 +58,6 @@ main (int argc, char *argv[])
       // ORB.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Parse arguments.
       if (parse_args (argc, argv) != 0)
@@ -67,37 +66,29 @@ main (int argc, char *argv[])
       // RTORB.
       CORBA::Object_var object =
         orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ()
                                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (check_for_nil (rt_orb.in (), "RTORB") == -1)
         return -1;
 
       // PolicyCurrent.
       object = orb->resolve_initial_references ("PolicyCurrent"
                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       CORBA::PolicyCurrent_var policy_current =
         CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (check_for_nil (policy_current.in (), "PolicyCurrent")
           == -1)
         return -1;
 
       // Test object 1.
       object = orb->string_to_object (ior1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       Test_var server1 = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (check_for_nil (server1.in (), "server1") == -1)
         return -1;
 
       // Test object 2.
       object = orb->string_to_object (ior2 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       Test_var server2 = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (check_for_nil (server2.in (), "server2") == -1)
         return -1;
 
@@ -106,30 +97,25 @@ main (int argc, char *argv[])
       // following three.
       ACE_DEBUG ((LM_DEBUG,
                   "\n  Invocation 1 --> new connection\n"));
-      server1->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server1->test_method ();
 
       ACE_DEBUG ((LM_DEBUG,
                   "\n  Invocation 2 --> use connection from invocation 1\n"));
-      server2->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server2->test_method ();
 
       ACE_DEBUG ((LM_DEBUG,
                   "\n  Invocation 3 --> use connection from invocation 1\n"));
-      server1->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server1->test_method ();
 
       ACE_DEBUG ((LM_DEBUG,
                   "\n  Invocation 4 --> use connection from invocation 1\n"));
-      server2->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server2->test_method ();
 
       // Set RTCORBA::PrivateConnectionPolicy on PolicyCurrent.
       CORBA::PolicyList policy_list;
       policy_list.length (1);
       policy_list[0] =
-        rt_orb->create_private_connection_policy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        rt_orb->create_private_connection_policy ();
 
       policy_current->set_policy_overrides (policy_list,
                                             CORBA::SET_OVERRIDE
@@ -143,29 +129,24 @@ main (int argc, char *argv[])
       // third, and <server2>'s reused on fourth.
       ACE_DEBUG ((LM_DEBUG,
                   "\n  Invocation 5 --> new connection\n"));
-      server1->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server1->test_method ();
 
       ACE_DEBUG ((LM_DEBUG,
                   "\n  Invocation 6 --> new connection\n"));
-      server2->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server2->test_method ();
 
       ACE_DEBUG ((LM_DEBUG,
                   "\n  Invocation 7 --> use connection from invocation 5\n"));
-      server1->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server1->test_method ();
 
       ACE_DEBUG ((LM_DEBUG,
                   "\n  Invocation 8 --> use connection from invocation 6\n"));
-      server2->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server2->test_method ();
 
       // Testing over.  Shut down Server ORB.
       ACE_DEBUG ((LM_DEBUG,
                   "\n  Testing over - shutting down\n"));
-      server1->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server1->shutdown ();
     }
   ACE_CATCHANY
     {
diff --git a/TAO/tests/RTCORBA/Private_Connection/server.cpp b/TAO/tests/RTCORBA/Private_Connection/server.cpp
index 07a844b3abb..2f802f07872 100644
--- a/TAO/tests/RTCORBA/Private_Connection/server.cpp
+++ b/TAO/tests/RTCORBA/Private_Connection/server.cpp
@@ -16,10 +16,10 @@ public:
   // ctor
 
   // = The Test methods.
-  void test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void test_method (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -41,7 +41,7 @@ Test_i::test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/* ACE_ENV_SINGLE_ARG_PARAM
 }
 
 void
-Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Test_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
@@ -107,17 +107,14 @@ create_object (PortableServer::POA_ptr poa,
   PortableServer::ObjectId_var id =
     poa->activate_object (server_impl ACE_ENV_ARG_PARAMETER);
 
-  ACE_CHECK_RETURN (-1);
 
   CORBA::Object_var server =
     poa->id_to_reference (id.in ()
                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   // Print out the IOR.
   CORBA::String_var ior =
     orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG, "<%s>\n\n", ior.in ()));
 
@@ -145,7 +142,6 @@ main (int argc, char *argv[])
       // ORB.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Parse arguments.
       if (parse_args (argc, argv) != 0)
@@ -154,17 +150,14 @@ main (int argc, char *argv[])
       // RootPOA.
       CORBA::Object_var object =
         orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (check_for_nil (root_poa.in (), "RootPOA") == -1)
         return -1;
 
       // POAManager.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       // Servants.
       Test_i server_impl1 (orb.in ());
@@ -177,7 +170,6 @@ main (int argc, char *argv[])
                               &server_impl1,
                               ior_output_file1
                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (result == -1)
         return -1;
 
@@ -186,16 +178,13 @@ main (int argc, char *argv[])
                               &server_impl2,
                               ior_output_file2
                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (result == -1)
         return -1;
 
       // Run ORB Event loop.
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n"));
     }
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp
index 61acf71eab9..247d0ba484f 100644
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp
+++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp
@@ -105,7 +105,7 @@ public:
           RTCORBA::RTORB_ptr rt_orb,
           CORBA::PolicyManager_ptr policy_manager);
 
-  void vanilla_invocations (ACE_ENV_SINGLE_ARG_DECL);
+  void vanilla_invocations (void);
 
   void priority_invocations (int debug
                              ACE_ENV_ARG_DECL);
@@ -116,9 +116,9 @@ public:
   void set_priority_bands (int debug
                            ACE_ENV_ARG_DECL);
 
-  void set_private_connection_policies (ACE_ENV_SINGLE_ARG_DECL);
+  void set_private_connection_policies (void);
 
-  void reset_policies (ACE_ENV_SINGLE_ARG_DECL);
+  void reset_policies (void);
 
 
 private:
@@ -142,7 +142,7 @@ public:
 
   int svc (void);
 
-  void validate_connection (ACE_ENV_SINGLE_ARG_DECL);
+  void validate_connection (void);
 
 private:
   Client client_;
@@ -165,7 +165,7 @@ Worker_Thread::Worker_Thread (ACE_Thread_Manager &thread_manager,
 }
 
 void
-Worker_Thread::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
+Worker_Thread::validate_connection (void)
 {
   // Try to validate the connection several times, ignoring transient
   // exceptions.  If the connection can still not be setup, return
@@ -180,7 +180,6 @@ Worker_Thread::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
           ++current_attempt;
           this->test_->_validate_connection (inconsistent_policies.out ()
                                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           // If successful, we are done.
           return;
@@ -198,7 +197,6 @@ Worker_Thread::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
           ACE_RE_THROW;
         }
       ACE_ENDTRY;
-      ACE_CHECK;
     }
 }
 
@@ -209,13 +207,10 @@ Worker_Thread::svc (void)
     {
       this->current_->the_priority (this->priority_
                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
-      this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->validate_connection ();
 
-      this->client_.vanilla_invocations (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->client_.vanilla_invocations ();
     }
   ACE_CATCHANY
     {
@@ -240,12 +235,11 @@ Client::Client (test_ptr test,
 }
 
 void
-Client::vanilla_invocations (ACE_ENV_SINGLE_ARG_DECL)
+Client::vanilla_invocations (void)
 {
   for (int i = 0; i < iterations; i++)
     {
-      this->test_->method (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->test_->method ();
     }
 }
 
@@ -329,7 +323,6 @@ Client::set_client_protocols_policies (int debug
                    policies,
                    debug
                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
   if (result != 0)
     {
       ACE_ERROR ((LM_ERROR,
@@ -341,7 +334,6 @@ Client::set_client_protocols_policies (int debug
   this->policy_manager_->set_policy_overrides (policies,
                                                CORBA::ADD_OVERRIDE
                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 void
@@ -357,7 +349,6 @@ Client::set_priority_bands (int debug
                         policies,
                         debug
                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
   if (result != 0)
     {
       ACE_ERROR ((LM_ERROR,
@@ -369,34 +360,30 @@ Client::set_priority_bands (int debug
   this->policy_manager_->set_policy_overrides (policies,
                                                CORBA::ADD_OVERRIDE
                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 void
-Client::set_private_connection_policies (ACE_ENV_SINGLE_ARG_DECL)
+Client::set_private_connection_policies (void)
 {
   CORBA::PolicyList policies;
   policies.length (1);
 
   policies[0] =
-    this->rt_orb_->create_private_connection_policy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->rt_orb_->create_private_connection_policy ();
 
   this->policy_manager_->set_policy_overrides (policies,
                                                CORBA::ADD_OVERRIDE
                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 void
-Client::reset_policies (ACE_ENV_SINGLE_ARG_DECL)
+Client::reset_policies (void)
 {
   CORBA::PolicyList empty_policies;
 
   this->policy_manager_->set_policy_overrides (empty_policies,
                                                CORBA::SET_OVERRIDE
                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 class Task : public ACE_Task_Base
@@ -427,46 +414,37 @@ Task::svc (void)
       CORBA::Object_var object =
         this->orb_->resolve_initial_references ("RTORB"
                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       RTCORBA::RTORB_var rt_orb =
         RTCORBA::RTORB::_narrow (object.in ()
                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       object =
         this->orb_->resolve_initial_references ("ORBPolicyManager"
                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       CORBA::PolicyManager_var policy_manager =
         CORBA::PolicyManager::_narrow (object.in ()
                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       object =
         this->orb_->resolve_initial_references ("RTCurrent"
                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       RTCORBA::Current_var current =
         RTCORBA::Current::_narrow (object.in ()
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       current->the_priority (0
                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       object =
         this->orb_->string_to_object (ior
                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       test_var test =
         test::_narrow (object.in ()
                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       Client client (test.in (),
                      this->orb_.in (),
@@ -474,78 +452,57 @@ Task::svc (void)
                      rt_orb.in (),
                      policy_manager.in ());
 
-      client.vanilla_invocations (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      client.vanilla_invocations ();
 
-      client.set_private_connection_policies (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      client.set_private_connection_policies ();
 
-      client.vanilla_invocations (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      client.vanilla_invocations ();
 
-      client.reset_policies (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      client.reset_policies ();
 
       client.set_client_protocols_policies (debug
                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
-      client.vanilla_invocations (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      client.vanilla_invocations ();
 
-      client.set_private_connection_policies (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      client.set_private_connection_policies ();
 
-      client.vanilla_invocations (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      client.vanilla_invocations ();
 
-      client.reset_policies (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      client.reset_policies ();
 
       client.set_priority_bands (debug
                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       client.priority_invocations (debug
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
-      client.set_private_connection_policies (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      client.set_private_connection_policies ();
 
       client.priority_invocations (debug
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
-      client.reset_policies (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      client.reset_policies ();
 
       client.set_priority_bands (debug
                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       client.set_client_protocols_policies (0
                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       client.priority_invocations (0
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
-      client.set_private_connection_policies (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      client.set_private_connection_policies ();
 
       client.priority_invocations (debug
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
-      client.reset_policies (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      client.reset_policies ();
 
       if (shutdown_server)
         {
-          test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test->shutdown ();
         }
     }
   ACE_CATCHANY
@@ -570,7 +527,6 @@ main (int argc, char **argv)
                          argv,
                          0
                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       int parse_args_result =
         parse_args (argc, argv);
@@ -625,7 +581,6 @@ main (int argc, char **argv)
       return -1;
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp
index 234e6d3ef58..31433ff9507 100644
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp
+++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp
@@ -30,13 +30,13 @@ public:
   test_i (CORBA::ORB_ptr orb,
           PortableServer::POA_ptr poa);
 
-  void method (ACE_ENV_SINGLE_ARG_DECL)
+  void method (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+  PortableServer::POA_ptr _default_POA (void);
 
 private:
 
@@ -52,7 +52,7 @@ test_i::test_i (CORBA::ORB_ptr orb,
 }
 
 void
-test_i::method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::method (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the ORB_Core's TSS resources.
@@ -77,7 +77,7 @@ test_i::method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+test_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (debug)
@@ -86,11 +86,10 @@ test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 
   this->orb_->shutdown (0
                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -157,7 +156,6 @@ write_iors_to_file (CORBA::Object_ptr object,
   CORBA::String_var ior =
     orb->object_to_string (object
                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   u_int result = 0;
   result =
@@ -182,7 +180,6 @@ vanilla_poa (CORBA::ORB_ptr orb,
   CORBA::Policy_var implicit_activation_policy =
     root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   policies.length (policies.length () + 1);
   policies[policies.length () - 1] =
@@ -193,25 +190,21 @@ vanilla_poa (CORBA::ORB_ptr orb,
                           poa_manager,
                           policies
                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   test_i *servant = 0;
   ACE_NEW_THROW_EX (servant,
                     test_i (orb,
                             poa.in ()),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   PortableServer::ServantBase_var safe_servant (servant);
 
   test_var test =
-    servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    servant->_this ();
 
   write_iors_to_file (test.in (),
                       orb
                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 void
@@ -230,7 +223,6 @@ rt_poa (CORBA::ORB_ptr orb,
                         policies,
                         debug
                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
   if (result != 0)
     {
       ACE_ERROR ((LM_ERROR,
@@ -253,7 +245,6 @@ rt_poa (CORBA::ORB_ptr orb,
                         policies,
                         debug
                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
   if (result != 0)
     {
       ACE_ERROR ((LM_ERROR,
@@ -266,13 +257,11 @@ rt_poa (CORBA::ORB_ptr orb,
     rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
                                           0
                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   // Implicit_activation policy.
   CORBA::Policy_var implicit_activation_policy =
     root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   policies.length (policies.length () + 1);
   policies[policies.length () - 1] =
@@ -287,25 +276,21 @@ rt_poa (CORBA::ORB_ptr orb,
                           poa_manager,
                           policies
                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   test_i *servant = 0;
   ACE_NEW_THROW_EX (servant,
                     test_i (orb,
                             poa.in ()),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   PortableServer::ServantBase_var safe_servant (servant);
 
   test_var test =
-    servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    servant->_this ();
 
   write_iors_to_file (test.in (),
                       orb
                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 class Task : public ACE_Task_Base
@@ -336,48 +321,38 @@ Task::svc (void)
       CORBA::Object_var object =
         this->orb_->resolve_initial_references ("RTORB"
                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       RTCORBA::RTORB_var rt_orb =
         RTCORBA::RTORB::_narrow (object.in ()
                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       object =
         this->orb_->resolve_initial_references ("RootPOA"
                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (object.in ()
                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       vanilla_poa (this->orb_.in (),
                    root_poa.in (),
                    poa_manager.in ()
                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       rt_poa (this->orb_.in (),
               rt_orb.in (),
               root_poa.in (),
               poa_manager.in ()
               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
 
-      this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->destroy ();
     }
   ACE_CATCHANY
     {
@@ -399,7 +374,6 @@ main (int argc, char **argv)
                          argv,
                          0
                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       int result =
         parse_args (argc, argv);
diff --git a/TAO/tests/RTCORBA/RTMutex/server.cpp b/TAO/tests/RTCORBA/RTMutex/server.cpp
index 425db1603fb..861a42c745c 100644
--- a/TAO/tests/RTCORBA/RTMutex/server.cpp
+++ b/TAO/tests/RTCORBA/RTMutex/server.cpp
@@ -67,23 +67,17 @@ test_mutex_simple (RTCORBA::RTORB_ptr rt_orb)
     {
       RTCORBA::Mutex_var my_mutex;
 
-      my_mutex = rt_orb->create_mutex (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      my_mutex = rt_orb->create_mutex ();
 
-      my_mutex->lock (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      my_mutex->lock ();
 
-      my_mutex->unlock (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      my_mutex->unlock ();
 
-      my_mutex->lock (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      my_mutex->lock ();
 
-      my_mutex->unlock (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      my_mutex->unlock ();
 
       rt_orb->destroy_mutex (my_mutex.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
     }
   ACE_CATCHANY
@@ -111,7 +105,6 @@ test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb)
 
       larry_mutex1 = rt_orb->create_named_mutex ("larry",
                                                  created_flag ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (created_flag != 1)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -121,18 +114,15 @@ test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb)
       moe_mutex1 = rt_orb->create_named_mutex ("moe",
                                                created_flag
                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (created_flag != 1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "ERROR: Expected named mutex moe to be created, but it wasn't\n"),
                           -1);
 
-      larry_mutex1->lock (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      larry_mutex1->lock ();
 
-      larry_mutex1->unlock (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      larry_mutex1->unlock ();
 
       // Test creating the mutex a second time
       {
@@ -140,7 +130,6 @@ test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb)
         larry_mutex2 = rt_orb->create_named_mutex ("larry",
                                                    created_flag
                                                    ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
 
         if (created_flag != 0)
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -154,11 +143,9 @@ test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb)
                              "ERROR: Should have gotten the same mutex, but didn't\n"),
                             -1);
 
-        larry_mutex2->lock (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        larry_mutex2->lock ();
 
-        larry_mutex2->unlock (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        larry_mutex2->unlock ();
       }
 
       // test opening the mutex
@@ -166,7 +153,6 @@ test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb)
         RTCORBA::Mutex_var larry_mutex3;
         larry_mutex3 = rt_orb->open_named_mutex ("larry"
                                                  ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
 
         // test the pointers...
         if (reinterpret_cast<void *> (larry_mutex1.in ())
@@ -175,25 +161,19 @@ test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb)
                              "ERROR: Should have gotten the same mutex, but didn't\n"),
                             -1);
 
-        larry_mutex3->lock (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        larry_mutex3->lock ();
 
-        larry_mutex3->unlock (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        larry_mutex3->unlock ();
       }
 
       // Make sure that nothing has been broken behind the scenes.
-      larry_mutex1->lock (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      larry_mutex1->lock ();
 
-      larry_mutex1->unlock (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      larry_mutex1->unlock ();
 
       rt_orb->destroy_mutex (larry_mutex1.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       rt_orb->destroy_mutex (moe_mutex1.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -218,7 +198,6 @@ test_named_mutex_exception (RTCORBA::RTORB_ptr rt_orb)
       RTCORBA::Mutex_var larry_mutex1;
 
       larry_mutex1 = rt_orb->open_named_mutex ("larry" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       ACE_ERROR_RETURN ((LM_ERROR,
                          "Expected a MutexNotFound exception, but didn't get one.\n"),
@@ -269,7 +248,6 @@ mutex_test_thread (void *args)
                       ACE_TEXT ("(%P|%t) = trying to lock on iteration %d\n"),
                       i));
           mutex->lock ();
-          ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("(%P|%t) = locked on iteration %d\n"),
@@ -302,7 +280,6 @@ mutex_test_thread (void *args)
           *shared_var = 0;
 
           mutex->unlock ();
-          ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("(%P|%t) = unlocked on iteration %d\n"),
@@ -335,8 +312,7 @@ test_mutex_threads (RTCORBA::RTORB_ptr rt_orb)
 
   ACE_TRY_NEW_ENV
     {
-      RTCORBA::Mutex_ptr mutex = rt_orb->create_mutex (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      RTCORBA::Mutex_ptr mutex = rt_orb->create_mutex ();
 
       test_data.mutex = mutex;
       test_data.shared_var = &shared_var;
@@ -381,7 +357,6 @@ mutex_test_try_lock_thread (void *args)
       // check that try_lock (0) returns false
       ACE_DEBUG ((LM_DEBUG,"attempting try_lock (0) - expect failure (but no exceptions) \n"));
       result = mutex->try_lock (0u ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (result)
         {
@@ -401,7 +376,6 @@ mutex_test_try_lock_thread (void *args)
 
           timer.start ();
           result = mutex->try_lock (50000000u /*5sec*/ ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
           timer.stop ();
 
           if (result)
@@ -451,13 +425,11 @@ test_mutex_try_lock (RTCORBA::RTORB_ptr rt_orb)
 
   ACE_TRY_NEW_ENV
     {
-      RTCORBA::Mutex_ptr mutex = rt_orb->create_mutex (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      RTCORBA::Mutex_ptr mutex = rt_orb->create_mutex ();
 
       // Test out try_lock and keep the lock so that the spawned task
       // can test out try_lock failure cases
       result = mutex->try_lock (0u ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (!result)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "try_lock failed\n"),
@@ -504,7 +476,6 @@ main (int argc, char *argv[])
     {
       // ORB.
       CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Parse arguments.
       if (parse_args (argc, argv) != 0)
@@ -513,10 +484,8 @@ main (int argc, char *argv[])
       // RTORB.
       CORBA::Object_var object =
         orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ()
                                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (check_for_nil (rt_orb.in (), "RTORB") == -1)
         return -1;
 
diff --git a/TAO/tests/RTCORBA/Server_Declared/client.cpp b/TAO/tests/RTCORBA/Server_Declared/client.cpp
index 9ac3ce834d6..9ad9778c388 100644
--- a/TAO/tests/RTCORBA/Server_Declared/client.cpp
+++ b/TAO/tests/RTCORBA/Server_Declared/client.cpp
@@ -55,25 +55,22 @@ check_policy (Test_ptr server
   CORBA::Policy_var policy =
     server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE
                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   RTCORBA::PriorityModelPolicy_var priority_policy =
     RTCORBA::PriorityModelPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   if (check_for_nil (priority_policy.in (), "PriorityModelPolicy") == -1)
     return -1;
 
   RTCORBA::PriorityModel priority_model =
-    priority_policy->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    priority_policy->priority_model ();
   if (priority_model != RTCORBA::SERVER_DECLARED)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "ERROR: priority_model != "
                        "RTCORBA::SERVER_DECLARED!\n"),
                       -1);
 
-  return priority_policy->server_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return priority_policy->server_priority ();
 }
 
 int
@@ -86,7 +83,6 @@ main (int argc, char *argv[])
       // ORB.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Parse arguments.
       if (parse_args (argc, argv) != 0)
@@ -95,19 +91,15 @@ main (int argc, char *argv[])
       // Test object 1.
       CORBA::Object_var object =
         orb->string_to_object (ior1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       Test_var server1 = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (check_for_nil (server1.in (), "server1") == -1)
         return -1;
 
       // Test object 2.
       object = orb->string_to_object (ior2 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       Test_var server2 = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (check_for_nil (server2.in (), "server2") == -1)
         return -1;
 
@@ -117,7 +109,6 @@ main (int argc, char *argv[])
       // Test object 1.
       CORBA::Short server1_priority =
         check_policy (server1.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (server1_priority == -1)
         return -1;
@@ -125,7 +116,6 @@ main (int argc, char *argv[])
       // Test object 2.
       CORBA::Short server2_priority =
         check_policy (server2.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (server2_priority == -1)
         return -1;
 
@@ -133,15 +123,12 @@ main (int argc, char *argv[])
       for (int i = 0; i < 5; ++i)
         {
           server1->test_method (server1_priority ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           server2->test_method (server2_priority ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
         }
 
       // Testing over. Shut down Server ORB.
-      server1->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server1->shutdown ();
 
     }
   ACE_CATCHANY
diff --git a/TAO/tests/RTCORBA/Server_Declared/server.cpp b/TAO/tests/RTCORBA/Server_Declared/server.cpp
index 6594427f846..8eb17270e82 100644
--- a/TAO/tests/RTCORBA/Server_Declared/server.cpp
+++ b/TAO/tests/RTCORBA/Server_Declared/server.cpp
@@ -21,7 +21,7 @@ public:
                     ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -44,18 +44,15 @@ Test_i::test_method (CORBA::Short priority
 
   CORBA::Object_var obj =
     this->orb_->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   RTCORBA::Current_var current =
     RTCORBA::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   if (CORBA::is_nil (obj.in ()))
     ACE_THROW (CORBA::INTERNAL ());
 
   CORBA::Short servant_thread_priority =
-    current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    current->the_priority ();
 
   // Print out the info.
   if (servant_thread_priority != priority)
@@ -70,7 +67,7 @@ Test_i::test_method (CORBA::Short priority
 }
 
 void
-Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Test_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
@@ -174,17 +171,14 @@ create_object (RTPortableServer::POA_ptr poa,
   else
     id = poa->activate_object (server_impl ACE_ENV_ARG_PARAMETER);
 
-  ACE_CHECK_RETURN (-1);
 
   CORBA::Object_var server =
     poa->id_to_reference (id.in ()
                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   // Print out the IOR.
   CORBA::String_var ior =
     orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG, "<%s>\n\n", ior.in ()));
 
@@ -232,27 +226,22 @@ Task::svc (void)
       // RTORB.
       CORBA::Object_var object =
         this->orb_->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ()
                                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (check_for_nil (rt_orb.in (), "RTORB") == -1)
         return -1;
 
       // RootPOA.
       object =
         this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (check_for_nil (root_poa.in (), "RootPOA") == -1)
         return -1;
 
       // POAManager.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       // Create child POA with SERVER_DECLARED PriorityModelPolicy,
       // and MULTIPLE_ID id uniqueness policy (so we can use one
@@ -263,23 +252,19 @@ Task::svc (void)
         rt_orb->create_priority_model_policy (RTCORBA::SERVER_DECLARED,
                                               poa_priority
                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       poa_policy_list[1] =
         root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID
                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("Child_POA",
                               poa_manager.in (),
                               poa_policy_list
                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       RTPortableServer::POA_var rt_poa =
         RTPortableServer::POA::_narrow (child_poa.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (check_for_nil (rt_poa.in (), "RTPOA") == -1)
         return -1;
 
@@ -291,7 +276,6 @@ Task::svc (void)
       ACE_DEBUG ((LM_DEBUG, "\nActivated object one as "));
       result = create_object (rt_poa.in (), this->orb_.in (), &server_impl,
                               -1, ior_output_file1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (result == -1)
         return -1;
 
@@ -299,17 +283,14 @@ Task::svc (void)
       ACE_DEBUG ((LM_DEBUG, "\nActivated object two as "));
       result = create_object (rt_poa.in (), this->orb_.in (), &server_impl,
                               object_priority, ior_output_file2 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (result == -1)
         return -1;
 
       // Activate POA manager.
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // Start ORB event loop.
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
 
       ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n\n"));
     }
@@ -332,7 +313,6 @@ main (int argc, char *argv[])
       // ORB.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Parse arguments.
       if (parse_args (argc, argv) != 0)
diff --git a/TAO/tests/RTCORBA/Server_Protocol/client.cpp b/TAO/tests/RTCORBA/Server_Protocol/client.cpp
index 7dd24cdb9b5..6ca122e99f7 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/client.cpp
+++ b/TAO/tests/RTCORBA/Server_Protocol/client.cpp
@@ -40,18 +40,15 @@ main (int argc, char *argv[])
       // Initialize and obtain reference to the Test object.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return -1;
 
       CORBA::Object_var object =
         orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       Test_var server =
         Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -62,8 +59,7 @@ main (int argc, char *argv[])
         }
 
       // Make an invocation on the obtained Test object.
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
     }
   ACE_CATCHANY
     {
diff --git a/TAO/tests/RTCORBA/Server_Protocol/server.cpp b/TAO/tests/RTCORBA/Server_Protocol/server.cpp
index 5ca5342d11e..7731d22334c 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/server.cpp
+++ b/TAO/tests/RTCORBA/Server_Protocol/server.cpp
@@ -18,7 +18,7 @@ public:
   Test_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -32,7 +32,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 void
-Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Test_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -102,12 +102,10 @@ check_server_protocol_at_root_poa (CORBA::ORB_ptr /*orb*/,
   CORBA::Policy_var server_protocol =
     policies.get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL
                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   RTCORBA::ServerProtocolPolicy_var policy =
     RTCORBA::ServerProtocolPolicy::_narrow (server_protocol.in ()
                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil (policy.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -115,8 +113,7 @@ check_server_protocol_at_root_poa (CORBA::ORB_ptr /*orb*/,
                        "is missing\n"),
                       -1);
 
-  RTCORBA::ProtocolList_var protocols = policy->protocols (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  RTCORBA::ProtocolList_var protocols = policy->protocols ();
 
   ACE_DEBUG ((LM_DEBUG,
               "\nRoot POA ServerProtocolPolicy "
@@ -137,7 +134,6 @@ check_server_protocol_at_root_poa (CORBA::ORB_ptr /*orb*/,
           RTCORBA::TCPProtocolProperties_var tcp_properties =
             RTCORBA::TCPProtocolProperties::_narrow (properties.in ()
                                                      ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
 
           if (!CORBA::is_nil (tcp_properties.in ()))
             ACE_DEBUG ((LM_DEBUG,
@@ -160,7 +156,6 @@ check_server_protocol_at_root_poa (CORBA::ORB_ptr /*orb*/,
           RTCORBA::UnixDomainProtocolProperties_var uiop_properties =
             RTCORBA::UnixDomainProtocolProperties::_narrow (properties.in ()
                                                             ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
 
           if (!CORBA::is_nil (uiop_properties.in ()))
             ACE_DEBUG ((LM_DEBUG,
@@ -175,7 +170,6 @@ check_server_protocol_at_root_poa (CORBA::ORB_ptr /*orb*/,
           RTCORBA::SharedMemoryProtocolProperties_var shmem_properties =
             RTCORBA::SharedMemoryProtocolProperties::_narrow (properties.in ()
                                                               ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
 
           if (!CORBA::is_nil (shmem_properties.in ()))
             ACE_DEBUG ((LM_DEBUG,
@@ -202,7 +196,6 @@ check_server_protocol_at_root_poa (CORBA::ORB_ptr /*orb*/,
           RTCORBA::UserDatagramProtocolProperties_var diop_properties =
             RTCORBA::UserDatagramProtocolProperties::_narrow (properties.in ()
                                                               ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
 
           if (!CORBA::is_nil (diop_properties.in ()))
             ACE_DEBUG ((LM_DEBUG,
@@ -215,7 +208,6 @@ check_server_protocol_at_root_poa (CORBA::ORB_ptr /*orb*/,
           RTCORBA::StreamControlProtocolProperties_var sciop_properties =
             RTCORBA::StreamControlProtocolProperties::_narrow (properties.in ()
                                                                ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
 
           if (!CORBA::is_nil (sciop_properties.in ()))
             ACE_DEBUG ((LM_DEBUG,
@@ -246,18 +238,15 @@ main (int argc, char *argv[])
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return -1;
 
       CORBA::Object_var object =
         orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -265,20 +254,16 @@ main (int argc, char *argv[])
                           -1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       object = orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ()
                                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Check ServerProtocol configurations.
       int result = check_server_protocol_at_root_poa (orb.in (),
                                                       root_poa.in ()
                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (result != 0)
         return -1;
 
@@ -300,7 +285,6 @@ main (int argc, char *argv[])
       poa_policy_list[0] =
         rt_orb->create_server_protocol_policy (protocols
                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       PortableServer::POA_var poa;
 
@@ -311,30 +295,25 @@ main (int argc, char *argv[])
                                   poa_manager.in (),
                                   poa_policy_list
                                   ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
         }
 
       else
         {
           poa = PortableServer::POA::_duplicate (root_poa.in ());
-          ACE_TRY_CHECK;
         }
 
       Test_i server_impl (orb.in ());
 
       PortableServer::ObjectId_var id =
         poa->activate_object (&server_impl ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       CORBA::Object_var server =
         poa->id_to_reference (id.in ()
                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Print Object IOR.
       CORBA::String_var ior =
         orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "\nActivated as <%s>\n\n", ior.in ()));
 
@@ -351,11 +330,9 @@ main (int argc, char *argv[])
         }
 
       // Run ORB Event loop.
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n\n"));
     }
diff --git a/TAO/tests/RTCORBA/Thread_Pool/client.cpp b/TAO/tests/RTCORBA/Thread_Pool/client.cpp
index 727015a2353..bb03fa95230 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/client.cpp
+++ b/TAO/tests/RTCORBA/Thread_Pool/client.cpp
@@ -78,11 +78,9 @@ Task::svc (void)
     {
       CORBA::Object_var object =
         this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       test_var test =
         test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       pid_t pid =
         ACE_OS::getpid ();
@@ -93,7 +91,6 @@ Task::svc (void)
             test->method (pid,
                           i
                           ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           ACE_ASSERT (r == i);
           // Assert disappears on with optimizations on.
@@ -102,8 +99,7 @@ Task::svc (void)
 
       if (shutdown_server)
         {
-          test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test->shutdown ();
         }
     }
   ACE_CATCHANY
@@ -124,7 +120,6 @@ main (int argc, char *argv[])
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       int result =
         parse_args (argc, argv);
diff --git a/TAO/tests/RTCORBA/Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Thread_Pool/server.cpp
index 5dd811de9bd..6b0cad7d3ab 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/server.cpp
+++ b/TAO/tests/RTCORBA/Thread_Pool/server.cpp
@@ -66,7 +66,6 @@ write_ior_to_file (CORBA::ORB_ptr orb,
   CORBA::String_var ior =
     orb->object_to_string (test
                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   char filename[BUFSIZ];
   ACE_OS::sprintf (filename,
@@ -110,7 +109,6 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
     root_poa->create_implicit_activation_policy
     (PortableServer::IMPLICIT_ACTIVATION
      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   // Thread pool policy.
   policies[1] =
@@ -121,7 +119,6 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
     rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
                                           0
                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   // Create the POA under the RootPOA.
   PortableServer::POA_var poa =
@@ -129,15 +126,13 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
                           poa_manager,
                           policies
                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   // Creation of POAs is over. Destroy the Policy objects.
   for (CORBA::ULong i = 0;
        i < policies.length ();
        ++i)
     {
-      policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      policies[i]->destroy ();
     }
 
   test_i *servant =
@@ -149,14 +144,12 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
   ACE_UNUSED_ARG (safe_servant);
 
   test_var test =
-    servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    servant->_this ();
 
   int result =
     write_ior_to_file (orb,
                        test.in ()
                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   return result;
 }
@@ -189,59 +182,48 @@ Task::svc (void)
       CORBA::Object_var object =
         this->orb_->resolve_initial_references ("RootPOA"
                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (object.in ()
                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       object =
         this->orb_->resolve_initial_references ("RTORB"
                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       RTCORBA::RTORB_var rt_orb =
         RTCORBA::RTORB::_narrow (object.in ()
                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       object =
         this->orb_->resolve_initial_references ("RTCurrent"
                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       RTCORBA::Current_var current =
         RTCORBA::Current::_narrow (object.in ()
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       RTCORBA::Priority default_thread_priority =
-        current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        current->the_priority ();
 
       test_i servant (this->orb_.in (),
                       root_poa.in (),
                       nap_time);
       test_var test =
-        servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        servant._this ();
 
       int result =
         write_ior_to_file (this->orb_.in (),
                            test.in ()
                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (result != 0)
         return result;
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       CORBA::ULong stacksize = 0;
       CORBA::Boolean allow_request_buffering = 0;
@@ -257,12 +239,10 @@ Task::svc (void)
                                    max_buffered_requests,
                                    max_request_buffer_size
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       CORBA::Policy_var threadpool_policy_1 =
         rt_orb->create_threadpool_policy (threadpool_id_1
                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       CORBA::Boolean allow_borrowing = 0;
       RTCORBA::ThreadpoolLanes lanes (1);
@@ -280,12 +260,10 @@ Task::svc (void)
                                               max_buffered_requests,
                                               max_request_buffer_size
                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       CORBA::Policy_var threadpool_policy_2 =
         rt_orb->create_threadpool_policy (threadpool_id_2
                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       result =
         create_POA_and_register_servant (threadpool_policy_1.in (),
@@ -295,7 +273,6 @@ Task::svc (void)
                                          this->orb_.in (),
                                          rt_orb.in ()
                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (result != 0)
         return result;
 
@@ -307,15 +284,12 @@ Task::svc (void)
                                          this->orb_.in (),
                                          rt_orb.in ()
                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (result != 0)
         return result;
 
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
 
-      this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->destroy ();
     }
   ACE_CATCHANY
     {
@@ -338,7 +312,6 @@ main (int argc, char *argv[])
                          argv,
                          ""
                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       int result =
         parse_args (argc, argv);
diff --git a/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp b/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp
index aab3f451e2b..6bf036e1119 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp
+++ b/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp
@@ -50,16 +50,15 @@ test_i::method (CORBA::Long client_id,
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 void
-test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+test_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0
                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
diff --git a/TAO/tests/RTCORBA/Thread_Pool/test_i.h b/TAO/tests/RTCORBA/Thread_Pool/test_i.h
index 14234e78d65..5a3507aa59e 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/test_i.h
+++ b/TAO/tests/RTCORBA/Thread_Pool/test_i.h
@@ -26,11 +26,11 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Shutdown the server.
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Our POA.
-  PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+  PortableServer::POA_ptr _default_POA (void);
 
 private:
   /// ORB.
diff --git a/TAO/tests/RTCORBA/common_args.cpp b/TAO/tests/RTCORBA/common_args.cpp
index 3085aa72bcb..f5e1ca5729b 100644
--- a/TAO/tests/RTCORBA/common_args.cpp
+++ b/TAO/tests/RTCORBA/common_args.cpp
@@ -99,7 +99,6 @@ get_priority_bands (const char *test_type,
   CORBA::Policy_var banded_connection_policy =
     rt_orb->create_priority_banded_connection_policy (bands
                                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   policies.length (policies.length () + 1);
   policies[policies.length () - 1] =
@@ -240,12 +239,10 @@ get_priority_lanes (const char *test_type,
                                           max_buffered_requests,
                                           max_request_buffer_size
                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   CORBA::Policy_var threadpool_policy =
     rt_orb->create_threadpool_policy (threadpool_id
                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   policies.length (policies.length () + 1);
   policies[policies.length () - 1] =
@@ -291,7 +288,6 @@ get_protocols (const char *test_type,
   CORBA::Policy_var protocol_policy =
     rt_orb->create_client_protocol_policy (protocols
                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   policies.length (policies.length () + 1);
   policies[policies.length () - 1] =
@@ -371,18 +367,15 @@ get_auto_priority_lanes_and_bands (CORBA::ULong number_of_lanes,
                                           max_buffered_requests,
                                           max_request_buffer_size
                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   policies.length (policies.length () + 1);
   policies[policies.length () - 1] =
     rt_orb->create_priority_banded_connection_policy (bands
                                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   policies.length (policies.length () + 1);
   policies[policies.length () - 1] =
     rt_orb->create_threadpool_policy (threadpool_id
                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }